engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui: added admin nav into admin pages

Browse source
This commit is contained in:
Marcin Kuzminski 2019-03-22 22:39:34 +01:00
parent 26ac57ecbc
commit 614edb5a23
12 changed files with 47 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/templates/admin/admin_audit_logs.mako
View file

@ -26,7 +26,7 @@
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
</div>
<!-- end box / title -->
<div class="table">

2
rhodecode/templates/admin/auth/auth_settings.mako
View file

@ -22,7 +22,7 @@
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
</div>
<div class='sidebar-col-wrapper'>

2
rhodecode/templates/admin/defaults/defaults.mako
View file

@ -21,7 +21,7 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
</div>
##main

2
rhodecode/templates/admin/main.mako
View file

@ -29,7 +29,7 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
</div>
##main

2
rhodecode/templates/admin/permissions/permissions.mako
View file

@ -22,7 +22,7 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
</div>
<div class="sidebar-col-wrapper scw-small">

2
rhodecode/templates/admin/repo_groups/repo_groups.mako
View file

@ -20,7 +20,7 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
<ul class="links">
%if h.HasPermissionAny('hg.admin','hg.repogroup.create.true')():
<li>

2
rhodecode/templates/admin/repos/repos.mako
View file

@ -20,7 +20,7 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
<ul class="links">
%if h.HasPermissionAny('hg.admin','hg.create.repository')():
<li>

2
rhodecode/templates/admin/settings/settings.mako
View file

@ -33,7 +33,7 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
</div>
##main

2
rhodecode/templates/admin/user_groups/user_groups.mako
View file

@ -21,7 +21,7 @@
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
<ul class="links">
%if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')():
<li>

2
rhodecode/templates/admin/users/users.mako
View file

@ -22,7 +22,7 @@
<div class="box">
<div class="title">
${self.breadcrumbs()}
${self.admin_menu()}
<ul class="links">
<li>
<a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>

78
rhodecode/templates/base/base.mako
View file

@ -75,18 +75,40 @@
</%def>
<%def name="admin_menu()">
<ul class="admin_menu submenu">
<li><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
<li><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
<li><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
<li><a href="${h.route_path('users')}">${_('Users')}</a></li>
<li><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
<li><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
<li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
<li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
<li><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
<li class="last"><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
</ul>
<ul id="context-pages" class="navigation horizontal-list">
<%
repositories=c.rhodecode_user.repositories_admin
repository_groups=c.rhodecode_user.repository_groups_admin
user_groups=c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')()
%>
## super admin case
% if c.rhodecode_user.is_admin:
<li><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
<li><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
<li><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
<li><a href="${h.route_path('users')}">${_('Users')}</a></li>
<li><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
<li><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
<li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
<li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
<li><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
<li><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
## delegated admin
% elif repositories or repository_groups or user_groups:
%if repositories:
<li class="local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
%endif
%if repository_groups:
<li class="local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
%endif
%if user_groups:
<li class="local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
%endif
% endif
</ul>
</%def>
@ -145,21 +167,6 @@
</%def>
## admin menu used for people that have some admin resources
<%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
<ul class="submenu">
%if repositories:
<li class="local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
%endif
%if repository_groups:
<li class="local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
%endif
%if user_groups:
<li class="local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
%endif
</ul>
</%def>
<%def name="repo_page_title(repo_instance)">
<div class="title-content">
<div class="title-main">
@ -573,23 +580,12 @@
</a>
</li>
% if h.HasPermissionAll('hg.admin')('access admin main page'):
<li class="${is_active('admin')}">
<a class="menulink childs" title="${_('Admin settings')}" href="#" onclick="return false;">
<div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
<a class="menulink childs" title="${_('Admin settings')}" href="${h.route_path('admin_home')}">
<div class="menulabel">${_('Admin')} </div>
</a>
${admin_menu()}
</li>
% elif c.rhodecode_user.repositories_admin or c.rhodecode_user.repository_groups_admin or c.rhodecode_user.user_groups_admin:
<li class="${is_active('admin')}">
<a class="menulink childs" title="${_('Delegated Admin settings')}">
<div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
</a>
${admin_menu_simple(c.rhodecode_user.repositories_admin,
c.rhodecode_user.repository_groups_admin,
c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
</li>
% endif
## render extra user menu
${usermenu(active=(active=='my_account'))}

6
rhodecode/templates/search/search.mako
View file

@ -63,15 +63,9 @@
<div class="box">
%if c.repo_name:
<!-- box / title -->
<!--div class="title">
${self.repo_page_title(c.rhodecode_db_repo)}
</div-->
${h.form(h.route_path('search_repo',repo_name=c.repo_name),method='get')}
%elif c.repo_group_name:
<!-- box / title -->
<!--div class="title">
${self.repo_group_page_title(c.repo_group)}
</div-->
${h.form(h.route_path('search_repo_group',repo_group_name=c.repo_group_name),method='get')}
%else:
<!-- box / title -->