##// END OF EJS Templates
a lot of fixes in templates,...
marcink -
r524:63212fea default
parent child Browse files
Show More
@@ -229,8 +229,9 b' class EmptyChangeset(BaseChangeset):'
229 """
229 """
230 return '0' * 40
230 return '0' * 40
231
231
232 @LazyProperty
232 def short_id(self):
233 def short_id(self):
233 self.raw_id[:12]
234 return self.raw_id[:12]
234
235
235 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
236 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
236 """
237 """
@@ -569,18 +569,47 b' div.options a:hover'
569 width:167px;
569 width:167px;
570 }
570 }
571
571
572 #header #header-inner #quick li ul li a.branches,#header #header-inner #quick li ul li a.branches:hover
572
573 {
573 #header #header-inner #quick li ul li a.fork,
574
574 #header #header-inner #quick li ul li a.fork:hover
575 {
576
577 background: #FFFFFF url("../images/icons/arrow_divide.png") no-repeat 4px 9px;
578 margin:0;
579 padding:12px 9px 7px 24px;
580 width:167px;
581 }
582
583 #header #header-inner #quick li ul li a.search,
584 #header #header-inner #quick li ul li a.search:hover
585 {
586 background: #FFFFFF url("../images/icons/search_16.png") no-repeat 4px 9px;
587 margin:0;
588 padding:12px 9px 7px 24px;
589 width:167px;
590 }
591
592 #header #header-inner #quick li ul li a.delete,
593 #header #header-inner #quick li ul li a.delete:hover
594 {
595 background: #FFFFFF url("../images/icons/delete.png") no-repeat 4px 9px;
596 margin:0;
597 padding:12px 9px 7px 24px;
598 width:167px;
599 }
600
601 #header #header-inner #quick li ul li a.branches,
602 #header #header-inner #quick li ul li a.branches:hover
603 {
575 background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 4px 9px;
604 background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 4px 9px;
576 margin:0;
605 margin:0;
577 padding:12px 9px 7px 24px;
606 padding:12px 9px 7px 24px;
578 width:167px;
607 width:167px;
579 }
608 }
580
609
581 #header #header-inner #quick li ul li a.tags,#header #header-inner #quick li ul li a.tags:hover
610 #header #header-inner #quick li ul li a.tags,
582 {
611 #header #header-inner #quick li ul li a.tags:hover
583
612 {
584 background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
613 background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
585 margin:0;
614 margin:0;
586 padding:12px 9px 7px 24px;
615 padding:12px 9px 7px 24px;
@@ -3464,12 +3493,14 b' table.code-browser .browser-dir {'
3464 .action_button {
3493 .action_button {
3465 border: 0px;
3494 border: 0px;
3466 display: block;
3495 display: block;
3496 color:#0066CC;
3467 }
3497 }
3468
3498
3469 .action_button:hover {
3499 .action_button:hover {
3470 border: 0px;
3500 border: 0px;
3471 font-style: italic;
3501 text-decoration:underline;
3472 cursor: pointer;
3502 cursor: pointer;
3503 color:#0066CC;
3473 }
3504 }
3474
3505
3475 /* -----------------------------------------------------------
3506 /* -----------------------------------------------------------
@@ -2,7 +2,7 b''
2 <%inherit file="/base/base.html"/>
2 <%inherit file="/base/base.html"/>
3
3
4 <%def name="title()">
4 <%def name="title()">
5 ${_('Repositories administration')}
5 ${_('Add new repository')}
6 </%def>
6 </%def>
7
7
8 <%def name="breadcrumbs_links()">
8 <%def name="breadcrumbs_links()">
@@ -174,16 +174,30 b''
174 <span>${_('Files')}</span>
174 <span>${_('Files')}</span>
175 </a>
175 </a>
176 </li>
176 </li>
177 %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
177
178 <li ${is_current('settings')}>
178 <li ${is_current('options')}>
179 <a title="${_('Settings')}" href="${h.url('repo_settings_home',repo_name=c.repo_name)}">
179 <a title="${_('Options')}" href="#">
180 <span class="icon">
180 <span class="icon">
181 <img src="/images/icons/cog_edit.png" alt="${_('Settings')}" />
181 <img src="/images/icons/table_gear.png" alt="${_('Admin')}" />
182 </span>
182 </span>
183 <span>${_('Settings')}</span>
183 <span>${_('Options')}</span>
184 </a>
184 </a>
185 </li>
185 <ul>
186 %endif
186 %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
187 <li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
188 %endif
189 <li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
190 <li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
191 %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
192 <li class="last">
193 ${h.link_to(_('delete'),'#',class_='delete')}
194 ## ${h.form(url('repo_settings_delete', repo_name=c.repo_name),method='delete')}
195 ## ${h.submit('remove_%s' % c.repo_name,'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
196 ## ${h.end_form()}
197 </li>
198 %endif
199 </ul>
200 </li>
187 </ul>
201 </ul>
188 %else:
202 %else:
189 ##ROOT MENU
203 ##ROOT MENU
@@ -31,7 +31,7 b''
31 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
31 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
32 <ul class="links">
32 <ul class="links">
33 <li>
33 <li>
34 <span>${h.link_to(u'ADD NEW REPOSITORY',h.url('admin_settings_create_repository'),class_="add_icon")}</span>
34 <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'),class_="add_icon")}</span>
35 </li>
35 </li>
36 </ul>
36 </ul>
37 %endif
37 %endif
@@ -2,7 +2,7 b''
2 <%inherit file="/base/base.html"/>
2 <%inherit file="/base/base.html"/>
3
3
4 <%def name="title()">
4 <%def name="title()">
5 ${_('Repositories administration')}
5 ${_('Repository settings')}
6 </%def>
6 </%def>
7
7
8 <%def name="breadcrumbs_links()">
8 <%def name="breadcrumbs_links()">
@@ -76,7 +76,7 b' E.onDOMReady(function(e){'
76 <label>${_('Last change')}:</label>
76 <label>${_('Last change')}:</label>
77 </div>
77 </div>
78 <div class="input-short">
78 <div class="input-short">
79 ${h.age(c.repo_info.last_change)} - ${h.rfc822date(c.repo_info.last_change)}
79 ${h.age(c.repo_info.last_change)} - ${h.rfc822date_notz(c.repo_info.last_change)}
80 ${_('by')} ${h.get_changeset_safe(c.repo_info,'tip').author}
80 ${_('by')} ${h.get_changeset_safe(c.repo_info,'tip').author}
81
81
82 </div>
82 </div>
@@ -122,7 +122,7 b' E.onDOMReady(function(e){'
122 var td2 = document.createElement('td');
122 var td2 = document.createElement('td');
123 var trending_language = document.createElement('div');
123 var trending_language = document.createElement('div');
124 trending_language.title = k;
124 trending_language.title = k;
125 trending_language.innerHTML = "<b>"+value+" ${_('files')} - "+percentage+" %</b>";
125 trending_language.innerHTML = "<b>"+percentage+"% "+value+" ${_('files')}</b>";
126 trending_language.setAttribute("class", 'trending_language');
126 trending_language.setAttribute("class", 'trending_language');
127 trending_language.style.width=percentage+"%";
127 trending_language.style.width=percentage+"%";
128 td2.appendChild(trending_language);
128 td2.appendChild(trending_language);
@@ -130,7 +130,6 b' E.onDOMReady(function(e){'
130 tr.appendChild(td1);
130 tr.appendChild(td1);
131 tr.appendChild(td2);
131 tr.appendChild(td2);
132 tbl.appendChild(tr);
132 tbl.appendChild(tr);
133 //YAHOO.util.Dom.get('lang_stats').appendChild(trending_language_label);
134
133
135 }
134 }
136 if(no_data){
135 if(no_data){
General Comments 0
You need to be logged in to leave comments. Login now