refactor(index haml): dry up nav bar code

pact-foundation · Feb 19, 2019 · 944adc8 · 944adc8
1 parent f68fce8
commit 944adc8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/lib/pact_broker/ui/views/index/_navbar.haml b/lib/pact_broker/ui/views/index/_navbar.haml
@@ -0,0 +1,14 @@
+%nav.navbase-default{role: "navigation", id: "navigation"}
+  .container-fluid
+    .navbar-header
+    %ul.navbar-right#top-left-menu
+      %li
+        - if tag_toggle
+          %a{href: './?tags=true'}
+            Show latest tags
+        - else
+          %a{href: './'}
+            Hide latest tags
+
+        %a{href: '/hal-browser/browser.html'}
+          API Browser
diff --git a/lib/pact_broker/ui/views/index/show-with-tags.haml b/lib/pact_broker/ui/views/index/show-with-tags.haml
@@ -1,19 +1,8 @@
 %body
-  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
   %link{rel: 'stylesheet', href: '/stylesheets/index.css'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
   %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
   .container
-    %nav.navbase-default{role: "navigation", id: "navigation"}
-      .container-fluid
-        .navbar-header
-        %ul.navbar-right#top-left-menu
-          %li
-            %a{href: './'}
-              Hide latest tags
-            %a{href: '/hal-browser/browser.html'}
-              API Browser
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false}
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }

diff --git a/lib/pact_broker/ui/views/index/show.haml b/lib/pact_broker/ui/views/index/show.haml
@@ -1,19 +1,8 @@
 %body
-  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
   %link{rel: 'stylesheet', href: '/stylesheets/index.css'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
   %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
   .container
-    %nav.navbase-default{role: "navigation", id: "navigation"}
-      .container-fluid
-        .navbar-header
-        %ul.navbar-right#top-left-menu
-          %li
-            %a{href: './?tags=true'}
-              Show latest tags
-            %a{href: '/hal-browser/browser.html'}
-              API Browser
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true}
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }

diff --git a/lib/pact_broker/ui/views/layouts/main.haml b/lib/pact_broker/ui/views/layouts/main.haml
@@ -3,4 +3,7 @@
   %head
     %title= defined?(title) ? title : ""
     %link{rel: 'shortcut icon', href: '/images/favicon.ico', type:'image/x-icon'}
+    %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
+    %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
+    %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
   = yield