Mercurial > kallithea

changeset 5130:06e4f5c6ec98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
admin: cleanup of naming of 'Default Permissions'
author Mads Kiilerich <madski@unity3d.com>
date Wed, 13 May 2015 01:27:50 +0200
parents 1f05cf31ec0d
children 99cec44b48c0
files kallithea/templates/admin/permissions/permissions.html kallithea/templates/base/base.html kallithea/templates/base/default_perms_box.html
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/admin/permissions/permissions.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/permissions/permissions.html	Wed May 13 01:27:50 2015 +0200
@@ -2,13 +2,13 @@
 <%inherit file="/base/base.html"/>
 
 <%block name="title">
-    ${_('Permissions Administration')}
+    ${_('Default Permissions')}
 </%block>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('Permissions')}
+    ${_('Default Permissions')}
 </%def>
 
 <%block name="header_menu">
--- a/kallithea/templates/base/base.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/base/base.html	Wed May 13 01:27:50 2015 +0200
@@ -61,7 +61,7 @@
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li>
       <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li>
       <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li>
-      <li><a href="${h.url('admin_permissions')}"><i class="icon-block"></i> ${_('Permissions')}</a></li>
+      <li><a href="${h.url('admin_permissions')}"><i class="icon-block"></i> ${_('Default Permissions')}</a></li>
       <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li>
       <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
--- a/kallithea/templates/base/default_perms_box.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/base/default_perms_box.html	Wed May 13 01:27:50 2015 +0200
@@ -11,13 +11,13 @@
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
-                    <label for="inherit_default_permissions">${_('Inherit from defaults')}:</label>
+                    <label for="inherit_default_permissions">${_('Inherit defaults')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('inherit_default_permissions',value=True)}
                     <span class="help-block">
-                    ${h.literal(_('Select to inherit permissions from %s permissions settings, and default IP address whitelist.')
-                                % h.link_to('default global', url('admin_permissions')))}
+                    ${h.literal(_('Select to inherit global settings, IP whitelist and permissions from the %s.')
+                                % h.link_to('default permissions', url('admin_permissions')))}
                     </span>
                 </div>
              </div>