Restore the submenu visibility check on main.mako

pymedusa · Jul 24, 2018 · 5b96019 · 5b96019
1 parent 4363ffe
commit 5b96019
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/themes-default/slim/views/layouts/main.mako b/themes-default/slim/views/layouts/main.mako
@@ -60,7 +60,9 @@
             <div id="checkboxControlsBackground" class="shadow" style="display: none"></div>
 
             <app-header></app-header>
+            % if submenu:
             <submenu></submenu>
+            % endif
             <%include file="/partials/alerts.mako"/>
                <div id="content-row" class="row">
                     <div v-if="globalLoading" class="text-center ${'col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1' if not app.LAYOUT_WIDE else 'col-lg-12 col-md-12'} col-sm-12 col-xs-12">

diff --git a/themes-default/slim/views/vue-components/submenu.mako b/themes-default/slim/views/vue-components/submenu.mako
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="submenu-template">
 <%text>
-<div v-if="submenu.length !== 0" id="sub-menu-container" class="row shadow">
+<div id="sub-menu-container" class="row shadow">
     <div id="sub-menu" class="submenu-default hidden-print col-md-12">
         <template v-for="menuItem in submenu">
             <app-link :key="menuItem.title" :href="menuItem.path" class="btn-medusa top-5 bottom-5"

diff --git a/themes/dark/templates/layouts/main.mako b/themes/dark/templates/layouts/main.mako
@@ -60,7 +60,9 @@
             <div id="checkboxControlsBackground" class="shadow" style="display: none"></div>
 
             <app-header></app-header>
+            % if submenu:
             <submenu></submenu>
+            % endif
             <%include file="/partials/alerts.mako"/>
                <div id="content-row" class="row">
                     <div v-if="globalLoading" class="text-center ${'col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1' if not app.LAYOUT_WIDE else 'col-lg-12 col-md-12'} col-sm-12 col-xs-12">

diff --git a/themes/dark/templates/vue-components/submenu.mako b/themes/dark/templates/vue-components/submenu.mako
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="submenu-template">
 <%text>
-<div v-if="submenu.length !== 0" id="sub-menu-container" class="row shadow">
+<div id="sub-menu-container" class="row shadow">
     <div id="sub-menu" class="submenu-default hidden-print col-md-12">
         <template v-for="menuItem in submenu">
             <app-link :key="menuItem.title" :href="menuItem.path" class="btn-medusa top-5 bottom-5"

diff --git a/themes/light/templates/layouts/main.mako b/themes/light/templates/layouts/main.mako
@@ -60,7 +60,9 @@
             <div id="checkboxControlsBackground" class="shadow" style="display: none"></div>
 
             <app-header></app-header>
+            % if submenu:
             <submenu></submenu>
+            % endif
             <%include file="/partials/alerts.mako"/>
                <div id="content-row" class="row">
                     <div v-if="globalLoading" class="text-center ${'col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1' if not app.LAYOUT_WIDE else 'col-lg-12 col-md-12'} col-sm-12 col-xs-12">

diff --git a/themes/light/templates/vue-components/submenu.mako b/themes/light/templates/vue-components/submenu.mako
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="submenu-template">
 <%text>
-<div v-if="submenu.length !== 0" id="sub-menu-container" class="row shadow">
+<div id="sub-menu-container" class="row shadow">
     <div id="sub-menu" class="submenu-default hidden-print col-md-12">
         <template v-for="menuItem in submenu">
             <app-link :key="menuItem.title" :href="menuItem.path" class="btn-medusa top-5 bottom-5"