Show More
@@ -1,89 +1,90 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)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - ${c.rhodecode_name} |
|
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)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].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')}</h3> |
|
29 | <h3 class="code-header-title">${_('Compare View')}</h3> | |
30 | <div> |
|
30 | <div> | |
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)} |
|
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 cs in c.cs_ranges: |
|
38 | %for cs in c.cs_ranges: | |
39 | <tr> |
|
39 | <tr> | |
40 | <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),14)}"/></div></td> |
|
40 | <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email(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.tooltip(h.age(cs.date))}">${h.fmt_date(cs.date)}</span></td> |
|
43 | <td><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${h.fmt_date(cs.date)}</span></td> | |
44 | <td><div class="message">${h.urlify_commit(cs.message, c.repo_name)}</div></td> |
|
44 | <td><div class="message">${h.urlify_commit(cs.message, c.repo_name)}</div></td> | |
45 | </tr> |
|
45 | </tr> | |
46 | %endfor |
|
46 | %endfor | |
47 | </table> |
|
47 | </table> | |
48 | </div> |
|
48 | </div> | |
49 | <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> |
|
49 | <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> | |
50 | <div class="cs_files"> |
|
50 | <div class="cs_files"> | |
51 | %for cs in c.cs_ranges: |
|
51 | %for cs in c.cs_ranges: | |
52 | <div class="cur_cs">r${cs}</div> |
|
52 | <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> | |
53 | %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]: |
|
53 | %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]: | |
54 | <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div> |
|
54 | <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div> | |
55 | %endfor |
|
55 | %endfor | |
56 | %endfor |
|
56 | %endfor | |
57 | </div> |
|
57 | </div> | |
58 | </div> |
|
58 | </div> | |
59 |
|
59 | |||
60 | </div> |
|
60 | </div> | |
61 | <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> |
|
61 | <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> | |
62 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> |
|
62 | <%namespace name="diff_block" file="/changeset/diff_block.html"/> | |
63 | %for cs in c.cs_ranges: |
|
63 | %for cs in c.cs_ranges: | |
64 | ##${comment.comment_inline_form(cs)} |
|
64 | ##${comment.comment_inline_form(cs)} | |
65 | ## diff block |
|
65 | ## diff block | |
66 |
<h3 style=" |
|
66 | <h3 style="padding-top:8px;">${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))}</h3> | |
|
67 | ||||
67 | ${diff_block.diff_block(c.changes[cs.raw_id])} |
|
68 | ${diff_block.diff_block(c.changes[cs.raw_id])} | |
68 | ##${comment.comments(cs)} |
|
69 | ##${comment.comments(cs)} | |
69 |
|
70 | |||
70 | %endfor |
|
71 | %endfor | |
71 | <script type="text/javascript"> |
|
72 | <script type="text/javascript"> | |
72 |
|
73 | |||
73 | YUE.onDOMReady(function(){ |
|
74 | YUE.onDOMReady(function(){ | |
74 |
|
75 | |||
75 | YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ |
|
76 | YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ | |
76 | var act = e.currentTarget.nextElementSibling; |
|
77 | var act = e.currentTarget.nextElementSibling; | |
77 |
|
78 | |||
78 | if(YUD.hasClass(act,'active')){ |
|
79 | if(YUD.hasClass(act,'active')){ | |
79 | YUD.removeClass(act,'active'); |
|
80 | YUD.removeClass(act,'active'); | |
80 | YUD.setStyle(act,'display','none'); |
|
81 | YUD.setStyle(act,'display','none'); | |
81 | }else{ |
|
82 | }else{ | |
82 | YUD.addClass(act,'active'); |
|
83 | YUD.addClass(act,'active'); | |
83 | YUD.setStyle(act,'display',''); |
|
84 | YUD.setStyle(act,'display',''); | |
84 | } |
|
85 | } | |
85 | }); |
|
86 | }); | |
86 | }) |
|
87 | }) | |
87 | </script> |
|
88 | </script> | |
88 | </div> |
|
89 | </div> | |
89 | </%def> |
|
90 | </%def> |
General Comments 0
You need to be logged in to leave comments.
Login now