← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/revision.pt

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/revision.pt
9
9
 
10
10
      <metal:block fill-slot="header_extras">
11
11
        <script type="text/javascript"
12
 
                tal:attributes="src python:branch.static_url('/static/javascript/collapse.js')">
 
12
                tal:attributes="src python:tg.url('/static/javascript/collapse.js')">
13
13
        </script>
14
14
      </metal:block>
15
15
    </head>
77
77
          </tal:we-are-comparing>
78
78
        </div>
79
79
 
80
 
        <tal:revision-info replace="structure python:revisioninfo(url, branch, change, modified_file_link_rev)" />
 
80
        <tal:revision-info replace="structure python:revisioninfo(url, branch, change, revid, modified_file_link_rev)" />
81
81
 
82
82
        <table class="diff-option-buttons">
83
83
          <tr>
84
84
            <td>
85
 
              <tal:b content="structure python:collapse_all_button('file', branch, normal='table-row')" />
 
85
              <tal:b content="structure python:collapse_all_button('file', 'table-row')" />
86
86
            </td>
87
87
 
88
88
            <td class="spacey">
89
89
              <a href="javascript:show_sbs()"
90
90
                 class="hide-all collapse-style-sbs-show"
91
91
                 title="collapse">
92
 
                <img tal:attributes="src python:branch.static_url('/static/images/nav-small-out.gif')"
 
92
                <img tal:attributes="src python:tg.url('/static/images/nav-small-out.gif')"
93
93
                     width="22" height="10" class="collapse-triangle" />
94
94
                show side by side
95
95
              </a>
96
96
              <a href="javascript:show_unified()"
97
97
                 class="hide-all collapse-style-unified-show"
98
98
                 title="expand">
99
 
                <img tal:attributes="src python:branch.static_url('/static/images/nav-small-in.gif')"
 
99
                <img tal:attributes="src python:tg.url('/static/images/nav-small-in.gif')"
100
100
                     width="22" height="10" class="collapse-triangle" />
101
101
                show unified diff
102
102
              </a>
124
124
              <tal:u define="u python:util.uniq(uniqs, item.file_id)">
125
125
                <tr>
126
126
                  <th class="filename" colspan="4">
127
 
                    <tal:b content="structure python:collapse_button('file', u, branch, normal='table-row')" />
128
 
                    <a tal:attributes="href  python:url(['/annotate', change.revno], clear=1, file_id=item.file_id);
 
127
                    <tal:b content="structure python:collapse_button('file', u, 'table-row')" />
 
128
                    <a tal:attributes="href  python:url(['/annotate', change.revid], file_id=item.file_id);
129
129
                                       name  string:${item/filename}-s;
130
130
                                       title string:Annotate ${item/filename}"
131
131
                       tal:content="item/filename">
211
211
              <tal:u define="u python:util.uniq(uniqs, item.file_id)">
212
212
                <tr>
213
213
                  <th class="filename" colspan="4">
214
 
                    <tal:b content="structure python:collapse_button('file', u, branch, normal='table-row')" />
 
214
                    <tal:b content="structure python:collapse_button('file', u, 'table-row')" />
215
215
                    <a tal:attributes="href  python:url(['/annotate', change.revid], file_id=item.file_id);
216
216
                                       name  string:${item/filename}-u;
217
217
                                       title string:Annotate ${item/filename}"