# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1431473270 -7200
# Node ID 1f05cf31ec0dc367700f5d3282d12d98b8dea632
# Parent  6f6aab7ca754ef21be01441ba1dbaafed91671d0
permissions: clarify the use of "Permissions" - use "Show Permissions" for the overview

53d6a64ce4f3 wasn't enough.

Pages for editing permissions for a subject are always just called
"Permissions".

Now, pages summarizing the actual permissions to objects are generally named
"Show Permissions".

This is especially important for User Groups which have both settings and where
"Default permissions" just is wrong.

diff -r 6f6aab7ca754 -r 1f05cf31ec0d kallithea/templates/admin/my_account/my_account.html
--- a/kallithea/templates/admin/my_account/my_account.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/my_account/my_account.html	Wed May 13 01:27:50 2015 +0200
@@ -38,7 +38,7 @@
           <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('my_account_emails')}">${_('My Emails')}</a></li>
           <li class="${'active' if c.active=='repos' else ''}"><a href="${h.url('my_account_repos')}">${_('My Repositories')}</a></li>
           <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched')}</a></li>
-          <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('My Permissions')}</a></li>
+          <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('Show Permissions')}</a></li>
         </ul>
     </div>
 
diff -r 6f6aab7ca754 -r 1f05cf31ec0d kallithea/templates/admin/permissions/permissions.html
--- 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
@@ -27,7 +27,7 @@
       <ul class="nav nav-pills nav-stacked">
         <li class="${'active' if c.active=='globals' else ''}"><a href="${h.url('admin_permissions')}">${_('Global')}</a></li>
         <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('admin_permissions_ips')}">${_('IP Whitelist')}</a></li>
-        <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('admin_permissions_perms')}">${_('Overview')}</a></li>
+        <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('admin_permissions_perms')}">${_('Show Permissions')}</a></li>
       </ul>
     </div>
 
diff -r 6f6aab7ca754 -r 1f05cf31ec0d kallithea/templates/admin/user_groups/user_group_edit.html
--- a/kallithea/templates/admin/user_groups/user_group_edit.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/user_groups/user_group_edit.html	Wed May 13 01:27:50 2015 +0200
@@ -28,8 +28,8 @@
       <ul class="nav nav-pills nav-stacked">
         <li class="${'active' if c.active=='settings' else ''}"><a href="${h.url('edit_users_group', id=c.user_group.users_group_id)}">${_('Settings')}</a></li>
         <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_group_advanced', id=c.user_group.users_group_id)}">${_('Advanced')}</a></li>
-        <li class="${'active' if c.active=='default_perms' else ''}"><a href="${h.url('edit_user_group_default_perms', id=c.user_group.users_group_id)}">${_('Default permissions')}</a></li>
         <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_group_perms', id=c.user_group.users_group_id)}">${_('Permissions')}</a></li>
+        <li class="${'active' if c.active=='default_perms' else ''}"><a href="${h.url('edit_user_group_default_perms', id=c.user_group.users_group_id)}">${_('Show Permissions')}</a></li>
         <li class="${'active' if c.active=='members' else ''}"><a href="${h.url('edit_user_group_members', id=c.user_group.users_group_id)}">${_('Members')}</a></li>
       </ul>
     </div>
diff -r 6f6aab7ca754 -r 1f05cf31ec0d kallithea/templates/admin/users/user_edit.html
--- a/kallithea/templates/admin/users/user_edit.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/users/user_edit.html	Wed May 13 01:27:50 2015 +0200
@@ -29,7 +29,7 @@
         <li class="${'active' if c.active=='profile' else ''}"><a href="${h.url('edit_user', id=c.user.user_id)}">${_('Profile')}</a></li>
         <li class="${'active' if c.active=='api_keys' else ''}"><a href="${h.url('edit_user_api_keys', id=c.user.user_id)}">${_('API Keys')}</a></li>
         <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_advanced', id=c.user.user_id)}">${_('Advanced')}</a></li>
-        <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_perms', id=c.user.user_id)}">${_('Permissions')}</a></li>
+        <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_perms', id=c.user.user_id)}">${_('Show Permissions')}</a></li>
         <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('edit_user_emails', id=c.user.user_id)}">${_('Emails')}</a></li>
         <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('edit_user_ips', id=c.user.user_id)}">${_('IP Whitelist')}</a></li>
       </ul>