Răsfoiți Sursa

HUE-6082 [core] Unified the common menubar of the admin wizard

Enrico Berti 8 ani în urmă
părinte
comite
acb0832

+ 2 - 3
apps/about/src/about/templates/admin_wizard.mako

@@ -20,12 +20,11 @@ from django.core.urlresolvers import reverse
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext as _
 %>
-
-<%namespace name="header" file="header.mako" />
+<%namespace name="layout" file="/about_layout.mako" />
 %if not is_embeddable:
 ${ commonheader(_('Quick Start'), "quickstart", user, request) | n,unicode }
 %endif
-${ header.menubar() }
+${ layout.menubar(section='quick_start') }
 
 <div class="container-fluid">
   <div class="row-fluid" style="margin-bottom: 100px;">

+ 0 - 40
apps/about/src/about/templates/header.mako

@@ -1,40 +0,0 @@
-## Licensed to Cloudera, Inc. under one
-## or more contributor license agreements.  See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership.  Cloudera, Inc. licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License.  You may obtain a copy of the License at
-##
-##     http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-<%!
-from django.utils.translation import ugettext as _
-%>
-
-<%def name="menubar()">
-  <div class="navbar hue3-navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <div class="nav-collapse">
-            <ul class="nav">
-              <li class="app-header">
-                <a href="/${app_name}"><img src="${ static('desktop/art/icon_hue_48.png') }" class="app-icon" alt="${ _('Hue Logo') }" />
-                ${ _('About Hue') }</a>
-               </li>
-               % if user.is_superuser:
-                 <li class="active"><a href="${url("about:admin_wizard")}">${_('Quick Start')}</a></li>
-                 <li><a href="${url("desktop.views.dump_config")}">${_('Configuration')}</a></li>
-                 <li><a href="${url("desktop.views.log_view")}">${_('Server Logs')}</a></li>
-               % endif
-            </ul>
-          </div>
-        </div>
-      </div>
-  </div>
-</%def>

+ 3 - 3
desktop/core/src/desktop/templates/about_layout.mako

@@ -37,9 +37,9 @@ def is_selected(section, matcher):
                 </a>
                </li>
               % if user.is_superuser:
-                <li class="${is_selected(section, 'quick_start')}"><a href="${url("about:admin_wizard")}">${_('Quick start')}</a></li>
-                <li class="${is_selected(section, 'dump_config')}"><a href="${url("desktop.views.dump_config")}">${_('Configuration')}</a></li>
-                <li class="${is_selected(section, 'log_view')}"><a href="${url("desktop.views.log_view")}">${_('Server Logs')}</a></li>
+                <li class="${is_selected(section, 'quick_start')}"><a href="${ is_embeddable and "javascript: huePubSub.publish('open.link', '" + url('about:admin_wizard') + "')" or url('about:admin_wizard') }">${_('Quick start')}</a></li>
+                <li class="${is_selected(section, 'dump_config')}"><a href="${ is_embeddable and "javascript: huePubSub.publish('open.link', '" + url('desktop.views.dump_config') + "')" or url('desktop.views.dump_config') }">${_('Configuration')}</a></li>
+                <li class="${is_selected(section, 'log_view')}"><a href="${ is_embeddable and "javascript: huePubSub.publish('open.link', '" + url('desktop.views.log_view') + "')" or url('desktop.views.log_view') }">${_('Server Logs')}</a></li>
               % endif
             </ul>
           </div>