Merge branch 'dev' of github.com:City-of-Helsinki/drupal-emergency-si…

…te into dev
City-of-Helsinki · Nov 10, 2023 · 9c0f9dd · 9c0f9dd
2 parents 5dcd3e0 + 18377e2
commit 9c0f9dd
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 105 deletions.
diff --git a/conf/cmi/core.entity_view_display.node.news_item.default.yml b/conf/cmi/core.entity_view_display.node.news_item.default.yml
@@ -16,7 +16,6 @@ dependencies:
   module:
     - entity_reference_revisions
     - helfi_platform_config
-    - link
     - user
 _core:
   default_config_hash: _31gTd8Z7ZT8KGS8tHPve5Vb_OAnn7JbybIcOXUGiyA
@@ -42,7 +41,7 @@ content:
       format_custom_false: ''
       format_custom_true: ''
     third_party_settings: {  }
-    weight: 9
+    weight: 8
     region: content
   field_lead_in:
     type: text_span
@@ -65,18 +64,6 @@ content:
     label: inline
     settings: {  }
     third_party_settings: {  }
-    weight: 8
-    region: content
-  field_news_item_links_link:
-    type: link
-    label: hidden
-    settings:
-      trim_length: 255
-      url_only: false
-      url_plain: false
-      rel: '0'
-      target: '0'
-    third_party_settings: {  }
     weight: 7
     region: content
   field_news_item_links_title:
@@ -111,6 +98,7 @@ content:
     weight: 3
     region: content
 hidden:
+  field_news_item_links_link: true
   field_news_item_tags: true
   langcode: true
   toc_enabled: true
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -23,7 +23,6 @@ module:
   easy_breadcrumb: 0
   editor: 0
   editoria11y: 0
-  encrypt: 0
   entity: 0
   entity_reference_revisions: 0
   entity_usage: 0
@@ -81,7 +80,6 @@ module:
   imagemagick: 0
   jquery_ui: 0
   jquery_ui_draggable: 0
-  key: 0
   language: 0
   link: 0
   linkit: 0
@@ -105,7 +103,6 @@ module:
   paragraphs_library: 0
   path: 0
   path_alias: 0
-  real_aes: 0
   redirect: 0
   responsive_image: 0
   rest: 0
@@ -122,7 +119,6 @@ module:
   taxonomy: 0
   telephone: 0
   text: 0
-  tfa: 0
   token: 0
   toolbar: 0
   twig_tweak: 0

diff --git a/conf/cmi/encrypt.profile.authentication_profile.yml b/conf/cmi/encrypt.profile.authentication_profile.yml
diff --git a/conf/cmi/encrypt.settings.yml b/conf/cmi/encrypt.settings.yml
diff --git a/conf/cmi/key.key.authentication_key.yml b/conf/cmi/key.key.authentication_key.yml
diff --git a/conf/cmi/tfa.settings.yml b/conf/cmi/tfa.settings.yml
diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml
@@ -28,6 +28,7 @@ dependencies:
     - file
     - filter
     - helfi_api_base
+    - helfi_emergency_general
     - locale
     - media
     - menu_link_attributes
@@ -44,7 +45,6 @@ dependencies:
     - simple_sitemap
     - system
     - taxonomy
-    - tfa
     - view_unpublished
 _core:
   default_config_hash: dKoMlS2I78xz3dRwDh7nlvZPJM1CmU8s6tNswGPk3_4
@@ -72,7 +72,6 @@ permissions:
   - 'administer pathauto'
   - 'administer redirects'
   - 'administer sitemap settings'
-  - 'administer tfa for other users'
   - 'administer url aliases'
   - 'administer users'
   - 'assign admin role'
@@ -153,6 +152,7 @@ permissions:
   - 'edit terms in news_group'
   - 'edit terms in news_neighbourhoods'
   - 'edit terms in news_tags'
+  - 'modify announcement message'
   - 'revert all revisions'
   - 'revert announcement revisions'
   - 'revert landing_page revisions'

diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml
@@ -8,7 +8,6 @@ dependencies:
     - media
     - paragraphs
     - system
-    - tfa
     - toolbar
 _core:
   default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI
@@ -20,7 +19,6 @@ permissions:
   - 'access content'
   - 'access toolbar'
   - 'display eu cookie compliance popup'
-  - 'setup own tfa'
   - 'view media'
   - 'view remote entities'
   - 'view unpublished paragraphs'
diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
@@ -18,7 +18,9 @@ function hdbt_subtheme_preprocess_block(&$variables) {
   }
   // Overwrite etusivu url.
   if ($variables['elements']['#plugin_id'] == 'system_branding_block') {
-    $variables['frontpage_instance_url'] = \Drupal::request()->getSchemeAndHttpHost();
+    $lang = \Drupal::languageManager()->getCurrentLanguage()->getId();
+    $variables['frontpage_instance_url'] =
+      \Drupal::request()->getSchemeAndHttpHost() . '/' . $lang;
   }
 }
 
@@ -128,6 +130,8 @@ function hdbt_subtheme_theme_suggestions_node_alter(&$suggestions, $variables) {
  */
 function hdbt_subtheme_preprocess_region(&$variables) {
   if (isset($variables['elements']['hdbt_subtheme_footerbottomnavigation'])) {
-    $variables['frontpage_instance_url'] = \Drupal::request()->getSchemeAndHttpHost();
+    $lang = \Drupal::languageManager()->getCurrentLanguage()->getId();
+    $variables['frontpage_instance_url'] =
+      \Drupal::request()->getSchemeAndHttpHost() . '/' . $lang;
   }
 }