← Back to branch summary

~ubuntu-branches/ubuntu/lucid/loggerhead/lucid-security

« back to all changes in this revision

Viewing changes to loggerhead/templates/revision.pt

  • Committer: Bazaar Package Importer
  • Author(s): James Westby, Roland Mas, Jelmer Vernooij, James Westby
  • Date: 2009-08-26 13:18:03 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090826131803-0ce1fhaetci8b0c5
Tags: 1.17-0ubuntu1
http://bugs.debian.org/511286
http://bugs.debian.org/507000
[ Roland Mas ]
* Use the YUI library provided by libjs-yui. (Closes: #511286)

[ Jelmer Vernooij ]
* Use my debian.org address in Uploaders field.
* Add ${misc:Depends} to please lintian.
* Suggest recent version of paste, which doesn't expose internal port
  numbers in links. (Closes: #507000)
* Bump standards version to 3.8.1.

[ James Westby ]
* New upstream release.
* Drop get-orig-source rule in favour of debian/watch.
* Add python-pkg-resources and python-paste to Build-Depends,
  python-pkg-resources to Depends and python-simplejson to
  Recommends due to dependency changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/revision.pt
9
9
      <metal:block fill-slot="header_extras">
10
10
        <link rel="stylesheet" type="text/css" media="all"
11
11
              tal:attributes="href python:branch.static_url('/static/css/diff.css')"/>
 
12
        <script type="text/javascript"
 
13
                tal:attributes="src python:branch.static_url('/static/javascript/diff.js')"></script>
 
14
        <script type="text/javascript">
 
15
          var link_data = <tal:b content="link_data" />;
 
16
          var specific_path = <tal:b content="json_specific_path" />;
 
17
          var path_to_id = <tal:b content="path_to_id" />;
 
18
        </script>
12
19
      </metal:block>
13
20
    </head>
14
21
 
25
32
          <tal:no-link condition="not: branch/branch_link">
26
33
            <span metal:use-macro="breadcrumbs/directory"></span>
27
34
          </tal:no-link>
28
 
          <span>: <tal:revno content="change/revno"></tal:revno>
29
 
        <tal:compare-to condition="python:compare_revid is not None">
30
 
          (compared to revision <tal:block content="python:history.get_revno(compare_revid)" />)
31
 
          </tal:compare-to>
32
 
        </span></h1>
 
35
          <span class="breadcrumb">:
 
36
            <tal:revno condition="not:specific_path" content="change/revno"></tal:revno>
 
37
            <a tal:condition="specific_path" tal:content="change/revno"
 
38
               tal:attributes="href python:url(['/revision', change.revno])"
 
39
               title="View changes to all files"></a>
 
40
                      <tal:compare-to condition="python:compare_revid is not None">
 
41
              (compared to revision <tal:block content="python:history.get_revno(compare_revid)" />)
 
42
            </tal:compare-to>
 
43
          </span>
 
44
          <span class="breadcrumb" tal:condition="specific_path">
 
45
            : <tal:annotate content="structure python:annotate_link(url, change.revno, specific_path)" />
 
46
          </span>
 
47
        </h1>
 
48
        <tal:branch-info replace="structure python:branchinfo(branch)" />
 
49
        <p tal:condition="not:specific_path">
 
50
          Viewing all changes in revision <tal:revno content="change/revno" />.
 
51
        </p>
 
52
        <p tal:condition="specific_path">
 
53
          <a tal:attributes="href python:url(['/revision', change.revno])">
 
54
            &#xAB; back to all changes in this revision
 
55
          </a>
 
56
        </p>
 
57
        <p tal:condition="specific_path">
 
58
          Viewing changes to <tal:annotate content="structure python:annotate_link(url, change.revno, specific_path)" />
 
59
        </p>
33
60
        <ul id="submenuTabs">
34
 
            <li id="first"><a tal:attributes="href python:url(['/files', change.revno]); 
35
 
                                               title string:browse files at revision ${change/revno}"
36
 
                               tal:content="string:browse files at revision ${change/revno}"></a></li>
37
 
            <li tal:condition="python:remember != change.revno">
38
 
                <a tal:attributes="href python:url(['/revision', change.revno], remember=change.revno, compare_revid=None); 
39
 
                                   title string:compare with another revision"
40
 
                   tal:content="string:Compare with another revision"></a></li>       
41
 
            <li tal:condition="python:(remember is not None) and (compare_revid is None) and (change.revno != remember)" >
42
 
                <a tal:attributes="href python:url(['/revision', change.revno], compare_revid=history.get_revno(remember))">
43
 
                compare with revision <tal:b content="python:history.get_revno(remember)" />
44
 
                </a>
45
 
            </li>
46
 
            <li>
 
61
          <li id="first"><a tal:attributes="href python:url(['/files', change.revno]);
 
62
                                            title string:browse files at revision ${change/revno}"
 
63
                            tal:content="string:browse files at revision ${change/revno}"></a></li>
 
64
          <li tal:condition="python:remember != change.revno">
 
65
            <a tal:attributes="href python:url(['/revision', change.revno], remember=change.revno, compare_revid=None);
 
66
                               title string:compare with another revision"
 
67
               tal:content="string:Compare with another revision"></a></li>
 
68
          <li tal:condition="python:(remember is not None) and (compare_revid is None) and (change.revno != remember)" >
 
69
            <a tal:attributes="href python:url(['/revision', change.revno], compare_revid=history.get_revno(remember))">
 
70
              compare with revision <tal:b content="python:history.get_revno(remember)" />
 
71
            </a>
 
72
          </li>
 
73
          <li>
47
74
            <a tal:condition="python:len(change.parents) > 0 and compare_revid is None"
48
 
                   tal:attributes="href python:url(['/diff', change.revno], clear=1)">download diff</a>
 
75
               tal:attributes="href python:url(['/diff', change.revno], clear=1)">download diff</a>
49
76
            <a tal:condition="python:compare_revid is not None"
50
 
                   tal:attributes="href python:url(['/diff', change.revno, history.get_revno(compare_revid)], clear=1)">download diff</a>
51
 
            </li>
52
 
            <li id="last"><a tal:attributes="href python:url(['/changes', change.revno]); 
53
 
                                  title string:view history from revision ${change/revno}"
54
 
                  tal:content="string:view history from revision ${change/revno}"></a></li>
 
77
               tal:attributes="href python:url(['/diff', change.revno, history.get_revno(compare_revid)], clear=1)">download diff</a>
 
78
          </li>
 
79
          <li id="last"><a tal:attributes="href python:url(['/changes', change.revno]);
 
80
                                           title string:view history from revision ${change/revno}"
 
81
                           tal:content="string:view history from revision ${change/revno}"></a></li>
55
82
        </ul>
56
83
 
57
84
        <tal:we-are-comparing condition="python:compare_revid is not None">
58
 
        <ul id="submenuTabs">
59
 
          <li id="first">
 
85
          <ul id="submenuTabs">
 
86
            <li id="first">
60
87
              <a tal:attributes="href python:url([ '/revision', history.get_revno(compare_revid) ], remember=change.revno, compare_revid=change.revno)">
61
88
                reverse the comparison (<tal:b content="change/revno" /> to <tal:b content="python:history.get_revno(compare_revid)" />)
62
89
              </a>
63
 
          </li>
64
 
          <li id="last">
 
90
            </li>
 
91
            <li id="last">
65
92
              <a tal:attributes="href python:url(['/revision', change.revno], remember=None, compare_revid=None)">
66
93
                stop comparing with revision <tal:b content="python:history.get_revno(compare_revid)" />
67
94
              </a>
68
 
          </li>
69
 
        </ul>
 
95
            </li>
 
96
          </ul>
70
97
        </tal:we-are-comparing>
71
 
        
72
 
        <tal:revision-info replace="structure python:revisioninfo(url, branch, change, modified_file_link_rev)" />
73
 
        <p class="expand" id="expand_all" style="display:none;"><a tal:attributes="href string:javascript:toggle_expand_all_revisionview('open')">
74
 
            <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"
75
 
                  alt="expand all" /> expand all</a>
76
 
        </p>
77
 
        <p class="expand" id="collapse_all"><a tal:attributes="href string:javascript:toggle_expand_all_revisionview('close')">
78
 
            <img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png')"
79
 
                  alt="collapse all" /> collapse all</a>
80
 
        </p>
81
 
        <!-- Table -->        
 
98
 
 
99
        <tal:revision-info replace="structure python:revisioninfo(url, branch, change, file_changes, specific_path, merged_in)" />
 
100
        <tal:specific-path condition="not:specific_path">
 
101
          <p class="expand show_if_js" id="expand_all"><a href="#">
 
102
              <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"
 
103
                   alt="expand all" /> expand all</a>
 
104
          </p>
 
105
          <p class="expand" id="collapse_all" style="display:none;"><a href="#">
 
106
              <img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png')"
 
107
                   alt="collapse all" /> collapse all</a>
 
108
          </p>
 
109
        </tal:specific-path>
 
110
        <!-- Table -->
 
111
        <p class="expand show_if_js"><a id="toggle_unified_sbs" href="#">Show diffs side-by-side</a></p>
82
112
        <p class="codin"><img tal:attributes="src python:branch.static_url('/static/images/newCode.gif')" alt="added" /> added</p>
83
113
        <p class="codin"><img tal:attributes="src python:branch.static_url('/static/images/deleteCode.gif')" alt="removed" /> removed</p>
84
114
        <div class="clear"><!-- --></div>
86
116
      </tal:block>
87
117
 
88
118
      <div metal:fill-slot="content">
89
 
        <div class="diff"
90
 
             tal:condition="change/changes/modified"
91
 
             tal:define="uniqs python:{}">
92
 
          <!-- ! side-by-side diff -->
93
 
          <tal:block repeat="item change/changes/modified">
94
 
 
95
 
              <tal:u define="u python:util.uniq(uniqs, item.file_id)">
96
 
                      <div class="diffBox"><img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png');
97
 
                                                                title python:branch.static_url('/static/images/treeCollapsed.png');
98
 
                                                                alt python:branch.static_url('/static/images/treeExpanded.png')"
99
 
                                                                class="expand_diff" />
100
 
                                           <a tal:attributes="href python:url(['/annotate', change.revno], clear=1, file_id=item.file_id);
101
 
                                                              id string:${item/filename}-s;
102
 
                                                              title string:Annotate ${item/filename}"
103
 
                                              tal:content="item/filename"></a></div>
104
 
               <div id="psuedotable" class="diffinfo">
105
 
               <tal:block repeat="chunk item/sbs_chunks">
106
 
 
107
 
                <tal:block condition="not:repeat/chunk/start">
108
 
                 <div class="lineNumber separate"></div>
109
 
                 <div class="lineCode separate"></div>
110
 
                 <div class="lineNumber separate"></div>
111
 
                 <div class="lineCode separate"></div>
112
 
                 <div class="clear"><!-- --></div>
113
 
                </tal:block>
114
 
 
115
 
                <tal:block repeat="line chunk/diff">
116
 
                    <div id="pseudorow">
117
 
                    <tal:block condition="line/old_lineno">
118
 
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.old_lineno)" /></div>
119
 
                        <div tal:attributes="class string:lineCode ${line/old_type}">
120
 
                            <tal:block replace="structure python:util.fill_div(line.old_line)" />
121
 
                        </div>
122
 
                    </tal:block>
123
 
 
124
 
                    <tal:block condition="not:line/old_lineno">
125
 
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.old_lineno)" /></div>
126
 
                        <div tal:attributes="class string:lineCode ${line/old_type}">
127
 
                            <tal:block replace="structure python:util.fill_div(line.old_line)" />
128
 
                        </div>
129
 
                    </tal:block>
130
 
 
131
 
                    <tal:block condition="line/new_lineno">
132
 
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.new_lineno)" /></div>
133
 
                        <div tal:attributes="class string:lineCode ${line/new_type}">
134
 
                            <tal:block replace="structure python:util.fill_div(line.new_line)" />
135
 
                        </div>
136
 
                    </tal:block>
137
 
 
138
 
                    <tal:block condition="not:line/new_lineno">
139
 
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.new_lineno)" /></div>
140
 
                        <div tal:attributes="class string:lineCode ${line/new_type}">
141
 
                            <tal:block replace="structure python:util.fill_div(line.new_line)" />
142
 
                        </div>
143
 
                    </tal:block>
144
 
                    <div class="clear"><!-- --></div>
 
119
        <tal:block condition="specific_path">
 
120
          <div class="diff">
 
121
 
 
122
            <div  class="diffBox">
 
123
              <a tal:attributes="href python:url(['/revision', change.revno, specific_path], clear=1);
 
124
                                 id string:${specific_path};
 
125
                                 title string:View changes to ${specific_path} only"
 
126
                 class="the-link">
 
127
                <img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png')"
 
128
                     class="expand_diff"/>
 
129
                <tal:b content="specific_path" />
 
130
              </a>
 
131
            </div>
 
132
            <div style="overflow: hidden">
 
133
              <div class="container">
 
134
                <div class="loading" style="display:none">
 
135
                  <img tal:attributes="src python:branch.static_url('/static/images/spinner.gif')" />
 
136
                </div>
 
137
                <div class="diffinfo">
 
138
                  <div class="pseudotable unified"
 
139
                       tal:repeat="chunk diff_chunks">
 
140
 
 
141
                    <tal:block condition="not:repeat/chunk/start">
 
142
                      <div class="pseudorow context-row">
 
143
                        <div class="lineNumber separate"></div>
 
144
                        <div class="lineNumber second separate"></div>
 
145
                        <div class="code separate"></div>
 
146
                        <div class="clear"><!-- --></div>
 
147
                      </div>
 
148
                    </tal:block>
 
149
 
 
150
                    <div tal:repeat="line chunk/diff"
 
151
                         tal:attributes="class string:pseudorow ${line/type}-row">
 
152
                      <div class="lineNumber first"
 
153
                           tal:content="structure python:util.fill_div(line.old_lineno)"></div>
 
154
                      <div class="lineNumber second"
 
155
                           tal:content="structure python:util.fill_div(line.new_lineno)"></div>
 
156
                      <div tal:attributes="class string:code ${line/type}"
 
157
                           tal:content="structure python:util.fill_div(util.html_clean(line.line))"></div>
 
158
                      <div class="clear"><!-- --></div>
145
159
                    </div>
146
 
                   </tal:block>
147
 
                 </tal:block>
148
 
                 </div>
149
 
              </tal:u>
150
 
            </tal:block>
151
 
        </div>
 
160
                  </div>
 
161
                </div>
 
162
              </div>
 
163
            </div>
 
164
          </div>
 
165
        </tal:block>
 
166
 
 
167
        <tal:block condition="not:specific_path">
 
168
          <div class="diff"
 
169
               tal:repeat="item file_changes/text_changes" tal:attributes="id string:diff-${item/index}">
 
170
 
 
171
            <div  class="diffBox">
 
172
              <a tal:attributes="href python:url(['/revision', change.revno, item.filename], clear=1);
 
173
                                 id string:${item/filename};
 
174
                                 title string:View changes to ${item/filename} only"
 
175
                 class="the-link">
 
176
                <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"
 
177
                     class="expand_diff" />
 
178
                <tal:b content="item/filename" />
 
179
              </a>
 
180
            </div>
 
181
            <div class="diffinfo"  style="display:none">
 
182
              <div class="loading">
 
183
                <img tal:attributes="src python:branch.static_url('/static/images/spinner.gif')" />
 
184
              </div>
 
185
            </div>
 
186
          </div>
 
187
        </tal:block>
152
188
 
153
189
        <ul tal:condition="python:navigation.prev_page_revid or navigation.next_page_revid"
154
190
            id="pages">
155
 
            <li tal:condition="navigation/prev_page_revid" 
156
 
                class="previous">
157
 
                <a tal:attributes="href navigation/prev_page_url">&laquo; Previous</a>
158
 
            </li>
159
 
            <!-- FIXME: Leaving this to eventually show page numbers. Can't show all of them,
160
 
                        so some magic has to be done to just show the previous and next N page numbers
 
191
          <li tal:condition="navigation/prev_page_revid"
 
192
              class="previous">
 
193
            <a tal:attributes="href navigation/prev_page_url">&laquo; Newer</a>
 
194
          </li>
 
195
          <!-- FIXME: Leaving this to eventually show page numbers. Can't show all of them,
 
196
               so some magic has to be done to just show the previous and next N page numbers
161
197
 
162
 
            <li class="active">1</li>
163
 
            <tal:block tal:repeat="page_number python:range(navigation.page_count)">
164
 
            <li><a href="#"
165
 
                   tal:content="page_number"></a></li>
 
198
               <li class="active">1</li>
 
199
               <tal:block tal:repeat="page_number python:range(navigation.page_count)">
 
200
                 <li><a href="#"
 
201
                        tal:content="page_number"></a></li>
166
202
               </tal:block>-->
167
 
            <li tal:condition="navigation/next_page_revid"
168
 
                class="next">
169
 
                <a tal:attributes="href navigation/next_page_url">Next &raquo;</a>
170
 
            </li>
 
203
          <li tal:condition="navigation/next_page_revid"
 
204
              class="next">
 
205
            <a tal:attributes="href navigation/next_page_url">Older &raquo;</a>
 
206
          </li>
171
207
        </ul>
172
208
 
173
209
      </div>