← 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
15
15
    <body>
16
16
 
17
17
      <tal:block metal:fill-slot="heading">
18
 
        <h1>
19
 
          <tal:has-link condition="branch/branch_link">
20
 
            <a tal:attributes="href branch/branch_link"
21
 
               tal:content="branch/friendly_name">
22
 
              nice/branch/name
23
 
            </a>
24
 
          </tal:has-link>
25
 
          <tal:no-link condition="not: branch/branch_link">
26
 
            <tal:branch-name replace="branch/friendly_name" />
27
 
          </tal:no-link>
28
 
          <span>: <tal:revno content="change/revno"></tal:revno>
 
18
        <h1><tal:block content="branch/friendly_name" /><span>: <tal:revno content="change/revno"></tal:revno>
29
19
        <tal:compare-to condition="python:compare_revid is not None">
30
20
          (compared to revision <tal:block content="python:history.get_revno(compare_revid)" />)
31
21
          </tal:compare-to>
32
22
        </span></h1>
33
23
        <ul id="submenuTabs">
34
 
            <li id="first"><a tal:attributes="href python:url(['/files', change.revno]); 
 
24
            <li id="inicio"><a tal:attributes="href python:url(['/files', change.revno]); 
35
25
                                               title string:browse files at revision ${change/revno}"
36
26
                               tal:content="string:browse files at revision ${change/revno}"></a></li>
37
27
            <li tal:condition="python:remember != change.revno">
43
33
                compare with revision <tal:b content="python:history.get_revno(remember)" />
44
34
                </a>
45
35
            </li>
46
 
            <li>
47
 
            <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>
49
 
            <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]); 
 
36
            <li id="final"><a tal:attributes="href python:url(['/changes', change.revno]); 
53
37
                                  title string:view history from revision ${change/revno}"
54
38
                  tal:content="string:view history from revision ${change/revno}"></a></li>
55
39
        </ul>
56
40
 
57
41
        <tal:we-are-comparing condition="python:compare_revid is not None">
58
42
        <ul id="submenuTabs">
59
 
          <li id="first">
 
43
          <li id="inicio">
60
44
              <a tal:attributes="href python:url([ '/revision', history.get_revno(compare_revid) ], remember=change.revno, compare_revid=change.revno)">
61
45
                reverse the comparison (<tal:b content="change/revno" /> to <tal:b content="python:history.get_revno(compare_revid)" />)
62
46
              </a>
63
47
          </li>
64
 
          <li id="last">
 
48
          <li id="final">
65
49
              <a tal:attributes="href python:url(['/revision', change.revno], remember=None, compare_revid=None)">
66
50
                stop comparing with revision <tal:b content="python:history.get_revno(compare_revid)" />
67
51
              </a>
70
54
        </tal:we-are-comparing>
71
55
        
72
56
        <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 -->        
82
 
        <p class="codin"><img tal:attributes="src python:branch.static_url('/static/images/newCode.gif')" alt="added" /> added</p>
 
57
        <!-- FIXME: This doesn't work yet -->
 
58
        <p class="expand"><a href="#"><img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')" 
 
59
                             alt="collapse all" /> collapse all</a></p>
 
60
                        <p class="codin"><img tal:attributes="src python:branch.static_url('/static/images/newCode.gif')" 
 
61
                           alt="added" /> added</p>
83
62
        <p class="codin"><img tal:attributes="src python:branch.static_url('/static/images/deleteCode.gif')" alt="removed" /> removed</p>
84
63
        <div class="clear"><!-- --></div>
85
64
 
93
72
          <tal:block repeat="item change/changes/modified">
94
73
 
95
74
              <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" />
 
75
                      <div class="diffBox"><a href="#"><img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png');
 
76
                                                                            title string:Annotate ${item/filename}" /></a>
100
77
                                           <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}"
 
78
                                                              id string:${item/filename}-s"
103
79
                                              tal:content="item/filename"></a></div>
104
 
               <div id="psuedotable" class="diffinfo">
 
80
               <div id="psuedotable">
105
81
               <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">
 
82
                 <tal:block repeat="line chunk/diff">
116
83
                    <div id="pseudorow">
117
84
                    <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>
 
85
                        <div class="lineNumber" tal:content="python:util.fill_div(line.old_lineno)"></div>
 
86
                        <div tal:attributes="class string:lineCode ${line/old_type}" tal:content="python:util.fill_div(line.old_line)"></div>
122
87
                    </tal:block>
123
88
 
124
89
                    <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>
 
90
                        <div class="lineNumber" tal:content="python:util.fill_div(line.old_lineno)"></div>
 
91
                        <div tal:attributes="class string:lineCode ${line/old_type}" tal:content="python:util.fill_div(line.old_line)"></div>
129
92
                    </tal:block>
130
93
 
131
94
                    <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>
 
95
                        <div class="lineNumber" tal:content="python:util.fill_div(line.new_lineno)"></div>
 
96
                        <div tal:attributes="class string:lineCode ${line/new_type}" tal:content="python:util.fill_div(line.new_line)"></div>
136
97
                    </tal:block>
137
98
 
138
99
                    <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>
 
100
                        <div class="lineNumber" tal:content="python:util.fill_div(line.new_lineno)"></div>
 
101
                        <div tal:attributes="class string:lineCode ${line/new_type}" tal:content="python:util.fill_div(line.new_line)"></div>
143
102
                    </tal:block>
144
103
                    <div class="clear"><!-- --></div>
145
104
                    </div>