Merge branch 'develop' into feature/html-mails

Author: rimi-itk

config/sync/field.field.paragraph.os2loop_section_page_free.os2loop_section_page_free_html.yml

@@ -19,6 +19,7 @@ third_party_settings:
       os2loop_post_comment_rich_text: 0
       os2loop_documents_body: 0
       os2loop_documents_rich_text: 0
+      os2loop_documents_table: 0
       os2loop_external: 0
       os2loop_message_message: 0
       os2loop_page: 0
@@ -41,6 +42,8 @@ third_party_settings:
           weight: '0'
         os2loop_documents_rich_text:
           weight: '0'
+        os2loop_documents_table:
+          weight: '0'
         os2loop_external:
           weight: '0'
         os2loop_message_message:
@@ -61,7 +64,7 @@ id: paragraph.os2loop_section_page_free.os2loop_section_page_free_html
 field_name: os2loop_section_page_free_html
 entity_type: paragraph
 bundle: os2loop_section_page_free
-label: 'Free HTML'
+label: 'Information block'
 description: 'Add any HTML to the page. This may be used for creating advanced content.'
 required: false
 translatable: false

config/sync/field.field.paragraph.os2loop_section_page_info_block.os2loop_section_page_info_text.yml

@@ -19,12 +19,14 @@ third_party_settings:
       os2loop_post_comment_rich_text: 0
       os2loop_documents_body: 0
       os2loop_documents_rich_text: 0
+      os2loop_documents_table: 0
       os2loop_external: 0
       os2loop_message_message: 0
       os2loop_page: 0
       os2loop_post: 0
       os2loop_question_plain_text: 0
       os2loop_question_rich_text: 0
+      os2loop_section_page_free_html: 0
     default_order_toggle: 0
     default_order_wrapper:
       formats:
@@ -40,6 +42,8 @@ third_party_settings:
           weight: '0'
         os2loop_documents_rich_text:
           weight: '0'
+        os2loop_documents_table:
+          weight: '0'
         os2loop_external:
           weight: '0'
         os2loop_message_message:
@@ -52,13 +56,15 @@ third_party_settings:
           weight: '0'
         os2loop_question_rich_text:
           weight: '0'
+        os2loop_section_page_free_html:
+          weight: '0'
         os2loop_section_page:
           weight: '0'
 id: paragraph.os2loop_section_page_info_block.os2loop_section_page_info_text
 field_name: os2loop_section_page_info_text
 entity_type: paragraph
 bundle: os2loop_section_page_info_block
-label: 'Information block'
+label: Text
 description: ''
 required: false
 translatable: false

config/sync/language/da/field.field.paragraph.os2loop_section_page_free.os2loop_section_page_free_html.yml

@@ -1,2 +1,2 @@
-label: 'Fri HTML'
+label: Informationsblok
 description: 'Tilføj enhver HTML til siden. Dette kan anvendes til at oprette avanceret indhold.'

config/sync/language/da/field.field.paragraph.os2loop_section_page_info_block.os2loop_section_page_info_text.yml

@@ -1 +1 @@
-label: Informationsblok
+label: Tekst

config/sync/language/da/paragraphs.paragraphs_type.os2loop_section_page_free.yml

@@ -1,2 +1,2 @@
-label: 'Fri HTML'
+label: Informationsblok
 description: 'Et tekstområde der ikke begrænser HTML'

config/sync/language/da/paragraphs.paragraphs_type.os2loop_section_page_info_block.yml

@@ -1,2 +1,2 @@
-label: Informationsblok
-description: 'Informationsblok til sektionssider'
+label: 'Fremhævet indhold'
+description: 'En paragraftype til at fremhæve indhold.'

config/sync/language/da/views.view.content.yml

@@ -5,7 +5,6 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: Filter
           reset_button_label: Gendan
           exposed_sorts_label: 'Sortér efter'
           sort_asc_label: Stigende
@@ -17,23 +16,29 @@ display:
             next: 'Næste ›'
             first: '« Første'
             last: 'Sidste »'
+          expose:
+            items_per_page_label: 'Antal pr. side'
+            items_per_page_options_all_label: '- Alle -'
+            offset_label: Begyndelse
       fields:
         title:
           label: Titel
         type:
           label: Indholdstype
-          separator: ', '
         name:
           label: Forfatter
         status:
-          label: Status
           settings:
             format_custom_true: Udgivet
             format_custom_false: 'Ikke udgivet'
         changed:
           label: Opdateret
         operations:
           label: Handlinger
+        os2loop_shared_subject:
+          label: Emne
+        os2loop_shared_tags:
+          label: Nøgleord
       filters:
         title:
           expose:
@@ -42,19 +47,29 @@ display:
           expose:
             label: Indholdstype
         status:
-          expose:
-            label: Status
+          expose: {  }
           group_info:
             label: Publiceringsstatus
             group_items:
               1:
                 title: Udgivet
               2:
                 title: 'Ikke udgivet'
+        tid:
+          admin_label: Emne
+          expose:
+            label: Emne
+        tid_1:
+          admin_label: Nøgleord
+          expose:
+            label: Nøgleord
       title: Indhold
       empty:
         area_text_custom:
           content: 'Der er intet indhold at vise.'
+      header:
+        result:
+          content: 'Viser @start - @end af @total'
     display_title: Standard
   page_1:
     display_options:
@@ -64,3 +79,63 @@ display:
         title: Indhold
         description: 'Find og håndtér indhold'
     display_title: Side
+  page_2:
+    display_options:
+      menu:
+        title: Spørgsmål/Indlæg
+      title: Spørgsmål/Indlæg
+      filters:
+        title:
+          expose:
+            label: Titel
+        type:
+          expose:
+            label: Indholdstype
+        status:
+          group_info:
+            label: Publiseringsstatus
+            group_items:
+              1:
+                title: Publiseret
+              2:
+                title: 'Ikke publiseret'
+        tid:
+          admin_label: Emne
+          expose:
+            label: Emne
+        tid_1:
+          admin_label: Nøgleord
+          expose:
+            label: Nøgleord
+        comment_count:
+          expose:
+            label: Besvaret/Ubesvaret
+          group_info:
+            label: Besvaret/Ubesvaret
+            group_items:
+              2:
+                title: Besvaret
+              3:
+                title: Ubesvaret
+      fields:
+        title:
+          label: Titel
+        type:
+          label: Indholdstype
+        name:
+          label: Forfatter
+        status:
+          settings:
+            format_custom_true: Publiseret
+            format_custom_false: 'Ikke publiseret'
+        changed:
+          label: Opdateret
+        os2loop_shared_subject:
+          label: Emne
+        os2loop_shared_tags:
+          label: Nøgleord
+        comment_count:
+          label: 'Antal kommentarer'
+        operations:
+          label: Handlinger
+    display_title: Spørgsmål/Indlæg

config/sync/paragraphs.paragraphs_type.os2loop_section_page_free.yml

@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 id: os2loop_section_page_free
-label: 'Free html'
+label: 'Information block'
 icon_uuid: null
 icon_default: null
 description: 'A textarea that does not limit html'

config/sync/paragraphs.paragraphs_type.os2loop_section_page_info_block.yml

@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 id: os2loop_section_page_info_block
-label: 'Info block'
+label: 'Highlighted content'
 icon_uuid: null
 icon_default: null
 description: 'Info block for section pages'

config/sync/views.view.comment.yml

@@ -1,6 +1,6 @@
 uuid: ff2c6227-a206-4a9e-80ef-2d14a300bac2
 langcode: en
-status: true
+status: false
 dependencies:
   module:
     - comment