Browse Source

[oozie] Refactor navigation bars

Romain Rigaux 12 years ago
parent
commit
f94523dcc8

+ 1 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako

@@ -24,12 +24,10 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
 ${ commonheader(_("Bundle Dashboard"), "oozie", user) | n,unicode }
 ${ commonheader(_("Bundle Dashboard"), "oozie", user) | n,unicode }
-${ layout.menubar(section='dashboard') }
+${ layout.menubar(section='bundles', dashboard=True) }
 
 
 
 
 <div class="container-fluid">
 <div class="container-fluid">
-  ${ layout.dashboard_sub_menubar(section='bundles') }
-
 <div class="row-fluid">
 <div class="row-fluid">
   <div class="span2">
   <div class="span2">
     <div class="sidebar-nav">
     <div class="sidebar-nav">

+ 2 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako

@@ -24,12 +24,10 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
 ${ commonheader(_("Bundles Dashboard"), "oozie", user) | n,unicode }
 ${ commonheader(_("Bundles Dashboard"), "oozie", user) | n,unicode }
-${layout.menubar(section='dashboard')}
+${layout.menubar(section='bundles', dashboard=True)}
 
 
 
 
 <div class="container-fluid">
 <div class="container-fluid">
-  ${ layout.dashboard_sub_menubar(section='bundles') }
-
   <form>
   <form>
     <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
     <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
 
 
@@ -91,7 +89,7 @@ ${layout.menubar(section='dashboard')}
       </tbody>
       </tbody>
      </table>
      </table>
    </div>
    </div>
-  ${ layout.dashboard_end_sub_menubar() }
+
 </div>
 </div>
 
 
 
 

+ 1 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -24,12 +24,10 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
 ${ commonheader(_("Coordinator Dashboard"), "oozie", user) | n,unicode }
 ${ commonheader(_("Coordinator Dashboard"), "oozie", user) | n,unicode }
-${ layout.menubar(section='dashboard') }
+${ layout.menubar(section='coordinators', dashboard=True) }
 
 
 
 
 <div class="container-fluid">
 <div class="container-fluid">
-  ${ layout.dashboard_sub_menubar(section='coordinators') }
-
 <div class="row-fluid">
 <div class="row-fluid">
   <div class="span2">
   <div class="span2">
     <div class="sidebar-nav">
     <div class="sidebar-nav">

+ 2 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -24,12 +24,10 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
 ${ commonheader(_("Coordinators Dashboard"), "oozie", user) | n,unicode }
 ${ commonheader(_("Coordinators Dashboard"), "oozie", user) | n,unicode }
-${layout.menubar(section='dashboard')}
+${layout.menubar(section='coordinators', dashboard=True)}
 
 
 
 
 <div class="container-fluid">
 <div class="container-fluid">
-  ${ layout.dashboard_sub_menubar(section='coordinators') }
-
   <form>
   <form>
     <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
     <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
 
 
@@ -96,7 +94,7 @@ ${layout.menubar(section='dashboard')}
       </tbody>
       </tbody>
      </table>
      </table>
    </div>
    </div>
-  ${ layout.dashboard_end_sub_menubar() }
+
 </div>
 </div>
 
 
 
 

+ 1 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako

@@ -23,11 +23,10 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
 ${ commonheader(_("Oozie Information"), "oozie", user) | n,unicode }
 ${ commonheader(_("Oozie Information"), "oozie", user) | n,unicode }
-${ layout.menubar(section='dashboard') }
+${ layout.menubar(section='oozie', dashboard=True) }
 
 
 
 
 <div class="container-fluid">
 <div class="container-fluid">
-  ${ layout.dashboard_sub_menubar(section='oozie') }
 
 
   <h1 class="card-heading card-heading-noborder simple pull-right" style="margin-top: -4px;">
   <h1 class="card-heading card-heading-noborder simple pull-right" style="margin-top: -4px;">
   ${ _('Oozie status') }
   ${ _('Oozie status') }
@@ -121,8 +120,6 @@ ${ layout.menubar(section='dashboard') }
 
 
   </div>
   </div>
 
 
-  ${ layout.dashboard_end_sub_menubar() }
-
 
 
 <script>
 <script>
   $(document).ready(function(){
   $(document).ready(function(){

+ 1 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -25,13 +25,11 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
 ${ commonheader(_("Workflow Dashboard"), "oozie", user) | n,unicode }
 ${ commonheader(_("Workflow Dashboard"), "oozie", user) | n,unicode }
-${ layout.menubar(section='dashboard') }
+${ layout.menubar(section='dashboard', dashboard=True) }
 
 
 
 
 <div class="container-fluid" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
 <div class="container-fluid" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
 
 
-  ${ layout.dashboard_sub_menubar(section='workflows') }
-
   <div class="row-fluid">
   <div class="row-fluid">
     <div class="span2">
     <div class="span2">
       <div class="sidebar-nav">
       <div class="sidebar-nav">

+ 1 - 3
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_action.mako

@@ -24,12 +24,10 @@
 <%namespace name="utils" file="../utils.inc.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
 ${ commonheader(_("Workflow Action"), "oozie", user) | n,unicode }
 ${ commonheader(_("Workflow Action"), "oozie", user) | n,unicode }
-${ layout.menubar(section='running') }
+${ layout.menubar(section='workflows', dashboard=True) }
 
 
 
 
 <div class="container-fluid">
 <div class="container-fluid">
-  ${ layout.dashboard_sub_menubar(section='workflows') }
-
  <div class="row-fluid">
  <div class="row-fluid">
     <div class="span2">
     <div class="span2">
       <div class="sidebar-nav">
       <div class="sidebar-nav">

+ 1 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

@@ -25,12 +25,10 @@
 
 
 
 
 ${ commonheader(_("Workflows Dashboard"), "oozie", user) | n,unicode }
 ${ commonheader(_("Workflows Dashboard"), "oozie", user) | n,unicode }
-${ layout.menubar(section='dashboard') }
+${ layout.menubar(section='dashboard', dashboard=True) }
 
 
 
 
 <div class="container-fluid">
 <div class="container-fluid">
-  ${ layout.dashboard_sub_menubar(section='workflows') }
-
   <form>
   <form>
     <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
     <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
 
 
@@ -99,7 +97,6 @@ ${ layout.menubar(section='dashboard') }
      </table>
      </table>
    </div>
    </div>
 
 
-  ${ layout.dashboard_end_sub_menubar() }
 </div>
 </div>
 
 
 
 

+ 12 - 24
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -21,7 +21,7 @@
 <%namespace name="utils" file="utils.inc.mako" />
 <%namespace name="utils" file="utils.inc.mako" />
 
 
 
 
-<%def name="menubar(section='')">
+<%def name="menubar(section='', dashboard=False)">
     <div class="navbar navbar-inverse navbar-fixed-top">
     <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
@@ -30,34 +30,22 @@
               <li class="currentApp">
               <li class="currentApp">
                 <a href="/${app_name}">
                 <a href="/${app_name}">
                   <img src="/oozie/static/art/icon_oozie_24.png" />
                   <img src="/oozie/static/art/icon_oozie_24.png" />
-                  ${ _('Oozie') }
+                  ${ _('Oozie Dashboard') if dashboard else _('Oozie Editor') }
                 </a>
                 </a>
                </li>
                </li>
-              <li class="${utils.is_selected(section, 'dashboard')}"><a href="${url('oozie:list_oozie_workflows')}">${ _('Dashboard') }</a></li>
-              <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_workflows')}">${ _('Workflows') }</a></li>
-              <li class="${utils.is_selected(section, 'coordinators')}"><a href="${url('oozie:list_coordinators')}">${ _('Coordinators') }</a></li>
-              <li class="${utils.is_selected(section, 'bundles')}"><a href="${url('oozie:list_bundles')}">${ _('Bundles') }</a></li>
+              % if dashboard:
+                <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_oozie_workflows')}">${ _('Workflows') }</a></li>
+                <li class="${utils.is_selected(section, 'coordinators')}"><a href="${url('oozie:list_oozie_coordinators')}">${ _('Coordinators') }</a></li>
+                <li class="${utils.is_selected(section, 'bundles')}"><a href="${url('oozie:list_oozie_bundles')}">${ _('Bundles') }</a></li>
+                <li class="${utils.is_selected(section, 'oozie')}"><a href="${url('oozie:list_oozie_info')}">${ _('Oozie') }</a></li>
+              % else:
+                <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_workflows')}">${ _('Workflows') }</a></li>
+                <li class="${utils.is_selected(section, 'coordinators')}"><a href="${url('oozie:list_coordinators')}">${ _('Coordinators') }</a></li>
+                <li class="${utils.is_selected(section, 'bundles')}"><a href="${url('oozie:list_bundles')}">${ _('Bundles') }</a></li>
+              % endif
             </ul>
             </ul>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
   </div>
   </div>
 </%def>
 </%def>
-
-<%def name="dashboard_sub_menubar(section='')">
-  <div class="card card-small">
-    <div class="card-body">
-      <p>
-        <ul class="nav nav-tabs">
-          <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_oozie_workflows')}">${ _('Workflows') }</a></li>
-          <li class="${utils.is_selected(section, 'coordinators')}"><a href="${url('oozie:list_oozie_coordinators')}">${ _('Coordinators') }</a></li>
-          <li class="${utils.is_selected(section, 'bundles')}"><a href="${url('oozie:list_oozie_bundles')}">${ _('Bundles') }</a></li>
-          <li class="${utils.is_selected(section, 'oozie')}"><a href="${url('oozie:list_oozie_info')}">${ _('Oozie') }</a></li>
-        </ul>
-</%def>
-
-<%def name="dashboard_end_sub_menubar()">
-      </p>
-    </div>
-  </div>
-</%def>

+ 1 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -254,7 +254,7 @@ from django.utils.translation import ugettext as _
          <a title="${_('Oozie')}" rel="tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Workflows')} <b class="caret"></b></a>
          <a title="${_('Oozie')}" rel="tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Workflows')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
          <ul role="menu" class="dropdown-menu">
            <li><a href="${ url('oozie:index') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Dashboard')}</a></li>
            <li><a href="${ url('oozie:index') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Dashboard')}</a></li>
-           <li><a href="${ url('oozie:create_workflow') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Editor')}</a></li>
+           <li><a href="${ url('oozie:list_workflows') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Editor')}</a></li>
          </ul>
          </ul>
        </li>
        </li>
        % endif
        % endif