govuk_publishing_components 29.4.0 → 29.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 831296f6233744d3d669b023b5f8243ee118f51ce7b1ba3b8c5f510346b87b9c
-  data.tar.gz: 7d01de1a9e86110a92c486394cf5a1ee509ca3421037cac5b6281b5ecb209690
+  metadata.gz: b74221682d0047e390f314e968edf8acd3b89efebfe41d833239d9ca44413c86
+  data.tar.gz: 1f87c5a4288b2a69da1e32598422162bc5017f2dab4ac577b326b582cbd9e8e9
 SHA512:
-  metadata.gz: a0cf8c3cebef33691aab437ff16219573f6d7b0132b266cc28178ae8a06c8e3034ed04275611876cccff7e63418ab38bf7564e17cb1ba98bc2fa877b8743f32c
-  data.tar.gz: 86bb5adec0ebb031efc467ec4bc566f790a1e466fdd454edf4fdca1e94946db467d660d9413943146a720271f34ef97e35d0fda6801d0de01559b832111b73bb
+  metadata.gz: 14d60ae3e9876edbbcac836010f6dbfd1655c3be4798119f79ac064cb70cfef71a612694d7b31ae6475c31f9813ca9d7775fb1ab3b3153707643bd61190e057d
+  data.tar.gz: 4e69c991fd6db0d47136d6a7e489fd516e1aa9c62b1422ccf87ed35164e7f6641a60fd64392281f5c99b84c4b9caef8be78bbd73faa922b604d27c227ec7080f

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js

@@ -51,6 +51,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     // giving the table a class of mc-stacked
     this.options.stacked = this.$table.classList.contains('mc-stacked')
 
+    // stacked charts require tables to use the th element in the table header
+    // if the th element is not included, then the ENABLED flag is set to false
+    // this will stop the chart and toggleLink from being rendered
+    if (this.options.stacked) {
+      var allTheTHsInTableHead = this.$table.querySelectorAll('thead th')
+      if (allTheTHsInTableHead.length === 0) {
+        this.ENABLED = false
+      }
+    }
+
     // set the negative option based on
     // giving the table a class of mc-negative
     this.options.negative = this.$table.classList.contains('mc-negative')
@@ -106,12 +116,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   MagnaCharta.prototype.apply = function () {
     if (this.ENABLED) {
-      this.constructChart()
-      this.addClassesToHeader()
-      this.applyWidths()
-      this.insert()
-      this.$table.classList.add('mc-hidden')
-      this.applyOutdent()
+      try {
+        this.constructChart()
+        this.addClassesToHeader()
+        this.applyWidths()
+        this.insert()
+        this.$table.classList.add('mc-hidden')
+        this.applyOutdent()
+      } catch (error) {
+        console.error('MagnaCharta error:', error)
+      }
     }
   }
 

data/app/assets/stylesheets/component_guide/application.scss

@@ -139,7 +139,7 @@ $gem-guide-border-width: 1px;
     position: absolute;
     top: 0;
     left: 0;
-    padding: .21053em .78947em;
+    padding: .2105em .7894em;
     background: $govuk-border-colour;
     color: govuk-colour("black");
     font-weight: bold;

data/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss

@@ -1,7 +1,7 @@
 @import "govuk/components/checkboxes/checkboxes";
 
 .govuk-checkboxes--nested {
-  margin-left: -(govuk-spacing(4) + 2px); //22px
+  margin-left: -(govuk-spacing(4) + 2px); // 22px
   box-sizing: border-box;
   border-left-style: solid;
   border-left-width: 4px;
@@ -17,7 +17,7 @@
 
 .govuk-checkboxes__conditional {
   margin-top: govuk-spacing(2);
-  margin-left: -(govuk-spacing(4) + 2px); //22px
+  margin-left: -(govuk-spacing(4) + 2px); // 22px
 }
 
 .gem-c-checkboxes__list {

data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss

@@ -19,7 +19,7 @@
 .gem-c-contextual-sidebar__cta {
   border-top: 2px solid $govuk-brand-colour;
   margin-bottom: govuk-spacing(6);
-  background-color: govuk-colour('light-grey', $legacy: 'grey-4');
+  background-color: govuk-colour("light-grey", $legacy: "grey-4");
   display: block;
   padding: 0 govuk-spacing(3) govuk-spacing(3);
   text-decoration: none;

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss

@@ -9,7 +9,7 @@ $pseudo-underline-height: 3px;
 $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
 
 @mixin chevron($colour, $update: false) {
-  @if ($update == true) {
+  @if $update == true {
     border-bottom-color: $colour;
     border-right-color: $colour;
   } @else {
@@ -816,7 +816,7 @@ $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
 
 .gem-c-layout-super-navigation-header__navigation-second-items--topics {
   @include govuk-media-query($from: "desktop") {
-    @include columns($items: 17, $columns: 2, $selector: "li", $flow: column);
+    @include columns($items: 16, $columns: 2, $selector: "li", $flow: column);
   }
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_modal-dialogue.scss

@@ -103,7 +103,7 @@ $govuk-modal-wide-breakpoint: $govuk-page-width + $govuk-modal-margin * 2 + $gov
 }
 
 .gem-c-modal-dialogue__logotype-crown {
-  fill: currentColor;
+  fill: currentcolor;
   vertical-align: middle;
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_organisation-logo.scss

@@ -55,13 +55,13 @@
 .gem-c-organisation-logo__name {
   position: relative;
   top: 3px;
-  font-family: "HelveticaNeue", "Helvetica Neue", "Arial", "Helvetica", sans-serif;
+  font-family: HelveticaNeue, "Helvetica Neue", Arial, Helvetica, sans-serif;
 }
 
 .gem-c-organisation-logo__link {
   @include govuk-link-common;
   @include govuk-link-style-text;
-  font-family: "HelveticaNeue", "Helvetica Neue", "Arial", "Helvetica", sans-serif;
+  font-family: HelveticaNeue, "Helvetica Neue", Arial, Helvetica, sans-serif;
 
   &:hover {
     color: $govuk-link-hover-colour;

data/app/assets/stylesheets/govuk_publishing_components/components/_reorderable-list.scss

@@ -19,12 +19,12 @@
 }
 
 .gem-c-reorderable-list__item--chosen {
-  background-color: govuk-colour('light-grey');
+  background-color: govuk-colour("light-grey");
   outline: 2px dotted $govuk-border-colour;
 }
 
 .gem-c-reorderable-list__item--drag {
-  background-color: govuk-colour('white');
+  background-color: govuk-colour("white");
   list-style-type: none;
 
   .gem-c-reorderable-list__actions {

data/app/assets/stylesheets/govuk_publishing_components/components/_search.scss

@@ -76,7 +76,7 @@ $large-input-size: 50px;
   padding: govuk-em(6, 16);
   border: $govuk-border-width-form-element solid $govuk-input-border-colour;
   background: govuk-colour("white");
-  border-radius: 0; //otherwise iphones apply an automatic border radius
+  border-radius: 0; // otherwise iphones apply an automatic border radius
   box-sizing: border-box;
   -webkit-appearance: none;
   -moz-appearance: none;
@@ -160,7 +160,7 @@ $large-input-size: 50px;
   background: govuk-colour("white");
 }
 
-//general class applied to search input and button wrapper
+// general class applied to search input and button wrapper
 .gem-c-search__item {
   position: relative;
   display: table-cell;

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss

@@ -3,7 +3,7 @@ $number-circle-size: 30px;
 $number-circle-size-large: 35px;
 $top-border: solid 1px govuk-colour("mid-grey", $legacy: "grey-3");
 
-@mixin step-nav-vertical-line ($line-style: solid) {
+@mixin step-nav-vertical-line($line-style: solid) {
   content: "";
   position: absolute;
   z-index: 2;

data/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss

@@ -40,7 +40,7 @@
 }
 
 .gem-c-summary-list--wide-title {
-  @include govuk-media-query($from: 'tablet') {
+  @include govuk-media-query($from: "tablet") {
     .govuk-summary-list__key {
       width: 60%;
     }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -101,7 +101,7 @@
 }
 
 .gem-c-govspeak--inverse {
-  color: govuk-colour('white');
+  color: govuk-colour("white");
 
   a {
     @include govuk-link-common;

data/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss

@@ -3,10 +3,10 @@
 @import "components/helpers/govuk-frontend-settings";
 @import "govuk/base";
 
-@import 'components/mixins/margins';
+@import "components/mixins/margins";
 // TODO: remove this focus override when govuk_template is no longer used
-@import 'components/mixins/govuk-template-link-focus-override';
-@import 'components/mixins/css3';
+@import "components/mixins/govuk-template-link-focus-override";
+@import "components/mixins/css3";
 
 $gem-secondary-button-colour: #00823b;
 $gem-secondary-button-hover-colour: darken($gem-secondary-button-colour, 5%);

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -13,8 +13,6 @@ module GovukPublishingComponents
         frontend
         government-frontend
         govspeak-preview
-        govuk-account-manager-prototype
-        govuk-coronavirus-vulnerable-people-form
         info-frontend
         licence-finder
         manuals-frontend
@@ -32,10 +30,9 @@ module GovukPublishingComponents
       gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
       gem_path = Dir.pwd if ENV["MAIN_COMPONENT_GUIDE"]
       host_dir = File.expand_path("..")
-      path = File.expand_path("..", gem_path)
 
       @in_application = false
-      @in_application = true unless path.to_s == host_dir.to_s
+      @in_application = true unless ENV["MAIN_COMPONENT_GUIDE"]
 
       components = AuditComponents.new(gem_path, false)
       applications = analyse_applications(host_dir, application_dirs)

data/app/models/govuk_publishing_components/audit_components.rb

@@ -12,29 +12,40 @@ module GovukPublishingComponents
   private
 
     def compile_data(path, simple)
+      # simple is used to reduce effort (and therefore page load time) required
+      # when loading auditing summary on the main component guide page
       @simple = simple
-      templates_path = "app/views/govuk_publishing_components/components"
-      stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components"
-      print_stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components/print"
-      javascripts_path = "app/assets/javascripts/govuk_publishing_components/components"
-      tests_path = "spec/components"
-      js_tests_path = "spec/javascripts/components"
-
-      templates = Dir["#{path}/#{templates_path}/*.erb"]
-      stylesheets = Dir["#{path}/#{stylesheets_path}/*.scss"]
-      print_stylesheets = Dir["#{path}/#{print_stylesheets_path}/*.scss"]
-      javascripts = Dir["#{path}/#{javascripts_path}/*.js"]
-      tests = Dir["#{path}/#{tests_path}/*.rb"]
-      js_tests = Dir["#{path}/#{js_tests_path}/*.js"]
-
-      @templates_full_path = "#{path}/#{templates_path}/"
-
-      @components = find_files(templates, [path, templates_path].join("/"))
-      @component_stylesheets = find_files(stylesheets, [path, stylesheets_path].join("/"))
-      @component_print_stylesheets = find_files(print_stylesheets, [path, print_stylesheets_path].join("/"))
-      @component_javascripts = find_files(javascripts, [path, javascripts_path].join("/"))
-      @component_tests = find_files(tests, [path, tests_path].join("/"))
-      @component_js_tests = find_files(js_tests, [path, js_tests_path].join("/"))
+
+      # paths to key file locations
+      @templates_path = "app/views/govuk_publishing_components/components"
+      @stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components"
+      @print_stylesheets_path = "app/assets/stylesheets/govuk_publishing_components/components/print"
+      @javascripts_path = "app/assets/javascripts/govuk_publishing_components/components"
+      @tests_path = "spec/components"
+      @js_tests_path = "spec/javascripts/components"
+      @helpers_path = "lib/govuk_publishing_components/presenters"
+
+      # get all files in key file locations
+      templates = Dir["#{path}/#{@templates_path}/*.erb"]
+      stylesheets = Dir["#{path}/#{@stylesheets_path}/*.scss"]
+      print_stylesheets = Dir["#{path}/#{@print_stylesheets_path}/*.scss"]
+      javascripts = Dir["#{path}/#{@javascripts_path}/*.js"]
+      tests = Dir["#{path}/#{@tests_path}/*.rb"]
+      js_tests = Dir["#{path}/#{@js_tests_path}/*.js"]
+      helpers = Dir["#{path}/#{@helpers_path}/*_helper.rb"]
+
+      @templates_full_path = "#{path}/#{@templates_path}/"
+
+      # find the cleaned names of components in key file locations
+      # i.e. will show that 'component name' has a stylesheet
+      # standardised like this to be used later for easier comparison
+      @components = clean_files(templates, [path, @templates_path].join("/"))
+      @component_stylesheets = clean_files(stylesheets, [path, @stylesheets_path].join("/"))
+      @component_print_stylesheets = clean_files(print_stylesheets, [path, @print_stylesheets_path].join("/"))
+      @component_javascripts = clean_files(javascripts, [path, @javascripts_path].join("/"))
+      @component_tests = clean_files(tests, [path, @tests_path].join("/"))
+      @component_js_tests = clean_files(js_tests, [path, @js_tests_path].join("/"))
+      @component_helpers = clean_files(helpers, [path, @helpers_path].join("/"))
 
       {
         gem_found: true,
@@ -44,12 +55,13 @@ module GovukPublishingComponents
         component_javascripts: @component_javascripts,
         component_tests: @component_tests,
         component_js_tests: @component_js_tests,
+        component_helpers: @component_helpers,
         components_containing_components: find_all_partials_in(templates),
         component_listing: list_all_component_details,
       }
     end
 
-    def find_files(files, replace)
+    def clean_files(files, replace)
       files.map { |file| clean_file_name(file.gsub(replace, "")) }.sort
     end
 
@@ -61,6 +73,7 @@ module GovukPublishingComponents
         .gsub(".js", "")
         .gsub("spec", "")
         .gsub(".rb", "")
+        .gsub("helper", "")
         .strip
     end
 
@@ -72,11 +85,14 @@ module GovukPublishingComponents
         .tr('\"\'', "")
     end
 
+    # create link to component guide page for a given component e.g. 'component name'
     def get_component_link(component)
       "/component-guide/#{component.gsub(' ', '_')}"
     end
 
     def find_all_partials_in(templates)
+      return [] if @simple
+
       components = []
 
       templates.each do |template|
@@ -142,6 +158,7 @@ module GovukPublishingComponents
           javascript: check_component_has("javascript", component),
           tests: check_component_has("test", component),
           js_tests: check_component_has("js_test", component),
+          helper: check_component_has("helper", component),
         }
       end
 
@@ -154,8 +171,28 @@ module GovukPublishingComponents
       look_in = @component_javascripts if a_thing == "javascript"
       look_in = @component_tests if a_thing == "test"
       look_in = @component_js_tests if a_thing == "js_test"
+      look_in = @component_helpers if a_thing == "helper"
+
+      if look_in.include?(component)
+        return get_asset_link(a_thing, component)
+      end
+
+      false
+    end
 
-      true if look_in.include?(component)
+    def get_asset_link(a_thing, component)
+      url = "https://github.com/alphagov"
+      repo = "govuk_publishing_components"
+      blob = "blob/main"
+      link = nil
+      link = "#{url}/#{repo}/#{blob}/#{@stylesheets_path}/_#{component.gsub(' ', '-')}.scss" if a_thing == "stylesheet"
+      link = "#{url}/#{repo}/#{blob}/#{@print_stylesheets_path}/_#{component.gsub(' ', '-')}.scss" if a_thing == "print_stylesheet"
+      link = "#{url}/#{repo}/#{blob}/#{@javascripts_path}/#{component.gsub(' ', '-')}.js" if a_thing == "javascript"
+      link = "#{url}/#{repo}/#{blob}/#{@tests_path}/#{component.gsub(' ', '_')}_spec.rb" if a_thing == "test"
+      link = "#{url}/#{repo}/#{blob}/#{@js_tests_path}/#{component.gsub(' ', '-')}-spec.js" if a_thing == "js_test"
+      link = "#{url}/#{repo}/#{blob}/#{@helpers_path}/#{component.gsub(' ', '_')}_helper.rb" if a_thing == "helper"
+
+      link
     end
   end
 end

data/app/views/govuk_publishing_components/audit/_applications.html.erb

@@ -32,6 +32,7 @@
 
     <% accordion_content = capture do %>
       <% if application[:application_found] %>
+        <% github_link = 'https://github.com/alphagov/' + application[:name] + '/blob/main/' %>
         <% application[:warnings].each do |warning| %>
           <p class="govuk-body">
             <strong class="govuk-tag">Warn</strong>
@@ -74,7 +75,9 @@
           <p class="govuk-body">This shows instances of `gem-c-` classes found in the application. If a reference is found in a stylesheet or in code a warning is created, as this could be a style override or hard coded component markup.</p>
           <ul class="govuk-list govuk-list--bullet">
             <% application[:gem_style_references].each do |ref| %>
-              <li><%= ref %></li>
+              <li>
+                <%= link_to ref, github_link + ref, class: 'govuk-link' %>
+              </li>
             <% end %>
           </ul>
         <% end %>
@@ -86,10 +89,12 @@
             margin_bottom: 4,
             heading_level: 3,
           } %>
-          <p class="govuk-body">This shows JavaScript files that might contain jQuery, which we are trying to remove our dependency on.</p>
+          <p class="govuk-body">This shows JavaScript files that might contain jQuery, which we are trying to remove.</p>
           <ul class="govuk-list govuk-list--bullet">
             <% application[:jquery_references].each do |ref| %>
-              <li><%= ref %></li>
+              <li>
+                <%= link_to ref, github_link + ref, class: 'govuk-link' %>
+              </li>
             <% end %>
           </ul>
         <% end %>

data/app/views/govuk_publishing_components/audit/_component_contents.html.erb

@@ -0,0 +1,82 @@
+<%
+  total_components = components.length
+  components_with_stylesheet = 0
+  components_with_print_stylesheet = 0
+  components_with_javascript = 0
+  components_with_test = 0
+  components_with_javascript_test = 0
+  components_with_helper = 0
+
+  components.each do |component|
+    components_with_stylesheet += 1 if component[:stylesheet]
+    components_with_print_stylesheet += 1 if component[:print_stylesheet]
+    components_with_javascript += 1 if component[:javascript]
+    components_with_test += 1 if component[:tests]
+    components_with_javascript_test += 1 if component[:js_tests]
+    components_with_helper += 1 if component[:helper]
+  end
+%>
+<table class="govuk-table">
+  <thead class="govuk-table__head">
+    <tr class="govuk-table__row">
+      <th scope="col" class="govuk-table__header sticky-table-header">Component (<%= total_components %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">CSS (<%= components_with_stylesheet %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Print CSS (<%= components_with_print_stylesheet %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">JS (<%= components_with_javascript %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Test (<%= components_with_test %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">JS test (<%= components_with_javascript_test %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Helper (<%= components_with_helper %>)</th>
+    </tr>
+  </thead>
+  <tbody class="govuk-table__body">
+    <% components.each do |component| %>
+      <tr class="govuk-table__row">
+        <th scope="row" class="govuk-table__header">
+          <a href="<%= component[:link] %>" class="govuk-link"><%= component[:name] %></a>
+        </th>
+        <td class="govuk-table__cell">
+          <% if component[:stylesheet] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:stylesheet] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:print_stylesheet] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:print_stylesheet] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:javascript] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:javascript] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:tests] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:tests] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:js_tests] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:js_tests] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:helper] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:helper] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/govuk_publishing_components/audit/_components.html.erb

@@ -1,6 +1,6 @@
 <% if @other_applications %>
   <%= render "govuk_publishing_components/components/heading", {
-    text: "Components",
+    text: "Components in the gem",
     font_size: "l",
     margin_bottom: 6,
   } %>
@@ -10,52 +10,7 @@
   <% component_items = [] %>
 
   <% component_files = capture do %>
-    <table class="govuk-table">
-      <thead class="govuk-table__head">
-        <tr class="govuk-table__row">
-          <th scope="col" class="govuk-table__header sticky-table-header">Component</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Stylesheet</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Print stylesheet</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">JS</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Test</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">JS test</th>
-        </tr>
-      </thead>
-      <tbody class="govuk-table__body">
-        <% @components[:component_listing].each do |component| %>
-          <tr class="govuk-table__row">
-            <th scope="row" class="govuk-table__header">
-              <a href="<%= component[:link] %>" class="govuk-link"><%= component[:name] %></a>
-            </th>
-            <td class="govuk-table__cell">
-              <% if component[:stylesheet] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:print_stylesheet] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:javascript] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:tests] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:js_tests] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+    <%= render partial: "component_contents", locals: { components: @components[:component_listing] } %>
   <% end %>
 
   <%

data/app/views/govuk_publishing_components/components/_attachment.html.erb

@@ -1,5 +1,5 @@
 <%
-  attachment = GovukPublishingComponents::Presenters::Attachment.new(attachment)
+  attachment = GovukPublishingComponents::Presenters::AttachmentHelper.new(attachment)
   target ||= "_self"
   hide_opendocument_metadata ||= false
   hide_order_copy_link ||= false

data/app/views/govuk_publishing_components/components/_attachment_link.html.erb

@@ -1,5 +1,5 @@
 <%
-  attachment = GovukPublishingComponents::Presenters::Attachment.new(attachment)
+  attachment = GovukPublishingComponents::Presenters::AttachmentHelper.new(attachment)
   target ||= nil
   data_attributes ||= {}
   attributes = []

data/config/locales/ar.yml

@@ -87,6 +87,7 @@ ar:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© حقوق نشر التاج الملكي</a>
       licence_html: كل المحتوى متاح بموجب <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">الترخيص الحكومي المفتوح (الإصدار v3.0)</a>، ما لم ينص على خلاف ذلك
+      navigation_links:
       support_links: روابط الدعم
     layout_for_public:
       account_layout:

data/config/locales/az.yml

@@ -83,6 +83,7 @@ az:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Bütün məzmunlar <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">v3.0 Açıq dövlət lisenziyasına əsasən mövcuddur</a>(başqa cür nəzərdə tutulmuş hallar istisna olmaqla)
+      navigation_links:
       support_links: Dəstək keçidləri
     layout_for_public:
       account_layout:

data/config/locales/be.yml

@@ -90,6 +90,7 @@ be:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Увесь змест даступны <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, калі не паказана іншае
+      navigation_links:
       support_links: Дапаможныя спасылкі
     layout_for_public:
       account_layout:

data/config/locales/bg.yml

@@ -88,6 +88,7 @@ bg:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Цялото съдържание е налично на <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, освен ако не е посочено друго
+      navigation_links:
       support_links: Помощни линкове
     layout_for_public:
       account_layout:

data/config/locales/bn.yml

@@ -85,6 +85,7 @@ bn:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© ক্রাউন কপিরাইট</a>
       licence_html: শুধুমাত্র অন্যভাবে বর্ণিত থাকা ছাড়া, সকল তথ্য <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">ওপেন গভর্নমেন্ট লাইসেন্স v3.0</a>-এর অধীনে উপলভ্য
+      navigation_links:
       support_links: সহায়তার লিংক
     layout_for_public:
       account_layout:

data/config/locales/cs.yml

@@ -89,6 +89,7 @@ cs:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Veškerý obsah je k dispozici pod <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, pokud není uvedeno jinak
+      navigation_links:
       support_links: Odkazy na podporu
     layout_for_public:
       account_layout: