# HG changeset patch # User Marcin Kuzminski # Date 2019-03-22 22:17:11 # Node ID 4cdfc5f169dd5f65de56c23c466b5ca8c41b2deb # Parent 9f92b9deaed9b4848ef09b7b3cf83d405562ff59 nav: updated navigation entries for admin - fixed integrations page diff --git a/rhodecode/apps/_base/navigation.py b/rhodecode/apps/_base/navigation.py --- a/rhodecode/apps/_base/navigation.py +++ b/rhodecode/apps/_base/navigation.py @@ -85,8 +85,6 @@ class NavigationRegistry(object): 'admin_settings_hooks'), NavEntry('search', _('Full Text Search'), 'admin_settings_search'), - NavEntry('integrations', _('Integrations'), - 'global_integrations_home'), NavEntry('system', _('System Info'), 'admin_settings_system'), NavEntry('exceptions', _('Exceptions Tracker'), diff --git a/rhodecode/templates/admin/integrations/base.mako b/rhodecode/templates/admin/integrations/base.mako --- a/rhodecode/templates/admin/integrations/base.mako +++ b/rhodecode/templates/admin/integrations/base.mako @@ -6,7 +6,7 @@ elif context['c'].repo_group: return "/admin/repo_groups/repo_group_edit.mako" else: - return "/admin/settings/settings.mako" + return "/admin/integrations/global.mako" %> <%inherit file="${inherit(context)}" /> diff --git a/rhodecode/templates/admin/integrations/global.mako b/rhodecode/templates/admin/integrations/global.mako new file mode 100644 --- /dev/null +++ b/rhodecode/templates/admin/integrations/global.mako @@ -0,0 +1,51 @@ +## -*- coding: utf-8 -*- +<%inherit file="/base/base.mako"/> + +<%def name="title()"> + ${_('Settings administration')} + %if c.rhodecode_name: + · ${h.branding(c.rhodecode_name)} + %endif + + +<%def name="breadcrumbs_links()"> + ${h.link_to(_('Admin'),h.route_path('admin_home'))} + » + ${_('Integrations')} + + +<%def name="menu_bar_nav()"> + ${self.menu_items(active='admin')} + + +<%def name="side_bar_nav()"> +
  • + Global +
  • + + +<%def name="main_content()"> + <%include file="/admin/settings/settings_${c.active}.mako"/> + + +<%def name="main()"> +
    +
    + ${self.admin_menu()} +
    + + ##main + +
    + +