Merge pull request #954 from danskernesdigitalebibliotek/merge-develo…

…p-into-release-brahma-13-again

Merge develop into release brahma 13 again

config/sync/dpl_patron_redirect.settings.yml

@@ -1 +1 @@
-pages: "/user/me\r\n/user/me/*"
+pages: '/user/me<br />/user/me/*'

config/sync/field.field.eventinstance.default.field_teaser_image.yml

@@ -11,7 +11,7 @@ field_name: field_teaser_image
 entity_type: eventinstance
 bundle: default
 label: 'Teaser image'
-description: "The teaser fields are used for the card of display.\r\nIf no image has been selected, the text will be shown instead:\r\n\r\n<img src=\"/themes/custom/novel/images/teaser-text-image.jpg\" />\r\n\r\n<hr/>"
+description: 'The teaser fields are used for the card of display.<br />If no image has been selected, the text will be shown instead:<br /><br /><img src="/themes/custom/novel/images/teaser-text-image.jpg" /><br /><br /><hr/>'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.eventseries.default.field_teaser_image.yml

@@ -11,7 +11,7 @@ field_name: field_teaser_image
 entity_type: eventseries
 bundle: default
 label: 'Teaser image'
-description: "The teaser fields are used for the card of display.\r\nIf no image has been selected, the text will be shown instead:\r\n\r\n<img src=\"/themes/custom/novel/images/teaser-text-image.jpg\" />\r\n\r\n<hr/>"
+description: 'The teaser fields are used for the card of display.<br />If no image has been selected, the text will be shown instead:<br /><br /><img src="/themes/custom/novel/images/teaser-text-image.jpg" /><br /><br /><hr/>'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.media.image.field_media_image.yml

@@ -12,7 +12,7 @@ field_name: field_media_image
 entity_type: media
 bundle: image
 label: Image
-description: "You can set a focal point, by clicking on the preview on the image, moving the white target.<br>\r\nBy setting a focal point, you tell the system which part of the image to keep in focus when it gets cropped.<br>\r\nUse the \"preview\" function, to see how your image will be cropped across image styles."
+description: 'You can set a focal point, by clicking on the preview on the image, moving the white target.<br /><br />By setting a focal point, you tell the system which part of the image to keep in focus when it gets cropped.<br /><br />Use the "preview" function, to see how your image will be cropped across image styles.'
 required: true
 translatable: true
 default_value: {  }

config/sync/field.field.node.article.field_show_override_author.yml

@@ -10,7 +10,7 @@ field_name: field_show_override_author
 entity_type: node
 bundle: article
 label: "Override the author\t"
-description: "By default, the author is set to the Drupal user that owns the content.<br>\r\nIf you want to override this, with a manual text, you can check this."
+description: 'By default, the author is set to the Drupal user that owns the content.<br /><br />If you want to override this, with a manual text, you can check this.'
 required: false
 translatable: false
 default_value:

config/sync/field.field.node.article.field_teaser_image.yml

@@ -11,7 +11,7 @@ field_name: field_teaser_image
 entity_type: node
 bundle: article
 label: 'Teaser image'
-description: "The teaser fields are used for the card of display.\r\nIf no image has been selected, the text will be shown instead:\r\n\r\n<img src=\"/themes/custom/novel/images/teaser-text-image.jpg\" />\r\n\r\n<hr/>"
+description: 'The teaser fields are used for the card of display.<br />If no image has been selected, the text will be shown instead:<br /><br /><img src="/themes/custom/novel/images/teaser-text-image.jpg" /><br /><br /><hr/>'
 required: false
 translatable: true
 default_value: {  }

config/sync/field.field.node.page.field_hero_title.yml

@@ -10,7 +10,7 @@ field_name: field_hero_title
 entity_type: node
 bundle: page
 label: 'Hero title'
-description: "The title that is shown at the top of the page.<br>\r\n<strong>If this is empty, the standard page title will be used instead.</strong>"
+description: 'The title that is shown at the top of the page.<br /><br /><strong>If this is empty, the standard page title will be used instead.</strong>'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.node.page.field_teaser_image.yml

@@ -11,7 +11,7 @@ field_name: field_teaser_image
 entity_type: node
 bundle: page
 label: 'Teaser image'
-description: "The teaser fields are used for the card of display.\r\nIf no image has been selected, the text will be shown instead:\r\n\r\n<img src=\"/themes/custom/novel/images/teaser-text-image.jpg\" />\r\n\r\n<hr/>"
+description: 'The teaser fields are used for the card of display.<br />If no image has been selected, the text will be shown instead:<br /><br /><img src="/themes/custom/novel/images/teaser-text-image.jpg" /><br /><br /><hr/>'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.paragraph.material_grid_automatic.field_amount_of_materials.yml

@@ -12,7 +12,7 @@ field_name: field_amount_of_materials
 entity_type: paragraph
 bundle: material_grid_automatic
 label: 'Amount of materials'
-description: "Determines the amount of materials that will be shown, based on the CQL string. \r\n\r\nObs: If for example a CQL string has 11 results, and an editor chooses 12. The list will display 8 instead of 11, since the grid should be able to increment by 4. "
+description: 'Determines the amount of materials that will be shown, based on the CQL string. <br /><br />Obs: If for example a CQL string has 11 results, and an editor chooses 12. The list will display 8 instead of 11, since the grid should be able to increment by 4. '
 required: true
 translatable: false
 default_value:

config/sync/field.field.paragraph.material_grid_automatic.field_cql_search.yml

@@ -12,7 +12,7 @@ field_name: field_cql_search
 entity_type: paragraph
 bundle: material_grid_automatic
 label: 'CQL Search'
-description: "This field is for inserting a CQL string based on a search. \r\n\r\nPlease be aware, that it is necessary to copy the exact CQL string, including the quotations. i.e: ( 'harry potter')\r\n\r\nA valid CQL search string can be generated, by performing a query through the advanced search, and copying the CQL string from there. "
+description: "This field is for inserting a CQL string based on a search. <br /><br />Please be aware, that it is necessary to copy the exact CQL string, including the quotations. i.e: ( 'harry potter')<br /><br />A valid CQL search string can be generated, by performing a query through the advanced search, and copying the CQL string from there. "
 required: true
 translatable: false
 default_value: {  }

config/sync/field.field.paragraph.material_grid_manual.field_material_grid_work_ids.yml

@@ -12,7 +12,7 @@ field_name: field_material_grid_work_ids
 entity_type: paragraph
 bundle: material_grid_manual
 label: 'Work IDs'
-description: "The grid will only display materials in internvals of 4. \r\n\r\nExample work ID: work-of:870970-basis:136336282.\r\n\r\nIf you need to link to a specific type, select it from the dropdown and the system will display that, if it is available."
+description: 'The grid will only display materials in internvals of 4. <br /><br />Example work ID: work-of:870970-basis:136336282.<br /><br />If you need to link to a specific type, select it from the dropdown and the system will display that, if it is available.'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.paragraph.recommendation.field_image_position_right.yml

@@ -10,7 +10,7 @@ field_name: field_image_position_right
 entity_type: paragraph
 bundle: recommendation
 label: 'Image position right'
-description: "This determines whether the image should be positioned to the left or right. \r\nIf left untoggled (default behaviour) the image is positioned to the left, if toggled on, the image will be positioned to the right. "
+description: 'This determines whether the image should be positioned to the left or right. <br />If left untoggled (default behaviour) the image is positioned to the left, if toggled on, the image will be positioned to the right. '
 required: false
 translatable: false
 default_value:

config/sync/field.field.paragraph.recommendation.field_recommendation_description.yml

@@ -10,7 +10,7 @@ field_name: field_recommendation_description
 entity_type: paragraph
 bundle: recommendation
 label: Description
-description: "This is the description for a recommendation. \r\n\r\nIf you add a description, the title of the the material will not be automatically generated. "
+description: 'This is the description for a recommendation. <br /><br />If you add a description, the title of the the material will not be automatically generated. '
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.paragraph.recommendation.field_recommendation_title.yml

@@ -13,7 +13,7 @@ field_name: field_recommendation_title
 entity_type: paragraph
 bundle: recommendation
 label: Title
-description: "The title of the recommended material.\r\n\r\nIf you add a title, the description for the material will not be automatically generated. "
+description: 'The title of the recommended material.<br /><br />If you add a title, the description for the material will not be automatically generated. '
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.paragraph.recommendation.field_recommendation_work_id.yml

@@ -12,7 +12,7 @@ field_name: field_recommendation_work_id
 entity_type: paragraph
 bundle: recommendation
 label: 'Work ID'
-description: "This is the work ID used to retrieve the material information. Example: work-of:870970-basis:136336282.\r\nCurrently this is retrieved by performing a search for a material manually, and copying this value from the URL.\r\nIf you need to link to a specific type, select it from the dropdown and the system will display that, if it is available."
+description: 'This is the work ID used to retrieve the material information. Example: work-of:870970-basis:136336282.<br />Currently this is retrieved by performing a search for a material manually, and copying this value from the URL.<br />If you need to link to a specific type, select it from the dropdown and the system will display that, if it is available.'
 required: false
 translatable: false
 default_value: {  }

config/sync/filter.format.basic.yml

@@ -12,6 +12,6 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p> <h2> <h3> <strong> <em> <a href data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol reversed start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption>'
+      allowed_html: '<br /> <p> <h2> <h3> <strong> <em> <a href data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol reversed start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption>'
       filter_html_help: true
       filter_html_nofollow: false

config/sync/filter.format.limited.yml

@@ -12,6 +12,6 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p> <strong> <em> <a href data-entity-type data-entity-uuid data-entity-substitution>'
+      allowed_html: '<br /> <p> <strong> <em> <a href data-entity-type data-entity-uuid data-entity-substitution>'
       filter_html_help: true
       filter_html_nofollow: false

config/sync/views.view.entity_clone_template.yml

@@ -481,7 +481,7 @@ display:
           admin_label: ''
           plugin_id: text_custom
           empty: true
-          content: "<div class=\"admin-item\">\r\n<p>\r\nYou can use existing content templates, to quickly re-use content structures that you have already created.\r\n</p>\r\n<p>\r\nTo create new templates that can be re-used, you need to create a new content from scratch, and choose to expose it as a template. Usually, this option is available in the sidebar in the edit form.\r\n</p>\r\n<p>\r\nOnce you've done this, the template will be shown here.\r\n</p>\r\n</div>"
+          content: '<div class="admin-item"><br /><p><br />You can use existing content templates, to quickly re-use content structures that you have already created.<br /></p><br /><p><br />To create new templates that can be re-used, you need to create a new content from scratch, and choose to expose it as a template. Usually, this option is available in the sidebar in the edit form.<br /></p><br /><p><br />Once you''ve done this, the template will be shown here.<br /></p><br /></div>'
           tokenize: false
       display_extenders: {  }
     cache_metadata:

config/sync/views.view.entity_reference_content.yml

@@ -232,7 +232,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "<div>\r\n<strong>{{ title }}</strong><br/>\r\n<small>{{ nid }} - {{ type }} - ({{ status }})</small>\r\n</div>"
+            text: '<div><br /><strong>{{ title }}</strong><br/><br /><small>{{ nid }} - {{ type }} - ({{ status }})</small><br /></div>'
             make_link: false
             path: ''
             absolute: false

config/sync/views.view.entity_reference_event_instance.yml

@@ -236,7 +236,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "<div>\r\n<strong>{{ title }}</strong><br/>\r\n<small>{{ id }} - <strong>{{date__value}}</strong> {{\_date__value_1 }} - ({{ status }})</small>\r\n</div>"
+            text: "<div><br /><strong>{{ title }}</strong><br/><br /><small>{{ id }} - <strong>{{date__value}}</strong> {{\_date__value_1 }} - ({{ status }})</small><br /></div>"
             make_link: false
             path: ''
             absolute: false

config/sync/views.view.entity_reference_event_series.yml

@@ -216,7 +216,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "<div>\r\n<strong>{{ title }}</strong><br/>\r\n<small>{{ id }} - <strong>{{eventseries_start_date}}</strong> - ({{ status }})</small>\r\n</div>"
+            text: '<div><br /><strong>{{ title }}</strong><br/><br /><small>{{ id }} - <strong>{{eventseries_start_date}}</strong> - ({{ status }})</small><br /></div>'
             make_link: false
             path: ''
             absolute: false

config/sync/views.view.event_admin.yml

@@ -368,7 +368,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "<strong>{{ date__value }}</strong> | {{ date__value_1 }}<br>\r\n<small>{{ recur_type }}</small>"
+            text: '<strong>{{ date__value }}</strong> | {{ date__value_1 }}<br /><br /><small>{{ recur_type }}</small>'
             make_link: false
             path: ''
             absolute: false

web/modules/custom/dpl_example_content/content/eventseries/c8177097-1438-493e-8177-e8ef968cc133.yml

@@ -158,7 +158,7 @@ default:
               value: true
           field_body:
             -
-              value: '<h2>Om udstillingen</h2><p>Deltagende kunstnere: Ei Arakawa, Mohamed Bourouissa, Cao Fei, Simon Denny, Lara Favaretto, GCC, Guan Xiao, Shadi Habib Allah, Roger Hiorns, Oliver Laric, Liz Magic Laser, Katja Novitskova, Laura Owens, Yuri Pattison, Sondra Perry, Josephine Pryde, Nick Relph, Cameron Rowland, Hito Steyerl, Martine Syms, Nora Turato.<br><br>Post-Capital: Art and the Economics of the Digital Age er kurateret af Michelle Cotton og produceret af Mudam Luxembourg – Musée d’Art Moderne Grand-Duc Jean i tæt samarbejde med Kunsthal Charlottenborg.</p><p><a href="https://www.danskdanseteater.dk/">Planlæg dit besøg</a>.</p>'
+              value: '<h2>Om udstillingen</h2><p>Deltagende kunstnere: Ei Arakawa, Mohamed Bourouissa, Cao Fei, Simon Denny, Lara Favaretto, GCC, Guan Xiao, Shadi Habib Allah, Roger Hiorns, Oliver Laric, Liz Magic Laser, Katja Novitskova, Laura Owens, Yuri Pattison, Sondra Perry, Josephine Pryde, Nick Relph, Cameron Rowland, Hito Steyerl, Martine Syms, Nora Turato.<br /><br />Post-Capital: Art and the Economics of the Digital Age er kurateret af Michelle Cotton og produceret af Mudam Luxembourg – Musée d’Art Moderne Grand-Duc Jean i tæt samarbejde med Kunsthal Charlottenborg.</p><p><a href="https://www.danskdanseteater.dk/">Planlæg dit besøg</a>.</p>'
               format: basic
     -
       entity:
@@ -261,7 +261,7 @@ default:
               value: true
           field_body:
             -
-              value: '<h2>Barokken er en kulturperiode der i Danmark gør sig gældende fra omkring 1650 – 1720</h2><p>Barokken er udtryk for en storslået og prangende stilretning inden for billedkunst, musik, arkitektur og litteratur, hvor man dyrkede det teatralske, storladne og sanselige udtryk. I dansk litteraturhistorie er det Anders Arrebo (1587-1637), som indleder barokken med sin oversættelse af Davis salmer i 1623 og Kingo bliver den kanoniserede repræsentant for perioden.<br><br>Barokkens vigtigste prosaværk i Danmark er Leonora Christina Ulfeldts (1621-1698) biografi ”Jammers minde”. ”Jammers minde” beskriver de 22 år, Leonora Christine sad fængslet i Blåtårn, anklaget for højforræderi af kong Frederik den 3.<br><br>Under perioden blev kunsten nærmest propaganda, som bl.a. i form af hyldestdigte understregede, at kongens plads var lige efter Guds. Salmer hyldede Gud som den, der giver verden mening. Samlerne er fyldt med billedsprog og modsætninger, som skal vise splittelsen mellem vores overfladiske liv og Gud, som lover, at der er en mening med tilværelsen.</p>'
+              value: '<h2>Barokken er en kulturperiode der i Danmark gør sig gældende fra omkring 1650 – 1720</h2><p>Barokken er udtryk for en storslået og prangende stilretning inden for billedkunst, musik, arkitektur og litteratur, hvor man dyrkede det teatralske, storladne og sanselige udtryk. I dansk litteraturhistorie er det Anders Arrebo (1587-1637), som indleder barokken med sin oversættelse af Davis salmer i 1623 og Kingo bliver den kanoniserede repræsentant for perioden.<br /><br />Barokkens vigtigste prosaværk i Danmark er Leonora Christina Ulfeldts (1621-1698) biografi ”Jammers minde”. ”Jammers minde” beskriver de 22 år, Leonora Christine sad fængslet i Blåtårn, anklaget for højforræderi af kong Frederik den 3.<br /><br />Under perioden blev kunsten nærmest propaganda, som bl.a. i form af hyldestdigte understregede, at kongens plads var lige efter Guds. Salmer hyldede Gud som den, der giver verden mening. Samlerne er fyldt med billedsprog og modsætninger, som skal vise splittelsen mellem vores overfladiske liv og Gud, som lover, at der er en mening med tilværelsen.</p>'
               format: basic
   field_event_partners:
     -