← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/revision.pt

  • Committer: Michael Hudson
  • Date: 2008-07-28 05:26:13 UTC
  • mfrom: (128.13.91 new_theme_trunk)
  • Revision ID: michael.hudson@canonical.com-20080728052613-35uxs2xz28dsqdgz
merge the new theme created by Martin Albisetti
(this work sponsored by Canonical)

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/revision.pt
4
4
    <head>
5
5
      <title metal:fill-slot="title"
6
6
             tal:content="string:${branch/friendly_name} : revision ${change/revno}">
7
 
        ${branch.friendly_name} : revision ${change.revno}
8
7
      </title>
9
8
 
10
9
      <metal:block fill-slot="header_extras">
11
 
        <script type="text/javascript"
12
 
                tal:attributes="src python:branch.static_url('/static/javascript/collapse.js')">
13
 
        </script>
 
10
        <link rel="stylesheet" type="text/css" media="all"
 
11
              tal:attributes="href python:branch.static_url('/static/css/diff.css')"/>
14
12
      </metal:block>
15
13
    </head>
16
14
 
17
15
    <body>
18
16
 
19
 
      <h1 metal:fill-slot="heading">
20
 
        <span class="branch-name" tal:content="branch/friendly_name">
21
 
          ${branch.friendly_name}
22
 
        </span>
23
 
        : revision
24
 
        <tal:revno content="change/revno">
25
 
          ${change.revno}
26
 
        </tal:revno>
 
17
      <tal:block metal:fill-slot="heading">
 
18
        <h1><tal:block content="branch/friendly_name" /><span>: <tal:revno content="change/revno"></tal:revno>
27
19
        <tal:compare-to condition="python:compare_revid is not None">
28
 
          (compared to revision <tal:b content="python:history.get_revno(compare_revid)" />)
29
 
        </tal:compare-to>
30
 
      </h1>
 
20
          (compared to revision <tal:block content="python:history.get_revno(compare_revid)" />)
 
21
          </tal:compare-to>
 
22
        </span></h1>
 
23
        <ul id="submenuTabs">
 
24
            <li id="first"><a tal:attributes="href python:url(['/files', change.revno]); 
 
25
                                               title string:browse files at revision ${change/revno}"
 
26
                               tal:content="string:browse files at revision ${change/revno}"></a></li>
 
27
            <li tal:condition="python:remember != change.revno">
 
28
                <a tal:attributes="href python:url(['/revision', change.revno], remember=change.revno, compare_revid=None); 
 
29
                                   title string:Compare with another revision"
 
30
                   tal:content="string:Compare with another revision"></a></li>       
 
31
            <li tal:condition="python:(remember is not None) and (compare_revid is None) and (change.revno != remember)" >
 
32
                <a tal:attributes="href python:url(['/revision', change.revno], compare_revid=history.get_revno(remember))">
 
33
                compare with revision <tal:b content="python:history.get_revno(remember)" />
 
34
                </a>
 
35
            </li>
 
36
            <li id="last"><a tal:attributes="href python:url(['/changes', change.revno]); 
 
37
                                  title string:view history from revision ${change/revno}"
 
38
                  tal:content="string:view history from revision ${change/revno}"></a></li>
 
39
        </ul>
31
40
 
32
 
      <div metal:fill-slot="content">
33
 
        <div class="links">
34
 
          <div>
35
 
            <b>&#8594;</b>
36
 
            <a tal:attributes="href python:url(['/files', change.revno])">
37
 
              browse files at revision <tal:b content="change/revno" />
38
 
            </a>
39
 
          </div>
40
 
          <div>
41
 
            <b>&#8594;</b>
42
 
            <a tal:attributes="href python:url(['/changes'], start_revid=change.revno)">
43
 
              view history from revision <tal:b content="change/revno" />
44
 
            </a>
45
 
          </div>
46
 
          <div tal:condition="python:(remember is not None) and (compare_revid is None) and remember != revid" >
47
 
            <b>&#8594;</b>
48
 
            <a tal:attributes="href python:url(['/revision', change.revno], compare_revid=history.get_revno(remember))">
49
 
              compare with revision <tal:b content="python:history.get_revno(remember)" />
50
 
            </a>
51
 
          </div>
52
 
          <div  tal:condition="python:remember != revid">
53
 
            <b>&#8594;</b>
54
 
            <a tal:attributes="href python:url(['/revision', change.revno], remember=change.revno, compare_revid=None)">
55
 
              compare with another revision
56
 
            </a>
57
 
          </div>
58
 
          <tal:we-are-comparing condition="python:compare_revid is not None">
59
 
            <div>
60
 
              <b>&#8594;</b>
 
41
        <tal:we-are-comparing condition="python:compare_revid is not None">
 
42
        <ul id="submenuTabs">
 
43
          <li id="first">
61
44
              <a tal:attributes="href python:url([ '/revision', history.get_revno(compare_revid) ], remember=change.revno, compare_revid=change.revno)">
62
45
                reverse the comparison (<tal:b content="change/revno" /> to <tal:b content="python:history.get_revno(compare_revid)" />)
63
46
              </a>
64
 
            </div>
65
 
            <div>
66
 
              <b>&#8594;</b>
 
47
          </li>
 
48
          <li id="last">
67
49
              <a tal:attributes="href python:url(['/revision', change.revno], remember=None, compare_revid=None)">
68
50
                stop comparing with revision <tal:b content="python:history.get_revno(compare_revid)" />
69
51
              </a>
70
 
            </div>
71
 
          </tal:we-are-comparing>
72
 
        </div>
73
 
 
 
52
          </li>
 
53
        </ul>
 
54
        </tal:we-are-comparing>
 
55
        
74
56
        <tal:revision-info replace="structure python:revisioninfo(url, branch, change, modified_file_link_rev)" />
75
 
 
76
 
        <table class="diff-option-buttons">
77
 
          <tr>
78
 
            <td>
79
 
              <tal:b content="structure python:collapse_all_button('file', branch, normal='table-row')" />
80
 
            </td>
81
 
 
82
 
            <td class="spacey">
83
 
              <a href="javascript:show_sbs()"
84
 
                 class="hide-all collapse-style-sbs-show"
85
 
                 title="collapse">
86
 
                <img tal:attributes="src python:branch.static_url('/static/images/nav-small-out.gif')"
87
 
                     width="22" height="10" class="collapse-triangle" />
88
 
                show side by side
89
 
              </a>
90
 
              <a href="javascript:show_unified()"
91
 
                 class="hide-all collapse-style-unified-show"
92
 
                 title="expand">
93
 
                <img tal:attributes="src python:branch.static_url('/static/images/nav-small-in.gif')"
94
 
                     width="22" height="10" class="collapse-triangle" />
95
 
                show unified diff
96
 
              </a>
97
 
            </td>
98
 
 
99
 
            <td class="diff-key-block diff-insert">
100
 
            </td>
101
 
            <td class="label">
102
 
              added
103
 
            </td>
104
 
            <td class="diff-key-block diff-delete">
105
 
            </td>
106
 
            <td class="label">
107
 
              removed
108
 
            </td>
109
 
          </tr>
110
 
        </table>
111
 
 
 
57
        <p class="expand" id="expand_all" style="display:none;"><a tal:attributes="href string:javascript:toggle_expand_all_revisionview('open')">
 
58
            <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"
 
59
                  alt="expand all" /> expand all</a>
 
60
        </p>
 
61
        <p class="expand" id="collapse_all"><a tal:attributes="href string:javascript:toggle_expand_all_revisionview('close')">
 
62
            <img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png')"
 
63
                  alt="collapse all" /> collapse all</a>
 
64
        </p>
 
65
        <!-- Table -->        
 
66
        <p class="codin"><img tal:attributes="src python:branch.static_url('/static/images/newCode.gif')" alt="added" /> added</p>
 
67
        <p class="codin"><img tal:attributes="src python:branch.static_url('/static/images/deleteCode.gif')" alt="removed" /> removed</p>
 
68
        <div class="clear"><!-- --></div>
 
69
 
 
70
      </tal:block>
 
71
 
 
72
      <div metal:fill-slot="content">
112
73
        <div class="diff"
113
74
             tal:condition="change/changes/modified"
114
75
             tal:define="uniqs python:{}">
115
76
          <!-- ! side-by-side diff -->
116
 
          <table class="diff-block collapse-style-sbs-content">
117
 
            <tal:block repeat="item change/changes/modified">
 
77
          <tal:block repeat="item change/changes/modified">
 
78
 
118
79
              <tal:u define="u python:util.uniq(uniqs, item.file_id)">
119
 
                <tr>
120
 
                  <th class="filename" colspan="4">
121
 
                    <tal:b content="structure python:collapse_button('file', u, branch, normal='table-row')" />
122
 
                    <a tal:attributes="href  python:url(['/annotate', change.revno], file_id=item.file_id);
123
 
                                       name  string:${item/filename}-s;
124
 
                                       title string:Annotate ${item/filename}"
125
 
                       tal:content="item/filename">
126
 
                      ${item.filename}
127
 
                    </a>
128
 
                  </th>
129
 
                </tr>
130
 
 
131
 
                <tal:block repeat="chunk item/sbs_chunks">
132
 
                  <tr tal:attributes="class string:diff-chunk collapse-file-${u}-content">
133
 
                    <th class="lineno">
134
 
                      old
135
 
                    </th>
136
 
                    <th>
137
 
                    </th>
138
 
                    <th class="lineno">
139
 
                      new
140
 
                    </th>
141
 
                    <th>
142
 
                    </th>
143
 
                  </tr>
144
 
                  <tr tal:repeat="line chunk/diff"
145
 
                      tal:attributes="class string:diff-chunk collapse-file-${u}-content">
 
80
                      <div class="diffBox"><img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png');
 
81
                                                                title python:branch.static_url('/static/images/treeCollapsed.png');
 
82
                                                                alt python:branch.static_url('/static/images/treeExpanded.png')"
 
83
                                                                class="expand_diff" />
 
84
                                           <a tal:attributes="href python:url(['/annotate', change.revno], clear=1, file_id=item.file_id);
 
85
                                                              id string:${item/filename}-s;
 
86
                                                              title string:Annotate ${item/filename}"
 
87
                                              tal:content="item/filename"></a></div>
 
88
               <div id="psuedotable" class="diffinfo">
 
89
               <tal:block repeat="chunk item/sbs_chunks">
 
90
 
 
91
                <tal:block condition="not:repeat/chunk/start">
 
92
                 <div class="lineNumber separate"></div>
 
93
                 <div class="lineCode separate"></div>
 
94
                 <div class="lineNumber separate"></div>
 
95
                 <div class="lineCode separate"></div>
 
96
                 <div class="clear"><!-- --></div>
 
97
                </tal:block>
 
98
 
 
99
                <tal:block repeat="line chunk/diff">
 
100
                    <div id="pseudorow">
146
101
                    <tal:block condition="line/old_lineno">
147
 
                      <td class="lineno"
148
 
                          tal:content="line/old_lineno">
149
 
                        ${line.old_lineno}
150
 
                      </td>
151
 
                      <td tal:attributes="class string:diff-${line/old_type}"
152
 
                          tal:content="line/old_line">
153
 
                        ${line.old_line}
154
 
                      </td>
 
102
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.old_lineno)" /></div>
 
103
                        <div tal:attributes="class string:lineCode ${line/old_type}">
 
104
                            <tal:block replace="structure python:util.fill_div(line.old_line)" />
 
105
                        </div>
155
106
                    </tal:block>
 
107
 
156
108
                    <tal:block condition="not:line/old_lineno">
157
 
                      <td class="lineno-skip"
158
 
                          tal:content="line/old_lineno">
159
 
                        ${line.old_lineno}
160
 
                      </td>
161
 
                      <td tal:attributes="class string:diff-${line/old_type}-skip"
162
 
                          tal:content="line/old_line">
163
 
                        ${line.old_line}
164
 
                      </td>
 
109
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.old_lineno)" /></div>
 
110
                        <div tal:attributes="class string:lineCode ${line/old_type}">
 
111
                            <tal:block replace="structure python:util.fill_div(line.old_line)" />
 
112
                        </div>
165
113
                    </tal:block>
 
114
 
166
115
                    <tal:block condition="line/new_lineno">
167
 
                      <td class="lineno"
168
 
                          tal:content="line/new_lineno">
169
 
                        ${line.new_lineno}
170
 
                      </td>
171
 
                      <td tal:attributes="class string:diff-${line/new_type}"
172
 
                          tal:content="line/new_line">
173
 
                        ${line.new_line}
174
 
                      </td>
 
116
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.new_lineno)" /></div>
 
117
                        <div tal:attributes="class string:lineCode ${line/new_type}">
 
118
                            <tal:block replace="structure python:util.fill_div(line.new_line)" />
 
119
                        </div>
175
120
                    </tal:block>
 
121
 
176
122
                    <tal:block condition="not:line/new_lineno">
177
 
                      <td class="lineno-skip"
178
 
                          tal:content="line/new_lineno">
179
 
                        ${line.new_lineno}
180
 
                      </td>
181
 
                      <td tal:attributes="class string:diff-${line/new_type}-skip"
182
 
                          tal:content="line/new_line">
183
 
                        ${line.new_line}
184
 
                      </td>
 
123
                    <div class="lineNumber"><tal:block replace="structure python:util.fill_div(line.new_lineno)" /></div>
 
124
                        <div tal:attributes="class string:lineCode ${line/new_type}">
 
125
                            <tal:block replace="structure python:util.fill_div(line.new_line)" />
 
126
                        </div>
185
127
                    </tal:block>
186
 
                  </tr>
187
 
                  <tr tal:attributes="class string:diff-chunk-spacing collapse-file-${u}-content">
188
 
                    <td colspan="4">
189
 
                      &nbsp;
190
 
                    </td>
191
 
                  </tr>
192
 
                </tal:block>
193
 
                <tr class="diff-spacing">
194
 
                  <td colspan="4">
195
 
                    &nbsp;
196
 
                  </td>
197
 
                </tr>
198
 
              </tal:u>
199
 
            </tal:block>
200
 
          </table>
201
 
 
202
 
          <!-- ! unified diff -->
203
 
          <table class="diff-block collapse-style-unified-content">
204
 
            <tal:block repeat="item change/changes/modified">
205
 
              <tal:u define="u python:util.uniq(uniqs, item.file_id)">
206
 
                <tr>
207
 
                  <th class="filename" colspan="4">
208
 
                    <tal:b content="structure python:collapse_button('file', u, branch, normal='table-row')" />
209
 
                    <a tal:attributes="href  python:url(['/annotate', change.revno], file_id=item.file_id);
210
 
                                       name  string:${item/filename}-u;
211
 
                                       title string:Annotate ${item/filename}"
212
 
                       tal:content="item/filename">
213
 
                      ${item.filename}
214
 
                    </a>
215
 
                  </th>
216
 
                </tr>
217
 
 
218
 
                <tal:block repeat="chunk item/chunks">
219
 
                  <tr tal:attributes="class string:diff-chunk collapse-file-${u}-content">
220
 
                    <th class="lineno">
221
 
                      old
222
 
                    </th>
223
 
                    <th class="lineno">
224
 
                      new
225
 
                    </th>
226
 
                    <th>
227
 
                    </th>
228
 
                    <th>
229
 
                    </th>
230
 
                  </tr>
231
 
                  <tr tal:repeat="line chunk/diff"
232
 
                      tal:attributes="class string:diff-chunk collapse-file-${u}-content">
233
 
                    <td class="lineno"
234
 
                        tal:content="line/old_lineno">
235
 
                      ${line.old_lineno}
236
 
                    </td>
237
 
                    <td class="lineno"
238
 
                        tal:content="line/new_lineno">
239
 
                      ${line.new_lineno}
240
 
                    </td>
241
 
                    <td tal:attributes="class string:diff-${line/type} text"
242
 
                        tal:content="line/line">
243
 
                      ${line.line}
244
 
                    </td>
245
 
                    <td>
246
 
                    </td>
247
 
                  </tr>
248
 
                  <tr tal:attributes="class string:diff-chunk-spacing collapse-file-${u}-content">
249
 
                    <td colspan="4">
250
 
                      &nbsp;
251
 
                    </td>
252
 
                  </tr>
253
 
                </tal:block>
254
 
                <tr class="diff-spacing">
255
 
                  <td colspan="4">
256
 
                    &nbsp;
257
 
                  </td>
258
 
                </tr>
259
 
              </tal:u>
260
 
            </tal:block>
261
 
          </table>
262
 
        </div>
263
 
 
264
 
        <div tal:condition="python:navigation.prev_page_revid or navigation.next_page_revid"
265
 
             class="bar">
266
 
          <table>
267
 
            <tr>
268
 
              <td class="buttons">
269
 
                <a tal:condition="navigation/prev_page_revid"
270
 
                   tal:attributes="href navigation/prev_page_url">
271
 
                  &lt; revision
272
 
                  <tal:r content="python:history.get_revno(navigation.prev_page_revid)" />
273
 
                </a>
274
 
              </td>
275
 
              <td class="rbuttons" align="right">
276
 
                <a tal:condition="navigation/next_page_revid"
277
 
                   tal:attributes="href navigation/next_page_url">
278
 
                  revision
279
 
                  <tal:r content="python:history.get_revno(navigation.next_page_revid)" />
280
 
                  &gt;
281
 
                </a>
282
 
              </td>
283
 
            </tr>
284
 
          </table>
285
 
        </div>
 
128
                    <div class="clear"><!-- --></div>
 
129
                    </div>
 
130
                   </tal:block>
 
131
                 </tal:block>
 
132
                 </div>
 
133
              </tal:u>
 
134
            </tal:block>
 
135
        </div>
 
136
 
 
137
        <ul tal:condition="python:navigation.prev_page_revid or navigation.next_page_revid"
 
138
            id="pages">
 
139
            <li tal:condition="navigation/prev_page_revid" 
 
140
                class="previous">
 
141
                <a tal:attributes="href navigation/prev_page_url">&laquo; Previous</a>
 
142
            </li>
 
143
            <!-- FIXME: Leaving this to eventually show page numbers. Can't show all of them,
 
144
                        so some magic has to be done to just show the previous and next N page numbers
 
145
 
 
146
            <li class="active">1</li>
 
147
            <tal:block tal:repeat="page_number python:range(navigation.page_count)">
 
148
            <li><a href="#"
 
149
                   tal:content="page_number"></a></li>
 
150
               </tal:block>-->
 
151
            <li tal:condition="navigation/next_page_revid"
 
152
                class="next">
 
153
                <a tal:attributes="href navigation/next_page_url">Next &raquo;</a>
 
154
            </li>
 
155
        </ul>
 
156
 
286
157
      </div>
287
158
    </body>
288
159
  </html>