Show More
@@ -342,8 +342,8 b' class ReposGroupsController(BaseControll' | |||
|
342 | 342 | "sort": "name", |
|
343 | 343 | "dir": "asc", |
|
344 | 344 | "records": repos_data |
|
345 |
}) |
|
|
346 | ||
|
345 | }) | |
|
346 | ||
|
347 | 347 | return render('admin/repos_groups/repos_groups.html') |
|
348 | 348 | |
|
349 | 349 | @HasPermissionAnyDecorator('hg.admin') |
@@ -157,7 +157,7 b' class FilesController(BaseRepoController' | |||
|
157 | 157 | _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path) |
|
158 | 158 | c.file_changeset = c.changeset |
|
159 | 159 | if _hist: |
|
160 |
c.file_changeset = (c.changeset |
|
|
160 | c.file_changeset = (c.changeset | |
|
161 | 161 | if c.changeset.revision < _hist[0].revision |
|
162 | 162 | else _hist[0]) |
|
163 | 163 | c.file_history = self._get_node_history(None, f_path, _hist) |
@@ -28,4 +28,4 b' try:' | |||
|
28 | 28 | except ImportError: |
|
29 | 29 | Errormator = None |
|
30 | 30 | else: |
|
31 | Errormator = make_errormator_middleware No newline at end of file | |
|
31 | Errormator = make_errormator_middleware |
@@ -44,4 +44,4 b' else:' | |||
|
44 | 44 | include_paths=list_from_setting(config, 'sentry.include_paths'), |
|
45 | 45 | exclude_paths=list_from_setting(config, 'sentry.exclude_paths'), |
|
46 | 46 | ) |
|
47 | super(Sentry, self).__init__(app, client) No newline at end of file | |
|
47 | super(Sentry, self).__init__(app, client) |
@@ -35,7 +35,7 b'' | |||
|
35 | 35 | <div class="info_box" style="clear: both;padding: 10px 6px;vertical-align: right;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.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_ref_type='branch',other_ref='default',repo=c.rhodecode_db_repo.fork.repo_name)}" class="ui-btn small">${_('Compare fork')}</a> |
|
41 | 41 | %endif |
@@ -161,11 +161,11 b'' | |||
|
161 | 161 | if(checked_checkboxes.length>0){ |
|
162 | 162 | // modify open pull request to show we have selected cs |
|
163 | 163 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; |
|
164 | ||
|
164 | ||
|
165 | 165 | }else{ |
|
166 |
YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; |
|
|
166 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; | |
|
167 | 167 | } |
|
168 | ||
|
168 | ||
|
169 | 169 | if(checked_checkboxes.length>1){ |
|
170 | 170 | var rev_end = checked_checkboxes[0].name; |
|
171 | 171 | var rev_start = checked_checkboxes[checked_checkboxes.length-1].name; |
@@ -188,9 +188,9 b'' | |||
|
188 | 188 | if (rev == rev_start){ |
|
189 | 189 | checked = false; |
|
190 | 190 | } |
|
191 | ||
|
191 | ||
|
192 | 192 | } |
|
193 | ||
|
193 | ||
|
194 | 194 | var url = url_tmpl.replace('__REVRANGE__', |
|
195 | 195 | rev_start+'...'+rev_end); |
|
196 | 196 | |
@@ -201,7 +201,7 b'' | |||
|
201 | 201 | YUD.get('rev_range_container').innerHTML = link; |
|
202 | 202 | YUD.setStyle('rev_range_container','display',''); |
|
203 | 203 | YUD.setStyle('rev_range_clear','display',''); |
|
204 | ||
|
204 | ||
|
205 | 205 | } |
|
206 | 206 | else{ |
|
207 | 207 | YUD.setStyle('rev_range_container','display','none'); |
@@ -94,8 +94,8 b'' | |||
|
94 | 94 | <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> |
|
95 | 95 | ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span> |
|
96 | 96 | %endfor |
|
97 |
</span> |
|
|
98 |
</div> |
|
|
97 | </span> | |
|
98 | </div> | |
|
99 | 99 | </div> |
|
100 | 100 | ${diff_block.diff_block(c.changes[cs.raw_id])} |
|
101 | 101 | ##${comment.comments(cs)} |
@@ -22,7 +22,7 b' YUE.onDOMReady(function(){' | |||
|
22 | 22 | ypjax(e.target.href,"followers",function(){ |
|
23 | 23 | show_more_event(); |
|
24 | 24 | tooltip_activate(); |
|
25 |
show_changeset_tooltip(); |
|
|
25 | show_changeset_tooltip(); | |
|
26 | 26 | }); |
|
27 | 27 | YUE.preventDefault(e); |
|
28 | 28 | },'.pager_link'); |
@@ -30,7 +30,7 b'' | |||
|
30 | 30 | ypjax(e.target.href,"forks",function(){ |
|
31 | 31 | show_more_event(); |
|
32 | 32 | tooltip_activate(); |
|
33 |
show_changeset_tooltip(); |
|
|
33 | show_changeset_tooltip(); | |
|
34 | 34 | }); |
|
35 | 35 | YUE.preventDefault(e); |
|
36 | 36 | },'.pager_link'); |
@@ -163,7 +163,7 b'' | |||
|
163 | 163 | firstPageLinkLabel: '<<', |
|
164 | 164 | lastPageLinkLabel: '>>', |
|
165 | 165 | containers:['user-paginator'] |
|
166 |
}), |
|
|
166 | }), | |
|
167 | 167 | MSG_SORTASC:"${_('Click to sort ascending')}", |
|
168 | 168 | MSG_SORTDESC:"${_('Click to sort descending')}" |
|
169 | 169 | }); |
@@ -224,7 +224,7 b'' | |||
|
224 | 224 | var data = ${c.data|n}; |
|
225 | 225 | var myDataSource = new YAHOO.util.DataSource(data); |
|
226 | 226 | myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; |
|
227 | ||
|
227 | ||
|
228 | 228 | myDataSource.responseSchema = { |
|
229 | 229 | resultsList: "records", |
|
230 | 230 | fields: [ |
@@ -243,7 +243,7 b'' | |||
|
243 | 243 | var data = res.results || [], |
|
244 | 244 | filtered = [], |
|
245 | 245 | i,l; |
|
246 | ||
|
246 | ||
|
247 | 247 | if (req) { |
|
248 | 248 | req = req.toLowerCase(); |
|
249 | 249 | for (i = 0; i<data.length; i++) { |
@@ -257,7 +257,7 b'' | |||
|
257 | 257 | YUD.get('repo_count').innerHTML = res.results.length; |
|
258 | 258 | return res; |
|
259 | 259 | } |
|
260 | ||
|
260 | ||
|
261 | 261 | // main table sorting |
|
262 | 262 | var myColumnDefs = [ |
|
263 | 263 | {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, |
@@ -270,7 +270,7 b'' | |||
|
270 | 270 | {key:"rss",label:"",sortable:false}, |
|
271 | 271 | {key:"atom",label:"",sortable:false}, |
|
272 | 272 | ]; |
|
273 | ||
|
273 | ||
|
274 | 274 | var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{ |
|
275 | 275 | sortedBy:{key:"name",dir:"asc"}, |
|
276 | 276 | paginator: new YAHOO.widget.Paginator({ |
@@ -287,7 +287,7 b'' | |||
|
287 | 287 | lastPageLinkLabel: '>>', |
|
288 | 288 | containers:['user-paginator'] |
|
289 | 289 | }), |
|
290 | ||
|
290 | ||
|
291 | 291 | MSG_SORTASC:"${_('Click to sort ascending')}", |
|
292 | 292 | MSG_SORTDESC:"${_('Click to sort descending')}", |
|
293 | 293 | MSG_EMPTY:"${_('No records found.')}", |
@@ -299,17 +299,17 b'' | |||
|
299 | 299 | tooltip_activate(); |
|
300 | 300 | quick_repo_menu(); |
|
301 | 301 | }); |
|
302 | ||
|
302 | ||
|
303 | 303 | var filterTimeout = null; |
|
304 | ||
|
304 | ||
|
305 | 305 | updateFilter = function () { |
|
306 | 306 | // Reset timeout |
|
307 | 307 | filterTimeout = null; |
|
308 | ||
|
308 | ||
|
309 | 309 | // Reset sort |
|
310 | 310 | var state = myDataTable.getState(); |
|
311 | 311 | state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC}; |
|
312 | ||
|
312 | ||
|
313 | 313 | // Get filtered data |
|
314 | 314 | myDataSource.sendRequest(YUD.get('q_filter').value,{ |
|
315 | 315 | success : myDataTable.onDataReturnInitializeTable, |
@@ -317,16 +317,15 b'' | |||
|
317 | 317 | scope : myDataTable, |
|
318 | 318 | argument: state |
|
319 | 319 | }); |
|
320 | ||
|
320 | ||
|
321 | 321 | }; |
|
322 | 322 | YUE.on('q_filter','click',function(){ |
|
323 | 323 | YUD.get('q_filter').value = ''; |
|
324 | 324 | }); |
|
325 | ||
|
325 | ||
|
326 | 326 | YUE.on('q_filter','keyup',function (e) { |
|
327 | 327 | clearTimeout(filterTimeout); |
|
328 | 328 | filterTimeout = setTimeout(updateFilter,600); |
|
329 | 329 | }); |
|
330 | 330 | </script> |
|
331 | 331 | % endif |
|
332 | No newline at end of file |
@@ -38,7 +38,7 b'' | |||
|
38 | 38 | <div class="title"> |
|
39 | 39 | <h5> |
|
40 | 40 | <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> |
|
41 |
<a id="show_watched" class="link-white" href="#watched">${_('Watched')}</a> / <a id="show_my" class="link-white" href="#my">${_('My repos')}</a> |
|
|
41 | <a id="show_watched" class="link-white" href="#watched">${_('Watched')}</a> / <a id="show_my" class="link-white" href="#my">${_('My repos')}</a> | |
|
42 | 42 | </h5> |
|
43 | 43 | %if h.HasPermissionAny('hg.admin','hg.create.repository')(): |
|
44 | 44 | <ul class="links"> |
@@ -117,10 +117,10 b'' | |||
|
117 | 117 | var nodes = YUQ('#my tr td a.repo_name'); |
|
118 | 118 | var func = function(node){ |
|
119 | 119 | return node.parentNode.parentNode.parentNode; |
|
120 |
} |
|
|
120 | } | |
|
121 | 121 | q_filter('q_filter',nodes,func); |
|
122 |
}); |
|
|
123 | ||
|
122 | }); | |
|
123 | ||
|
124 | 124 | } |
|
125 | 125 | YUE.on('show_my','click',function(e){ |
|
126 | 126 | show_my(e); |
@@ -140,7 +140,7 b'' | |||
|
140 | 140 | }) |
|
141 | 141 | //init watched |
|
142 | 142 | show_watched(); |
|
143 | ||
|
143 | ||
|
144 | 144 | var tabs = { |
|
145 | 145 | 'watched': show_watched, |
|
146 | 146 | 'my': show_my, |
@@ -150,8 +150,8 b'' | |||
|
150 | 150 | //We have a hash |
|
151 | 151 | var tabHash = url[1]; |
|
152 | 152 | tabs[tabHash](); |
|
153 |
} |
|
|
154 | ||
|
153 | } | |
|
154 | ||
|
155 | 155 | YUE.on('refresh','click',function(e){ |
|
156 | 156 | ypjax(e.currentTarget.href,"journal",function(){ |
|
157 | 157 | show_more_event(); |
@@ -44,4 +44,4 b'' | |||
|
44 | 44 | ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")} |
|
45 | 45 | %endif |
|
46 | 46 | </div> |
|
47 | %endif No newline at end of file | |
|
47 | %endif |
@@ -73,7 +73,7 b'' | |||
|
73 | 73 | <div id="affected_files"> |
|
74 | 74 | % if c.files: |
|
75 | 75 | <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div> |
|
76 |
<div class="cs_files"> |
|
|
76 | <div class="cs_files"> | |
|
77 | 77 | %for fid, change, f, stat in c.files: |
|
78 | 78 | <div class="cs_${change}"> |
|
79 | 79 | <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div> |
@@ -63,15 +63,15 b'' | |||
|
63 | 63 | </span> |
|
64 | 64 | %endif |
|
65 | 65 | %endif: |
|
66 | ||
|
66 | ||
|
67 | 67 | ## locking icon |
|
68 | 68 | %if c.rhodecode_db_repo.enable_locking: |
|
69 | 69 | %if c.rhodecode_db_repo.locked[0]: |
|
70 |
<span class="locking_locked tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.rhodecode_db_repo.locked[0])}"></span> |
|
|
70 | <span class="locking_locked tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.rhodecode_db_repo.locked[0])}"></span> | |
|
71 | 71 | %else: |
|
72 | 72 | <span class="locking_unlocked tooltip" title="${_('Repository unlocked')}"></span> |
|
73 | 73 | %endif |
|
74 |
%endif |
|
|
74 | %endif | |
|
75 | 75 | ##REPO TYPE |
|
76 | 76 | %if h.is_hg(c.dbrepo): |
|
77 | 77 | <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/> |
General Comments 0
You need to be logged in to leave comments.
Login now