~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/changelog.pt

  • Committer: Jelmer Vernooij
  • Date: 2010-01-11 02:54:48 UTC
  • mfrom: (398 trunk)
  • mto: This revision was merged to the branch mainline in revision 399.
  • Revision ID: jelmer@samba.org-20100111025448-lokdg33w2awf9f8n
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
73
73
          <td class="expandcell show_if_js">&nbsp;</td>
74
74
          <td class="summarycell">Summary</td>
75
75
          <td class="authorcell">Authors</td>
 
76
          <td tal:condition="show_tag_col" class="tagscell">Tags</td>
76
77
          <td class="datecell">Date</td>
77
78
          <td class="diffcell">Diff</td>
78
79
          <td class="downloadcell">Files</td>
94
95
            </td>
95
96
            <td class="summcell">
96
97
              <div class="short_description">
 
98
                <img tal:condition="python:entry.parents[1:]"
 
99
                     tal:attributes="src python:branch.static_url('/static/images/ico_mergefrom.gif')" />
97
100
                <a tal:attributes="title python:'Show revision '+entry.revno;
98
101
                                   href  python:url(['/revision', entry.revno], clear=1);
99
102
                                   class string:link"
100
103
                   tal:content="entry/short_comment"></a>
101
104
              </div>
102
105
              <div class="long_description" style="display: none">
 
106
                <img tal:condition="python:entry.parents[1:]"
 
107
                     tal:attributes="src python:branch.static_url('/static/images/ico_mergefrom.gif')" />
103
108
                <a tal:attributes="title python:'Show revision '+entry.revno;
104
109
                                   href  python:url(['/revision', entry.revno], clear=1);
105
110
                                   class string:link"
111
116
            </td>
112
117
            <td tal:content="python:util.trunc(util.hide_email(entry.authors[0]), 20)"
113
118
                class="autcell"></td>
 
119
            <td tal:condition="show_tag_col" tal:content="string:${entry/tags}"
 
120
                class="tagcell"></td>
114
121
            <td class="date">
115
122
              <span tal:attributes="title python:util.date_time(entry.date)"
116
123
                    tal:content="python:util._approximatedate(entry.date)"></span>