Mercurial > kallithea
annotate rhodecode/templates/changeset/changeset_range.html @ 3592:549c73bfc206 beta
changelog / compare: adjust titles
Clarify what shows changesets and what more see changesets as revisions that
specify snapshots that are compared.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 08 Mar 2013 00:50:49 +0100 |
parents | 1f334a68d057 |
children | 51da0e019248 |
rev | line source |
---|---|
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
1 ## -*- coding: utf-8 -*- |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
2 <%inherit file="/base/base.html"/> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
3 |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
4 <%def name="title()"> |
3582
1f334a68d057
improved title consistency
Marcin Kuzminski <marcin@python-works.com>
parents:
3269
diff
changeset
|
5 ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} · ${c.rhodecode_name} |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
6 </%def> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
7 |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
8 <%def name="breadcrumbs_links()"> |
2492
79818f546538
i18n 'Home' in breadcrumbs
Takumi IINO <trot.thunder@gmail.com>
parents:
2462
diff
changeset
|
9 ${h.link_to(_(u'Home'),h.url('/'))} |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
10 » |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
11 ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
12 » |
3269
7818c8c31c4c
html: use > instead of >
Mads Kiilerich <madski@unity3d.com>
parents:
3197
diff
changeset
|
13 ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
14 </%def> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
15 |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
16 <%def name="page_nav()"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
17 ${self.menu('changelog')} |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
18 </%def> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
19 |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
20 <%def name="main()"> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
21 <div class="box"> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
22 <!-- box / title --> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
23 <div class="title"> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
24 ${self.breadcrumbs()} |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
25 </div> |
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
26 <div class="table"> |
3197 | 27 <div id="body" class="diffblock"> |
28 <div class="code-header cv"> | |
3592
549c73bfc206
changelog / compare: adjust titles
Mads Kiilerich <madski@unity3d.com>
parents:
3582
diff
changeset
|
29 <h3 class="code-header-title">${_('Show changesets')}</h3> |
1688
82e604d3fc46
changeset ranges use new fileid method.
Marcin Kuzminski <marcin@python-works.com>
parents:
1602
diff
changeset
|
30 <div> |
3592
549c73bfc206
changelog / compare: adjust titles
Mads Kiilerich <madski@unity3d.com>
parents:
3582
diff
changeset
|
31 ${h.link_to('r%s:%s -> r%s:%s' % (c.cs_ranges[0].revision, h.short_id(c.cs_ranges[0].raw_id), c.cs_ranges[-1].revision, h.short_id(c.cs_ranges[-1].raw_id)), |
549c73bfc206
changelog / compare: adjust titles
Mads Kiilerich <madski@unity3d.com>
parents:
3582
diff
changeset
|
32 h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id) |
549c73bfc206
changelog / compare: adjust titles
Mads Kiilerich <madski@unity3d.com>
parents:
3582
diff
changeset
|
33 )} |
3197 | 34 </div> |
35 </div> | |
36 </div> | |
37 <div id="changeset_compare_view_content"> | |
38 <div class="container"> | |
39 <table class="compare_view_commits noborder"> | |
2240
87664e60bbc0
added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
40 %for cnt,cs in enumerate(c.cs_ranges): |
1010
643e4a540ddd
added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
982
diff
changeset
|
41 <tr> |
2732
c25cc1c7c65f
again #531 forgot to replace other occurences of h.email call
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
42 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td> |
1010
643e4a540ddd
added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
982
diff
changeset
|
43 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td> |
643e4a540ddd
added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
982
diff
changeset
|
44 <td><div class="author">${h.person(cs.author)}</div></td> |
643e4a540ddd
added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
982
diff
changeset
|
45 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> |
2240
87664e60bbc0
added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
46 <td> |
87664e60bbc0
added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
47 %if c.statuses: |
2430 | 48 <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div> |
2240
87664e60bbc0
added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
49 %endif |
87664e60bbc0
added changeset status into changeset range
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
50 </td> |
1868
f26acc1b27e2
added repository name into issue tracker link to support different projects issues tracker mapping
Marcin Kuzminski <marcin@python-works.com>
parents:
1844
diff
changeset
|
51 <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td> |
1010
643e4a540ddd
added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
982
diff
changeset
|
52 </tr> |
643e4a540ddd
added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
982
diff
changeset
|
53 %endfor |
643e4a540ddd
added nicer compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
982
diff
changeset
|
54 </table> |
3197 | 55 </div> |
56 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> | |
57 <div class="cs_files"> | |
58 %for cs in c.cs_ranges: | |
59 <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div> | |
60 %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): | |
61 <div class="cs_${change}">${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}</div> | |
62 %endfor | |
63 %endfor | |
64 </div> | |
65 </div> | |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
66 |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
67 </div> |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
68 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
69 <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
70 %for cs in c.cs_ranges: |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
71 ##${comment.comment_inline_form(cs)} |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
72 ## diff block |
2926
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
73 <div class="h3"> |
2591
86c544532840
add commit messaged and gravatar to split compare view
Marcin Kuzminski <marcin@python-works.com>
parents:
2492
diff
changeset
|
74 <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a> |
2926
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
75 <div class="gravatar"> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
76 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
77 </div> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
78 <div class="right"> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
79 <span class="logtags"> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
80 %if len(cs.parents)>1: |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
81 <span class="merge">${_('merge')}</span> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
82 %endif |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
83 %if cs.branch: |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
84 <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
85 ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
86 </span> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
87 %endif |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
88 %if h.is_hg(c.rhodecode_repo): |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
89 %for book in cs.bookmarks: |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
90 <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}"> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
91 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
92 </span> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
93 %endfor |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
94 %endif |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
95 %for tag in cs.tags: |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
96 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
97 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> |
3555c56694b5
Changeset range shows branch/tags/bookmarks
Marcin Kuzminski <marcin@python-works.com>
parents:
2732
diff
changeset
|
98 %endfor |
2973
9937afa7f093
whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2926
diff
changeset
|
99 </span> |
9937afa7f093
whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2926
diff
changeset
|
100 </div> |
2673
d5e42c00f3c1
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2591
diff
changeset
|
101 </div> |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
102 ${diff_block.diff_block(c.changes[cs.raw_id])} |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
103 ##${comment.comments(cs)} |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
104 |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
105 %endfor |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
106 <script type="text/javascript"> |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
107 |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
108 YUE.onDOMReady(function(){ |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
109 |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
110 YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
111 var act = e.currentTarget.nextElementSibling; |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
112 |
1787
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
113 if(YUD.hasClass(act,'active')){ |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
114 YUD.removeClass(act,'active'); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
115 YUD.setStyle(act,'display','none'); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
116 }else{ |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
117 YUD.addClass(act,'active'); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
118 YUD.setStyle(act,'display',''); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
119 } |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
120 }); |
d4a7b6c82efe
code garden for changeset ranges and comments
Marcin Kuzminski <marcin@python-works.com>
parents:
1777
diff
changeset
|
121 }) |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
122 </script> |
977
28524453bb76
started work on #93 added rev ranges view, checkboxes in changelog to view ranges of changes
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
123 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1868
diff
changeset
|
124 </%def> |