← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/changelog.pt

  • Committer: Michael Hudson-Doyle
  • Date: 2012-01-23 21:10:46 UTC
  • mfrom: (461.3.1 bug-390029)
  • Revision ID: michael.hudson@linaro.org-20120123211046-ec3rqt27goxfnxnq
fix a crash in comparing a revision to itself

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/changelog.pt
1
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2
 
<tal:block define="onload string:sortCollapseElements()">
3
 
  <html xmlns="http://www.w3.org/1999/xhtml" metal:use-macro="macros/main">
4
 
    <head>
5
 
      <title metal:fill-slot="title"
6
 
             tal:content="string:${branch/friendly_name} : changes"></title>
7
 
      <metal:block fill-slot="header_extras">
8
 
        <link rel="alternate" type="application/atom+xml"
9
 
              tal:attributes="href python:url(['/atom']);
10
 
                              title string:RSS feed for ${branch/friendly_name}" />
11
 
      </metal:block>
12
 
    </head>
13
 
 
14
 
    <body>
15
 
        <tal:block metal:fill-slot="heading">
16
 
         <h1>
17
 
           <tal:has-link condition="branch/branch_link">
18
 
             <a tal:attributes="href branch/branch_link"
19
 
                tal:content="branch/friendly_name">
20
 
               nice/branch/name
21
 
             </a>
22
 
           </tal:has-link>
23
 
           <tal:no-link condition="not: branch/branch_link">
24
 
             <tal:branch-name replace="branch/friendly_name" />
25
 
           </tal:no-link>
26
 
           : changes
27
 
          <tal:block condition="filter_file_id">to <span tal:content="python:history.get_path(revid, filter_file_id)" /></tal:block>
28
 
          <tal:block condition="start_revid">from revision <tal:block content="python:history.get_revno(start_revid)" /></tal:block>
29
 
          <tal:block condition="query">matching <tal:block content="query" /></tal:block>
30
 
         </h1>
31
 
        </tal:block>
32
 
 
33
 
       <div metal:fill-slot="content">
34
 
           <!-- Something nicer-looking should be done with search -->
35
 
        <p tal:condition="search_failed">
36
 
          Sorry, no results found for your search.
37
 
        </p>
38
 
 
39
 
        <p tal:condition="not:changes">
40
 
          No revisions!
41
 
        </p>
42
 
 
43
 
        <p class="fr revnolink">From Revision <a tal:attributes="href #
44
 
                                                            title python:'Show revision '+history.get_revno(revid)" 
45
 
                                tal:content="python:history.get_revno(revid)"></a>
46
 
          <tal:block tal:condition="python:navigation.last_in_page_revid is not None"> to
47
 
          <a tal:attributes="href # 
 
2
<html xmlns="http://www.w3.org/1999/xhtml" metal:use-macro="macros/main">
 
3
  <head>
 
4
    <title metal:fill-slot="title"
 
5
           tal:content="string:${branch/friendly_name} : changes"></title>
 
6
    <metal:block fill-slot="header_extras">
 
7
      <link rel="alternate" type="application/atom+xml"
 
8
            tal:attributes="href python:url(['/atom']);
 
9
                            title string:RSS feed for ${branch/friendly_name}" />
 
10
    <script type="text/javascript">
 
11
      var revids = <tal:block content="data" />;
 
12
    </script>
 
13
      <script type="text/javascript"
 
14
              tal:attributes="src python:branch.static_url('/static/javascript/changelog.js')"></script>
 
15
    </metal:block>
 
16
  </head>
 
17
 
 
18
  <body>
 
19
      <tal:block metal:fill-slot="backlink">
 
20
          <tal:has-link condition="branch/branch_link">
 
21
            <div class="black-link">
 
22
                <a tal:attributes="href branch/branch_link">
 
23
                  &#8592; Back to branch summary
 
24
                </a>
 
25
            </div>
 
26
          </tal:has-link>
 
27
      </tal:block>
 
28
    <tal:block metal:fill-slot="branchname" tal:content="string:${branch/friendly_name}" />
 
29
    <tal:block metal:fill-slot="heading">
 
30
        <div id="breadcrumbs">
 
31
            <tal:has-link condition="branch/branch_link">
 
32
              <a tal:attributes="href branch/branch_link"
 
33
                 tal:content="branch/friendly_name">
 
34
                nice/branch/name
 
35
              </a>
 
36
            </tal:has-link>
 
37
            <tal:no-link condition="not: branch/branch_link">
 
38
              <span metal:use-macro="breadcrumbs/directory"></span>
 
39
            </tal:no-link>
 
40
            <tal:block condition="changes">
 
41
              &#187; Changes
 
42
              <tal:block condition="filter_file_id">to <span tal:content="python:history.get_path(revid, filter_file_id)" /></tal:block>
 
43
              <tal:block condition="start_revid">from revision
 
44
                <span tal:content="python:history.get_revno(start_revid)"/>
 
45
              </tal:block>
 
46
              <tal:block condition="query">matching <tal:block content="query" /></tal:block>
 
47
            </tal:block>
 
48
        </div>
 
49
    </tal:block>
 
50
 
 
51
    <div metal:fill-slot="content">
 
52
      <tal:branch-info replace="structure python:branchinfo(branch)" />
 
53
 
 
54
      <!-- Something nicer-looking should be done with search -->
 
55
      <p tal:condition="search_failed">
 
56
        Sorry, no results found for your search.
 
57
      </p>
 
58
 
 
59
      <p tal:condition="not:changes">
 
60
        No revisions!
 
61
      </p>
 
62
 
 
63
      <p class="fr revnolink">From Revision <a tal:attributes="href #
 
64
                                                               title python:'Show revision '+history.get_revno(revid)"
 
65
                                               tal:content="python:history.get_revno(revid)"></a>
 
66
        <tal:block tal:condition="python:navigation.last_in_page_revid is not None"> to
 
67
          <a tal:attributes="href #
48
68
                             title 'Show revision '+history.get_revno(navigation.last_in_page_revid)"
49
69
             tal:content="python:history.get_revno(navigation.last_in_page_revid)"></a>
50
 
         </tal:block></p>
51
 
        <p class="expand" id="expand_all"><a tal:attributes="href string:javascript:toggle_expand_all('open')">
52
 
            <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"
53
 
                  alt="expand all" /> expand all</a>
54
 
        </p>
55
 
        <p class="expand" id="collapse_all" style="display:none;"><a tal:attributes="href string:javascript:toggle_expand_all('close')">
56
 
            <img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png')"
57
 
                  alt="collapse all" /> collapse all</a>
58
 
        </p>
59
 
        <!-- Table -->        
60
 
        <table id="logentries"
61
 
               tal:define="subcolspan python:4-bool(all_same_author)">
62
 
            <tr class="logheader">
63
 
                <td class="revisionnumber">Rev</td>
64
 
                <td class="expandcell">&nbsp;</td>
65
 
                <td class="summarycell">Summary</td>
66
 
                <td class="authorcell">Author</td>
67
 
                <td class="datecell">Date</td>
68
 
                <td class="diffcell">Diff</td>
69
 
                <td class="downloadcell">Files</td>
70
 
            </tr>
71
 
            <tal:block tal:repeat="entry changes">
72
 
            <a tal:attributes="name string:entry-${entry/revno}"/>
73
 
                <tr tal:attributes="class string:blueRow${entry/parity} revision_log">
74
 
                <td class="revnro revnolink"><a tal:attributes="title python:'Show revision '+entry.revno;
75
 
                                                                href  python:url(['/revision', entry.revno], clear=1)"
76
 
                                                tal:content="python:util.trunc(entry.revno)"></a>
77
 
                </td>            
78
 
                <td class="expcell">
79
 
                    <div class="expand_revisioninfo">
80
 
                        <!-- So, this is interesting. I'm using "alt" to have the correct URL for the image of the expanded icon
81
 
                             and "title" tag for the contracted URL of the image. This is a bit of a hack, but it's better than
82
 
                             other approaches I tried  :)  -->
83
 
                        <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png');
84
 
                                             alt python:branch.static_url('/static/images/treeExpanded.png');
85
 
                                             title python:branch.static_url('/static/images/treeCollapsed.png')" 
86
 
                             class="expand_icon" />
87
 
                    </div>
88
 
                </td>
89
 
                <td class="summcell"><div tal:attributes="class string:short_description">
90
 
                                        <a tal:attributes="title python:'Show revision '+entry.revno;
91
 
                                                           href  python:url(['/revision', entry.revno], clear=1);
92
 
                                                           class string:link"
93
 
                                           tal:content="entry/short_comment"></a>
94
 
                                     </div>
95
 
                                     <div tal:attributes="class string:long_description;
96
 
                                                          style string:display:none">
97
 
                                        <a tal:attributes="title python:'Show revision '+entry.revno;
98
 
                                                           href  python:url(['/revision', entry.revno], clear=1);
99
 
                                                           class string:link"
100
 
                                           tal:content="entry/comment"></a>
101
 
                                     </div>
102
 
                                <div class="revisioninfo" style="display:none;">
103
 
                                    <ul class="expandrev">
104
 
                                        <li class="mfrom" tal:repeat="parent python:entry.parents[1:]">
105
 
                                            <span class="revnolink">
106
 
                                                <a tal:attributes="href python:url(['/changes', parent.revno])"
107
 
                                                   tal:content="parent/revno"></a>
108
 
                                            </span>
109
 
                                            <a tal:attributes="href python:url(['/changes'], start_revid=parent.revno)"
110
 
                                               tal:content="python:'(' + parent.branch_nick + ')'"
111
 
                                                title="Show history" class="link"></a>
112
 
                                        </li>
113
 
                                        <li class="mto" tal:repeat="merge_point entry/merge_points">
114
 
                                            <a tal:attributes="href python:url(['/changes'], start_revid=merge_point.revno)"
115
 
                                               tal:content="python:revno_with_nick(merge_point)"
116
 
                                               title="Show history" class="link"></a>
117
 
                                        </li>
118
 
                                        <li class="committerli" tal:content="python:util.hide_email(entry.author)"></li>
119
 
                                        <tal:block content="structure python:file_change_summary(url, entry, modified_file_link_log)" />
120
 
                                    </ul>
121
 
                                </div>
122
 
                </td>
123
 
                <td tal:content="python:util.trunc(util.hide_email(entry.author), 20)"
124
 
                    class="autcell"></td>
125
 
                <td class="date">
126
 
                    <span tal:attributes="title python:util.date_time(entry.date)"
127
 
                          tal:content="python:util._approximatedate(entry.date)"></span>
128
 
                </td>
129
 
                <td class="diffr"><a tal:attributes="title python:'Show diff at revision '+entry.revno;
130
 
                                                     href python:url(['/revision', entry.revno], clear=1)">
131
 
                                  <img tal:attributes="src python:branch.static_url('/static/images/ico_diff.gif')" alt="Diff" /></a></td>
132
 
                <td class="downr"><a tal:attributes="href python:branch.url(['/files', entry.revno]);
133
 
                                                     title string:Files at revision ${entry/revno}">
134
 
                                   <img tal:attributes="src python:branch.static_url('/static/images/ico_file.gif');
135
 
                                                        alt string:Files" /></a>
136
 
                </td>
137
 
            </tr>
138
 
          </tal:block>
139
 
        </table>
140
 
 
141
 
        <ul tal:condition="python:navigation.prev_page_revid or navigation.next_page_revid"
142
 
            id="pages">
143
 
            <li tal:condition="navigation/prev_page_revid" 
144
 
                class="previous">
145
 
                <a tal:attributes="href navigation/prev_page_url">&laquo; Previous</a>
146
 
            </li>
147
 
            <!-- FIXME: Leaving this to eventually show page numbers. Can't show all of them,
148
 
                        so some magic has to be done to just show the previous and next N page numbers
149
 
 
150
 
            <li class="active">1</li>
151
 
            <tal:block tal:repeat="page_number python:range(navigation.page_count)">
152
 
            <li><a href="#"
153
 
                   tal:content="page_number"></a></li>
154
 
               </tal:block>-->
155
 
            <li tal:condition="navigation/next_page_revid"
156
 
                class="next">
157
 
                <a tal:attributes="href navigation/next_page_url">Next &raquo;</a>
158
 
            </li>
159
 
        </ul>
160
 
 
161
 
      </div>
162
 
    </body>
163
 
  </html>
164
 
</tal:block>
 
70
      </tal:block></p>
 
71
      <p class="expand show_if_js" id="expand_all"><a href="#">
 
72
          <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"
 
73
               alt="expand all" /> expand all</a>
 
74
      </p>
 
75
      <p class="expand" id="collapse_all" style="display:none;"><a href="#">
 
76
          <img tal:attributes="src python:branch.static_url('/static/images/treeExpanded.png')"
 
77
               alt="collapse all" /> collapse all</a>
 
78
      </p>
 
79
      <!-- Table -->
 
80
      <table id="logentries">
 
81
        <tr class="logheader">
 
82
          <th class="revisionnumber">Rev</th>
 
83
          <th class="expandcell show_if_js">&nbsp;</th>
 
84
          <th class="summarycell">Summary</th>
 
85
          <th class="authorcell">Authors</th>
 
86
          <th tal:condition="show_tag_col" class="tagscell">Tags</th>
 
87
          <th class="datecell">Date</th>
 
88
          <th class="diffcell">Diff</th>
 
89
          <th class="downloadcell">Files</th>
 
90
        </tr>
 
91
        <tal:block tal:repeat="entry changes">
 
92
          <a tal:attributes="name string:entry-${entry/revno}"/>
 
93
          <tr tal:attributes="class string:blueRow${entry/parity} revision_log; id string:log-${entry/index}">
 
94
            <td class="revnro revnolink"><a tal:attributes="title python:'Show revision '+entry.revno;
 
95
                                                            href  python:url(['/revision', entry.revno], clear=1)"
 
96
                                            tal:content="python:util.trunc(entry.revno)"></a>
 
97
            </td>
 
98
            <td class="expcell show_if_js">
 
99
              <div class="expand_revisioninfo">
 
100
                <a href="#">
 
101
                  <img tal:attributes="src python:branch.static_url('/static/images/treeCollapsed.png')"
 
102
                       class="expand_icon" />
 
103
                </a>
 
104
              </div>
 
105
            </td>
 
106
            <td class="summcell">
 
107
              <div class="short_description">
 
108
                <img tal:condition="python:entry.parents[1:]"
 
109
                     tal:attributes="src python:branch.static_url('/static/images/ico_mergefrom.gif')" />
 
110
                <a tal:attributes="title python:'Show revision '+entry.revno;
 
111
                                   href  python:url(['/revision', entry.revno], clear=1);
 
112
                                   class string:link"
 
113
                   tal:content="entry/short_comment"></a>
 
114
              </div>
 
115
              <div class="long_description" style="display: none">
 
116
                <img tal:condition="python:entry.parents[1:]"
 
117
                     tal:attributes="src python:branch.static_url('/static/images/ico_mergefrom.gif')" />
 
118
                <a tal:attributes="title python:'Show revision '+entry.revno;
 
119
                                   href  python:url(['/revision', entry.revno], clear=1);
 
120
                                   class string:link"
 
121
                   tal:content="structure python:util.fixed_width(entry.comment)"></a>
 
122
                <div class="loading">
 
123
                  <img tal:attributes="src python:branch.static_url('/static/images/spinner.gif')" />
 
124
                </div>
 
125
              </div>
 
126
            </td>
 
127
            <td tal:content="python:util.trunc(util.hide_email(entry.authors[0]), 20)"
 
128
                class="autcell"></td>
 
129
            <td tal:condition="show_tag_col" tal:content="string:${entry/tags}"
 
130
                class="tagcell"></td>
 
131
            <td class="date">
 
132
              <span tal:attributes="title python:util.date_time(entry.date)"
 
133
                    tal:content="python:util._approximatedate(entry.date)"></span>
 
134
            </td>
 
135
            <td class="diffr"><a tal:attributes="title python:'Show diff at revision '+entry.revno;
 
136
                                                 href python:url(['/revision', entry.revno], clear=1)">
 
137
                <img tal:attributes="src python:branch.static_url('/static/images/ico_diff.gif')" alt="Diff" /></a></td>
 
138
            <td class="downr"><a tal:attributes="href python:branch.url(['/files', entry.revno]);
 
139
                                                 title string:Files at revision ${entry/revno}">
 
140
                <img tal:attributes="src python:branch.static_url('/static/images/ico_file.gif')" alt="Files" /></a>
 
141
            </td>
 
142
          </tr>
 
143
        </tal:block>
 
144
      </table>
 
145
 
 
146
      <ul tal:condition="python:navigation.prev_page_revid or navigation.next_page_revid"
 
147
          id="pages">
 
148
        <li tal:condition="navigation/prev_page_revid"
 
149
            class="previous">
 
150
          <a tal:attributes="href navigation/prev_page_url">&laquo; Newer</a>
 
151
        </li>
 
152
        <!-- FIXME: Leaving this to eventually show page numbers. Can't show all of them,
 
153
             so some magic has to be done to just show the previous and next N page numbers
 
154
 
 
155
             <li class="active">1</li>
 
156
             <tal:block tal:repeat="page_number python:range(navigation.page_count)">
 
157
               <li><a href="#"
 
158
                      tal:content="page_number"></a></li>
 
159
             </tal:block>-->
 
160
        <li tal:condition="navigation/next_page_revid"
 
161
            class="next">
 
162
          <a tal:attributes="href navigation/next_page_url">Older &raquo;</a>
 
163
        </li>
 
164
      </ul>
 
165
 
 
166
    </div>
 
167
  </body>
 
168
</html>