ISAICP-6765: Rename image style and fix text style.

ec-europa · Oct 27, 2021 · 52e2f0d · 52e2f0d
1 parent a2fc0da
commit 52e2f0d
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 208 deletions.
diff --git a/config/sync/core.entity_view_display.node.document.highlighted.yml b/config/sync/core.entity_view_display.node.document.highlighted.yml
@@ -20,24 +20,24 @@ dependencies:
     - field.field.node.document.field_type
     - field.field.node.document.og_audience
     - node.type.document
-    - responsive_image.styles.highlighted_solution
+    - responsive_image.styles.highlighted_content
   module:
     - field_delimiter
     - field_formatter_range
     - field_group
+    - joinup_html_stripper
     - layout_builder
     - responsive_image
     - template_suggestion
-    - text
     - user
 third_party_settings:
   field_group:
     group_categorisation:
       children:
-        - field_short_title
-        - field_type
         - field_document_publication_date
         - field_licence
+        - field_short_title
+        - field_type
       parent_name: ''
       weight: 5
       format_type: html_element
@@ -81,7 +81,7 @@ mode: highlighted
 content:
   body:
     label: hidden
-    type: text_trimmed
+    type: joinup_html_stripper_stripped
     weight: 2
     settings:
       trim_length: 200
@@ -95,7 +95,7 @@ content:
     region: content
     label: hidden
     settings:
-      responsive_image_style: highlighted_solution
+      responsive_image_style: highlighted_content
       image_link: ''
     third_party_settings:
       template_suggestion:

diff --git a/config/sync/core.entity_view_display.node.event.highlighted.yml b/config/sync/core.entity_view_display.node.event.highlighted.yml
@@ -27,13 +27,13 @@ dependencies:
     - field.field.node.event.field_topic
     - field.field.node.event.og_audience
     - node.type.event
-    - responsive_image.styles.highlighted_solution
+    - responsive_image.styles.highlighted_content
   module:
     - field_delimiter
     - field_formatter_range
+    - joinup_html_stripper
     - layout_builder
     - responsive_image
-    - smart_trim
     - template_suggestion
     - user
 third_party_settings:
@@ -46,23 +46,12 @@ bundle: event
 mode: highlighted
 content:
   body:
-    type: smart_trim
+    type: joinup_html_stripper_stripped
     weight: 2
     region: content
     label: hidden
     settings:
       trim_length: 200
-      trim_type: chars
-      trim_suffix: ''
-      wrap_class: trimmed
-      more_text: More
-      more_class: more-link
-      summary_handler: full
-      wrap_output: false
-      more_link: false
-      trim_options:
-        text: false
-        trim_zero: false
     third_party_settings:
       template_suggestion:
         template_suggestion: ''
@@ -72,7 +61,7 @@ content:
     region: content
     label: hidden
     settings:
-      responsive_image_style: highlighted_solution
+      responsive_image_style: highlighted_content
       image_link: ''
     third_party_settings:
       template_suggestion:

diff --git a/config/sync/core.entity_view_display.node.news.highlighted.yml b/config/sync/core.entity_view_display.node.news.highlighted.yml
@@ -19,14 +19,14 @@ dependencies:
     - field.field.node.news.field_topic
     - field.field.node.news.og_audience
     - node.type.news
-    - responsive_image.styles.highlighted_solution
+    - responsive_image.styles.highlighted_content
   module:
     - field_delimiter
     - field_formatter_range
     - field_group
+    - joinup_html_stripper
     - layout_builder
     - responsive_image
-    - smart_trim
     - template_suggestion
     - user
 third_party_settings:
@@ -58,21 +58,10 @@ mode: highlighted
 content:
   body:
     label: hidden
-    type: smart_trim
+    type: joinup_html_stripper_stripped
     weight: 2
     settings:
       trim_length: 200
-      trim_type: chars
-      trim_suffix: ''
-      wrap_class: trimmed
-      more_text: More
-      more_class: more-link
-      summary_handler: full
-      wrap_output: false
-      more_link: false
-      trim_options:
-        text: false
-        trim_zero: false
     third_party_settings:
       template_suggestion:
         template_suggestion: ''
@@ -83,7 +72,7 @@ content:
     region: content
     label: hidden
     settings:
-      responsive_image_style: highlighted_solution
+      responsive_image_style: highlighted_content
       image_link: content
     third_party_settings:
       template_suggestion:

diff --git a/config/sync/core.entity_view_display.rdf_entity.collection.highlighted.yml b/config/sync/core.entity_view_display.rdf_entity.collection.highlighted.yml
diff --git a/config/sync/core.entity_view_display.rdf_entity.solution.highlighted.yml b/config/sync/core.entity_view_display.rdf_entity.solution.highlighted.yml
@@ -46,7 +46,7 @@ dependencies:
     - field.field.rdf_entity.solution.field_status
     - field.field.rdf_entity.solution.field_topic
     - rdf_entity.rdfentity.solution
-    - responsive_image.styles.highlighted_solution
+    - responsive_image.styles.highlighted_content
   module:
     - field_delimiter
     - field_formatter_range
@@ -109,7 +109,7 @@ content:
     region: content
     label: hidden
     settings:
-      responsive_image_style: highlighted_solution
+      responsive_image_style: highlighted_content
       image_link: content
     third_party_settings:
       template_suggestion:

diff --git a/...ive_image.styles.highlighted_solution.yml → ...sive_image.styles.highlighted_content.yml b/...ive_image.styles.highlighted_solution.yml → ...sive_image.styles.highlighted_content.yml
@@ -20,8 +20,8 @@ dependencies:
     - image.style.xxl_col_5_2x
   theme:
     - ventuno
-id: highlighted_solution
-label: 'Highlighted solution'
+id: highlighted_content
+label: 'Highlighted content'
 image_style_mappings:
   -
     breakpoint_id: ventuno.xl

diff --git a/config/sync/user.role.moderator.yml b/config/sync/user.role.moderator.yml
@@ -234,7 +234,6 @@ permissions:
   - 'update discover_topics entityqueue'
   - 'update highlighted_content entityqueue'
   - 'update highlighted_event entityqueue'
-  - 'update highlighted_solution entityqueue'
   - 'update paragraph content iframe'
   - 'update paragraph content json_map'
   - 'update site alerts'

diff --git a/web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-content.html.twig b/web/themes/ventuno/templates/block/block--entityqueue-block--highlighted-content.html.twig
@@ -41,7 +41,9 @@
   {% endif %}
   {{ title_suffix }}
   {% block content %}
-    {{ related_content }}
+    {% if related_content %}
+      {{ related_content }}
+    {% endif %}
     {{ content }}
   {% endblock %}
 </div>
diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme
@@ -15,6 +15,7 @@ use Drupal\joinup_bundle_class\LogoInterface;
 use Drupal\joinup_collection\JoinupCollectionHelper;
 use Drupal\rdf_entity\Entity\Rdf;
 use Drupal\smart_trim\Truncate\TruncateHTML;
+use Drupal\topic\Entity\TopicReferencingEntityInterface;
 
 /**
  * Implements hook_theme_suggestions_HOOK_alter().
@@ -147,26 +148,27 @@ function ventuno_preprocess_block(&$variables) {
       /** @var \Drupal\node\NodeInterface $node */
       $node = $variables['elements']['content']['entities'][0]['#node'];
 
-      $topics = $node->get('field_topic')->getValue();
-
-      $options = [
-        'query' =>
-        [
-          'f' =>
+      $topics = $node instanceof TopicReferencingEntityInterface ? $node->getTopics() : [];
+      if ($topics) {
+        $options = [
+          'query' =>
           [
-            'type:' . $node->bundle(),
-            'topic:' . reset($topics)["target_id"],
+            'f' =>
+            [
+              'type:' . $node->bundle(),
+              'topic:' . reset($topics)["target_id"],
+            ],
+          ],
+        ];
+        $variables['related_content'] = [
+          '#type' => 'link',
+          '#title' => t('Related content'),
+          '#url' => Url::fromRoute('view.search.page_1', [], $options),
+          '#attributes' => [
+            'class' => ['more-link'],
           ],
-        ],
-      ];
-      $variables['related_content'] = [
-        '#type' => 'link',
-        '#title' => t('Related content'),
-        '#url' => Url::fromRoute('view.search.page_1', [], $options),
-        '#attributes' => [
-          'class' => ['more-link'],
-        ],
-      ];
+        ];
+      }
     }
   }
 }