← Back to branch summary

~jamesh/loggerhead/devel

« back to all changes in this revision

Viewing changes to loggerhead/templates/inventory.kid

  • Committer: James Henstridge
  • Date: 2007-01-25 02:43:08 UTC
  • mfrom: (97.1.13 loggerhead)
  • Revision ID: james@jamesh.id.au-20070125024308-w3gyvoo5830hcvr2
merge from robey's branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/inventory.kid
35
35
            <th class="children"> merged in: </th>
36
36
            <td class="children">
37
37
                <span py:for="child in change.merge_points">
38
 
                    ${revision_link(child.revid, '(' + child.revno + util.if_present(' %s', child.branch_nick) + ')',
39
 
                                    clear=1, start_revid=child.revid)} <br />
 
38
                    ${revision_link(child.revid, '(' + child.revno + util.if_present(' %s', child.branch_nick) + ')', clear=1, start_revid=child.revid)} <br />
40
39
                </span>
41
40
            </td>
42
41
        </tr>
44
43
                <th class="parents"> merged from: </th>
45
44
                <td class="parents">
46
45
                    <span py:for="parent in change.parents"><span py:if="parent.revid != change.parents[0].revid">
47
 
                        ${revision_link(parent.revid, '(' + parent.revno + util.if_present(' %s', parent.branch_nick) + ')',
48
 
                                        clear=1, start_revid=parent.revid)} <br />
 
46
                        ${revision_link(parent.revid, '(' + parent.revno + util.if_present(' %s', parent.branch_nick) + ')', clear=1, start_revid=parent.revid)} <br />
49
47
                    </span></span>
50
48
                </td>
51
49
        </tr>
89
87
                **util.get_context(file_id=file.file_id))}" title="Annotate ${file.filename}">${file.filename}</a>
90
88
        </td>
91
89
        <td class="size"> <span py:if="file.kind=='file'"> ${util.human_size(file.size)} </span></td>
92
 
        <td class="revision"> ${revision_link(file.revid, util.trunc(file.change.revno, 15),
93
 
            **util.get_context(start_revid=file.revid, file_id=file.file_id))} </td>
 
90
        <td class="revision"> ${revision_link(file.revid, util.trunc(file.change.revno, 15), **util.get_context(start_revid=file.revid, file_id=file.file_id))} </td>
94
91
        <td class="date"> ${file.change.date.strftime('%d %b %Y %H:%M')} </td>
95
92
        <td class="changes-link"> 
96
93
            <a href="${branch.url('/changes', **util.get_context(start_revid=file.revid, file_id=file.file_id))}"