govuk_publishing_components 17.1.1 → 17.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67ef1e7cfae1f60d9524d55cc3634ac8b6c6f681869c0505b1cc5e848d649976
-  data.tar.gz: 51361825126e2e44b7f553dcca8c4f18e6bb28d122e8ccf6aa921824258edb27
+  metadata.gz: 33f5dbdf1676f065363ebbc65af431eb4bd35498ee823d8b65897d1b0478bd8c
+  data.tar.gz: 7f89b1060016427871d1716dfdf2b4e677d23b1331be55f22f77850c9483804d
 SHA512:
-  metadata.gz: c4a98672525cc574a6d860b3e25d5bb0709aa24b0ab7b79ba9fb0599b5956f1879f6a4b36efad1bcf613849bfefb9cbf67aa4fef4d7977af180c9788ff2f4381
-  data.tar.gz: 62f47a6a27a24894c85f1cb95b2b0ca39068a3a16ce28f713941f925a8915a13018b54f0ddf93a04ef295c6f5b180a81ef712f5aea75d8d21e913aad586a33cc
+  metadata.gz: 2ee4fab8d517368ba42560bcbb2fabc3f5e67bdc2af25e18e131d41f2b10d5aeffe371c0d64a2a09eda2835c9eda0d89452ebd3de179099ca725f60e440f1fab
+  data.tar.gz: e728271a0a22df07e877afa58892cda0f99f5a5e7f2078076f36574b20751cbe0360ed7d6e3e98047a04901fd77680db88101ffbacd118896004e66444abab82

data/README.md

@@ -59,17 +59,17 @@ bundle exec yard server --reload
 The default rake task runs all tests:
 
 ```
-bundle exec rake
+bin/rake
 ```
 
 Javascript is tested using Jasmine and the [Jasmine gem](https://github.com/pivotal/jasmine-gem). Tests can be run either in the browser or on the command line via the dummy app’s tasks:
 
 ```sh
 # browser
-bundle exec rake app:jasmine
+bin/rake app:jasmine
 
 # command line
-bundle exec rake app:jasmine:ci
+bin/rake app:jasmine:ci
 ```
 
 ## Licence

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

@@ -39,10 +39,18 @@
 
 .gem-c-document-list__item-description {
   @include govuk-text-colour;
-  @include govuk-font($size: 16, $line-height: 1.5);
   margin: 0 0 5px 0;
 }
 
+.gem-c-document-list__subtext {
+  margin: govuk-spacing(1) 0 0 0;
+}
+
+.gem-c-document-list__item-description,
+.gem-c-document-list__subtext {
+  @include govuk-font($size: 16, $line-height: 1.5);
+}
+
 .gem-c-document-list__item-metadata {
   padding: 0;
 }
@@ -72,3 +80,19 @@
   width: 100%;
   margin-right: 25px;
 }
+
+.gem-c-document-list__item--highlight {
+  border: 1px solid govuk-colour("grey-2");
+  padding: govuk-spacing(6);
+  margin-bottom: govuk-spacing(6);
+
+  .gem-c-document-list__item-title {
+    @include govuk-font(24, bold);
+  }
+}
+
+.gem-c-document-list__highlight-text {
+  @include govuk-font(16, bold);
+  margin: 0 0 govuk-spacing(3) 0;
+
+}

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

@@ -1,5 +1,5 @@
 .gem-c-feedback {
-  max-width: 960px;
+  max-width: $govuk-page-width;
   margin: 0 auto;
 
   .visually-hidden {
@@ -8,10 +8,10 @@
 }
 
 .gem-c-feedback--top-margin {
-  margin-top: $gutter;
+  margin-top: govuk-spacing(6);
 
-  @include media(tablet) {
-    margin-top: $gutter * 2;
+  @include govuk-media-query($from: tablet) {
+    margin-top: govuk-spacing(9);
   }
 }
 
@@ -33,25 +33,23 @@
   }
 }
 
-.gem-c-feedback__grid-row {
-  @extend %grid-row;
-}
+@include govuk-grid-row($class: "gem-c-feedback__grid-row");
 
 .gem-c-feedback__column-two-thirds {
-  @include grid-column(2 / 3);
+  @include govuk-grid-column(two-thirds, $class: false)
 }
 
 .gem-c-feedback__prompt {
-  @extend %contain-floats;
-  background-color: $govuk-blue;
-  color: $white;
-  padding: $gutter-one-third $gutter-half 0;
+  @include govuk-clearfix;
+  background-color: govuk-colour("blue");
+  color: govuk-colour("white");
+  padding: govuk-spacing(2) govuk-spacing(3) 0;
   outline: 0;
 }
 
 .gem-c-feedback__prompt-question,
 .gem-c-feedback__prompt-success {
-  @include bold-19;
+  @include govuk-font(19, $weight: bold);
   display: inline-block;
 
   // There's a global h3 rule in some layouts that interferes with this component
@@ -61,27 +59,27 @@
     outline: 0;
   }
 
-  @include media(tablet) {
-    @include bold-16;
+  @include govuk-media-query($from: tablet) {
+    @include govuk-font(16, $weight: bold);
     float: left;
   }
 }
 
 .gem-c-feedback__prompt-link {
   @include govuk-link-common;
-  @include core-19;
-  margin-left: $gutter-half;
+  @include govuk-font(19);
+  margin-left: govuk-spacing(3);
 
-  @include media(tablet) {
-    @include core-16;
+  @include govuk-media-query($from: tablet) {
+    @include govuk-font(16);
     float: left; // needed to ensure vertical alignment consistent with prompt-link--wrong
-    margin-left: $gutter-one-third;
+    margin-left: govuk-spacing(2);
   }
 }
 
 .gem-c-feedback__prompt-link:link,
 .gem-c-feedback__prompt-link:visited {
-  color: $white;
+  color: govuk-colour("white");
 
   &:focus {
     color: $govuk-focus-text-colour;
@@ -91,43 +89,43 @@
 .gem-c-feedback__prompt-link--wrong {
   display: block;
   clear: both;
-  margin-top: $gutter-half;
+  margin-top: govuk-spacing(3);
   margin-left: 0;
 
-  @include media(tablet) {
+  @include govuk-media-query($from: tablet) {
     float: right;
     clear: none;
     margin-top: 0;
-    margin-left: $gutter-one-third;
+    margin-left: govuk-spacing(2);
   }
 }
 
 .gem-c-feedback__error-summary {
-  margin-bottom: $gutter-half;
-  padding: $gutter-half;
-  border: solid 4px $error-colour;
+  margin-bottom: govuk-spacing(3);
+  padding: govuk-spacing(3);
+  border: solid $govuk-border-width-mobile $govuk-error-colour;
   clear: both;
 
   &:focus {
-    outline: solid 3px $focus-colour;
+    outline: solid 3px $govuk-focus-colour;
   }
 
-  @include media(tablet) {
-    border-width: 5px;
+  @include govuk-media-query($from: tablet) {
+    border-width: $govuk-border-width;
   }
 
   // this comes from the backend so we can't put a class on it
   h2,
   .gem-c-feedback__heading {
     @include govuk-text-colour;
-    @include bold-24;
+    @include govuk-font(24, $weight: bold);
     margin: 0;
   }
 
   p {
     @include govuk-text-colour;
-    @include core-19;
-    margin: $gutter-one-third 0;
+    @include govuk-font(19);
+    margin: govuk-spacing(2) 0;
   }
 
   a {
@@ -136,60 +134,60 @@
 }
 
 .gem-c-feedback__error-message {
-  @include bold-19;
+  @include govuk-font(19, $weight: bold);
   display: block;
   padding: 4px 0 0;
-  color: $error-colour;
+  color: $govuk-error-colour;
 }
 
 .gem-c-feedback__form {
-  margin-top: $gutter-half;
-  padding: $gutter-half 0;
-  border-top: $gutter-one-third solid $govuk-blue;
+  margin-top: govuk-spacing(3);
+  padding: govuk-spacing(3) 0;
+  border-top: govuk-spacing(2) solid govuk-colour("blue");
 
-  @include media(tablet) {
-    padding: $gutter 0;
+  @include govuk-media-query($from: tablet) {
+    padding: govuk-spacing(6) 0;
   }
 }
 
 .gem-c-feedback__form-heading {
   @include govuk-text-colour;
-  @include bold-24;
-  margin: 0 0 $gutter-half 0;
+  @include govuk-font(24, $weight: bold);
+  margin: 0 0 govuk-spacing(3) 0;
 }
 
 .gem-c-feedback__form-paragraph {
   @include govuk-text-colour;
-  @include core-19;
-  margin: 0 0 $gutter 0;
+  @include govuk-font(19);
+  margin: 0 0 govuk-spacing(6) 0;
 }
 
 .gem-c-feedback__form-label {
-  @include core-16;
+  @include govuk-font(16);
   display: block;
-  padding-bottom: $gutter-half;
+  padding-bottom: govuk-spacing(3);
 }
 
 .gem-c-feedback__close {
   @include govuk-link-common;
   @include govuk-link-style-default;
-  @include core-19;
+  @include govuk-font(19);
   float: right;
-  margin: 0 0 $gutter-one-third 0;
+  margin: 0 0 govuk-spacing(2) 0;
 
-  @include media(tablet) {
+  @include govuk-media-query($from: tablet) {
     padding-top: 0;
   }
 }
 
 .gem-c-feedback__email-link {
   display: block;
-  margin-top: $gutter-half;
+  margin-top: govuk-spacing(3);
 
-  @include media(tablet) {
+  @include govuk-media-query($from: tablet) {
     display: inline-block;
     margin-top: 0;
-    margin-left: $gutter-half;
+    margin-left: govuk-spacing(3);
   }
 }
 

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

@@ -2,7 +2,6 @@ $stroke-width: 2px;
 $stroke-width-large: 3px;
 $number-circle-size: 26px;
 $number-circle-size-large: 35px;
-$dot-size: 16px;
 $top-border: solid 2px $grey-3;
 
 @mixin step-nav-vertical-line ($line-style: solid) {
@@ -372,27 +371,25 @@ $top-border: solid 2px $grey-3;
     z-index: 5;
     top: .6em; // position the dot to align with the first row of text in the link
     left: -($gutter + $gutter-half);
-    margin-left: ($number-circle-size / 2) - ($dot-size / 2);
-    width: $dot-size;
-    height: $dot-size;
-    margin-top: -($dot-size / 2);
+    margin-top: -($stroke-width / 2);
+    margin-left: ($number-circle-size / 2);
+    width: $number-circle-size / 2;
+    height: $stroke-width;
     background: $black;
-    border: solid 2px $white;
-    border-radius: 100px;
   }
 
   .gem-c-step-nav--large & {
     @include media(tablet) {
       &:before {
         left: -($gutter * 2);
-        margin-left: ($number-circle-size-large / 2) - ($dot-size / 2);
+        margin-left: ($number-circle-size-large / 2);
+        height: $stroke-width-large;
       }
     }
   }
 
   .gem-c-step-nav__link {
     @include govuk-link-style-text;
-    text-decoration: none;
   }
 }
 

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

@@ -14,7 +14,12 @@
     <ol class="gem-c-document-list<%= margin_bottom_class %><%= margin_top_class %>">
   <% end %>
     <% items.each do |item| %>
-      <li class="gem-c-document-list__item<%= within_multitype_list_class %> <%= brand_helper.brand_class %>">
+      <% highlight_class = " gem-c-document-list__item--highlight" if item[:highlight] %>
+
+      <li class="gem-c-document-list__item<%= within_multitype_list_class %> <%= brand_helper.brand_class %> <%= highlight_class %>">
+        <% if item[:highlight] && item[:highlight_text] %>
+          <p class='gem-c-document-list__highlight-text'><%= item[:highlight_text] %></p>
+        <% end %>
         <%=
           link_to(
             item[:link][:text],
@@ -47,6 +52,10 @@
             <% end %>
           </ul>
         <% end %>
+
+        <% if item[:subtext] %>
+          <p class="gem-c-document-list__subtext"><%= item[:subtext] %></p>
+        <% end %>
       </li>
     <% end %>
   <% unless within_multitype_list %>

data/app/views/govuk_publishing_components/components/docs/document_list.yml

@@ -76,6 +76,27 @@ examples:
           text: 'Become an apprentice'
           path: '/become-an-apprentice'
           description: 'Becoming an apprentice - what to expect, apprenticeship levels, pay and training, making an application, complaining about an apprenticeship.'
+      - link:
+          text: 'Become a journeyman'
+          path: '/become-a-journeyman'
+          description: 'Becoming a journeyman - what to expect, what to take, pay and training, making an application, complaining about being a journeyman.'
+  with_description_and_metadata:
+    data:
+      items:
+      - link:
+          text: 'School behaviour and attendance: parental responsibility measures'
+          path: '/government/publications/parental-responsibility-measures-for-behaviour-and-attendance'
+          description: 'The responsibilities parents have relating to school behaviour and attendance.'
+        metadata:
+          public_updated_at: 2017-01-05 14:50:33
+          document_type: 'Statutory guidance'
+      - link:
+          text: 'School exclusion'
+          path: '/government/publications/school-exclusion'
+          description: 'Rules governing school exclusion.'
+        metadata:
+          public_updated_at: 2017-07-19 15:01:48
+          document_type: 'Statutory guidance'
   with_branding:
     description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) for more details.
     data:
@@ -115,6 +136,48 @@ examples:
           path: '/government/organisations/advisory-committee-on-the-microbiological-safety-of-food'
           context: 'moving to GOV.UK'
           description: "Works with 4 agencies and public bodies"
+  with_subtext:
+    description: This is used on finders to highlight search results from past governments.
+    data:
+      items:
+      - link:
+          text: 'Department for Education – Statistics at DfE'
+          path: '/government/organisations/department-for-education/about/statistics'
+          description: 'The Department for Education publishes official statistics on education and children.'
+        metadata:
+          public_updated_at: 2017-07-19 15:01:48
+          document_type: 'Corporate information'
+        subtext: 'First published during the 2007 Labour Government'
+      - link:
+          text: 'State-funded school inspections and outcomes: management information'
+          path: '/government/organisations/department-for-education/about/statistics'
+          description: 'Management information published monthly and a one-off publication of inspections and outcomes from 2005 to 2015.'
+        metadata:
+          public_updated_at: 2017-07-19 15:01:48
+          document_type: 'Statistical data set'
+        subtext: 'First published during the 1996 Conservative Government'
+  highlighted_result:
+    description: Highlight one or more of the items in the list. This is used on finders to provide a 'top result' for a search. The `highlight_text` parameter is optional.
+    data:
+      items:
+      - link:
+          text: 'Department for Education – Statistics at DfE'
+          path: '/government/organisations/department-for-education/about/statistics'
+          description: 'The Department for Education publishes official statistics on education and children.'
+        metadata:
+          public_updated_at: 2017-07-19 15:01:48
+          document_type: 'Corporate information'
+        subtext: 'First published during the 2007 Labour Government'
+        highlight: true
+        highlight_text: 'Most relevant result'
+      - link:
+          text: 'State-funded school inspections and outcomes: management information'
+          path: '/government/organisations/department-for-education/about/statistics'
+          description: 'Management information published monthly and a one-off publication of inspections and outcomes from 2005 to 2015.'
+        metadata:
+          public_updated_at: 2017-07-19 15:01:48
+          document_type: 'Statistical data set'
+        subtext: 'First published during the 1996 Conservative Government'
   right_to_left:
     data:
       items:

data/app/views/govuk_publishing_components/components/docs/machine_readable_metadata.yml

@@ -69,6 +69,28 @@ examples:
             - title: "Dodgy Wands Commission"
               base_path: "/dodgy-wands-commission"
       schema: :organisation
+  organisation_schema_with_people:
+    data:
+      content_item:
+        title: "Ministry of Organisation"
+        base_path: "/foo"
+        details:
+          ordered_ministers:
+            - name_prefix: "Minister"
+              name: "Rufus Scrimgeour MP"
+              role: "Minister for Magic"
+              href: "/rufus-scrimgeour"
+              role_href: "/minister-for-magic"
+              image:
+                url: "https://images.gov.uk/rufus.jpg"
+            - name_prefix: "Minister"
+              name: "Rufus Scrimgeour MP"
+              role: "Head of Auror Office"
+              href: "/rufus-scrimgeour"
+              role_href: "/head-of-auror-office"
+              image:
+                url: "https://images.gov.uk/rufus.jpg"
+      schema: :organisation
   search_results_page_schema:
     data:
       content_item:

data/lib/govuk_publishing_components/presenters/machine_readable/organisation_schema.rb

@@ -18,11 +18,76 @@ module GovukPublishingComponents
           },
           "name" => page.title,
           "description" => page.description || page.body,
-        }.merge(parent_organisations).merge(sub_organisations).merge(search_action)
+        }
+        .merge(members)
+        .merge(parent_organisations)
+        .merge(sub_organisations)
+        .merge(search_action)
       end
 
     private
 
+      def members
+        return {} unless ministers.present?
+
+        members = ministers_with_grouped_roles.map do |person, roles|
+          person.merge("hasOccupation" => roles)
+        end
+
+        {
+          "member" => members
+        }
+      end
+
+      def ministers
+        page.content_item.dig("details", "ordered_ministers") || []
+      end
+
+      def ministers_with_grouped_roles
+        ministers.reduce({}) do |grouped, minister|
+          person_schema = person_schema_for_minister(minister)
+
+          if grouped.has_key? person_schema
+            grouped[person_schema] << role_for_minister(minister)
+          else
+            grouped[person_schema] = [role_for_minister(minister)]
+          end
+          grouped
+        end
+      end
+
+      def person_schema_for_minister(minister)
+        {
+          "@type" => "Person",
+          "honorificPrefix" => minister["name_prefix"],
+          "image" => minister.dig("image", "url"),
+          "name" => minister["name"],
+          "url" => minister_url(minister)
+        }
+      end
+
+      def role_for_minister(minister)
+        return {} unless minister["role"].present?
+
+        {
+          "@type" => "Role",
+          "name" => minister["role"],
+          "url" => role_url(minister)
+        }
+      end
+
+      def minister_url(minister)
+        "#{website_root}#{minister['href']}"
+      end
+
+      def role_url(minister)
+        "#{website_root}#{minister['role_href']}"
+      end
+
+      def website_root
+        @website_root ||= Plek.new.website_root
+      end
+
       def parent_organisations
         related_organisations("ordered_parent_organisations", "parentOrganization")
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.1.1'.freeze
+  VERSION = '17.2.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "43f3031501fd6d8434749b5ad34c3f8ee23d991f",
+  "_shasum": "828d0b174da2c7779fb957d3c7240807bc93012a",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 17.1.1
+  version: 17.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters