##// END OF EJS Templates
Bugfix: On the changelog page, its possible that some changeset is already checked out by the browser. So we check for that on page load.
Leonardo Carneiro -
r3464:d253f1b5 beta
parent child Browse files
Show More
@@ -1,286 +1,290 b''
1 1 ## -*- coding: utf-8 -*-
2 2
3 3 <%inherit file="/base/base.html"/>
4 4
5 5 <%def name="title()">
6 6 ${_('%s Changelog') % c.repo_name} - ${c.rhodecode_name}
7 7 </%def>
8 8
9 9 <%def name="breadcrumbs_links()">
10 10 ${h.link_to(_(u'Home'),h.url('/'))}
11 11 &raquo;
12 12 ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
13 13 &raquo;
14 14 <% size = c.size if c.size <= c.total_cs else c.total_cs %>
15 15 ${_('changelog')} - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
16 16 </%def>
17 17
18 18 <%def name="page_nav()">
19 19 ${self.menu('changelog')}
20 20 </%def>
21 21
22 22 <%def name="main()">
23 23 <div class="box">
24 24 <!-- box / title -->
25 25 <div class="title">
26 26 ${self.breadcrumbs()}
27 27 </div>
28 28 <div class="table">
29 29 % if c.pagination:
30 30 <div id="graph">
31 31 <div id="graph_nodes">
32 32 <canvas id="graph_canvas"></canvas>
33 33 </div>
34 34 <div id="graph_content">
35 35 <div class="info_box" style="clear: both;padding: 10px 6px;text-align: right;">
36 36 <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
37 37 <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
38 38
39 39 %if c.rhodecode_db_repo.fork:
40 40 <a 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')}" class="ui-btn small">${_('Compare fork with parent')}</a>
41 41 %endif
42 42 %if h.is_hg(c.rhodecode_repo):
43 43 <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a>
44 44 %endif
45 45 </div>
46 46 <div class="container_header">
47 47 ${h.form(h.url.current(),method='get')}
48 48 <div class="info_box" style="float:left">
49 49 ${h.submit('set',_('Show'),class_="ui-btn")}
50 50 ${h.text('size',size=1,value=c.size)}
51 51 ${_('revisions')}
52 52 </div>
53 53 ${h.end_form()}
54 54 <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
55 55 </div>
56 56
57 57 %for cnt,cs in enumerate(c.pagination):
58 58 <div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
59 59 <div class="left">
60 60 <div>
61 61 ${h.checkbox(cs.raw_id,class_="changeset_range")}
62 62 <span class="tooltip" title="${h.tooltip(h.age(cs.date))}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
63 63 </div>
64 64 <div class="author">
65 65 <div class="gravatar">
66 66 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
67 67 </div>
68 68 <div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div>
69 69 </div>
70 70 <div class="date">${h.fmt_date(cs.date)}</div>
71 71 </div>
72 72 <div class="mid">
73 73 <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>
74 74 <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
75 75 </div>
76 76 <div class="right">
77 77 <div class="changes">
78 78 <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}">${len(cs.affected_files)}</div>
79 79 <div class="comments-container">
80 80 %if len(c.comments.get(cs.raw_id,[])) > 0:
81 81 <div class="comments-cnt" title="${('comments')}">
82 82 <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)}">
83 83 <div class="comments-cnt">${len(c.comments[cs.raw_id])}</div>
84 84 <img src="${h.url('/images/icons/comments.png')}">
85 85 </a>
86 86 </div>
87 87 %endif
88 88 </div>
89 89 <div class="changeset-status-container">
90 90 %if c.statuses.get(cs.raw_id):
91 91 <div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
92 92 <div class="changeset-status-ico">
93 93 %if c.statuses.get(cs.raw_id)[2]:
94 94 <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /></a>
95 95 %else:
96 96 <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
97 97 %endif
98 98 </div>
99 99 %endif
100 100 </div>
101 101 </div>
102 102 %if cs.parents:
103 103 %for p_cs in reversed(cs.parents):
104 104 <div class="parent">${_('Parent')}
105 105 <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
106 106 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
107 107 </div>
108 108 %endfor
109 109 %else:
110 110 <div class="parent">${_('No parents')}</div>
111 111 %endif
112 112
113 113 <span class="logtags">
114 114 %if len(cs.parents)>1:
115 115 <span class="merge">${_('merge')}</span>
116 116 %endif
117 117 %if cs.branch:
118 118 <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
119 119 ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
120 120 </span>
121 121 %endif
122 122 %if h.is_hg(c.rhodecode_repo):
123 123 %for book in cs.bookmarks:
124 124 <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
125 125 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
126 126 </span>
127 127 %endfor
128 128 %endif
129 129 %for tag in cs.tags:
130 130 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
131 131 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
132 132 %endfor
133 133 </span>
134 134 </div>
135 135 </div>
136 136
137 137 %endfor
138 138 <div class="pagination-wh pagination-left">
139 139 ${c.pagination.pager('$link_previous ~2~ $link_next')}
140 140 </div>
141 141 </div>
142 142 </div>
143 143
144 144 <script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
145 145 <script type="text/javascript">
146 146 YAHOO.util.Event.onDOMReady(function(){
147 147
148 148 //Monitor range checkboxes and build a link to changesets
149 149 //ranges
150 150 var checkboxes = YUD.getElementsByClassName('changeset_range');
151 151 var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
152 152 var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
153 YUE.on(checkboxes,'click',function(e){
153
154 var checkbox_checker = function(e){
154 155 var clicked_cb = e.currentTarget;
155 156 var checked_checkboxes = [];
156 157 for (pos in checkboxes){
157 158 if(checkboxes[pos].checked){
158 159 checked_checkboxes.push(checkboxes[pos]);
159 160 }
160 161 }
161 162 if(YUD.get('open_new_pr')){
162 163 if(checked_checkboxes.length>0){
163 164 // modify open pull request to show we have selected cs
164 165 YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
165 166 }else{
166 167 YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
167 168 }
168 169 }
169 170
170 171 if(checked_checkboxes.length>0){
171 172 var rev_end = checked_checkboxes[0].name;
172 173 var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
173 174 var url = url_tmpl.replace('__REVRANGE__',
174 175 rev_start+'...'+rev_end);
175 176
176 177 var link = (rev_start == rev_end)
177 178 ? _TM['Show selected change __S']
178 179 : _TM['Show selected changes __S -> __E'];
179 180
180 181 link = link.replace('__S',rev_start.substr(0,6));
181 182 link = link.replace('__E',rev_end.substr(0,6));
182 183 YUD.get('rev_range_container').href = url;
183 184 YUD.get('rev_range_container').innerHTML = link;
184 185 YUD.setStyle('rev_range_container','display','');
185 186 YUD.setStyle('rev_range_clear','display','');
186 187
187 188 YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
188 189
189 190 }
190 191 else{
191 192 YUD.setStyle('rev_range_container','display','none');
192 193 YUD.setStyle('rev_range_clear','display','none');
193 194 }
194 });
195 };
196 YUE.onDOMReady(checkbox_checker);
197 YUE.on(checkboxes,'click', checkbox_checker);
198
195 199 YUE.on('rev_range_clear','click',function(e){
196 200 for (var i=0; i<checkboxes.length; i++){
197 201 var cb = checkboxes[i];
198 202 cb.checked = false;
199 203 }
200 204 YUE.preventDefault(e);
201 205 })
202 206 var msgs = YUQ('.message');
203 207 // get first element height
204 208 var el = YUQ('#graph_content .container')[0];
205 209 var row_h = el.clientHeight;
206 210 for(var i=0;i<msgs.length;i++){
207 211 var m = msgs[i];
208 212
209 213 var h = m.clientHeight;
210 214 var pad = YUD.getStyle(m,'padding');
211 215 if(h > row_h){
212 216 var offset = row_h - (h+12);
213 217 YUD.setStyle(m.nextElementSibling,'display','block');
214 218 YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
215 219 };
216 220 }
217 221 YUE.on(YUQ('.expand'),'click',function(e){
218 222 var elem = e.currentTarget.parentNode.parentNode;
219 223 YUD.setStyle(e.currentTarget,'display','none');
220 224 YUD.setStyle(elem,'height','auto');
221 225
222 226 //redraw the graph, line_count and jsdata are global vars
223 227 set_canvas(100);
224 228
225 229 var r = new BranchRenderer();
226 230 r.render(jsdata,100,line_count);
227 231
228 232 })
229 233
230 234 // Fetch changeset details
231 235 YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
232 236 var id = e.currentTarget.id;
233 237 var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}";
234 238 var url = url.replace('__CS__',id.replace('changed_total_',''));
235 239 ypjax(url,id,function(){tooltip_activate()});
236 240 });
237 241
238 242 // change branch filter
239 243 YUE.on(YUD.get('branch_filter'),'change',function(e){
240 244 var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
241 245 var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
242 246 var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
243 247 var url = url.replace('__BRANCH__',selected_branch);
244 248 if(selected_branch != ''){
245 249 window.location = url;
246 250 }else{
247 251 window.location = url_main;
248 252 }
249 253
250 254 });
251 255
252 256 function set_canvas(width) {
253 257 var c = document.getElementById('graph_nodes');
254 258 var t = document.getElementById('graph_content');
255 259 canvas = document.getElementById('graph_canvas');
256 260 var div_h = t.clientHeight;
257 261 c.style.height=div_h+'px';
258 262 canvas.setAttribute('height',div_h);
259 263 c.style.height=width+'px';
260 264 canvas.setAttribute('width',width);
261 265 };
262 266 var heads = 1;
263 267 var line_count = 0;
264 268 var jsdata = ${c.jsdata|n};
265 269
266 270 for (var i=0;i<jsdata.length;i++) {
267 271 var in_l = jsdata[i][2];
268 272 for (var j in in_l) {
269 273 var m = in_l[j][1];
270 274 if (m > line_count)
271 275 line_count = m;
272 276 }
273 277 }
274 278 set_canvas(100);
275 279
276 280 var r = new BranchRenderer();
277 281 r.render(jsdata,100,line_count);
278 282
279 283 });
280 284 </script>
281 285 %else:
282 286 ${_('There are no changes yet')}
283 287 %endif
284 288 </div>
285 289 </div>
286 290 </%def>
General Comments 0
You need to be logged in to leave comments. Login now