Merge branch 'pkubowicz-valid-html'

pact-foundation · Oct 23, 2018 · 2e9c32a · 2e9c32a
2 parents f57184e + 27eb83c
commit 2e9c32a
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 192 deletions.
diff --git a/DEVELOPER_SETUP.md b/DEVELOPER_SETUP.md
@@ -8,6 +8,7 @@
 * To run the example:
 
       cd dev
+      bundle install
       bundle exec rackup
 
 * The application will be available on `http://localhost:9292`

diff --git a/lib/pact_broker/api/renderers/html_pact_renderer.rb b/lib/pact_broker/api/renderers/html_pact_renderer.rb
@@ -167,4 +167,4 @@ def consumer_contract
       end
     end
   end
-end
+end
diff --git a/lib/pact_broker/ui/views/index/show-with-tags.haml b/lib/pact_broker/ui/views/index/show-with-tags.haml
@@ -18,27 +18,28 @@
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }
       %thead
-        %th.consumer
-          Consumer
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.consumer-version-number
-          Consumer<br>Version
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.pact{ style: 'width: 40px' }
-        %th.provider
-          Provider
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.provider-version-number
-          Provider<br>Version
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th
-          Published
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th
-          Webhook<br>status
-        %th
-          Last<br>verified
-          %span.glyphicon.glyphicon-sort.relationships-sort
+        %tr
+          %th.consumer
+            Consumer
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.consumer-version-number
+            Consumer<br>Version
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.pact{ style: 'width: 40px' }
+          %th.provider
+            Provider
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.provider-version-number
+            Provider<br>Version
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th
+            Published
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th
+            Webhook<br>status
+          %th
+            Last<br>verified
+            %span.glyphicon.glyphicon-sort.relationships-sort
       %tbody
 
       - index_items.each do | index_item |
@@ -84,17 +85,17 @@
     %div.relationships-size
       = index_items.size_label
 
-:javascript
-  $(function(){
-    $("#relationships").tablesorter();
-  });
+  :javascript
+    $(function(){
+      $("#relationships").tablesorter();
+    });
 
-  $(document).ready(function(){
-    $("span.pact a").load("/images/doc-text.svg");
-    $("span.pact-matrix a").load("/images/doc-matrix.svg");
-    $('td[data-toggle="tooltip"]').each(function(index, td){
-      //appended tooltip div screws up table if it's appended after a
-      //td, so need to append it to a div
-      $(td).tooltip({container: $(td).first()});
+    $(document).ready(function(){
+      $("span.pact a").load("/images/doc-text.svg");
+      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $('td[data-toggle="tooltip"]').each(function(index, td){
+        //appended tooltip div screws up table if it's appended after a
+        //td, so need to append it to a div
+        $(td).tooltip({container: $(td).first()});
+      });
     });
-  });
diff --git a/lib/pact_broker/ui/views/index/show.haml b/lib/pact_broker/ui/views/index/show.haml
@@ -18,22 +18,23 @@
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }
       %thead
-        %th
-        %th.consumer
-          Consumer
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.pact
+        %tr
+          %th
+          %th.consumer
+            Consumer
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th.pact
 
-        %th.provider
-          Provider
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th
-        %th
-          Latest pact<br>published
-        %th
-          Webhook<br>status
-        %th
-          Last<br>verified
+          %th.provider
+            Provider
+            %span.glyphicon.glyphicon-sort.relationships-sort
+          %th
+          %th
+            Latest pact<br>published
+          %th
+            Webhook<br>status
+          %th
+            Last<br>verified
       %tbody
 
       - index_items.each do | index_item |
@@ -65,17 +66,17 @@
     %div.relationships-size
       = index_items.size_label
 
-:javascript
-  $(function(){
-    $("#relationships").tablesorter();
-  });
+  :javascript
+    $(function(){
+      $("#relationships").tablesorter();
+    });
 
-  $(document).ready(function(){
-    $("span.pact a").load("/images/doc-text.svg");
-    $("span.pact-matrix a").load("/images/doc-matrix.svg");
-    $('td[data-toggle="tooltip"]').each(function(index, td){
-      //appended tooltip div screws up table if it's appended after a
-      //td, so need to append it to a div
-      $(td).tooltip({container: $(td).first()});
+    $(document).ready(function(){
+      $("span.pact a").load("/images/doc-text.svg");
+      $("span.pact-matrix a").load("/images/doc-matrix.svg");
+      $('td[data-toggle="tooltip"]').each(function(index, td){
+        //appended tooltip div screws up table if it's appended after a
+        //td, so need to append it to a div
+        $(td).tooltip({container: $(td).first()});
+      });
     });
-  });
diff --git a/lib/pact_broker/ui/views/layouts/main.haml b/lib/pact_broker/ui/views/layouts/main.haml
@@ -1,6 +1,6 @@
+<!DOCTYPE html>
 %html
   %head
     %title= defined?(title) ? title : ""
     %link{rel: 'shortcut icon', href: '/images/favicon.ico', type:'image/x-icon'}
-  %body
-    = yield
+  = yield