Merge pull request #1213 from dof-dss/cscs_config

Changes to the CSCS config

config/cscsreviewni/config/block.block.sociallinks.yml

@@ -0,0 +1,25 @@
+uuid: 416647c7-eeda-4920-add5-58ac08f815d5
+langcode: en
+status: false
+dependencies:
+  content:
+    - 'block_content:basic_block:7983a04e-d163-4202-9fda-49b93502ee31'
+  module:
+    - block_content
+  theme:
+    - cscsreviewni_theme
+id: sociallinks
+theme: cscsreviewni_theme
+region: footer_second
+weight: 0
+provider: null
+plugin: 'block_content:7983a04e-d163-4202-9fda-49b93502ee31'
+settings:
+  id: 'block_content:7983a04e-d163-4202-9fda-49b93502ee31'
+  label: 'Social links'
+  provider: block_content
+  label_display: '0'
+  status: true
+  info: ''
+  view_mode: full
+visibility: {  }

config/cscsreviewni/config/contact.settings.yml

@@ -2,6 +2,6 @@ default_form: feedback
 flood:
   limit: 5
   interval: 3600
-user_default_enabled: true
+user_default_enabled: false
 _core:
   default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8

config/cscsreviewni/config/google_analytics.settings.yml

@@ -1,4 +1,4 @@
-account: ''
+account: '<placeholder>'
 premium: false
 domain_mode: 0
 cross_domains: ''

config/cscsreviewni/config/origins_workflow.auditsettings.yml

@@ -2,11 +2,8 @@ audit_button_text: 'Audit this published content'
 audit_button_hover_text: 'Click this link to indicate you have checked this content for accuracy and relevance'
 audit_confirmation_text: 'Click this button to indicate that you have audited this published content and are happy that it is still accurate and relevant.'
 audit_content_types:
-  page: page
-  consultation: 0
+  basic_page: basic_page
   news: 0
-  publication_page: 0
-  staff_member: 0
-  vacancy: 0
+  publication: 0
 _core:
   default_config_hash: 3SEIckwYL56FAPOaQjHj9GcV2CUC9lkT-AxU07onAWE

config/cscsreviewni/config/system.site.yml

@@ -14,3 +14,4 @@ _core:
 uuid: 720b0f57-1b72-4200-9dcf-4b0ec43ae9c5
 frontpage_title: 'Welcome to CSCS NI Independent Review'
 frontpage_show_title: 0
+mail_notification: ''

config/cscsreviewni/config/user.mail.yml

@@ -1,115 +1,29 @@
 cancel_confirm:
-  body: |-
-    [user:display-name],
-
-    A request to cancel your account has been made at [site:name].
-
-    You may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:
-
-    [user:cancel-url]
-
-    NOTE: The cancellation of your account is not reversible.
-
-    This link expires in one day and nothing will happen if it is not used.
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nA request to cancel your account has been made at [site:name].\r\n\r\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:cancel-url]\r\n\r\nNOTE: The cancellation of your account is not reversible.\r\n\r\nThis link expires in one day and nothing will happen if it is not used.\r\n\r\n--  [site:name] team"
   subject: 'Account cancellation request for [user:display-name] at [site:name]'
 password_reset:
-  body: |-
-    [user:display-name],
-
-    A request to reset the password for your account has been made at [site:name].
-
-    You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nA request to reset the password for your account has been made at [site:name].\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\r\n\r\n--  [site:name] team"
   subject: 'Replacement login information for [user:display-name] at [site:name]'
 register_admin_created:
-  body: |-
-    [user:display-name],
-
-    A site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password.
-
-    After setting your password, you will be able to log in at [site:login-url] in the future using:
-
-    username: [user:name]
-    password: Your password
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
   subject: 'An administrator created an account for you at [site:name]'
 register_no_approval_required:
-  body: |-
-    [user:display-name],
-
-    Thank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password.
-
-    After setting your password, you will be able to log in at [site:login-url] in the future using:
-
-    username: [user:name]
-    password: Your password
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name]'
 register_pending_approval:
-  body: |-
-    [user:display-name],
-
-    Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
 register_pending_approval_admin:
-  body: |-
-    [user:display-name] has applied for an account.
-
-    [user:edit-url]
+  body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]"
   subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
 status_activated:
-  body: |-
-    [user:display-name],
-
-    Your account at [site:name] has been activated.
-
-    You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password.
-
-    After setting your password, you will be able to log in at [site:login-url] in the future using:
-
-    username: [user:account-name]
-    password: Your password
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (approved)'
 status_blocked:
-  body: |-
-    [user:display-name],
-
-    Your account on [site:name] has been blocked.
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (blocked)'
 status_canceled:
-  body: |-
-    [user:display-name],
-
-    Your account on [site:name] has been canceled.
-
-    --  [site:name] team
+  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been canceled.\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (canceled)'
 langcode: en
 _core:

config/cscsreviewni/config/views.view.news_search.yml

@@ -273,7 +273,8 @@ display:
         menu_name: main
       exposed_block: true
       cache:
-        type: none
+        type: search_api_tag
+        options: {  }
       defaults:
         cache: false
     cache_metadata:

config/cscsreviewni/config/views.view.publications_search.yml

@@ -8,7 +8,6 @@ dependencies:
   module:
     - search_api
     - text
-    - views_custom_cache_tag
 id: publications_search
 label: 'Publications search'
 module: views
@@ -27,9 +26,8 @@ display:
         type: none
         options: {  }
       cache:
-        type: custom_tag
-        options:
-          custom_tag: 'node_list:publication'
+        type: search_api_tag
+        options: {  }
       query:
         type: views_query
         options: