← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/viewvc/oneiric-security

« back to all changes in this revision

Viewing changes to templates/dir_new.ezt

  • Committer: Bazaar Package Importer
  • Author(s): David Martínez Moreno, John Zaitseff, David Martínez Moreno
  • Date: 2010-07-02 02:24:34 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100702022434-9a5shavr4tj4cfqy
Tags: 1.1.5-1
http://bugs.debian.org/532611
http://bugs.debian.org/575777
http://bugs.debian.org/575787
http://bugs.debian.org/576307
http://bugs.debian.org/570573
http://bugs.debian.org/434301
http://bugs.debian.org/585366
[ John Zaitseff ]
* New upstream release (closes: #532611, #575777, #575787, #576307).  This
  solves CVE-2010-0004, CVE-2010-0005, CVE-2010-0736 and CVE-2010-0132.
* Extensive rewrite of files in the debian directory.  Updated to Debian
  policy 3.8.4, updated all control files to Debhelper 7, rewrote
  debian/rules for clarity (and to use Debhelper 7).
* Removed all references to Debconf, as previous versions of this
  package violated Debian policy (section 10.7.3): /etc/viewvc/viewvc.conf
  is a conffile, and maintainer scripts must NOT modify it at any time.
* Reorganised the installation files in /usr/lib/viewvc.  The CGI
  programs are now links to files in /usr/lib/viewvc/cgi-bin.
* Packaged the Apache mod-python modules for optional use (in
  /usr/lib/viewvc/mod-python).  See README.Debian for more information.
* Moved the static help documentation ("docroot") from /usr/share/viewvc
  to /usr/share/viewvc/docroot, as per Webapps Policy, section 3.1.
* Updated the debian/patches subdirectory to remove patches no longer
  relevant to ViewVC 1.1.x and to update those that still apply.
* debian/control:
  - Removed the dependency on gawk, as that was only required for Debconf
    configuration.
  - Demoted the dependency on mime-support to "Suggests": ViewVC can use
    it, if appropriately configured, but does not require it.
  - Added a suggestion for the python-tk package: viewvc-standalone(1)
    uses this when passed the "--gui" flag.
  - Modified all dependencies as appropriate.  Depend on httpd-cgi, not
    httpd, since the viewvc package needs a CGI server.  In addition,
    python-egenix-mxdatetime is no longer needed (since ViewVC 1.0.x).
  - Updated the XS-Python-Version field to "all" (Closes: #570573).
  - ViewVC 1.1.x supports only python-pygments as a syntax highlighter,
    not enscript.  Adjusted dependencies as appropriate.

[ David Martínez Moreno ]
* Changed history and added the CVE entry to the changelog for 1.0.9-1.
* debian/control:
  - Moved Section to vcs in order to match the overrides.
  - Make python-dev dependency just python.
  - Removed dummy package viewcvs, it was already dummy in lenny.
* debian/viewcvs.*: Removed.
* debian/NEWS: Fixed version in John's entry and removed old news from 0.9.4.
* debian/README.source: Added.
* The new release also addresses in a different way how to show long
  annotation messages (closes: #434301).
* Added debian/patches/92-no_strings_in_raise for fixing a couple of
  occurrences of string exceptions in the code, no longer valid in Python
  2.6, the default now (closes: #585366).

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/dir_new.ezt
1
1
[include "include/dir_header.ezt"]
2
2
 
3
 
<table cellspacing="1" cellpadding="2">
 
3
<table cellspacing="1" cellpadding="2" class="fixed">
4
4
<thead>
5
5
<tr>
6
 
  <th class="vc_header[is sortby "file"]_sort[end]" colspan="2">
 
6
  <th style="width: 200px" class="vc_header[is sortby "file"]_sort[end]">
7
7
    [if-any sortby_file_href]<a href="[sortby_file_href]#dirlist">File</a>[else]File[end]
8
8
    [is sortby "file"]
9
9
      <img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
11
11
        src="[docroot]/images/[is sortdir "up"]up[else]down[end].png" />
12
12
    [end]
13
13
  </th>
 
14
  <th style="width: 96px" class="vc_header"></th>
14
15
  [if-any sortby_rev_href]
15
16
  <th class="vc_header[is sortby "rev"]_sort[end]">
16
17
    <a href="[sortby_rev_href]#dirlist">Last Change</a>
35
36
<tbody>
36
37
[if-any up_href]
37
38
  <tr class="vc_row_odd">
38
 
    <td>
 
39
    <td style="width: 200px">
39
40
      <a href="[up_href]">
40
 
      <img src="[docroot]/images/back_small.png" alt="" width="16" height="16"
 
41
      <img src="[docroot]/images/back_small.png" alt="" class="vc_icon"
41
42
      />&nbsp;Parent&nbsp;Directory</a>
42
43
    </td>
43
 
    <td>&nbsp;</td>
 
44
    <td style="width: 96px; font-size: 0;"></td>
44
45
    <td>&nbsp;</td>
45
46
  </tr>
46
47
 [end]
47
48
[for entries]
48
49
  <tr class="vc_row_[if-index entries even]even[else]odd[end]">
49
 
    <td>
 
50
    <td style="width: 200px">
50
51
    <a name="[entries.anchor]" href="[is entries.pathtype "dir"][entries.view_href][else][if-any entries.prefer_markup][entries.view_href][else][entries.download_href][end][end]" title="[is entries.pathtype "dir"]View Directory Contents[else][if-any entries.prefer_markup]View[else]Download[end] File Contents[end]">
51
 
       <img src="[docroot]/images/[is entries.pathtype "dir"]dir[else][is entries.state "dead"]broken[else]text[end][end].png" alt="" width="16" height="16" />
 
52
       <img src="[docroot]/images/[is entries.pathtype "dir"]dir[else][is entries.state "dead"]broken[else]text[end][end].png" alt="" class="vc_icon" />
52
53
       [entries.name][is entries.pathtype "dir"]/[end]</a>
 
54
       [if-any entries.lockinfo]<img src="[docroot]/images/lock.png" alt="locked" class="vc_icon" title="Locked by [entries.lockinfo]" />[end]
53
55
       [is entries.state "dead"](dead)[end]
54
56
    </td>
55
57
 
56
58
    [if-any entries.errors]
57
59
      <td colspan="2">[for entries.errors]<em>[entries.errors]</em>[end]</td>
58
60
    [else]
59
 
      <td style="width:1%; white-space: nowrap">
60
 
 
61
 
        [# Icon column. We might want to add more icons like a tarball
62
 
         # icon for directories or a diff to previous icon for files. ]
63
 
 
64
 
        [if-any entries.log_href]
65
 
        <a href="[entries.log_href]"><img
66
 
        src="[docroot]/images/log.png"
67
 
        alt="View Log" width="16" height="16" /></a>
68
 
        [end]
69
 
 
70
 
        [is entries.pathtype "dir"]
71
 
          [is roottype "cvs"]
72
 
            [# no point in showing icon when there's only one to choose from]
73
 
          [else]
74
 
            <a href="[entries.view_href]"><img
75
 
            src="[docroot]/images/list.png"
76
 
            alt="View Directory Listing" width="16" height="16" /></a>
77
 
          [end]
78
 
        [end]
79
 
 
80
 
        [is entries.pathtype "file"]
81
 
          [if-any entries.graph_href]
82
 
          <a href="[entries.graph_href]"
 
61
      [define view_icon_link][end]
 
62
      [define graph_icon_link][end]
 
63
      [define download_icon_link][end]
 
64
      [define annotate_icon_link][end]
 
65
      [define log_icon_link][if-any entries.log_href]<a 
 
66
        href="[entries.log_href]"
 
67
        title="View Log"><img
 
68
          src="[docroot]/images/log.png"
 
69
          alt="View Log" 
 
70
          class="vc_icon" /></a>[end][end]
 
71
 
 
72
      [is entries.pathtype "dir"]
 
73
        [is roottype "cvs"]
 
74
          [# no point in showing icon when there's only one to choose from]
 
75
        [else]
 
76
          [define view_icon_link]<a 
 
77
            href="[entries.view_href]"
 
78
            title="View Directory Listing"><img
 
79
              src="[docroot]/images/list.png"
 
80
              alt="View Directory Listing" 
 
81
              class="vc_icon" /></a>[end]
 
82
        [end]
 
83
      [end]
 
84
 
 
85
      [is entries.pathtype "file"]
 
86
        [define view_icon_link][if-any entries.view_href]<a 
 
87
          href="[entries.view_href]"
 
88
          title="View File"><img
 
89
            src="[docroot]/images/view.png"
 
90
            alt="View File" 
 
91
            class="vc_icon" /></a>[end][end]
 
92
 
 
93
        [define graph_icon_link][if-any entries.graph_href]<a 
 
94
          href="[entries.graph_href]"
83
95
          title="View Revision Graph"><img
84
 
          src="[docroot]/images/cvsgraph_16x16.png"
85
 
          alt="View Revision Graph" width="16" height="16" />
86
 
          </a>
87
 
          [end]
88
 
 
89
 
          [if-any entries.view_href]
90
 
          <a href="[entries.view_href]"><img
91
 
          src="[docroot]/images/view.png"
92
 
          alt="View File" width="16" height="16" /></a>
93
 
          [end]
94
 
 
95
 
          [if-any entries.download_href]
96
 
          <a href="[entries.download_href]"><img
97
 
          src="[docroot]/images/download.png"
98
 
          alt="Download File" width="16" height="16" /></a>
99
 
          [end]
100
 
 
101
 
          [if-any entries.annotate_href]
102
 
          <a href="[entries.annotate_href]"><img
103
 
          src="[docroot]/images/annotate.png"
104
 
          alt="Annotate File" width="16" height="16" /></a>
105
 
          [end]
106
 
        [end]
107
 
      </td>
 
96
            src="[docroot]/images/cvsgraph_16x16.png"
 
97
            alt="View Revision Graph" 
 
98
            class="vc_icon" /></a>[end][end]
 
99
 
 
100
        [define download_icon_link][if-any entries.download_href]<a 
 
101
          href="[entries.download_href]"
 
102
          title="Download File"><img
 
103
            src="[docroot]/images/download.png"
 
104
            alt="Download File"
 
105
            class="vc_icon" /></a>[end][end]
 
106
 
 
107
        [define annotate_icon_link][if-any entries.annotate_href]<a 
 
108
          href="[entries.annotate_href]"
 
109
          title="Annotate File"><img
 
110
            src="[docroot]/images/annotate.png"
 
111
            alt="Annotate File" 
 
112
            class="vc_icon" /></a>[end][end]
 
113
      [end]
 
114
 
 
115
      <td style="width: 96px"
 
116
        >[# Icon column. We might want to add more icons like a tarball
 
117
          # icon for directories or a diff to previous icon for files.
 
118
          # Make sure this sucker has no whitespace in it, or the fixed
 
119
          # widthness of will suffer for large font sizes
 
120
         ][log_icon_link][view_icon_link][graph_icon_link][download_icon_link][annotate_icon_link]</td>
 
121
 
108
122
      <td>
109
123
        [if-any entries.rev]
110
 
          <strong>[if-any entries.revision_href]<a href="[entries.revision_href]">[entries.rev]</a>[else][entries.rev][end]</strong>
 
124
          <strong>[if-any entries.revision_href]<a href="[entries.revision_href]" title="Revision [entries.rev]">[entries.rev]</a>[else][entries.rev][end]</strong>
111
125
          ([entries.ago] ago)
112
126
          by <em>[entries.author]</em>:
113
127
          [entries.log]