Fix reports masthead

galaxyproject · Apr 28, 2023 · 57c1bd8 · 57c1bd8
1 parent 69a5272
commit 57c1bd8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 31 deletions.
diff --git a/templates/base/base_panels.mako b/templates/base/base_panels.mako
@@ -147,9 +147,7 @@
             <div id="background"></div>
 
             ## Layer iframes over backgrounds
-            <div id="masthead" class="navbar navbar-fixed-top navbar-inverse">
-                ${self.masthead()}
-            </div>
+            ${self.masthead()}
 
             %if self.message_box_visible:
                 <div id="messagebox" class="alert alert-${app.config.message_box_class} rounded-0 m-0 p-2">

diff --git a/templates/webapps/reports/base_panels.mako b/templates/webapps/reports/base_panels.mako
@@ -17,32 +17,17 @@
 
 ## Masthead
 <%def name="masthead()">
-    ## Tab area, fills entire width
-    <div style="position: absolute; top: 0; left: 0; width: 100%; text-align: center">
-        <table class="tab-group" border="0" cellspacing="0" style="margin: auto;">
-            <tr>
-                <%def name="tab( id, display, href, target='_parent', visible=True, extra_class='' )">
-                    <%
-                    cls = "tab"
-                    if extra_class:
-                        cls += " " + extra_class
-                    if self.active_view == id:
-                        cls += " active"
-                    style = ""
-                    if not visible:
-                        style = "display: none;"
-                    %>
-                    <td class="${cls}" style="${style}"><a target="${target}" href="${href}">${display}</a></td>
-                </%def>
-            </tr>
-        </table>
-    </div>
-    ## Logo, layered over tabs to be clickable
-    <a class="navbar-brand" href="${h.url_for( app.config.get( 'logo_url', '/' ) )}">
-        <img class="navbar-brand-image" src="${h.url_for('/static/favicon.svg')}" />
-        <span class="navbar-brand-title">Galaxy Reports</span>
-        %if app.config.brand:
-            <span class='brand'>/ ${app.config.brand}</span>
-        %endif
-    </a>
+    <!-- This has the class masthead-toolshed for 23.0, but will be masthead-simple merged forward -->
+    <nav id="masthead" class="masthead-toolshed navbar navbar-expand navbar-fixed-top justify-content-center navbar-dark">
+        <a href="${h.url_for( app.config.get( 'logo_url', '/' ) )}" aria-label="homepage" class="navbar-brand">
+            <img alt="logo" class="navbar-brand-image" src="${h.url_for('/static/favicon.svg')}">
+            <span class="navbar-brand-title">
+                Reports
+                %if app.config.brand:
+                    / ${app.config.brand}
+                %endif
+            </span>
+        </a>
+         <ul class="navbar-nav"/>
+    </nav>
 </%def>