Merge branch 'develop' into feature/LOOP-907-alerts

itk-dev · Oct 15, 2021 · 45cdfd7 · 45cdfd7
2 parents 2b9ba5d + 7e4a2b1
commit 45cdfd7
Show file tree

Hide file tree

Showing 35 changed files with 805 additions and 184 deletions.
diff --git a/composer.json b/composer.json
@@ -73,6 +73,7 @@
         "drupal/simple_menu_permissions": "^1.3",
         "drupal/snowball_stemmer": "^2.0",
         "drupal/theme_switcher": "dev-8.x-1.x",
+        "drupal/toc_api": "^1.1",
         "drupal/token": "^1.9",
         "drupal/token_filter": "^1.2",
         "drupal/twig_tweak": "^3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml b/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml
@@ -31,7 +31,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   os2loop_documents_document_autho:
-    weight: 7
+    weight: 8
     settings:
       size: 60
       placeholder: ''
@@ -48,7 +48,7 @@ content:
     region: content
   os2loop_documents_document_conte:
     type: entity_reference_paragraphs
-    weight: 6
+    weight: 7
     settings:
       title: Paragraph
       title_plural: Paragraphs
@@ -77,7 +77,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   os2loop_shared_profession:
-    weight: 8
+    weight: 9
     settings:
       match_limit: '0'
       min_length: 0
@@ -94,13 +94,13 @@ content:
     type: autocomplete_deluxe
     region: content
   os2loop_shared_rev_date:
-    weight: 26
+    weight: 12
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   os2loop_shared_subject:
-    weight: 9
+    weight: 10
     settings:
       match_limit: '0'
       min_length: 0
@@ -117,7 +117,7 @@ content:
     type: autocomplete_deluxe
     region: content
   os2loop_shared_tags:
-    weight: 10
+    weight: 11
     settings:
       min_length: 0
       delimiter: ''
@@ -135,7 +135,7 @@ content:
     region: content
   path:
     type: path
-    weight: 30
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }

diff --git a/config/sync/core.entity_form_display.paragraph.table_of_contents.default.yml b/config/sync/core.entity_form_display.paragraph.table_of_contents.default.yml
@@ -0,0 +1,26 @@
+uuid: 02a1d547-04eb-4283-87cc-5c99b9c54ec4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.table_of_contents.table_of_contents
+    - paragraphs.paragraphs_type.table_of_contents
+  module:
+    - block_field
+id: paragraph.table_of_contents.default
+targetEntityType: paragraph
+bundle: table_of_contents
+mode: default
+content:
+  table_of_contents:
+    weight: 0
+    settings:
+      plugin_id: ''
+      settings: {  }
+      configuration_form: full
+    third_party_settings: {  }
+    type: block_field_default
+    region: content
+hidden:
+  created: true
+  status: true
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml
@@ -39,31 +39,31 @@ content:
     settings: {  }
     third_party_settings: {  }
   os2loop_documents_document_autho:
-    weight: 4
+    weight: 5
     label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
     type: string
     region: content
   os2loop_documents_document_body:
-    weight: 2
+    weight: 3
     label: hidden
     settings: {  }
     third_party_settings: {  }
     type: text_default
     region: content
   os2loop_documents_document_conte:
     type: entity_reference_revisions_entity_view
-    weight: 3
+    weight: 4
     label: visually_hidden
     settings:
       view_mode: default
       link: ''
     third_party_settings: {  }
     region: content
   os2loop_documents_info_box:
-    weight: 1
+    weight: 2
     label: hidden
     settings: {  }
     third_party_settings: {  }
@@ -78,7 +78,7 @@ content:
     type: entity_reference_label
     region: content
   os2loop_shared_profession:
-    weight: 5
+    weight: 6
     label: above
     settings:
       link: true
@@ -95,7 +95,7 @@ content:
     type: datetime_default
     region: content
   os2loop_shared_subject:
-    weight: 6
+    weight: 7
     label: above
     settings:
       link: true

diff --git a/config/sync/core.entity_view_display.paragraph.table_of_contents.default.yml b/config/sync/core.entity_view_display.paragraph.table_of_contents.default.yml
@@ -0,0 +1,26 @@
+uuid: 5f97f68b-d969-428b-a7c5-5b4b2410662d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.table_of_contents.table_of_contents
+    - paragraphs.paragraphs_type.table_of_contents
+  module:
+    - block_field
+id: paragraph.table_of_contents.default
+targetEntityType: paragraph
+bundle: table_of_contents
+mode: default
+content:
+  table_of_contents:
+    weight: 0
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    type: block_field
+    region: content
+hidden:
+  entity_print_view_epub: true
+  entity_print_view_pdf: true
+  entity_print_view_word_docx: true
+  search_api_excerpt: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -66,6 +66,7 @@ module:
   os2loop_shared: 0
   os2loop_subscriptions: 0
   os2loop_taxonomy: 0
+  os2loop_toc_block: 0
   os2loop_upvote: 0
   os2loop_user: 0
   os2loop_user_login: 0
@@ -87,6 +88,7 @@ module:
   taxonomy: 0
   text: 0
   theme_switcher: 0
+  toc_api: 0
   token: 0
   token_filter: 0
   toolbar: 0

diff --git a/config/sync/field.field.node.os2loop_documents_document.os2loop_documents_document_conte.yml b/config/sync/field.field.node.os2loop_documents_document.os2loop_documents_document_conte.yml
@@ -9,6 +9,7 @@ dependencies:
     - paragraphs.paragraphs_type.os2loop_documents_step_by_step
     - paragraphs.paragraphs_type.os2loop_documents_table
     - paragraphs.paragraphs_type.os2loop_documents_text_and_image
+    - paragraphs.paragraphs_type.table_of_contents
   module:
     - entity_reference_revisions
 id: node.os2loop_documents_document.os2loop_documents_document_conte
@@ -30,6 +31,7 @@ settings:
       os2loop_documents_step_by_step: os2loop_documents_step_by_step
       os2loop_documents_text_and_image: os2loop_documents_text_and_image
       os2loop_documents_table: os2loop_documents_table
+      table_of_contents: table_of_contents
     target_bundles_drag_drop:
       os2loop_documents_highlighted_co:
         enabled: true
@@ -46,6 +48,9 @@ settings:
       os2loop_documents_text_and_image:
         enabled: true
         weight: 8
+      os2loop_section_page_free:
+        weight: 16
+        enabled: false
       os2loop_section_page_info_block:
         weight: 14
         enabled: false
@@ -55,4 +60,7 @@ settings:
       os2loop_section_page_views_refer:
         weight: 16
         enabled: false
+      table_of_contents:
+        enabled: true
+        weight: 20
 field_type: entity_reference_revisions
diff --git a/config/sync/field.field.node.os2loop_section_page.os2loop_section_page_paragraph.yml b/config/sync/field.field.node.os2loop_section_page.os2loop_section_page_paragraph.yml
@@ -9,6 +9,7 @@ dependencies:
     - paragraphs.paragraphs_type.os2loop_section_page_info_block
     - paragraphs.paragraphs_type.os2loop_section_page_search
     - paragraphs.paragraphs_type.os2loop_section_page_views_refer
+    - paragraphs.paragraphs_type.table_of_contents
   module:
     - entity_reference_revisions
 id: node.os2loop_section_page.os2loop_section_page_paragraph
@@ -30,6 +31,7 @@ settings:
       os2loop_section_page_views_refer: os2loop_section_page_views_refer
       os2loop_section_page_info_block: os2loop_section_page_info_block
       os2loop_section_page_search: os2loop_section_page_search
+      table_of_contents: table_of_contents
     target_bundles_drag_drop:
       os2loop_documents_highlighted_co:
         weight: 6
@@ -40,6 +42,9 @@ settings:
       os2loop_documents_step_by_step:
         weight: 8
         enabled: false
+      os2loop_documents_table:
+        weight: 14
+        enabled: false
       os2loop_documents_text_and_image:
         weight: 9
         enabled: false
@@ -55,4 +60,7 @@ settings:
       os2loop_section_page_views_refer:
         enabled: true
         weight: 10
+      table_of_contents:
+        enabled: true
+        weight: 20
 field_type: entity_reference_revisions
diff --git a/config/sync/field.field.paragraph.table_of_contents.table_of_contents.yml b/config/sync/field.field.paragraph.table_of_contents.table_of_contents.yml
@@ -0,0 +1,25 @@
+uuid: bd28a88c-b7de-4d87-b046-cf3de4fd99f4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.table_of_contents
+    - paragraphs.paragraphs_type.table_of_contents
+  module:
+    - block_field
+id: paragraph.table_of_contents.table_of_contents
+field_name: table_of_contents
+entity_type: paragraph
+bundle: table_of_contents
+label: 'Table of contents'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  selection: blocks
+  selection_settings:
+    plugin_ids:
+      os2loop_toc_block: os2loop_toc_block
+field_type: block_field
diff --git a/config/sync/field.storage.paragraph.table_of_contents.yml b/config/sync/field.storage.paragraph.table_of_contents.yml
@@ -0,0 +1,19 @@
+uuid: 291713f1-996b-432c-a0b5-2cd8175129f1
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_field
+    - paragraphs
+id: paragraph.table_of_contents
+field_name: table_of_contents
+entity_type: paragraph
+type: block_field
+settings: {  }
+module: block_field
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/sync/language/da/toc_api.toc_type.default.yml b/config/sync/language/da/toc_api.toc_type.default.yml
@@ -0,0 +1,3 @@
+label: Standard
+options:
+  title: Indholdsfortegnelse
diff --git a/config/sync/paragraphs.paragraphs_type.table_of_contents.yml b/config/sync/paragraphs.paragraphs_type.table_of_contents.yml
@@ -0,0 +1,10 @@
+uuid: 3f4bd8ff-bac5-4d4c-aab3-a4a9cb3291bf
+langcode: en
+status: true
+dependencies: {  }
+id: table_of_contents
+label: 'Table of contents'
+icon_uuid: null
+icon_default: null
+description: 'A table of contents'
+behavior_plugins: {  }
diff --git a/config/sync/toc_api.toc_type.default.yml b/config/sync/toc_api.toc_type.default.yml
@@ -0,0 +1,29 @@
+uuid: 60fa76c2-404e-4f83-a7ec-e073949faf97
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 83pJ_ZhgrmuPELjG0kOnns7gEluWdqcuTj_itSDiHZA
+id: default
+label: Default
+options:
+  template: default
+  title: ''
+  block: false
+  header_count: 1
+  header_min: 2
+  header_max: 4
+  header_allowed_tags: '<em> <b> <del> <i> <mark> <s> <span> <strong> <sup> <sub> <em> <b> <del> <i> <mark> <s> <span> <strong> <sup> <sub>'
+  header_id: title
+  header_id_prefix: section
+  top_min: 1
+  top_max: 1
+  top_label: 'Back to top'
+  default:
+    number_type: none
+    number_prefix: ''
+    number_suffix: ') '
+  number_path_separator: .
+  number_path: true
+  number_path_truncate: true
+  headers: {  }
diff --git a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig
@@ -9,14 +9,14 @@
 #}
 <div class="list-group">
   {% if data is empty %}
-    <div class="container list-group-item bg-light border-top mb-2 js-view-empty">
+    <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2 js-view-empty">
       <article class="row">
         {{ 'No content related to your user'|t }}
       </article>
     </div>
   {% else %}
     {% for node in data %}
-      <div class="container list-group-item bg-light border-top mb-2">
+      <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2">
         <article class="row">
           <div class="col-4 col-sm-3 col-md-2 col-lg-1">
             {{ drupal_field('os2loop_user_image', 'user', node.uid.target_id) }}

diff --git a/...rofiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig b/...rofiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig
@@ -9,14 +9,14 @@
 #}
 <div class="list-group">
   {% if data is empty %}
-    <div class="container list-group-item bg-light border-top mb-2 js-view-empty">
+    <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2 js-view-empty">
       <article class="row">
         {{ 'No content related to your user'|t }}
       </article>
     </div>
   {% else %}
     {% for node in data %}
-      <div class="container list-group-item bg-light border-top mb-2">
+      <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2">
         <article class="row">
           <div class="col-4 col-sm-3 col-md-2 col-lg-1">
             {{ drupal_field('os2loop_user_image', 'user', node.uid.target_id) }}

diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/README.md b/web/profiles/custom/os2loop/modules/os2loop_toc_block/README.md
@@ -0,0 +1,3 @@
+# OS2Loop Toc Block
+
+Adds table of contents block using toc api.
diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.info.yml b/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.info.yml
@@ -0,0 +1,9 @@
+name: 'OS2Loop toc block'
+type: module
+description: 'Adds table of contents block'
+core: 8.x
+core_version_requirement: ^8 || ^9
+package: 'OS2Loop'
+
+dependencies:
+  - drupal:toc_api
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# OS2Loop Toc Block

		Adds table of contents block using toc api.