← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/templates/revisioninfo.pt

Merged from trunk, resolved billions of conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/templates/revisioninfo.pt
1
 
<div class="infoContainer">
 
1
<div id="infoContainer" class="revision-info">
2
2
    <div id="infTxt">
3
 
        <div class="committer" tal:content="python:', '.join(util.hide_emails(change.authors))"></div>
 
3
        <div class="comiter" tal:content="python:util.hide_email(change.author)"></div>
4
4
        <div class="timer" tal:content="python:util.date_time(change.date)"></div>
5
5
        <div class="mfrom" tal:repeat="parent python:change.parents[1:]">
6
6
            <a tal:attributes="title string:Merged From ${parent/revno};
7
7
                               href python:url(['/revision', parent.revno], clear=1)"
8
8
               tal:content="python:revno_with_nick(parent)"></a>
9
9
        </div>
10
 
        <div class="mto" tal:repeat="merge_point change/merge_points">
 
10
        <div class="mfrom" tal:repeat="merge_point change/merge_points">
11
11
            <a tal:attributes="title string:Merged In ${merge_point/revno};
12
 
                               href python:url(['/revision', merge_point.revno], clear=1)"
 
12
                               href python:url(['/revision', merge_point/revno], clear=1)"
13
13
               tal:content="python:revno_with_nick(merge_point)"></a>
14
14
        </div>
15
 
        <div class="mto" tal:condition="merged_in">
16
 
          This revision was merged to the branch mainline in
17
 
          <a tal:attributes="href python:url(['/revision', merged_in], clear=1)">revision
18
 
            <tal:b content="merged_in"/></a>.
19
 
        </div>
20
 
        <div class="revid" tal:content="string:Revision ID: ${change/revid}"></div>
21
 
        <div class="information" tal:content="structure python:util.fixed_width(change.comment)"></div>
 
15
        <div class="revid" tal:content="string:RevisionID: ${change/revid}"></div>
 
16
        <div class="information" tal:content="change/comment"></div>
22
17
    </div>
23
 
    <ul id="list-files" tal:condition="file_changes">
24
 
      <tal:block content="structure python:file_change_summary(url, change, file_changes, 'fragment', currently_showing)" />
 
18
    <ul id="list-files">
 
19
        <tal:block condition="nocall:modified_file_link">
 
20
        <tal:block content="structure python:file_change_summary(url, change, modified_file_link)" /></tal:block>
25
21
    </ul>
26
22
    <div class="clear"><!-- --></div>
27
23
</div>