Mercurial > kallithea

comparison rhodecode/templates/changelog/changelog.html @ 4116:ffd45b185016 rhodecode-2.2.5-gpl

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Imported some of the GPLv3'd changes from RhodeCode v2.2.5. This imports changes between changesets 21af6c4eab3d and 6177597791c2 in RhodeCode's original repository, including only changes to Python files and HTML. RhodeCode clearly licensed its changes to these files under GPLv3 in their /LICENSE file, which states the following: The Python code and integrated HTML are licensed under the GPLv3 license. (See: https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE or http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE for an online copy of that LICENSE file) Conservancy reviewed these changes and confirmed that they can be licensed as a whole to the Kallithea project under GPLv3-only. While some of the contents committed herein are clearly licensed GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the statement above from RhodeCode indicates that they intend GPLv3-only as their license, per GPLv3ยง14 and other relevant sections of GPLv3.
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:03:13 -0400
parents c7e656e96c5d
children 30a683d04e77
comparison
equal deleted inserted replaced
4115:8b7294a804a0 4116:ffd45b185016
1 ## -*- coding: utf-8 -*- 1 ## -*- coding: utf-8 -*-
2 2
3 <%inherit file="/base/base.html"/> 3 <%inherit file="/base/base.html"/>
4 4
5 <%def name="title()"> 5 <%def name="title()">
6 ${_('%s Changelog') % c.repo_name} &middot; 6 ${_('%s Changelog') % c.repo_name}
7 %if c.changelog_for_path: 7 %if c.changelog_for_path:
8 /${c.changelog_for_path} &middot; 8 /${c.changelog_for_path}
9 %endif 9 %endif
10 ${c.rhodecode_name} 10 %if c.rhodecode_name:
11 &middot; ${c.rhodecode_name}
12 %endif
11 </%def> 13 </%def>
12 14
13 <%def name="breadcrumbs_links()"> 15 <%def name="breadcrumbs_links()">
14 <% size = c.size if c.size <= c.total_cs else c.total_cs %> 16 <% size = c.size if c.size <= c.total_cs else c.total_cs %>
15 ${_('Changelog')} 17 ${_('Changelog')}
32 </div> 34 </div>
33 <div class="table"> 35 <div class="table">
34 % if c.pagination: 36 % if c.pagination:
35 <div id="graph"> 37 <div id="graph">
36 <div style="display:${'none' if c.changelog_for_path else ''}"> 38 <div style="display:${'none' if c.changelog_for_path else ''}">
37 <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">
38 <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
39 <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
40
41 %if c.rhodecode_db_repo.fork:
42 <a id="compare_fork" title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default',merge=1)}" class="ui-btn small">${_('Compare fork with parent')}</a>
43 %endif
44 %if h.is_hg(c.rhodecode_repo):
45 <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a>
46 %endif
47 </div>
48 <div class="container_header"> 39 <div class="container_header">
49 ${h.form(h.url.current(),method='get')} 40 <div style="float:right; margin: 0px 0px 0px 4px">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
50 <div style="float:left"> 41 <div class="info_box" style="text-align: right; float: right">
51 ${h.submit('set',_('Show'),class_="ui-btn")} 42 <a href="#" class="btn btn-mini" id="rev_range_container" style="display:none"></a>
52 ${h.text('size',size=1,value=c.size)} 43 <a href="#" class="btn btn-mini" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
53 ${_('revisions')} 44
54 </div> 45 %if c.rhodecode_db_repo.fork:
55 ${h.end_form()} 46 <a id="compare_fork"
56 <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div> 47 title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}"
48 href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type=c.rhodecode_db_repo.landing_rev[0],org_ref=c.rhodecode_db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],other_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1], merge=1)}"
49 class="btn btn-mini"><i class="icon-loop"></i> ${_('Compare fork with Parent(%s)' % c.rhodecode_db_repo.fork.repo_name)}</a>
50 %endif
51 <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="btn btn-mini">${_('Open new pull request')}</a>
52 </div>
53
54 ${h.form(h.url.current(),method='get')}
55 <div style="float:left">
56 ${h.submit('set',_('Show'),class_="btn btn-mini")}
57 ${h.text('size',size=1,value=c.size)}
58 ${_('revisions')}
59 </div>
60 ${h.end_form()}
57 </div> 61 </div>
58 </div> 62 </div>
59 <div id="graph_nodes"> 63 <div id="graph_nodes">
60 <canvas id="graph_canvas"></canvas> 64 <canvas id="graph_canvas"></canvas>
61 </div> 65 </div>
62 <div id="graph_content"> 66 <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">
63 67
64 <table id="changesets"> 68 <table id="changesets">
65 <tbody> 69 <tbody>
66 %for cnt,cs in enumerate(c.pagination): 70 %for cnt,cs in enumerate(c.pagination):
67 <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}"> 71 <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
96 </a> 100 </a>
97 </td> 101 </td>
98 <td class="date"> 102 <td class="date">
99 <div class="date">${h.age(cs.date,True)}</div> 103 <div class="date">${h.age(cs.date,True)}</div>
100 </td> 104 </td>
105 <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
106 <i class="icon-resize-vertical" style="color:#DDD"></i>
107 </td>
101 <td class="mid"> 108 <td class="mid">
102 <div class="log-container"> 109 <div class="log-container">
103 <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div> 110 <div class="message" id="C-${cs.raw_id}">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
104 <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
105 <div class="extra-container"> 111 <div class="extra-container">
106 %if c.comments.get(cs.raw_id): 112 %if c.comments.get(cs.raw_id):
107 <div class="comments-container"> 113 <div class="comments-container">
108 <div class="comments-cnt" title="${_('Changeset has comments')}"> 114 <div class="comments-cnt" title="${_('Changeset has comments')}">
109 <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> 115 <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
110 ${len(c.comments[cs.raw_id])} 116 ${len(c.comments[cs.raw_id])}
117 <i class="icon-comment-alt icon-comment-colored"></i>
111 </a> 118 </a>
112 </div> 119 </div>
113 </div> 120 </div>
114 %endif 121 %endif
115 %if h.is_hg(c.rhodecode_repo): 122 %if h.is_hg(c.rhodecode_repo):
150 //Monitor range checkboxes and build a link to changesets 157 //Monitor range checkboxes and build a link to changesets
151 //ranges 158 //ranges
152 var checkboxes = YUD.getElementsByClassName('changeset_range'); 159 var checkboxes = YUD.getElementsByClassName('changeset_range');
153 // register our routes needed for this view 160 // register our routes needed for this view
154 pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']); 161 pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
155 pyroutes.register('changelog_home', "${h.url('changelog_home', repo_name='%(repo_name)s')}", ['repo_name']);
156 pyroutes.register('pullrequest_home', "${h.url('pullrequest_home', repo_name='%(repo_name)s')}", ['repo_name']);
157 162
158 var checkbox_checker = function(e){ 163 var checkbox_checker = function(e){
159 var checked_checkboxes = []; 164 var checked_checkboxes = [];
160 for (pos in checkboxes){ 165 for (pos in checkboxes){
161 if(checkboxes[pos].checked){ 166 if(checkboxes[pos].checked){
237 var offset = row_h - (h+12); 242 var offset = row_h - (h+12);
238 YUD.setStyle(m.nextElementSibling,'display','block'); 243 YUD.setStyle(m.nextElementSibling,'display','block');
239 YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px'); 244 YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
240 }; 245 };
241 } 246 }
242 YUE.on(YUQ('.expand'),'click',function(e){ 247
243 var elem = e.currentTarget.parentNode.parentNode; 248 $('.expand_commit').on('click',function(e){
244 YUD.setStyle(e.currentTarget,'display','none'); 249 $(this).children('i').hide();
245 YUD.setStyle(elem,'height','auto'); 250 var cid = $(this).attr('commit_id');
246 251 $('#C-'+cid).css({'height': 'auto', 'margin': '4px 0px 4px 0px'})
247 //redraw the graph, line_count and jsdata are global vars 252 //redraw the graph, line_count and jsdata are global vars
248 set_canvas(100); 253 set_canvas(100);
249 254
250 var r = new BranchRenderer(); 255 var r = new BranchRenderer();
251 r.render(jsdata,100,line_count); 256 r.render(jsdata,100,line_count);
252
253 }); 257 });
254 258
255 // change branch filter 259 // change branch filter
256 YUE.on(YUD.get('branch_filter'),'change',function(e){ 260 YUE.on(YUD.get('branch_filter'),'change',function(e){
257 var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value; 261 var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
287 291
288 var r = new BranchRenderer(); 292 var r = new BranchRenderer();
289 r.render(jsdata,100,line_count); 293 r.render(jsdata,100,line_count);
290 294
291 }); 295 });
296
292 </script> 297 </script>
293 %else: 298 %else:
294 ${_('There are no changes yet')} 299 ${_('There are no changes yet')}
295 %endif 300 %endif
296 </div> 301 </div>