← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/annotate.kid

  • Committer: Michael Hudson
  • Date: 2008-08-01 04:48:26 UTC
  • mfrom: (189.1.2 user-aware)
  • Revision ID: michael.hudson@canonical.com-20080801044826-3b1601affjg9uo9u
Merge Tim's changes to support the url traversal we want on bzr-playground.
On the way, clean up how paths get passed around loggerhead/apps/filesystem.py
and add the first hints of configuration for the serve-branches script.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/annotate.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_name} : contents of ${path} at revision ${change.revno} </title>
7
 
</head>
8
 
 
9
 
<body>
10
 
 
11
 
${navbar()}
12
 
 
13
 
<h1> <span class="branch-name">${branch_name}</span> : <span class="annotate-path">${path}</span> (revision ${change.revno})
14
 
        <div class="links">
15
 
            <div> <b>&#8594;</b> <a href="${tg.url([ '/files', revid ])}"> browse files </a> </div>
16
 
            <div> <b>&#8594;</b> <a href="${tg.url('/revision', start_revid=revid)}"> view revision </a> </div>
17
 
        </div>
18
 
</h1>
19
 
 
20
 
<!-- !FIXME: this is just copied verbatim from revision.kid -->
21
 
<!--div class="revision-info">
22
 
    <table>
23
 
        <tr>
24
 
            <th class="author">committed by:</th>
25
 
            <td class="author"> ${util.hide_email(change.author)} </td>
26
 
        </tr>
27
 
        <tr>
28
 
            <th class="date">date:</th>
29
 
            <td class="date"> ${change.date.strftime('%d %b %Y %H:%M')} </td>
30
 
        </tr>
31
 
 
32
 
        <tr py:if="len(change.merge_points) > 0">
33
 
            <th class="children"> merged in: </th>
34
 
            <td class="children">
35
 
                <span py:for="child in change.merge_points">
36
 
                    ${revlink_path(child.revid, child.revid, '(' + child.revno + util.if_present(' %s', child.branch_nick) + ')', None)} <br />
37
 
                </span>
38
 
            </td>
39
 
        </tr>
40
 
        <tr py:if="len(change.parents) > 1">
41
 
                <th class="parents"> merged from: </th>
42
 
                <td class="parents">
43
 
                    <span py:for="parent in change.parents"><span py:if="parent.revid != change.parents[0].revid">
44
 
                        ${revlink_path(parent.revid, parent.revid, '(' + parent.revno + util.if_present(' %s', parent.branch_nick) + ')', None)} <br />
45
 
                </span></span>
46
 
                </td>
47
 
        </tr>
48
 
 
49
 
        <tr>
50
 
            <th class="description">description:</th>
51
 
            <td class="description"><span py:for="line in change.comment_clean">${XML(line)} <br /></span></td>
52
 
        </tr>
53
 
    </table>
54
 
</div-->
55
 
 
56
 
<div class="annotate">
57
 
    <table>
58
 
        <tr>
59
 
            <th class="lineno"> Line# </th>
60
 
            <th class="revision"> Revision </th>
61
 
            <th class="text"> Contents </th>
62
 
        </tr>
63
 
 
64
 
        <tr py:for="line in contents" class="parity${line.parity}">
65
 
            <td class="lineno ${line.status}"> ${line.lineno} </td>
66
 
            <td class="revno ${line.status}">
67
 
                <a py:if="line.status=='changed'" href="${tg.url('/revision', start_revid=line.change.revid, path=path)}"
68
 
                    title="${line.change.revno} by ${util.hide_email(line.change.author)}, on ${line.change.date.strftime('%d %b %Y %H:%M')} (${util.ago(line.change.date)})">${line.trunc_revno}</a>
69
 
            </td>
70
 
            <!--td class="author"> ${util.hide_email(line.author)} </td-->
71
 
            <td class="text ${line.status}"> ${XML(line.text)} </td>
72
 
        </tr>
73
 
    </table>
74
 
</div>
75
 
 
76
 
</body>
77
 
</html>