Merge branch 'ISAICP-9199' into 'develop'

ISAICP-9199: Remove video from welcome page (anonymous view).

See merge request digit/digit-joinup-dev!1697

config/sync/page_manager.page_variant.homepage-layout_builder-0.yml

@@ -127,7 +127,7 @@ variant_settings:
           additional: {  }
       third_party_settings: {  }
     -
-      layout_id: joinup_layout_twocolfooter_onecol_67_33
+      layout_id: joinup_layout_twocolfooter_onecol_50_50
       layout_settings:
         label: About
       components:
@@ -220,36 +220,6 @@ variant_settings:
                 class: ''
                 style: ''
                 data: ''
-        6ab0ceea-4541-4153-8b64-227e02369d30:
-          uuid: 6ab0ceea-4541-4153-8b64-227e02369d30
-          region: third
-          configuration:
-            id: custom_markup
-            label: 'New Interoperable Europe Portal video'
-            label_display: '0'
-            provider: custom_markup_block
-            context_mapping: {  }
-            markup:
-              value: '<drupal-media data-entity-type="media" data-entity-uuid="b03799ea-2116-4d21-965f-3556002d8a00">&nbsp;</drupal-media>'
-              format: content_editor
-          weight: 0
-          additional:
-            component_attributes:
-              block_attributes:
-                id: ''
-                class: about-video
-                style: ''
-                data: ''
-              block_title_attributes:
-                id: ''
-                class: ''
-                style: ''
-                data: ''
-              block_content_attributes:
-                id: ''
-                class: ''
-                style: ''
-                data: ''
       third_party_settings: {  }
 page: homepage
 selection_criteria:

resources/runner/drupal.yml

@@ -256,9 +256,6 @@ drupal:
         // Enable test_mode.
         $config['joinup_test.settings']['test_mode'] = TRUE;
 
-        // The video from the home page interacts with Selenium tests.
-        $config['page_manager.page_variant.homepage-layout_builder-0']['variant_settings']['sections'][4]['components']['6ab0ceea-4541-4153-8b64-227e02369d30']['configuration']['text'] = 'Some joinup video';
-
         // In order to ensure that tests assert dates correctly even in edge cases, we
         // set the website default timezone to UTC and the same in tests too so that
         // even edge cases produce expected results.

web/modules/custom/joinup_layout/joinup_layout.layouts.yml

@@ -57,6 +57,24 @@ joinup_layout_twocolfooter_onecol_67_33:
     two_col_footer:
       label: Two column footer
 
+joinup_layout_twocolfooter_onecol_50_50:
+  label: 'Joinup two columns, two with common footer'
+  path: layouts/twocolfooter-onecol-50-50
+  template: joinup-layout--twocolfooter-onecol-50-50
+  library: joinup_layout/twocolfooter_onecol_50_50
+  category: 'Columns: 2'
+  default_region: first
+  icon_map:
+    - [first, second]
+    - [two_col_footer]
+  regions:
+    first:
+      label: First
+    second:
+      label: Second
+    two_col_footer:
+      label: Two column footer
+
 joinup_layout_oss_heading:
   label: 'Joinup OSS heading'
   path: layouts/oss-heading

web/modules/custom/joinup_layout/joinup_layout.libraries.yml

@@ -10,6 +10,12 @@ twocolfooter_onecol_67_33:
     theme:
       layouts/twocolfooter-onecol-67-33/twocolfooter_onecol_67_33.css: {}
 
+twocolfooter_onecol_50_50:
+  version: VERSION
+  css:
+    theme:
+      layouts/twocolfooter-onecol-50-50/twocolfooter_onecol_50_50.css: {}
+
 oss_heading:
   css:
     layout:

web/modules/custom/joinup_layout/layouts/twocolfooter-onecol-50-50/joinup-layout--twocolfooter-onecol-50-50.html.twig

+{#
+/**
+ * @file
+ * Default theme implementation for a two column layout.
+ *
+ * Available variables:
+ * - content: The content for this layout.
+ * - attributes: HTML attributes for the layout <div>.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+  set classes = [
+    'joinup-layout',
+    'joinup-layout--twocolfooter-onecol-50-50',
+  ]
+%}
+{% if content %}
+  <div{{ attributes.addClass(classes) }}>
+    <div class="inline-column-top">
+      {% if content.first %}
+        <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
+          {{ content.first }}
+        </div>
+      {% endif %}
+      {% if content.second %}
+        <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
+          {{ content.second }}
+        </div>
+      {% endif %}
+    </div>
+    <div class="inline-column-bottom">
+      {% if content.two_col_footer %}
+        <div {{ region_attributes.two_col_footer.addClass('layout__region', 'layout__region--two_col_footer') }}>
+          {{ content.two_col_footer }}
+        </div>
+      {% endif %}
+    </div>
+  </div>
+{% endif %}

web/modules/custom/joinup_layout/layouts/twocolfooter-onecol-50-50/twocolfooter_onecol_50_50.css

+/*
+ * @file
+ * Provides the layout styles for layout twocolfooter_onecol_67_33.
+ */
+
+.joinup-layout--twocolfooter-onecol-50-50 > .inline-column-top {
+  display: flex;
+  flex: 0 1 100%;
+  flex-wrap: wrap;
+}
+
+.joinup-layout--twocolfooter-onecol-50-50 > .inline-column-bottom {
+  display: flex;
+  flex: 0 1 100%;
+  flex-wrap: wrap;
+}
+
+.joinup-layout--twocolfooter-onecol-50-50
+  > .inline-column-top
+  > .layout__region,
+.joinup-layout--twocolfooter-onecol-50-50
+  > .inline-column-right
+  > .layout__region {
+  flex: 0 1 100%;
+}
+
+@media screen and (min-width: 40em) {
+  .joinup-layout--twocolfooter-onecol-50-50
+    > .inline-column-top
+    > .layout__region--first,
+  .joinup-layout--twocolfooter-onecol-50-50
+    > .inline-column-top
+    > .layout__region--second {
+    flex: 0 1 50%;
+  }
+}