govuk_publishing_components 32.1.0 → 35.0.0

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("govspeak-html-publication")
+
   govspeak_locals = {}
   govspeak_locals[:content] = local_assigns.fetch(:content) if local_assigns.include?(:content)
   govspeak_locals[:direction] = local_assigns.fetch(:direction) if local_assigns.include?(:direction)

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("heading")
+
   brand ||= false
   lang = local_assigns[:lang].presence
 

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

@@ -1,11 +1,14 @@
 <%
+  add_gem_component_stylesheet("hint")
+
   id ||= "hint-#{SecureRandom.hex(4)}"
+  right_to_left ||= false
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   css_classes = %w( gem-c-hint govuk-hint )
   css_classes << shared_helper.get_margin_bottom
 %>
 
-<%= tag.div id: id, class: css_classes do %>
+<%= tag.div id: id, class: css_classes, dir: right_to_left ? "rtl" : nil do %>
   <%= text %>
 <% end %>

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

@@ -1,12 +1,16 @@
 <%
+  add_gem_component_stylesheet("image-card")
+
   sizes ||= false
   brand ||= false
+
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
-  card_helper = GovukPublishingComponents::Presenters::ImageCardHelper.new(local_assigns)
+  card_helper = GovukPublishingComponents::Presenters::ImageCardHelper.new(local_assigns, brand_helper)
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-  classes = "gem-c-image-card"
-  classes << " gem-c-image-card--large" if card_helper.large
-  classes << " gem-c-image-card--no-image" unless defined?(image_src)
+  classes = %w[gem-c-image-card]
+  classes << "gem-c-image-card--large" if card_helper.large
+  classes << "gem-c-image-card--no-image" unless (card_helper.image_src || card_helper.youtube_video_id)
+  classes << brand_helper.brand_class if brand_helper.brand_class
 
   font_size ||= card_helper.large ? 'm' : 's'
   heading_class = %w[gem-c-image-card__title]
@@ -15,7 +19,7 @@
   heading_link_classes = %w[
     gem-c-image-card__title-link
     govuk-link
-  ] 
+  ]
   heading_link_classes << brand_helper.color_class
   extra_link_classes = %w[
     gem-c-image-card__list-item-link
@@ -23,11 +27,12 @@
   ]
   extra_link_classes << brand_helper.color_class
 
+  data_modules = %w[]
+  data_modules << "gem-track-click ga4-link-tracker" if card_helper.is_tracking?
+  data_modules << "image-card" if card_helper.youtube_video_id
 %>
 <% if card_helper.href || card_helper.extra_details.any? %>
-  <div class="<%= classes %> <%= brand_helper.brand_class %>"
-    <%= "data-module=gem-track-click" if card_helper.is_tracking? %>
-    <%= "lang=#{card_helper.lang}" if card_helper.lang %>>
+  <%= content_tag(:div, class: classes, "data-module": data_modules, lang: card_helper.lang) do %>
     <div class="gem-c-image-card__text-wrapper">
       <div class="gem-c-image-card__header-and-context-wrapper">
         <% if card_helper.heading_text %>
@@ -56,8 +61,8 @@
                 %>
               <% else %>
                 <%= link[:text] %>
-              <% end %>  
-            </li>    
+              <% end %>
+            </li>
           <% end %>
         </ul>
       <% end %>
@@ -65,6 +70,6 @@
         <p class="gem-c-image-card__metadata"><%= card_helper.metadata %></p>
       <% end %>
     </div>
-    <%= card_helper.image %>
-  </div>
+    <%= card_helper.media %>
+  <% end %>
 <% end %>

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("input")
+
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   autocomplete ||= nil
@@ -31,6 +33,8 @@
   heading_level ||= nil
   prefix ||= nil
   suffix ||= nil
+  right_to_left ||= false
+  right_to_left_help = right_to_left_help.nil? ? right_to_left : right_to_left_help
 
   css_classes = %w(gem-c-input govuk-input)
   css_classes << "govuk-input--error" if has_error
@@ -70,7 +74,8 @@
     <% label_markup = capture do %>
       <%= render "govuk_publishing_components/components/label", {
         html_for: id,
-        heading_size: heading_size
+        heading_size: heading_size,
+        right_to_left: right_to_left_help
       }.merge(label.symbolize_keys) %>
     <% end %>
 
@@ -86,7 +91,8 @@
   <% if hint %>
     <%= render "govuk_publishing_components/components/hint", {
       id: hint_id,
-      text: hint
+      text: hint,
+      right_to_left: right_to_left_help
     } %>
   <% end %>
 
@@ -95,6 +101,7 @@
       id: error_id,
       text: error_message,
       items: error_items,
+      right_to_left: right_to_left_help
     } %>
   <% end %>
 
@@ -107,6 +114,7 @@
     autofocus: autofocus,
     class: css_classes,
     data: data,
+    dir: right_to_left ? "rtl" : nil,
     enterkeyhint: checked_enterkeyhint,
     id: id,
     inputmode: inputmode,

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("inset-text")
+
   id ||= "inset-text-#{SecureRandom.hex(4)}"
   margin_top ||= 6
   margin_bottom ||= 6

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("intervention")
+
   dismiss_text ||= false
   suggestion_link_text ||= false
   suggestion_link_url ||= false

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("inverse-header")
+
   css_classes = []
   css_classes << " gem-c-inverse-header--full-width" if local_assigns[:full_width]
   css_classes << " gem-c-inverse-header--padding-top" unless local_assigns[:padding_top].eql?(false)

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

@@ -1,11 +1,15 @@
 <%
+  add_gem_component_stylesheet("label")
+
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   hint_text ||= ""
+  id ||= nil
   is_radio_label ||= false
   bold ||= false
   heading_size = false unless shared_helper.valid_heading_size?(heading_size)
   is_page_heading ||= false
+  right_to_left ||= false
 
   css_classes = %w[gem-c-label govuk-label]
   css_classes << "govuk-label--s" if bold
@@ -18,14 +22,14 @@
 
 <% if is_page_heading %>
   <%= tag.h1 text, class: "govuk-label-wrapper" do %>
-    <%= tag.label text, for: html_for, class: css_classes %>
+    <%= tag.label text, id: id, for: html_for, class: css_classes, dir: right_to_left ? "rtl" : nil %>
   <% end %>
 <% else %>
-  <%= tag.label text, for: html_for, class: css_classes %>
+  <%= tag.label text, id: id, for: html_for, class: css_classes, dir: right_to_left ? "rtl" : nil %>
 <% end %>
 
 <% if hint_text.present? %>
-  <%= tag.span id: hint_id, class: hint_text_css_classes do %>
+  <%= tag.div id: hint_id, class: hint_text_css_classes, dir: right_to_left ? "rtl" : nil do %>
     <%= hint_text %>
   <% end %>
 <% end %>

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("layout-footer")
+
   meta ||= []
   navigation ||= []
   with_border ||= false

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

@@ -1,4 +1,8 @@
-<% product_name ||= "Publishing" %>
+<%
+  add_gem_component_stylesheet("layout-for-admin")
+
+  product_name ||= "Publishing"
+%>
 
 <!DOCTYPE html>
 <html lang="en" class="govuk-template">
@@ -9,15 +13,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%= csrf_meta_tags %>
     <%= favicon_link_tag "govuk_publishing_components/favicon-#{environment}.png" %>
-    <%= stylesheet_link_tag "application" %>
-    <%= stylesheet_link_tag "print", media: "print" %>
+    <%= stylesheet_link_tag "application", media: "all" %>
     <%= javascript_include_tag "govuk_publishing_components/vendor/modernizr" %>
     <%= yield :head %>
   </head>
   <body class="gem-c-layout-for-admin govuk-template__body">
-    <script>
+    <%= javascript_tag nonce: true do -%>
       document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
-    </script>
+    <% end -%>
     <%= yield %>
     <%= javascript_include_tag "application" %>
   </body>

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("layout-for-public")
+
   emergency_banner ||= nil
   full_width ||= false
   global_bar ||= nil
@@ -59,10 +61,13 @@
         }
       } %>
 
+    <% # Used for Google Analytics 4 debugging. Must be placed before load-analytics script. %>
+    <meta name="govuk:components_gem_version" content="<%= GovukPublishingComponents::VERSION %>" />
+    <%= javascript_include_tag "govuk_publishing_components/load-analytics" %>
+
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag "application", media: "all" %>
-    <%= stylesheet_link_tag "print", media: "print" %>
     <!--[if lt IE 9]><%= javascript_include_tag "govuk_publishing_components/ie", integrity: true, crossorigin: "anonymous" %><![endif]-->
     <link rel="shortcut icon" href="<%= asset_path 'favicon.ico' %>" type="image/x-icon" />
     <link rel="mask-icon" href="<%= asset_path 'govuk-mask-icon.svg' %>" color="#0b0c0c">
@@ -82,9 +87,9 @@
     <%= yield :head %>
   </head>
   <%= tag.body class: body_css_classes do %>
-    <script>
+    <%= javascript_tag nonce: true do -%>
       document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
-    </script>
+    <% end -%>
     <%= render "govuk_publishing_components/components/skip_link", {
       href: "#content"
     } %>

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

@@ -1,4 +1,6 @@
 <%
+  add_gem_component_stylesheet("layout-header")
+
   environment ||= nil
   full_width ||= false
   navigation_aria_label ||= t("components.layout_header.top_level")