govuk_publishing_components 15.0.0 → 15.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c88deb6d387134dbbd3b685859363b74ead59e037184c74a58130e36a2dff1
-  data.tar.gz: 8defeb9c30b3c1e5f50a39b25e2b4a59c74b119dfcfd88b342cf7c140ea81df2
+  metadata.gz: d21f7a40f42fc1c1b961df545b591df2da73baaa33869f76a0acc36055e09230
+  data.tar.gz: 37ac7bae8ae7eee35df45b6eaee315725965d3def80720aa6690a3f2e1d6a914
 SHA512:
-  metadata.gz: 9186c00000ffd5aefd70e72229c038a8dbbfcaeec112b966c3fc50aca4e90eef3ca24f5f28cd057b8af8368819d01daa2c68cbddafecdd59a15d3bda9ab6bc22
-  data.tar.gz: e9194364870a3c2039dfe6e577991561c81fb1a6ab50a489579259651068267a89db9615b2882646f8f9560eb72fcf11baf54733c932000cc93051f6ee02a071
+  metadata.gz: 1ec0e319b221759aa64509c7550e0fd2d2187864d083e5ad90e13cdb7e2a4f5ee70dd2f24e3c76872846179d90bc581b987e7d3a09a6e511f308e7814bb759d8
+  data.tar.gz: 41fdfa1e968dd6fabe723f687fd47ae39fec66061ca7123107b771cec4253cc35a78116a4c99b33beb2e2f4a6918acce9d7f05e53efd2f75a98c861475f911ec

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

@@ -1,11 +1,13 @@
 <% if defined?(title) %>
   <%
     description_text ||= false
-    description_govspeak ||= yield || ""
+    description_govspeak ||= false
+    description ||= yield || false
     margin_bottom_class = " gem-c-notice--bottom-margin" unless local_assigns[:margin_bottom]
+    description_present = description.present? || description_text.present? || description_govspeak.present?
   %>
   <section class="gem-c-notice<%= margin_bottom_class %>" aria-label="Notice" role="region">
-    <% if description_text.present? || description_govspeak.present? %>
+    <% if description_present %>
       <h2 class="gem-c-notice__title"><%= title %></h2>
     <% else %>
       <span class="gem-c-notice__title"><%= title %></span>
@@ -15,7 +17,11 @@
       <p class="gem-c-notice__description"><%= description_text %></p>
     <% end %>
 
-    <% unless description_govspeak.empty? %>
+    <% if description %>
+      <%= description %>
+    <% end %>
+
+    <% if description_govspeak.present? %>
       <%= render 'govuk_publishing_components/components/govspeak', content: description_govspeak %>
     <% end %>
   </section>

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

@@ -13,6 +13,14 @@ examples:
   default:
     data:
       title: 'Statistics release cancelled'
+  with_description:
+    data:
+      title: 'Statistics release cancelled'
+      description: '<p>The Oil &amp; Gas Authority launched a new website on 3 October 2016 to reflect its new status as a government company.</p><p>This formalises the transfer of the Secretary of State’s regulatory powers in respect of oil and gas to the OGA, and grants it new powers. This website will no longer be updated. Visitors should refer to <a rel="external" href="https://www.ogauthority.co.uk/news-publications/announcements/2015/establishment-of-the-oil-and-gas-authority-1/">www.ogauthority.co.uk</a></p>'
+  with_description_from_a_block:
+    data:
+      title: 'Statistics release update'
+      block: '<p>The Oil &amp; Gas Authority launched a new website on 3 October 2016 to reflect its new status as a government company.</p><p>This formalises the transfer of the Secretary of State’s regulatory powers in respect of oil and gas to the OGA, and grants it new powers. This website will no longer be updated. Visitors should refer to <a rel="external" href="https://www.ogauthority.co.uk/news-publications/announcements/2015/establishment-of-the-oil-and-gas-authority-1/">www.ogauthority.co.uk</a></p>'
   with_description_text:
     data:
       title: 'Statistics release cancelled'
@@ -21,10 +29,6 @@ examples:
     data:
       title: 'Statistics release update'
       description_govspeak: '<p>The Oil &amp; Gas Authority launched a new website on 3 October 2016 to reflect its new status as a government company.</p><p>This formalises the transfer of the Secretary of State’s regulatory powers in respect of oil and gas to the OGA, and grants it new powers. This website will no longer be updated. Visitors should refer to <a rel="external" href="https://www.ogauthority.co.uk/news-publications/announcements/2015/establishment-of-the-oil-and-gas-authority-1/">www.ogauthority.co.uk</a></p>'
-  with_govspeak_from_a_block:
-    data:
-      title: 'Statistics release update'
-      block: '<p>The Oil &amp; Gas Authority launched a new website on 3 October 2016 to reflect its new status as a government company.</p><p>This formalises the transfer of the Secretary of State’s regulatory powers in respect of oil and gas to the OGA, and grants it new powers. This website will no longer be updated. Visitors should refer to <a rel="external" href="https://www.ogauthority.co.uk/news-publications/announcements/2015/establishment-of-the-oil-and-gas-authority-1/">www.ogauthority.co.uk</a></p>'
   with_markup_in_the_title:
     description: In some circumstances it may be necessary to include simple markup in the title, such as a link. Note that this will be wrapped in a H2 tag if there is no description included, so be sure that any markup inserted is valid inside that tag (e.g. another heading tag inside a H2 would be invalid).
     data:

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '15.0.0'.freeze
+  VERSION = '15.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 15.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govspeak