_header_navbar.html.erb in arclight-0.2.0

- old
+ new
@@ -1,53 +1,65 @@
-<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
-  <div class="<%= container_classes %>">
-    <%= link_to application_name, root_path, class: "navbar-brand" %>
-    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
+<header>
+  <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" aria-label="utilities" role="navigation">
+    <div class="<%= container_classes %>">
+      <%= link_to application_name, root_path, class: "navbar-brand" %>
+      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
 
-    
-
-    <div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
-      <%= render 'shared/user_util_links' %>
+      <div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
+        <%= render 'shared/user_util_links' %>
+      </div>
     </div>
-  </div>
-</nav>
+  </nav>
 
-<% if controller_name == 'catalog' && !has_search_parameters? && action_name == 'index' %>
-  <div class='al-homepage-masthead jumbotron'>
-    <div class='d-flex justify-content-center'>
-      <h1 class='text-center'><%= t('arclight.masthead_heading') %></h1>
+  <% if controller_name == 'catalog' && !has_search_parameters? && action_name == 'index' %>
+    <div class='al-homepage-masthead jumbotron'>
+      <div class="container">
+        <div class="row align-items-center">
+          <div class="col-md-8 masthead-center" >
+            <h1><%= t('arclight.masthead_heading') %></h1>
+          </div>
+
+          <div class="col-md-4 nav-links d-flex justify-content-end" >
+            <span class="navbar-nav" aria-label="browse" role="navigation">
+              <%= render 'shared/main_menu_links' %>
+            </span>
+          </div>
+        </div>
+      </div>
+      <div class='row justify-content-md-center'>
+        <div class='col-md-6 col-sm-12'>
+          <div class='navbar-search'>
+            <%= render_search_bar %>
+          </div>
+        </div>
+      </div>
     </div>
-    <div class='row justify-content-md-center'>
-      <div class='col-md-6 col-sm-12'>
-        <div class='navbar-search'>
-          <%= render_search_bar %>
+  <% else %>
+    <div class='bg-faded al-masthead'>
+      <div class="container">
+        <div class="row align-items-center">
+          <div class="col-md-8" >
+            <h1><%= t('arclight.masthead_heading') %></h1>
+          </div>
+
+          <div class="col-md-4 nav-links d-flex justify-content-end" >
+            <span class="navbar-nav" aria-label="browse" role="navigation">
+              <%= render 'shared/main_menu_links' %>
+            </span>
+          </div>
         </div>
       </div>
     </div>
-    <nav class="navbar justify-content-center" role="navigation">
-      <ul class="nav">
-        <%= render 'shared/main_menu_links' %>
-      </ul>
-    </nav>
-  </div>
-<% else %>
-  <div class='bg-faded al-masthead'>
-    <div class="container">
-      <h1><%= t('arclight.masthead_heading') %></h1>
-    </div>
-  </div>
-  <div class="navbar-search navbar navbar-expand-sm bg-faded" role="navigation">
-    <div class="<%= container_classes %>">
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="navbarSupportedContent">
-        <ul class="navbar-nav mr-auto">
-          <%= render 'shared/main_menu_links' %>
-        </ul>
-        <%= render_search_bar  %>
+    <div class="navbar-search navbar navbar-expand-sm bg-faded">
+      <div class="<%= container_classes %>">
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+          <%= render_search_bar  %>
+        </div>
       </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</header>