Show More
@@ -1,122 +1,122 b'' | |||||
1 | ## -*- coding: utf-8 -*- |
|
1 | ## -*- coding: utf-8 -*- | |
2 | <%inherit file="/base/base.html"/> |
|
2 | <%inherit file="/base/base.html"/> | |
3 |
|
3 | |||
4 | <%def name="title()"> |
|
4 | <%def name="title()"> | |
5 |
${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} - |
|
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} | |
6 | </%def> |
|
6 | </%def> | |
7 |
|
7 | |||
8 | <%def name="breadcrumbs_links()"> |
|
8 | <%def name="breadcrumbs_links()"> | |
9 | ${h.link_to(_(u'Home'),h.url('/'))} |
|
9 | ${h.link_to(_(u'Home'),h.url('/'))} | |
10 | » |
|
10 | » | |
11 | ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} |
|
11 | ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} | |
12 | » |
|
12 | » | |
13 |
${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} - |
|
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)} | |
14 | </%def> |
|
14 | </%def> | |
15 |
|
15 | |||
16 | <%def name="page_nav()"> |
|
16 | <%def name="page_nav()"> | |
17 | ${self.menu('changelog')} |
|
17 | ${self.menu('changelog')} | |
18 | </%def> |
|
18 | </%def> | |
19 |
|
19 | |||
20 | <%def name="main()"> |
|
20 | <%def name="main()"> | |
21 | <div class="box"> |
|
21 | <div class="box"> | |
22 | <!-- box / title --> |
|
22 | <!-- box / title --> | |
23 | <div class="title"> |
|
23 | <div class="title"> | |
24 | ${self.breadcrumbs()} |
|
24 | ${self.breadcrumbs()} | |
25 | </div> |
|
25 | </div> | |
26 | <div class="table"> |
|
26 | <div class="table"> | |
27 | <div id="body" class="diffblock"> |
|
27 | <div id="body" class="diffblock"> | |
28 | <div class="code-header cv"> |
|
28 | <div class="code-header cv"> | |
29 | <h3 class="code-header-title">${_('Compare View')} / ${h.link_to(_('Show combined compare'),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))}</h3> |
|
29 | <h3 class="code-header-title">${_('Compare View')} / ${h.link_to(_('Show combined compare'),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))}</h3> | |
30 | <div> |
|
30 | <div> | |
31 |
${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} - |
|
31 | ${_('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)} | |
32 | </div> |
|
32 | </div> | |
33 | </div> |
|
33 | </div> | |
34 | </div> |
|
34 | </div> | |
35 | <div id="changeset_compare_view_content"> |
|
35 | <div id="changeset_compare_view_content"> | |
36 | <div class="container"> |
|
36 | <div class="container"> | |
37 | <table class="compare_view_commits noborder"> |
|
37 | <table class="compare_view_commits noborder"> | |
38 | %for cnt,cs in enumerate(c.cs_ranges): |
|
38 | %for cnt,cs in enumerate(c.cs_ranges): | |
39 | <tr> |
|
39 | <tr> | |
40 | <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td> |
|
40 | <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td> | |
41 | <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> |
|
41 | <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> | |
42 | <td><div class="author">${h.person(cs.author)}</div></td> |
|
42 | <td><div class="author">${h.person(cs.author)}</div></td> | |
43 | <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> |
|
43 | <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td> | |
44 | <td> |
|
44 | <td> | |
45 | %if c.statuses: |
|
45 | %if c.statuses: | |
46 | <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div> |
|
46 | <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div> | |
47 | %endif |
|
47 | %endif | |
48 | </td> |
|
48 | </td> | |
49 | <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td> |
|
49 | <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td> | |
50 | </tr> |
|
50 | </tr> | |
51 | %endfor |
|
51 | %endfor | |
52 | </table> |
|
52 | </table> | |
53 | </div> |
|
53 | </div> | |
54 | <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> |
|
54 | <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> | |
55 | <div class="cs_files"> |
|
55 | <div class="cs_files"> | |
56 | %for cs in c.cs_ranges: |
|
56 | %for cs in c.cs_ranges: | |
57 | <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> |
|
57 | <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> | |
58 | %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): |
|
58 | %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): | |
59 | <div class="cs_${change}">${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}</div> |
|
59 | <div class="cs_${change}">${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}</div> | |
60 | %endfor |
|
60 | %endfor | |
61 | %endfor |
|
61 | %endfor | |
62 | </div> |
|
62 | </div> | |
63 | </div> |
|
63 | </div> | |
64 |
|
64 | |||
65 | </div> |
|
65 | </div> | |
66 | <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> |
|
66 | <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> | |
67 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
|
67 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |
68 | %for cs in c.cs_ranges: |
|
68 | %for cs in c.cs_ranges: | |
69 | ##${comment.comment_inline_form(cs)} |
|
69 | ##${comment.comment_inline_form(cs)} | |
70 | ## diff block |
|
70 | ## diff block | |
71 | <div class="h3"> |
|
71 | <div class="h3"> | |
72 | <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> |
|
72 | <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> | |
73 | <div class="gravatar"> |
|
73 | <div class="gravatar"> | |
74 | <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/> |
|
74 | <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/> | |
75 | </div> |
|
75 | </div> | |
76 | <div class="right"> |
|
76 | <div class="right"> | |
77 | <span class="logtags"> |
|
77 | <span class="logtags"> | |
78 | %if len(cs.parents)>1: |
|
78 | %if len(cs.parents)>1: | |
79 | <span class="merge">${_('merge')}</span> |
|
79 | <span class="merge">${_('merge')}</span> | |
80 | %endif |
|
80 | %endif | |
81 | %if cs.branch: |
|
81 | %if cs.branch: | |
82 | <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> |
|
82 | <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> | |
83 | ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} |
|
83 | ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} | |
84 | </span> |
|
84 | </span> | |
85 | %endif |
|
85 | %endif | |
86 | %if h.is_hg(c.rhodecode_repo): |
|
86 | %if h.is_hg(c.rhodecode_repo): | |
87 | %for book in cs.bookmarks: |
|
87 | %for book in cs.bookmarks: | |
88 | <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}"> |
|
88 | <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}"> | |
89 | ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} |
|
89 | ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} | |
90 | </span> |
|
90 | </span> | |
91 | %endfor |
|
91 | %endfor | |
92 | %endif |
|
92 | %endif | |
93 | %for tag in cs.tags: |
|
93 | %for tag in cs.tags: | |
94 | <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> |
|
94 | <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> | |
95 | ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> |
|
95 | ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> | |
96 | %endfor |
|
96 | %endfor | |
97 | </span> |
|
97 | </span> | |
98 | </div> |
|
98 | </div> | |
99 | </div> |
|
99 | </div> | |
100 | ${diff_block.diff_block(c.changes[cs.raw_id])} |
|
100 | ${diff_block.diff_block(c.changes[cs.raw_id])} | |
101 | ##${comment.comments(cs)} |
|
101 | ##${comment.comments(cs)} | |
102 |
|
102 | |||
103 | %endfor |
|
103 | %endfor | |
104 | <script type="text/javascript"> |
|
104 | <script type="text/javascript"> | |
105 |
|
105 | |||
106 | YUE.onDOMReady(function(){ |
|
106 | YUE.onDOMReady(function(){ | |
107 |
|
107 | |||
108 | YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ |
|
108 | YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ | |
109 | var act = e.currentTarget.nextElementSibling; |
|
109 | var act = e.currentTarget.nextElementSibling; | |
110 |
|
110 | |||
111 | if(YUD.hasClass(act,'active')){ |
|
111 | if(YUD.hasClass(act,'active')){ | |
112 | YUD.removeClass(act,'active'); |
|
112 | YUD.removeClass(act,'active'); | |
113 | YUD.setStyle(act,'display','none'); |
|
113 | YUD.setStyle(act,'display','none'); | |
114 | }else{ |
|
114 | }else{ | |
115 | YUD.addClass(act,'active'); |
|
115 | YUD.addClass(act,'active'); | |
116 | YUD.setStyle(act,'display',''); |
|
116 | YUD.setStyle(act,'display',''); | |
117 | } |
|
117 | } | |
118 | }); |
|
118 | }); | |
119 | }) |
|
119 | }) | |
120 | </script> |
|
120 | </script> | |
121 | </div> |
|
121 | </div> | |
122 | </%def> |
|
122 | </%def> |
@@ -1,12 +1,12 b'' | |||||
1 | ## -*- coding: utf-8 -*- |
|
1 | ## -*- coding: utf-8 -*- | |
2 | <%inherit file="main.html"/> |
|
2 | <%inherit file="main.html"/> | |
3 |
|
3 | |||
4 | <h4>${subject}</h4> |
|
4 | <h4>${subject}</h4> | |
5 |
|
5 | |||
6 | ${body} |
|
6 | ${body} | |
7 |
|
7 | |||
8 | % if status_change is not None: |
|
8 | % if status_change is not None: | |
9 | <div> |
|
9 | <div> | |
10 |
${_('New status$')} - |
|
10 | ${_('New status$')} -> ${status_change} | |
11 | </div> |
|
11 | </div> | |
12 | % endif |
|
12 | % endif |
@@ -1,15 +1,15 b'' | |||||
1 | ## -*- coding: utf-8 -*- |
|
1 | ## -*- coding: utf-8 -*- | |
2 | <%inherit file="main.html"/> |
|
2 | <%inherit file="main.html"/> | |
3 |
|
3 | |||
4 | ${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user, pr_id, pr_target_repo) |n} |
|
4 | ${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user, pr_id, pr_target_repo) |n} | |
5 | <div>${_('View this comment here')}: ${pr_comment_url}</div> |
|
5 | <div>${_('View this comment here')}: ${pr_comment_url}</div> | |
6 |
|
6 | |||
7 | <p> |
|
7 | <p> | |
8 | ${body} |
|
8 | ${body} | |
9 |
|
9 | |||
10 | %if status_change: |
|
10 | %if status_change: | |
11 |
<span>${_('New status')} - |
|
11 | <span>${_('New status')} -> ${status_change}</span> | |
12 | %endif |
|
12 | %endif | |
13 | </p> |
|
13 | </p> | |
14 |
|
14 | |||
15 |
|
15 |
General Comments 0
You need to be logged in to leave comments.
Login now