Show More
@@ -314,7 +314,6 b' class BaseRepoController(BaseController)' | |||||
314 | c.repository_followers: number of followers |
|
314 | c.repository_followers: number of followers | |
315 | c.repository_forks: number of forks |
|
315 | c.repository_forks: number of forks | |
316 | c.repository_following: weather the current user is following the current repo |
|
316 | c.repository_following: weather the current user is following the current repo | |
317 |
|
||||
318 | """ |
|
317 | """ | |
319 |
|
318 | |||
320 | def __before__(self): |
|
319 | def __before__(self): |
@@ -355,7 +355,6 b' def age(prevdate, show_short_version=Fal' | |||||
355 | If show_short_version is True, then it will generate a not so accurate but shorter string, |
|
355 | If show_short_version is True, then it will generate a not so accurate but shorter string, | |
356 | example: 2days ago, instead of 2 days and 23 hours ago. |
|
356 | example: 2days ago, instead of 2 days and 23 hours ago. | |
357 |
|
357 | |||
358 |
|
||||
359 | :param prevdate: datetime object |
|
358 | :param prevdate: datetime object | |
360 | :param show_short_version: if it should aproximate the date and return a shorter string |
|
359 | :param show_short_version: if it should aproximate the date and return a shorter string | |
361 | :rtype: unicode |
|
360 | :rtype: unicode |
@@ -48,13 +48,13 b'' | |||||
48 | #content #context-bar, |
|
48 | #content #context-bar, | |
49 | #content #context-bar a, |
|
49 | #content #context-bar a, | |
50 | #content #context-bar button { |
|
50 | #content #context-bar button { | |
51 |
|
|
51 | color: #FFFFFF; | |
52 | } |
|
52 | } | |
53 |
|
53 | |||
54 | #header #header-inner #quick a:hover, |
|
54 | #header #header-inner #quick a:hover, | |
55 | #content #context-bar a:hover, |
|
55 | #content #context-bar a:hover, | |
56 | #content #context-bar button:hover { |
|
56 | #content #context-bar button:hover { | |
57 |
|
|
57 | text-decoration: none; | |
58 | } |
|
58 | } | |
59 |
|
59 | |||
60 | #content #context-bar .icon { |
|
60 | #content #context-bar .icon { | |
@@ -162,6 +162,7 b' ul#context-actions {' | |||||
162 | border-radius: 4px; |
|
162 | border-radius: 4px; | |
163 | background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%); |
|
163 | background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%); | |
164 | } |
|
164 | } | |
|
165 | ||||
165 | #content ul#context-actions li { |
|
166 | #content ul#context-actions li { | |
166 | padding: 0px; |
|
167 | padding: 0px; | |
167 | border-right: 1px solid rgba(0,0,0,0.1); |
|
168 | border-right: 1px solid rgba(0,0,0,0.1); | |
@@ -252,7 +253,7 b' ul#context-actions {' | |||||
252 | border-left: 1px solid rgba(0,0,0,0.1); |
|
253 | border-left: 1px solid rgba(0,0,0,0.1); | |
253 | } |
|
254 | } | |
254 |
|
255 | |||
255 |
#context-pages li.curre |
|
256 | #context-pages li.current { | |
256 | background: #535353; /* Old browsers */ |
|
257 | background: #535353; /* Old browsers */ | |
257 | background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */ |
|
258 | background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */ | |
258 | background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */ |
|
259 | background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */ |
@@ -421,9 +421,8 b' div:hover > a.permalink {' | |||||
421 | } |
|
421 | } | |
422 |
|
422 | |||
423 | #header #header-inner #quick li span.icon { |
|
423 | #header #header-inner #quick li span.icon { | |
424 |
|
||||
425 | border-left: none; |
|
424 | border-left: none; | |
426 |
padding-left: 10px |
|
425 | padding-left: 10px; | |
427 | } |
|
426 | } | |
428 |
|
427 | |||
429 | #header #header-inner #quick li span.icon_short { |
|
428 | #header #header-inner #quick li span.icon_short { | |
@@ -1725,7 +1724,6 b' div.form div.fields div.field div.button' | |||||
1725 | padding-right: 10px; |
|
1724 | padding-right: 10px; | |
1726 | } |
|
1725 | } | |
1727 |
|
1726 | |||
1728 |
|
||||
1729 | #repo_size_2 { |
|
1727 | #repo_size_2 { | |
1730 | margin-left: 30px; |
|
1728 | margin-left: 30px; | |
1731 | display: block; |
|
1729 | display: block; | |
@@ -2514,10 +2512,6 b' h3.files_location {' | |||||
2514 | border-color: #cdcdcd; |
|
2512 | border-color: #cdcdcd; | |
2515 | } |
|
2513 | } | |
2516 |
|
2514 | |||
2517 | #graph_content .container { |
|
|||
2518 |
|
||||
2519 | } |
|
|||
2520 |
|
||||
2521 | #graph_content #changesets td { |
|
2515 | #graph_content #changesets td { | |
2522 | overflow: hidden; |
|
2516 | overflow: hidden; | |
2523 | text-overflow: ellipsis; |
|
2517 | text-overflow: ellipsis; |
@@ -576,7 +576,6 b' var showRepoSize = function(target, repo' | |||||
576 | return false; |
|
576 | return false; | |
577 | } |
|
577 | } | |
578 |
|
578 | |||
579 |
|
||||
580 | /** |
|
579 | /** | |
581 | * TOOLTIP IMPL. |
|
580 | * TOOLTIP IMPL. | |
582 | */ |
|
581 | */ |
@@ -14,7 +14,7 b'' | |||||
14 | </%def> |
|
14 | </%def> | |
15 |
|
15 | |||
16 | <%def name="main()"> |
|
16 | <%def name="main()"> | |
17 |
|
|
17 | ${self.context_bar('options')} | |
18 | <div class="box box-left"> |
|
18 | <div class="box box-left"> | |
19 | <!-- box / title --> |
|
19 | <!-- box / title --> | |
20 | <div class="title"> |
|
20 | <div class="title"> |
@@ -83,7 +83,7 b'' | |||||
83 |
|
83 | |||
84 | <%def name="admin_menu_simple()"> |
|
84 | <%def name="admin_menu_simple()"> | |
85 | <ul> |
|
85 | <ul> | |
86 |
<li>${h.link_to(_('repositor |
|
86 | <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li> | |
87 | </ul> |
|
87 | </ul> | |
88 | </%def> |
|
88 | </%def> | |
89 |
|
89 | |||
@@ -129,10 +129,6 b'' | |||||
129 | %endif |
|
129 | %endif | |
130 | </div> |
|
130 | </div> | |
131 | <div id="context-state"> |
|
131 | <div id="context-state"> | |
132 | <!--button id="revision-changer"> |
|
|||
133 | <span class="branch-name">graphics/shader-move</span> |
|
|||
134 | <span class="revision">@73318:8d3d6ee94072</span> |
|
|||
135 | </button--> |
|
|||
136 | <ul id="context-pages" class="horizontal-list"> |
|
132 | <ul id="context-pages" class="horizontal-list"> | |
137 | <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}" class="summary">${_('Summary')}</a></li> |
|
133 | <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}" class="summary">${_('Summary')}</a></li> | |
138 | <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}" class="changelogs">${_('Changelog')}</a></li> |
|
134 | <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}" class="changelogs">${_('Changelog')}</a></li> |
@@ -11,7 +11,6 b'' | |||||
11 | <%def name="css()"> |
|
11 | <%def name="css()"> | |
12 | <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.rhodecode_version)}" media="screen"/> |
|
12 | <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.rhodecode_version)}" media="screen"/> | |
13 | <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.rhodecode_version)}"/> |
|
13 | <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.rhodecode_version)}"/> | |
14 |
|
||||
15 | <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.rhodecode_version)}"/> |
|
14 | <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.rhodecode_version)}"/> | |
16 | ## EXTRA FOR CSS |
|
15 | ## EXTRA FOR CSS | |
17 | ${self.css_extra()} |
|
16 | ${self.css_extra()} |
@@ -25,7 +25,7 b'' | |||||
25 | <div class="table"> |
|
25 | <div class="table"> | |
26 | % if c.pagination: |
|
26 | % if c.pagination: | |
27 | <div id="graph"> |
|
27 | <div id="graph"> | |
28 |
|
|
28 | <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;"> | |
29 | <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a> |
|
29 | <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a> | |
30 | <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> |
|
30 | <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> | |
31 |
|
31 | |||
@@ -110,7 +110,6 b'' | |||||
110 | </tbody> |
|
110 | </tbody> | |
111 | </table> |
|
111 | </table> | |
112 |
|
112 | |||
113 |
|
||||
114 | <div class="pagination-wh pagination-left"> |
|
113 | <div class="pagination-wh pagination-left"> | |
115 | ${c.pagination.pager('$link_previous ~2~ $link_next')} |
|
114 | ${c.pagination.pager('$link_previous ~2~ $link_next')} | |
116 | </div> |
|
115 | </div> | |
@@ -127,7 +126,7 b'' | |||||
127 | var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}"; |
|
126 | var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}"; | |
128 | var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}"; |
|
127 | var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}"; | |
129 |
|
128 | |||
130 |
|
|
129 | var checkbox_checker = function(e){ | |
131 | var checked_checkboxes = []; |
|
130 | var checked_checkboxes = []; | |
132 | for (pos in checkboxes){ |
|
131 | for (pos in checkboxes){ | |
133 | if(checkboxes[pos].checked){ |
|
132 | if(checkboxes[pos].checked){ | |
@@ -135,17 +134,17 b'' | |||||
135 | } |
|
134 | } | |
136 | } |
|
135 | } | |
137 | if(YUD.get('open_new_pr')){ |
|
136 | if(YUD.get('open_new_pr')){ | |
138 |
|
|
137 | if(checked_checkboxes.length>1){ | |
139 |
|
|
138 | YUD.setStyle('open_new_pr','display','none'); | |
140 |
|
|
139 | } else { | |
141 |
|
|
140 | YUD.setStyle('open_new_pr','display',''); | |
142 | if(checked_checkboxes.length>0){ |
|
141 | if(checked_checkboxes.length>0){ | |
143 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; |
|
142 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; | |
144 | }else{ |
|
143 | }else{ | |
145 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; |
|
144 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; | |
146 | } |
|
145 | } | |
147 | } |
|
|||
148 | } |
|
146 | } | |
|
147 | } | |||
149 |
|
148 | |||
150 | if(checked_checkboxes.length>0){ |
|
149 | if(checked_checkboxes.length>0){ | |
151 | var rev_end = checked_checkboxes[0].name; |
|
150 | var rev_end = checked_checkboxes[0].name; | |
@@ -165,25 +164,25 b'' | |||||
165 | YUD.setStyle('rev_range_clear','display',''); |
|
164 | YUD.setStyle('rev_range_clear','display',''); | |
166 |
|
165 | |||
167 | YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end); |
|
166 | YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end); | |
168 |
|
|
167 | YUD.setStyle('compare_fork','display','none'); | |
169 |
} |
|
168 | }else{ | |
170 | YUD.setStyle('rev_range_container','display','none'); |
|
169 | YUD.setStyle('rev_range_container','display','none'); | |
171 | YUD.setStyle('rev_range_clear','display','none'); |
|
170 | YUD.setStyle('rev_range_clear','display','none'); | |
172 |
|
|
171 | if (checkboxes){ | |
173 |
|
|
172 | YUD.get('open_new_pr').href = pr_tmpl + '?rev_end={0}'.format(checkboxes[0].name); | |
174 | } |
|
|||
175 | YUD.setStyle('compare_fork','display',''); |
|
|||
176 | } |
|
173 | } | |
177 | }; |
|
174 | YUD.setStyle('compare_fork','display',''); | |
178 | YUE.onDOMReady(checkbox_checker); |
|
175 | } | |
179 | YUE.on(checkboxes,'click', checkbox_checker); |
|
176 | }; | |
|
177 | YUE.onDOMReady(checkbox_checker); | |||
|
178 | YUE.on(checkboxes,'click', checkbox_checker); | |||
180 |
|
179 | |||
181 | YUE.on('rev_range_clear','click',function(e){ |
|
180 | YUE.on('rev_range_clear','click',function(e){ | |
182 | for (var i=0; i<checkboxes.length; i++){ |
|
181 | for (var i=0; i<checkboxes.length; i++){ | |
183 | var cb = checkboxes[i]; |
|
182 | var cb = checkboxes[i]; | |
184 | cb.checked = false; |
|
183 | cb.checked = false; | |
185 | } |
|
184 | } | |
186 |
|
|
185 | checkbox_checker(); | |
187 | YUE.preventDefault(e); |
|
186 | YUE.preventDefault(e); | |
188 | }); |
|
187 | }); | |
189 |
|
188 | |||
@@ -234,9 +233,7 b'' | |||||
234 | var t = document.getElementById('graph_content'); |
|
233 | var t = document.getElementById('graph_content'); | |
235 | canvas = document.getElementById('graph_canvas'); |
|
234 | canvas = document.getElementById('graph_canvas'); | |
236 | var div_h = t.clientHeight; |
|
235 | var div_h = t.clientHeight; | |
237 | //c.style.height=div_h+'px'; |
|
|||
238 | canvas.setAttribute('height',div_h); |
|
236 | canvas.setAttribute('height',div_h); | |
239 | //c.style.height=width+'px'; |
|
|||
240 | canvas.setAttribute('width',width); |
|
237 | canvas.setAttribute('width',width); | |
241 | }; |
|
238 | }; | |
242 | var heads = 1; |
|
239 | var heads = 1; |
@@ -16,7 +16,7 b'' | |||||
16 | </%def> |
|
16 | </%def> | |
17 |
|
17 | |||
18 | <%def name="main()"> |
|
18 | <%def name="main()"> | |
19 |
|
|
19 | ${self.context_bar('files')} | |
20 | <div class="box"> |
|
20 | <div class="box"> | |
21 | <!-- box / title --> |
|
21 | <!-- box / title --> | |
22 | <div class="title"> |
|
22 | <div class="title"> |
@@ -29,7 +29,7 b'' | |||||
29 | %endif |
|
29 | %endif | |
30 | </%def> |
|
30 | </%def> | |
31 | <%def name="main()"> |
|
31 | <%def name="main()"> | |
32 |
|
|
32 | ${self.context_bar('options')} | |
33 | <div class="box"> |
|
33 | <div class="box"> | |
34 | <!-- box / title --> |
|
34 | <!-- box / title --> | |
35 | <div class="title"> |
|
35 | <div class="title"> |
@@ -20,7 +20,7 b'' | |||||
20 | ${self.menu('shortlog')} |
|
20 | ${self.menu('shortlog')} | |
21 | </%def> |
|
21 | </%def> | |
22 | <%def name="main()"> |
|
22 | <%def name="main()"> | |
23 |
|
|
23 | ${self.context_bar('options')} | |
24 | <div class="box"> |
|
24 | <div class="box"> | |
25 | <!-- box / title --> |
|
25 | <!-- box / title --> | |
26 | <div class="title"> |
|
26 | <div class="title"> |
General Comments 0
You need to be logged in to leave comments.
Login now