nav: updated navigation entries for admin

- fixed integrations page

rhodecode/templates/admin/integrations/global.mako

@@ -0,0 +1,51 b''
+## -*- coding: utf-8 -*-
+<%inherit file="/base/base.mako"/>
+
+<%def name="title()">
+    ${_('Settings administration')}
+    %if c.rhodecode_name:
+        &middot; ${h.branding(c.rhodecode_name)}
+    %endif
+</%def>
+
+<%def name="breadcrumbs_links()">
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
+    &raquo;
+    ${_('Integrations')}
+</%def>
+
+<%def name="menu_bar_nav()">
+    ${self.menu_items(active='admin')}
+</%def>
+
+<%def name="side_bar_nav()">
+    <li class="active">
+      <a href="${h.route_path('global_integrations_home')}">Global</a>
+    </li>
+</%def>
+
+<%def name="main_content()">
+  <%include file="/admin/settings/settings_${c.active}.mako"/>
+</%def>
+
+<%def name="main()">
+<div class="box">
+    <div class="title">
+        ${self.admin_menu()}
+    </div>
+
+    ##main
+    <div class='sidebar-col-wrapper'>
+      <div class="sidebar">
+          <ul class="nav nav-pills nav-stacked">
+            ${self.side_bar_nav()}
+          </ul>
+      </div>
+
+      <div class="main-content-auto-width">
+        ${self.main_content()}
+      </div>
+    </div>
+</div>
+
+</%def>

rhodecode/apps/_base/navigation.py

@@ -85,8 +85,6 b' 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'),

rhodecode/templates/admin/integrations/base.mako

@@ -6,7 +6,7 b''
       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)}" />