kallithea Changeset - fdebc5f67dc6

Changeset - fdebc5f67dc6

Parent rev.

Child rev.

[Not reviewed]

celery

0 4 0

Marcin Kuzminski - 15 years ago 2010-09-14 17:34:15
marcin@python-works.com

Some gui fixes

4 files changed with 29 insertions and 7 deletions:

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

0 comments (0 inline, 0 general)

pylons_app/model/hg_model.py

➞

Show inline comments

@@ @@ -52,27 +52,27 @@ def _get_repos_cached_initial(app_global @@
 @cache_region('long_term', 'cached_repo_list')
 def _get_repos_cached():
     """
     return cached dict with repos
     """
     log.info('getting all repositories list')
     from pylons import app_globals as g
     return HgModel.repo_scan(g.paths[0][0], g.paths[0][1], g.baseui)
 @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
 @cache_region('long_term', 'full_changelog')
 def _full_changelog_cached(repo_name):
     log.info('getting full changelog for %s', repo_name)
     return list(reversed(list(HgModel().get_repo(repo_name))))
 class HgModel(object):
     """
     Mercurial Model
     """

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -505,24 +505,42 @@ div.options a:hover @@
 /*ICONS*/
 #header #header-inner #quick li ul li a.journal,
 #header #header-inner #quick li ul li a.journal:hover
+{
     background:url("../images/icons/book.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     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
+{
     background:url("../images/icons/folder_edit.png") no-repeat scroll 4px 9px #FFFFFF;
     margin:0;
     padding:12px 9px 7px 24px;
     width:167px;
+}
 #header #header-inner #quick li ul li a.users,
 #header #header-inner #quick li ul li a.users:hover

pylons_app/templates/admin/permissions/permissions.html

➞

Show inline comments

@@ @@ -20,47 +20,47 @@ @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <h3>${_('Default permissions')}</h3>
     ${h.form(url('permission', id='default'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
 			<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)}
 		                ${h.checkbox('overwrite_default','true')}
 		                <label for="overwrite_default">
 		                <span class="tooltip"
 		                tooltip_title="${h.tooltip(_('All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories will be lost'))}">
 		                ${_('overwrite existing settings')}</span> </label>
 				</div>
 			</div>
 			<div class="field">
 		        <div class="label">
 		            <label for="default_register">${_('Registration')}:</label>
 		        </div>
 				<div class="select">
 					${h.select('default_register','',c.register_choices)}
 				</div>
 			</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)}
 				</div>
              </div>
 	        <div class="buttons">
 	        ${h.submit('set','set',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 	        </div>
         </div>
     </div>
     ${h.end_form()}

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -88,26 +88,30 @@ @@
 		%if current not in ['home','admin']:
 		   ##REGULAR MENU
 	        <ul id="quick">
 				<!-- repo switcher -->
 				<li>
 					<a id="repo_switcher" title="${_('Switch repository')}" href="#">
                     <span class="icon">
                         <img src="/images/icons/database.png" alt="${_('Products')}" />
                     </span>
                     <span>&darr;</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>
 	            <li ${is_current('summary')}>
 	               <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
 	               <span class="icon">
 	                   <img src="/images/icons/clipboard_16.png" alt="${_('Summary')}" />
 	               </span>
 	               <span>${_('Summary')}</span>
 	               </a>
 	            </li>

0 comments (0 inline, 0 general)