Mercurial > kallithea
changeset 477:fdebc5f67dc6 celery
Some gui fixes
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 14 Sep 2010 17:34:15 +0200 |
parents | 8ba65e4c4e4c |
children | 7010af6efde5 |
files | pylons_app/model/hg_model.py pylons_app/public/css/style.css pylons_app/templates/admin/permissions/permissions.html pylons_app/templates/base/base.html |
diffstat | 4 files changed, 29 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/model/hg_model.py Mon Sep 13 13:02:20 2010 +0200 +++ b/pylons_app/model/hg_model.py Tue Sep 14 17:34:15 2010 +0200 @@ -61,9 +61,9 @@ @cache_region('super_short_term', 'cached_repos_switcher_list') def _get_repos_switcher_cached(cached_repo_list): repos_lst = [] - for repo in sorted(x.name.lower() for x in cached_repo_list.values()): - if HasRepoPermissionAny('repository.write', 'repository.read', 'repository.admin')(repo, 'main page check'): - repos_lst.append(repo) + for repo in sorted(x for x in cached_repo_list.values()): + if HasRepoPermissionAny('repository.write', 'repository.read', 'repository.admin')(repo.name.lower(), 'main page check'): + repos_lst.append((repo.name.lower(), repo.dbrepo.private,)) return repos_lst
--- a/pylons_app/public/css/style.css Mon Sep 13 13:02:20 2010 +0200 +++ b/pylons_app/public/css/style.css Tue Sep 14 17:34:15 2010 +0200 @@ -514,6 +514,24 @@ width:167px; } +#header #header-inner #quick li ul li a.private_repo, +#header #header-inner #quick li ul li a.private_repo:hover +{ + background:url("../images/icons/lock.png") no-repeat scroll 4px 9px #FFFFFF; + margin:0; + padding:12px 9px 7px 24px; + width:167px; + +} +#header #header-inner #quick li ul li a.public_repo, +#header #header-inner #quick li ul li a.public_repo:hover +{ + background:url("../images/icons/lock_open.png") no-repeat scroll 4px 9px #FFFFFF; + margin:0; + padding:12px 9px 7px 24px; + width:167px; + +} #header #header-inner #quick li ul li a.repos, #header #header-inner #quick li ul li a.repos:hover
--- a/pylons_app/templates/admin/permissions/permissions.html Mon Sep 13 13:02:20 2010 +0200 +++ b/pylons_app/templates/admin/permissions/permissions.html Tue Sep 14 17:34:15 2010 +0200 @@ -29,7 +29,7 @@ <div class="field"> <div class="label"> - <label for="default_perm">${_('Default repository permission')}:</label> + <label for="default_perm">${_('Repository permission')}:</label> </div> <div class="select"> ${h.select('default_perm','',c.perms_choices)} @@ -51,7 +51,7 @@ </div> <div class="field"> <div class="label"> - <label for="default_create">${_('Allow repository creation')}:</label> + <label for="default_create">${_('Repository creation')}:</label> </div> <div class="select"> ${h.select('default_create','',c.create_choices)}
--- a/pylons_app/templates/base/base.html Mon Sep 13 13:02:20 2010 +0200 +++ b/pylons_app/templates/base/base.html Tue Sep 14 17:34:15 2010 +0200 @@ -97,8 +97,12 @@ <span>↓</span> </a> <ul class="repo_switcher"> - %for repo in c.repo_switcher_list: - <li>${h.link_to(repo,h.url('summary_home',repo_name=repo))}</li> + %for repo,private in c.repo_switcher_list: + %if private: + <li>${h.link_to(repo,h.url('summary_home',repo_name=repo),class_="private_repo")}</li> + %else: + <li>${h.link_to(repo,h.url('summary_home',repo_name=repo),class_="public_repo")}</li> + %endif %endfor </ul> </li>