# HG changeset patch # User Marcin Kuzminski # Date 2010-09-29 22:36:53 # Node ID 63212fea247162d9b253f67e351d95ed52b3ae16 # Parent d64a3ab188459baeeecdba1cdc9e6d11a3ec074d a lot of fixes in templates, added options to each repository showing fork/serach/settings fixed emtpy changeset (again !) diff --git a/pylons_app/lib/utils.py b/pylons_app/lib/utils.py --- a/pylons_app/lib/utils.py +++ b/pylons_app/lib/utils.py @@ -229,8 +229,9 @@ class EmptyChangeset(BaseChangeset): """ return '0' * 40 + @LazyProperty def short_id(self): - self.raw_id[:12] + return self.raw_id[:12] def repo2db_mapper(initial_repo_list, remove_obsolete=False): """ diff --git a/pylons_app/public/css/style.css b/pylons_app/public/css/style.css --- a/pylons_app/public/css/style.css +++ b/pylons_app/public/css/style.css @@ -569,18 +569,47 @@ div.options a:hover width:167px; } -#header #header-inner #quick li ul li a.branches,#header #header-inner #quick li ul li a.branches:hover -{ - + +#header #header-inner #quick li ul li a.fork, +#header #header-inner #quick li ul li a.fork:hover +{ + + background: #FFFFFF url("../images/icons/arrow_divide.png") no-repeat 4px 9px; + margin:0; + padding:12px 9px 7px 24px; + width:167px; +} + +#header #header-inner #quick li ul li a.search, +#header #header-inner #quick li ul li a.search:hover +{ + background: #FFFFFF url("../images/icons/search_16.png") no-repeat 4px 9px; + margin:0; + padding:12px 9px 7px 24px; + width:167px; +} + +#header #header-inner #quick li ul li a.delete, +#header #header-inner #quick li ul li a.delete:hover +{ + background: #FFFFFF url("../images/icons/delete.png") no-repeat 4px 9px; + margin:0; + padding:12px 9px 7px 24px; + width:167px; +} + +#header #header-inner #quick li ul li a.branches, +#header #header-inner #quick li ul li a.branches:hover +{ background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 4px 9px; margin:0; padding:12px 9px 7px 24px; width:167px; } -#header #header-inner #quick li ul li a.tags,#header #header-inner #quick li ul li a.tags:hover -{ - +#header #header-inner #quick li ul li a.tags, +#header #header-inner #quick li ul li a.tags:hover +{ background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 4px 9px; margin:0; padding:12px 9px 7px 24px; @@ -3464,12 +3493,14 @@ table.code-browser .browser-dir { .action_button { border: 0px; display: block; + color:#0066CC; } .action_button:hover { border: 0px; - font-style: italic; + text-decoration:underline; cursor: pointer; + color:#0066CC; } /* ----------------------------------------------------------- diff --git a/pylons_app/templates/admin/repos/repo_add.html b/pylons_app/templates/admin/repos/repo_add.html --- a/pylons_app/templates/admin/repos/repo_add.html +++ b/pylons_app/templates/admin/repos/repo_add.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories administration')} + ${_('Add new repository')} <%def name="breadcrumbs_links()"> diff --git a/pylons_app/templates/base/base.html b/pylons_app/templates/base/base.html --- a/pylons_app/templates/base/base.html +++ b/pylons_app/templates/base/base.html @@ -174,16 +174,30 @@ ${_('Files')} - %if h.HasRepoPermissionAll('repository.admin')(c.repo_name): -
  • - + +
  • + - ${_('Settings')} + ${_('Admin')} - ${_('Settings')} - -
  • - %endif + ${_('Options')} + + + %else: ##ROOT MENU diff --git a/pylons_app/templates/index.html b/pylons_app/templates/index.html --- a/pylons_app/templates/index.html +++ b/pylons_app/templates/index.html @@ -31,7 +31,7 @@ %if h.HasPermissionAny('hg.admin','hg.create.repository')(): %endif diff --git a/pylons_app/templates/settings/repo_settings.html b/pylons_app/templates/settings/repo_settings.html --- a/pylons_app/templates/settings/repo_settings.html +++ b/pylons_app/templates/settings/repo_settings.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories administration')} + ${_('Repository settings')} <%def name="breadcrumbs_links()"> diff --git a/pylons_app/templates/summary/summary.html b/pylons_app/templates/summary/summary.html --- a/pylons_app/templates/summary/summary.html +++ b/pylons_app/templates/summary/summary.html @@ -76,7 +76,7 @@ E.onDOMReady(function(e){
    - ${h.age(c.repo_info.last_change)} - ${h.rfc822date(c.repo_info.last_change)} + ${h.age(c.repo_info.last_change)} - ${h.rfc822date_notz(c.repo_info.last_change)} ${_('by')} ${h.get_changeset_safe(c.repo_info,'tip').author}
    @@ -122,7 +122,7 @@ E.onDOMReady(function(e){ var td2 = document.createElement('td'); var trending_language = document.createElement('div'); trending_language.title = k; - trending_language.innerHTML = ""+value+" ${_('files')} - "+percentage+" %"; + trending_language.innerHTML = ""+percentage+"% "+value+" ${_('files')}"; trending_language.setAttribute("class", 'trending_language'); trending_language.style.width=percentage+"%"; td2.appendChild(trending_language); @@ -130,7 +130,6 @@ E.onDOMReady(function(e){ tr.appendChild(td1); tr.appendChild(td2); tbl.appendChild(tr); - //YAHOO.util.Dom.get('lang_stats').appendChild(trending_language_label); } if(no_data){