← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/changelog.kid

[r=SteveA] fix the rendering of revisions that have whitespace only commit messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/changelog.kid
 
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
2
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
 
3
    py:extends="'master.kid'">
 
4
<head>
 
5
    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
 
6
    <title> ${branch.friendly_name} : changes </title>
 
7
    <link rel="alternate" type="application/atom+xml" href="${branch.url('/atom')}" title="RSS feed for ${branch.friendly_name}" />
 
8
    
 
9
    <span py:def="loglink(revid, text)">
 
10
        <a title="Show history" href="${branch.url('/changes', **util.get_context(start_revid=revid))}" class="revlink"> ${text} </a>
 
11
    </span>
 
12
 
 
13
    <span py:def="file_link(filename, file_id, revid)">
 
14
        <a href="${branch.url([ '/annotate', revid ], **util.get_context(file_id=file_id))}" title="Annotate ${filename}">${filename}</a>
 
15
    </span>
 
16
    
 
17
    ${use_collapse_buttons()}
 
18
</head>
 
19
 
 
20
<body onload="javascript:sortCollapseElements();">
 
21
 
 
22
${navbar()}
 
23
 
 
24
<h1> <span class="branch-name">${branch.friendly_name}</span> : changes
 
25
<span py:if="file_id"> to <span class="filename">${history.get_path(revid, file_id)}</span></span>
 
26
<span py:if="viewing_from"> from ${history.get_revno(start_revid)} </span>
 
27
<span py:if="query"> matching "${query}"</span>
 
28
</h1>
 
29
 
 
30
<span py:if="search_failed">
 
31
    Sorry, no results found for your search.
 
32
</span>
 
33
 
 
34
<span py:if="not changes">
 
35
    No revisions!
 
36
</span>
 
37
 
 
38
<span py:if="not search_failed" class="changelog"> ${collapse_all_button('cl')} </span>
 
39
 
 
40
<table class="log-entries">
 
41
    <tr class="log-header">
 
42
        <th class="revision-number">Rev</th>
 
43
        <th></th>
 
44
        <th class="summary">Summary</th>
 
45
        <span py:strip="True" py:if="all_same_author">
 
46
            <th></th>
 
47
        </span>
 
48
        <span py:strip="True" py:if="not all_same_author">
 
49
            <th class="author">Committer</th>
 
50
        </span>
 
51
        <th class="date" colspan="2">Date</th>
 
52
    </tr>
 
53
    <div py:for="entry in changes" class="revision">
 
54
        <a name="entry-${entry.revno}" />
 
55
        <tr class="revision-header parity${entry.parity}">
 
56
            <td class="revision-number"> ${revision_link(entry.revid, util.trunc(entry.revno))} </td>
 
57
            <td class="expand-button"> ${collapse_button('cl', entry.revno)} </td>
 
58
            <td class="summary"> ${revision_link(entry.revid, entry.short_comment)} </td>
 
59
            <span py:strip="True" py:if="all_same_author">
 
60
                <td></td>
 
61
            </span>
 
62
            <span py:strip="True" py:if="not all_same_author">
 
63
                <td class="author"> ${util.trunc(util.hide_email(entry.author), 20)} </td>
 
64
            </span>
 
65
            <td class="date"> ${entry.date.strftime('%Y-%m-%d, %H:%M')} &nbsp; (${util.ago(entry.date)}) </td>
 
66
            <td class="inventory-link"> 
 
67
                <a href="${branch.url([ '/files', entry.revid ])}"
 
68
                    title="Files at revision ${entry.revno}"> files</a>
 
69
            </td>
 
70
        </tr>
 
71
        
 
72
        <tr class="revision-details-block parity${entry.parity}">
 
73
            <td colspan="2"></td>
 
74
            <td colspan="4"><table class="revision-details hidden-details collapse-cl-${entry.revno}-content">
 
75
                <tr py:if="len(entry.merge_points) > 0">
 
76
                    <th class="children"> merged in: </th>
 
77
                    <td class="children">
 
78
                        <span py:for="child in entry.merge_points">
 
79
                            ${loglink(child.revid, '(' + child.revno + util.if_present(' %s', child.branch_nick) + ')')} <br />
 
80
                        </span>
 
81
                    </td>
 
82
                </tr>
 
83
                <tr py:if="len(entry.parents) > 1">
 
84
                    <th class="parents"> merged from: </th>
 
85
                    <td class="parents">
 
86
                        <span py:for="parent in entry.parents"><span py:if="parent.revid != entry.parents[0].revid">
 
87
                            ${loglink(parent.revid, '(' + parent.revno + util.if_present(' %s', parent.branch_nick) + ')')} <br />
 
88
                        </span></span>
 
89
                    </td>
 
90
                </tr>
 
91
                <span py:strip="True" py:if="all_same_author">
 
92
                    <tr>
 
93
                        <th class="author">committed by:</th>
 
94
                        <td class="author"> ${util.hide_email(entry.author)} </td>
 
95
                    </tr>
 
96
                </span>
 
97
                <tr>
 
98
                    <th class="description">description:</th>
 
99
                    <td class="description"><span py:for="line in entry.comment_clean">${XML(line)} <br /></span> </td>
 
100
                </tr>
 
101
                <tr py:if="entry.changes.added">
 
102
                    <th class="files"> files added: </th>
 
103
                    <td class="files"> <span py:for="filename, fid in entry.changes.added" class="filename">${file_link(filename, fid, entry.revid)} <br /></span> </td>
 
104
                </tr>
 
105
                <tr py:if="entry.changes.removed">
 
106
                    <th class="files"> files removed: </th>
 
107
                    <td class="files"> <span py:for="filename, fid in entry.changes.removed" class="filename">${file_link(filename, fid, entry.revid)} <br /></span> </td>
 
108
                </tr>
 
109
                <tr py:if="entry.changes.renamed">
 
110
                    <th class="files"> files renamed: </th>
 
111
                    <td class="files"> <span py:for="old_filename, new_filename, fid in entry.changes.renamed" class="filename">
 
112
                        ${file_link(old_filename, fid, entry.revid)} => ${file_link(new_filename, fid, entry.revid)}<br />
 
113
                    </span> </td>
 
114
                </tr>
 
115
                <tr py:if="entry.changes.modified">
 
116
                    <th class="files"> files modified: </th>
 
117
                    <td class="files"> <span py:for="item in entry.changes.modified">
 
118
                        <span class="filename">${file_link(item.filename, item.file_id, entry.revid)}</span> &nbsp;
 
119
                        <a href="${branch.url([ '/revision', entry.revid ], **util.get_context()) + '#' + item.filename}" class="jump">&#8594; diff</a>
 
120
                        <br />
 
121
                    </span> </td>
 
122
                </tr>
 
123
                </table>
 
124
            </td>
 
125
        </tr>
 
126
    </div>
 
127
</table>
 
128
 
 
129
<div py:if="navigation.prev_page_revid or navigation.next_page_revid" class="bar">
 
130
    <table>
 
131
        <tr>
 
132
                <td class="buttons">
 
133
                <a py:if="navigation.prev_page_revid" href="${navigation.prev_page_url}"> &lt;&lt; page </a>
 
134
                        </td>
 
135
                        <td class="rbuttons" align="right">
 
136
                <a py:if="navigation.next_page_revid" href="${navigation.next_page_url}"> page &gt;&gt; </a>
 
137
                        </td>
 
138
                </tr>
 
139
        </table>
 
140
</div>
 
141
 
 
142
</body>
 
143
</html>