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

ui: navigation, fixed wrapping of new admin navigation items

Browse source
This commit is contained in:
Marcin Kuzminski 2019-03-22 23:49:07 +01:00
parent 84de94bb5b
commit c2d20af1b7
13 changed files with 73 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,13 +22,12 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='audit_logs')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.admin_menu()}
</div>
<!-- end box / title -->
<div class="table">
<div id="user_log">
<%include file="/admin/admin_log_base.mako" />

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

@ -18,12 +18,13 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='authentication')}
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
</div>
<div class='sidebar-col-wrapper'>

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

@ -18,11 +18,12 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='defaults')}
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
</div>
##main
<div class="sidebar-col-wrapper">

6
rhodecode/templates/admin/integrations/base.mako
View file

@ -31,12 +31,6 @@
%endif
</%def>
<%def name="menu_bar_subnav()">
%if c.repo:
${self.repo_menu(active='options')}
%endif
</%def>
<%def name="main_content()">
${next.body()}
</%def>

9
rhodecode/templates/admin/integrations/global.mako
View file

@ -2,7 +2,7 @@
<%inherit file="/base/base.mako"/>
<%def name="title()">
${_('Settings administration')}
${_('Integrations administration')}
%if c.rhodecode_name:
&middot; ${h.branding(c.rhodecode_name)}
%endif
@ -18,6 +18,10 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='integrations')}
</%def>
<%def name="side_bar_nav()">
<li class="active">
<a href="${h.route_path('global_integrations_home')}">Global</a>
@ -30,9 +34,6 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
</div>
##main
<div class='sidebar-col-wrapper'>

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

@ -18,6 +18,10 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu()}
</%def>
<%def name="side_bar_nav()">
</%def>
@ -28,9 +32,6 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
</div>
##main
<div class='sidebar-col-wrapper'>

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

@ -18,12 +18,12 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='permissions')}
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
</div>
<div class="sidebar-col-wrapper scw-small">
##main

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

@ -17,10 +17,14 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='repository_groups')}
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
<ul class="links">
%if h.HasPermissionAny('hg.admin','hg.repogroup.create.true')():
<li>

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

@ -17,10 +17,13 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='repositories')}
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
<ul class="links">
%if h.HasPermissionAny('hg.admin','hg.create.repository')():
<li>

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

@ -13,11 +13,15 @@
&raquo;
${_('Settings')}
</%def>
##
<%def name="menu_bar_nav()">
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='settings')}
</%def>
<%def name="side_bar_nav()">
% for navitem in c.navlist:
<li class="${'active' if c.active in navitem.active_list else ''}">
@ -32,9 +36,6 @@
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
</div>
##main
<div class='sidebar-col-wrapper'>

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

@ -17,11 +17,14 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='user_groups')}
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
<ul class="links">
%if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')():
<li>

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

@ -17,12 +17,15 @@
${self.menu_items(active='admin')}
</%def>
<%def name="menu_bar_subnav()">
${self.admin_menu(active='users')}
</%def>
<%def name="main()">
<div class="box">
<div class="title">
${self.admin_menu()}
<ul class="links">
<li>
<a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>

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

@ -74,41 +74,48 @@
</div>
</%def>
<%def name="admin_menu()">
<ul id="context-pages" class="navigation horizontal-list">
<%def name="admin_menu(active=None)">
<div id="context-bar">
<div class="wrapper">
<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')()
def is_active(selected):
if selected == active:
return "active"
%>
## 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>
<li class="${is_active('audit_logs')}"><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
<li class="${is_active('repositories')}"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
<li class="${is_active('repository_groups')}"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
<li class="${is_active('users')}"><a href="${h.route_path('users')}">${_('Users')}</a></li>
<li class="${is_active('user_groups')}"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
<li class="${is_active('permissions')}"><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
<li class="${is_active('authentication')}"><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
<li class="${is_active('integrations')}"><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
<li class="${is_active('defaults')}"><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
<li class="${is_active('settings')}"><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>
<li class="${is_active('repositories')} 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>
<li class="${is_active('repository_groups')} 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>
<li class="${is_active('user_groups')} local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
%endif
% endif
</ul>
</div>
<div class="clear"></div>
</div>
</%def>
@ -232,7 +239,7 @@
return "active"
%>
<!--- CONTEXT BAR -->
<!--- REPO CONTEXT BAR -->
<div id="context-bar">
<div class="wrapper">
@ -306,7 +313,7 @@
<strong>${_('This repository has been archived. It is now read-only.')}</strong>
</div>
% endif
<!--- END CONTEXT BAR -->
<!--- REPO END CONTEXT BAR -->
</%def>
@ -344,7 +351,7 @@
%>
<!--- CONTEXT BAR -->
<!--- REPO GROUP CONTEXT BAR -->
<div id="context-bar">
<div class="wrapper">
<ul id="context-pages" class="navigation horizontal-list">
@ -371,7 +378,7 @@
<div class="clear"></div>
</div>
<!--- END CONTEXT BAR -->
<!--- REPO GROUP CONTEXT BAR -->
</%def>