Procházet zdrojové kódy

HUE-6077 [about] Use correct default URL in Hue 4

Romain Rigaux před 8 roky
rodič
revize
58fb828206

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

@@ -20,7 +20,9 @@ from django.core.urlresolvers import reverse
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext as _
 %>
+
 <%namespace name="layout" file="/about_layout.mako" />
+
 %if not is_embeddable:
 ${ commonheader(_('Quick Start'), "quickstart", user, request) | n,unicode }
 %endif

+ 10 - 4
desktop/core/src/desktop/templates/about_layout.mako

@@ -31,15 +31,21 @@ def is_selected(section, matcher):
           <div class="nav-collapse">
             <ul class="nav">
               <li class="app-header">
-                <a href="/about">
+                <a href="${ is_embeddable and "javascript: huePubSub.publish('open.link', '" + url('about:admin_wizard') + "')" or url('about:admin_wizard') }">
                   <img src="${ static('desktop/art/icon_hue_48.png') }" class="app-icon"  alt="${ _('Hue icon') }"/>
                   ${ _('About Hue') }
                 </a>
                </li>
               % if user.is_superuser:
-                <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>
+                <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>

+ 2 - 1
desktop/core/src/desktop/templates/hue.mako

@@ -213,7 +213,7 @@ ${ hueIcons.symbols() }
             % endif
             <li><a href="http://gethue.com" target="_blank"><span class="dropdown-no-icon">${_('Help')}</span></a></li>
             % if user.is_superuser:
-            <li><a href="/about"><span class="dropdown-no-icon">${_('About Hue')}</span></a></li>
+            <li><a href="/about/"><span class="dropdown-no-icon">${_('About Hue')}</span></a></li>
             % endif
             <li class="divider"></li>
             <li><a title="${_('Sign out')}" href="/accounts/logout/"><i class="fa fa-sign-out"></i> ${ _('Sign out') }</a></li>
@@ -767,6 +767,7 @@ ${ assist.assistPanel() }
 
         var pageMapping = [
           { url: '/500', app: '500' },
+          { url: '/about/', app: 'admin_wizard' },
           { url: '/about/admin_wizard', app: 'admin_wizard' },
           { url: '/dashboard/admin/collections', app: 'collections' },
           { url: '/dashboard/*', app: 'dashboard' },