Update configuration

City-of-Helsinki · Nov 16, 2022 · 2617aca · 2617aca
1 parent 0d327ac
commit 2617aca
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 82 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml
@@ -70,7 +70,7 @@ enable_save_preferences_button: true
 domain_all_sites: true
 settings_tab_enabled: false
 containing_element: body
-cookie_policy_version: 1.0.0
+cookie_policy_version: 1.1.0
 cookie_value_disagreed: '0'
 cookie_value_agreed_show_thank_you: '1'
 cookie_value_agreed: '2'

diff --git a/conf/cmi/hdbt.settings.yml b/conf/cmi/hdbt.settings.yml
@@ -6,6 +6,7 @@ features:
 logo:
   use_default: 1
 favicon:
-  use_default: 1
+  use_default: 0
+  path: ''
 _core:
   default_config_hash: K2gkzwu6yIWvdJgOBpqqGsIB4ZKLNNMvAJsWn-v5iOI
diff --git a/conf/cmi/hdbt_subtheme.settings.yml b/conf/cmi/hdbt_subtheme.settings.yml
@@ -0,0 +1,3 @@
+favicon:
+  use_default: 0
+  path: ''
diff --git a/conf/cmi/language/fi/views.view.media_library.yml b/conf/cmi/language/fi/views.view.media_library.yml
@@ -46,8 +46,6 @@ display:
             group_items:
               1:
                 title: Julkaistu
-              2:
-                title: Julkaisematon
         name:
           expose:
             label: Nimi

diff --git a/conf/cmi/language/ru/views.view.media_library.yml b/conf/cmi/language/ru/views.view.media_library.yml
@@ -46,8 +46,6 @@ display:
             group_items:
               1:
                 title: Опубликовано
-              2:
-                title: 'Снято с публикации'
         name:
           expose:
             label: Название

diff --git a/conf/cmi/language/sv/views.view.media_library.yml b/conf/cmi/language/sv/views.view.media_library.yml
@@ -46,8 +46,6 @@ display:
             group_items:
               1:
                 title: Publicerad
-              2:
-                title: 'Ej publicerad'
         name:
           expose:
             label: Namn

diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml
@@ -270,11 +270,11 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items:
-              1:
+              -
                 title: Published
                 operator: '='
                 value: '1'
-              2:
+              -
                 title: Unpublished
                 operator: '='
                 value: '0'
@@ -1032,7 +1032,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: '<a href="/media/{{ mid }}/edit" class="media-library-item__edit icon-link" title="{% trans %}Edit {{ name }}. Opens in a new tab.{% endtrans %}" target="_new">{% trans %}Edit {{ name }}{% endtrans %}</a>'
+            text: "<a href=\"{{ path('entity.media.edit_form', {'media': mid }) }}\" class=\"media-library-item__edit icon-link\" title=\"{% trans %}Edit {{ name }}. Opens in a new tab.{% endtrans %}\" target=\"_new\">{% trans %}Edit {{ name }}{% endtrans %}</a>\r\n"
             make_link: false
             path: ''
             absolute: false
@@ -1275,6 +1275,27 @@ display:
       rendering_language: '***LANGUAGE_language_interface***'
       display_extenders: {  }
       path: admin/content/media-widget
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 24
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '6, 12, 24, 48'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
     cache_metadata:
       max-age: -1
       contexts:

diff --git a/public/sites/default/azure.settings.php b/public/sites/default/azure.settings.php
@@ -20,3 +20,5 @@
 
 // Keep old assets for three months (default is one month).
 $config['system.performance']['stale_file_threshold'] = 7776000;
+
+$settings['is_azure'] = TRUE;
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -211,6 +211,8 @@
   $settings['container_yamls'][] = 'modules/contrib/redis/redis.services.yml';
 }
 
+$settings['is_azure'] = FALSE;
+
 // Environment specific overrides.
 if (file_exists(__DIR__ . '/all.settings.php')) {
   include __DIR__ . '/all.settings.php';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,5 @@

		// Keep old assets for three months (default is one month).
		$config['system.performance']['stale_file_threshold'] = 7776000;

		$settings['is_azure'] = TRUE;