Mercurial > kallithea
comparison rhodecode/templates/changeset/changeset.html @ 1512:bf263968da47
merge beta in stable branch
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 07 Oct 2011 01:08:50 +0200 |
parents | 0dc8d578ff49 aaec08ad9daf |
children | 82a88013a3fd |
comparison
equal
deleted
inserted
replaced
1329:e058df3ff2b4 | 1512:bf263968da47 |
---|---|
23 <!-- box / title --> | 23 <!-- box / title --> |
24 <div class="title"> | 24 <div class="title"> |
25 ${self.breadcrumbs()} | 25 ${self.breadcrumbs()} |
26 </div> | 26 </div> |
27 <div class="table"> | 27 <div class="table"> |
28 <div id="body" class="diffblock"> | 28 <div class="diffblock"> |
29 <div class="code-header"> | 29 <div class="code-header"> |
30 <div> | 30 <div> |
31 ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} | 31 ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} |
32 » <span>${h.link_to(_('raw diff'), | 32 » <span>${h.link_to(_('raw diff'), |
33 h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span> | 33 h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span> |
49 </div> | 49 </div> |
50 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</div> | 50 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</div> |
51 </div> | 51 </div> |
52 <div class="right"> | 52 <div class="right"> |
53 <div class="changes"> | 53 <div class="changes"> |
54 % if len(c.changeset.affected_files) <= c.affected_files_cut_off: | |
54 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> | 55 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> |
55 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> | 56 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> |
56 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> | 57 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> |
58 % else: | |
59 <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> | |
60 <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> | |
61 <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> | |
62 % endif | |
57 </div> | 63 </div> |
58 %if len(c.changeset.parents)>1: | 64 %if len(c.changeset.parents)>1: |
59 <div class="merge"> | 65 <div class="merge"> |
60 ${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/> | 66 ${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/> |
61 </div> | 67 </div> |
78 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> | 84 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> |
79 %endfor | 85 %endfor |
80 </span> | 86 </span> |
81 </div> | 87 </div> |
82 </div> | 88 </div> |
83 <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> | 89 <span style="font-size:1.1em;font-weight: bold"> |
90 ${_('%s files affected with %s additions and %s deletions.') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)} | |
91 </span> | |
84 <div class="cs_files"> | 92 <div class="cs_files"> |
85 %for change,filenode,diff,cs1,cs2 in c.changes: | 93 %for change,filenode,diff,cs1,cs2,stat in c.changes: |
86 <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))))}</div> | 94 <div class="cs_${change}"> |
95 <div class="node">${h.link_to(h.safe_unicode(filenode.path), | |
96 h.url.current(anchor=h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))))}</div> | |
97 <div class="changes">${h.fancy_file_stats(stat)}</div> | |
98 </div> | |
87 %endfor | 99 %endfor |
100 % if c.cut_off: | |
101 ${_('Changeset was too big and was cut off...')} | |
102 % endif | |
88 </div> | 103 </div> |
89 </div> | 104 </div> |
90 | 105 |
91 </div> | 106 </div> |
92 | 107 |
93 %for change,filenode,diff,cs1,cs2 in c.changes: | 108 %for change,filenode,diff,cs1,cs2,stat in c.changes: |
94 %if change !='removed': | 109 %if change !='removed': |
95 <div style="clear:both;height:10px"></div> | 110 <div style="clear:both;height:10px"></div> |
96 <div id="body" class="diffblock"> | 111 <div class="diffblock"> |
97 <div id="${h.repo_name_slug('CHANGE-%s' % h.safe_unicode(filenode.path))}" class="code-header"> | 112 <div id="${h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))}" class="code-header"> |
98 <div class="changeset_header"> | 113 <div class="changeset_header"> |
99 <span class="changeset_file"> | 114 <span class="changeset_file"> |
100 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name, | 115 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name, |
101 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))} | 116 revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))} |
102 </span> | 117 </span> |
118 %endif | 133 %endif |
119 </div> | 134 </div> |
120 </div> | 135 </div> |
121 %endif | 136 %endif |
122 %endfor | 137 %endfor |
123 </div> | 138 </div> |
124 </div> | |
125 | |
126 </%def> | 139 </%def> |