hr-design-system-handlebars 1.61.4 → 1.63.0

package/dist/views/components/externalService/external_service_with_datapolicy_check.hbs

@@ -0,0 +1,16 @@
+<div class="grid clear-both mt-10">
+        {{~> components/base/a11y/hiddenText _locaTag="story_externalservice_intro_sr" ~}}
+        <div class="c-externalService c-externalService__{{this.externalServiceConfig.externalServiceId}} js-load"
+             data-hr-external-service-ds='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}", "embedType": "{{this.externalServiceConfig.externalServiceEmbedType}}", "dataPolicyCheck": true,"iFrameConfig": {"heightClass":"ar_iframe"{{#if
+                 this.fixedHeight}},"fixedHeight":"{{this.fixedHeight}}", "fixedHeightClass":"-fixedHeight"{{else}},{{#if
+                 this.aspectRatio}}"aspectRatio":"{{this.aspectRatio}}"{{else}}"aspectRatio":"16x9"{{/if}}{{/if}},"noResponsiveIframe":"{{{this.setResponsiveIframe}}}","refreshContent":"{{{this.setTimedReloadIframe}}}","refreshIntervall":"{{this.setTimeForReload}}"}}'>
+            {{~> components/externalService/components/external_service_data_policy ~}}
+        </div>
+        {{~> components/externalService/components/external_service_caption ~}}
+        {{~> components/base/a11y/hiddenText _locaTag="story_externalservice_outro_sr" ~}}
+        <div class="hidden js-content-settings-button">
+            <div class="float-right">
+            {{~> components/externalService/components/external_service_settings_button ~}}
+            </div>
+        </div>
+</div>

package/dist/views_static/components/content/copytext/components/externalservice.hbs

@@ -1,80 +1,5 @@
-{{~#if (isStorybook)~}}
-    
-    {{#with this.toModel.externalService}}
-    
-        <!--div>serviceUrl: <b>{{this.serviceUrl}}</b></div-->
-        <div>externalServiceName: <b>{{this.externalServiceConfig.externalServiceName}}</b></div>
-        <div>makeConfigurable: <b>{{this.externalServiceConfig.makeConfigurable}}</b></div>
-        <div>externalServiceId: <b>{{this.externalServiceConfig.externalServiceId}}</b></div>
-        <div>externalServiceEmbedType: <b>{{this.externalServiceConfig.externalServiceEmbedType}}</b></div>
-        <div>embedAsIFrame: <b>{{this.externalServiceConfig.embedAsIFrame}}</b></div>
-        <div>fixedHeight: <b>{{this.fixedHeight}}</b></div>
-        <div>aspectRatio: <b>{{this.aspectRatio}}</b></div>
-        <div>setResponsiveIframe: <b>{{this.setResponsiveIframe}}</b></div>
-        <div>setTimedReloadIframe: <b>{{this.setTimedReloadIframe}}</b></div>
-        <div>setTimeForReload: <b>{{this.setTimeForReload}}</b></div>
-        <div>externalServiceCaption: <b>{{this.externalServiceCaption}}</b></div>
-        
-        {{> components/externalService/externalservice }}
+{{#with this.toModel.externalService}}
 
-    {{/with}}
+    {{> components/externalService/external_service }}
 
-{{~else~}}
-    {{#with this.toModel.externalService}}
-        {{#if this.externalServiceConfig.makeConfigurable}}
-            {{~> modules/externalService/externalService~}}
-        {{else}}
-            {{#if this.externalServiceConfig.embedAsIFrame}}
-                {{#if this.fixedHeight}}
-                    {{#if this.serviceUrl}}
-                        <div class="copytext__externalService">
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_intro_sr" ~}}
-                            <div class="copytext__scrollWrapper -fixedHeight"
-                                    style="height:{{this.fixedHeight}}px;">
-                                <iframe frameborder="0" width="100%" height="100%"
-                                        src="{{{this.serviceUrl}}}" webkitallowfullscreen mozallowfullscreen
-                                        allowfullscreen scrolling='no'></iframe>
-                            </div>
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_outro_sr" ~}}
-                            {{#with this.externalServiceCaption}}
-                                <div class="copytext__captionLine">
-                                    <span class="figcaption">{{this}}</span>
-                                </div>
-                            {{/with}}
-                        </div>
-                    {{/if}}
-                {{else}}
-                    {{#if this.serviceUrl}}
-                        <div class="copytext__externalService">
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_intro_sr" ~}}
-                            <div class="copytext__scrollWrapper">
-                                <div class="ar--{{defaultIfEmpty this.aspectRatio "auto"}}">
-                                    <iframe frameborder="0" class="ar__content" width="100%" height="100%"
-                                            src="{{{this.serviceUrl}}}" webkitallowfullscreen
-                                            mozallowfullscreen allowfullscreen></iframe>
-                                </div>
-                            </div>
-                            {{#with this.externalServiceCaption}}
-                                <div class="copytext__captionLine">
-                                    <span class="figcaption">{{this}}</span>
-                                </div>
-                            {{/with}}
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_outro_sr" ~}}
-                        </div>
-                    {{/if}}
-                {{/if}}
-            {{else}}
-                <div class="copytext__externalService">
-                    <div class="c-externalService__{{this.externalServiceConfig.externalServiceId}} js-load"
-                            data-hr-external-service='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}", "embedType": "{{this.externalServiceConfig.externalServiceEmbedType}}", "dataPolicyCheck": false, "iFrameConfig":{}}'>
-                    </div>
-                    {{#with this.externalServiceCaption}}
-                        <div class="copytext__captionLine js-externalservice__caption">
-                            <span class="figcaption">{{this}}</span>
-                        </div>
-                    {{/with}}
-                </div>
-            {{/if}}
-        {{/if}}
-    {{/with}}
-{{~/if~}}
+{{/with}}

package/dist/views_static/components/content/copytext/copytext.hbs

@@ -127,4 +127,13 @@
             {{> components/content/copytext/components/jobposting }}
         {{/if}}
     {{/each}}
-</div>
+</div>
+{{! Globaler Einstellungsbutton; nur für Copytext/Externe Dienste Story; 
+damit der Einstellungsdialog aufgerufen werden kann }}
+{{~#if (isStorybook)~}}
+    {{#with @root.dataPolicy}}
+        <div class="p-4 bg-footer-bg mt-14">
+            {{~> components/dataPolicySettings/data_policy_settings ~}}
+        </div>
+    {{/with}}
+{{~/if~}}

package/dist/views_static/components/event/label_byline.ssi.hbs

@@ -3,7 +3,7 @@
         {{> components/event/event_status _css="ml-2" _status=(loca this.statusDescriptionForLabelShort)}} 
     {{else}}
         {{#> components/text/byline _css="ml-2"}}
-            {{this.startDateTime.date}}, {{this.startDateTime.time}} Uhr
+            {{this.startDateTime.date}}{{#if this.hasStartTime}}, {{this.startDateTime.time}} Uhr{{/if}}
         {{/components/text/byline}}
     {{/if}}
 {{/with}}

package/dist/views_static/components/externalService/components/external_service_caption.hbs

@@ -0,0 +1,5 @@
+{{#with this.externalServiceCaption}}
+    <div class="py-2.5">
+        <span class="text-sm font-copy dark:text-text-dark">{{this}}</span>
+    </div>
+{{/with}}

package/dist/views_static/components/externalService/{external_service_data_policy.hbs → components/external_service_data_policy.hbs}

@@ -1,19 +1,19 @@
-<div id="service--{{nextRandom}}" class="p-10 sm:mx-0 col-span-12 grid bg-highlight-1 rounded-tl-hr rounded-br-hr js-datapolicy">
+<div id="service--{{nextRandom}}" class="grid col-span-12 p-10 sm:mx-0 bg-highlight-1 rounded-tl-hr rounded-br-hr js-datapolicy">
     <h3 class="text-2xl font-headingSerif">
         {{loca "ext_service_datapolicy_headline" this.externalServiceConfig.externalServiceName}}
     </h3>
     <div class="">
         <p class="pt-4 text-base font-copy">
             {{loca "ext_service_datapolicy_text" this.externalServiceConfig.externalServiceName}}
-            {{~> components/externalService/data_policy_link ~}}
+            {{~> components/externalService/components/data_policy_link ~}}
         </p>
         <div class="pt-4">
-            {{~> components/externalService/external_service_form_checkbox ~}}
+            {{~> components/externalService/components/external_service_form_checkbox ~}}
         </div>
-        <div class="pt-4 float-right">
+        <div class="float-right pt-4">
             {{#with this}}
                 <div class="inline-flex">
-                 {{~> components/externalService/external_service_settings_button ~}}
+                 {{~> components/externalService/components/external_service_settings_button ~}}
                 {{#*inline "htmlProperties"}}
                     data-piano-tracking='{"label":"DSGVO-Overlay"}'
                     data-a11y-dialog-show="datapolicy-settings-dialog"
@@ -21,7 +21,7 @@
                 </div>
             {{/with}}
             <div class="inline-flex">
-            {{~> components/externalService/external_service_load_content_button ~}}
+            {{~> components/externalService/components/external_service_load_content_button ~}}
             {{#*inline "htmlProperties"}}{{/inline}}
             </div>
         </div>

package/dist/views_static/components/externalService/{external_service_form_checkbox.hbs → components/external_service_form_checkbox.hbs}

@@ -1,11 +1,11 @@
 <fieldset>
     <div class="mt-6 space-y-6">
     <div class="relative flex gap-x-3">
-        <div class="flex h-6 items-center">
+        <div class="flex items-center h-6">
         <input id="dataPolicyAcceptPermanently-{{getRandom}}" name="dataPolicyAcceptPermanently"
                     title="Externe Inhalte von {{this.externalServiceConfig.externalServiceName}} zukünftig immer laden."
                     placeholder="Externe Inhalte von {{this.externalServiceConfig.externalServiceName}} zukünftig immer laden."
-                    value="0" required="" type="checkbox" class="h-6 w-6 rounded border-gray text-indigo focus:ring-indigo">
+                    value="0" required="" type="checkbox" class="w-6 h-6 rounded js-dataPolicy-acceptPermanentely border-gray text-indigo focus:ring-indigo">
         </div>
         <div class="text-sm leading-6">
         <label for="dataPolicyAcceptPermanently-{{getRandom}}" class="text-base font-copy">

package/{src/stories/views/components/externalService → dist/views_static/components/externalService/components}/external_service_load_content_button.hbs

@@ -1,4 +1,4 @@
-{{#> components/button/button _size="md" _variant="primary" _css="" _type="button"}}
-            {{> components/button/components/button_label _label="Inhalte anzeigen"}}
+{{#> components/button/button _size="md" _variant="primary" _css="js-dataPolicy-accept" _type="submit"}}
             {{> components/button/components/button_icon _icon="reload" _iconmap="icons"}}
+            {{> components/button/components/button_label _label="Inhalte anzeigen"}}
 {{/components/button/button}}

package/dist/{views/components/externalService → views_static/components/externalService/components}/external_service_settings_button.hbs

@@ -1,6 +1,6 @@
 {{#> components/button/button _size="md" _variant="tertiary" _css="" _type="button"}}
-            {{> components/button/components/button_label _label="Einstellungen"}}
             {{> components/button/components/button_icon _icon="settings" _iconmap="icons"}}
+            {{> components/button/components/button_label _label="Einstellungen"}}
 {{/components/button/button}}
 {{#*inline "htmlProperties"}}
     data-piano-tracking='{"label":"","secondLevelId":}'

package/dist/views_static/components/externalService/external_service.hbs

@@ -1,17 +1,35 @@
-<div class="grid">
-        {{~> components/base/a11y/hiddenText _locaTag="story_externalservice_intro_sr" ~}}
-        <div class="c-externalService c-externalService__{{this.externalServiceConfig.externalServiceId}} js-load"
-             data-hr-external-service='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}", "embedType": "{{this.externalServiceConfig.externalServiceEmbedType}}", "dataPolicyCheck": true,"iFrameConfig": {"heightClass":"ar_iframe"{{#if
-                 this.fixedHeight}},"fixedHeight":"{{this.fixedHeight}}", "fixedHeightClass":"-fixedHeight"{{else}},{{#if
-                 this.aspectRatio}}"aspectRatio":"{{this.aspectRatio}}"{{else}}"aspectRatio":"16x9"{{/if}}{{/if}},"noResponsiveIframe":"{{{this.setResponsiveIframe}}}","refreshContent":"{{{this.setTimedReloadIframe}}}","refreshIntervall":"{{this.setTimeForReload}}"}}'>
-            {{~> components/externalService/external_service_data_policy ~}}
+{{#if this.externalServiceConfig.makeConfigurable}}
+    
+    {{> components/externalService/external_service_with_datapolicy_check }}
+
+{{else}}
+    
+    {{#if this.serviceUrl}}
+        <div class="clear-both mt-10">
+            <span class="sr-only">{{loca "story_externalservice_intro_sr" }}</span>    
+            {{#if this.externalServiceConfig.embedAsIFrame}}              
+                    
+                <div class="{{#if this.fixedHeight}}overflow-y-hidden{{else}}overflow-hidden{{/if}}" {{#if this.fixedHeight}}style="height:{{this.fixedHeight}}px;"{{/if}}>
+                    {{#unless this.fixedHeight}}<div class="{{~inline-switch this.aspectRatio  '["16x9","16x7","4x3","100x27","100","9x16","7x16"]' '["ar-16-9","ar-16-7","ar-4-3","ar-100-27","ar-1-1","ar-9-16","ar-7-16","ar-16-9"]'~}}">{{/unless}}
+                        <iframe frameborder="0" width="100%" height="100%"
+                                src="{{{this.serviceUrl}}}" webkitallowfullscreen mozallowfullscreen
+                                allowfullscreen scrolling='no'>
+                        </iframe>
+                    {{#unless this.fixedHeight}}</div>{{/unless}}                        
+                </div>
+            
+            {{else}}
+            
+                <div class="c-externalService__{{this.externalServiceConfig.externalServiceId}} js-load"
+                    data-hr-external-service-ds='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}", "embedType": "{{this.externalServiceConfig.externalServiceEmbedType}}", "dataPolicyCheck": false, "iFrameConfig":{}}'>
+                </div>
+                
+            {{/if}}
+                
+            {{~> components/externalService/components/external_service_caption ~}}
+            
+            <span class="sr-only">{{loca "story_externalservice_outro_sr" }}</span>    
         </div>
-        {{~> components/externalService/external_service_caption ~}}
-        {{~> components/base/a11y/hiddenText _locaTag="story_externalservice_outro_sr" ~}}
-        <div >
-            <div class="float-right">
-            {{~> components/externalService/external_service_settings_button ~}}
-            </div>
-        </div>
-</div>
-{{~> components/dataPolicySettings/data_policy_settings ~}}
+    {{/if}}
+
+{{/if}}

package/dist/views_static/components/externalService/external_service_with_datapolicy_check.hbs

@@ -0,0 +1,16 @@
+<div class="grid clear-both mt-10">
+        {{~> components/base/a11y/hiddenText _locaTag="story_externalservice_intro_sr" ~}}
+        <div class="c-externalService c-externalService__{{this.externalServiceConfig.externalServiceId}} js-load"
+             data-hr-external-service-ds='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}", "embedType": "{{this.externalServiceConfig.externalServiceEmbedType}}", "dataPolicyCheck": true,"iFrameConfig": {"heightClass":"ar_iframe"{{#if
+                 this.fixedHeight}},"fixedHeight":"{{this.fixedHeight}}", "fixedHeightClass":"-fixedHeight"{{else}},{{#if
+                 this.aspectRatio}}"aspectRatio":"{{this.aspectRatio}}"{{else}}"aspectRatio":"16x9"{{/if}}{{/if}},"noResponsiveIframe":"{{{this.setResponsiveIframe}}}","refreshContent":"{{{this.setTimedReloadIframe}}}","refreshIntervall":"{{this.setTimeForReload}}"}}'>
+            {{~> components/externalService/components/external_service_data_policy ~}}
+        </div>
+        {{~> components/externalService/components/external_service_caption ~}}
+        {{~> components/base/a11y/hiddenText _locaTag="story_externalservice_outro_sr" ~}}
+        <div class="hidden js-content-settings-button">
+            <div class="float-right">
+            {{~> components/externalService/components/external_service_settings_button ~}}
+            </div>
+        </div>
+</div>

package/package.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "main": "dist/index.js",
     "repository": "https://github.com/szuelch/hr-design-system-handlebars",
-    "version": "1.61.4",
+    "version": "1.63.0",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "storybook": "storybook dev -p 6006 public",

package/src/assets/css/custom-utilities.css

@@ -25,89 +25,123 @@
     }
 
 
-    .ar-16-9, .ar-16x9-DS {
+    .ar-16-9 {
         aspect-ratio: 16 / 9;
     }
 
     @supports not (aspect-ratio: 16 / 9) {
-        .ar-16-9::before, .ar-16x9-DS::before {
+        .ar-16-9::before {
             float: left;
             padding-top: calc(9 / 16 * 100%);
             content: '';
         }
 
-        .ar-16-9::after, .ar-16x9-DS::after {
+        .ar-16-9::after {
             display: block;
             content: '';
             clear: both;
         }
     }
 
-    .ar-16-7, .ar-16x7-DS {
+    .ar-16-7 {
         aspect-ratio: 16 / 7;
     }
 
     @supports not (aspect-ratio: 16 / 7) {
-        .ar-16-7::before, .ar-16x7-DS::before {
+        .ar-16-7::before {
             float: left;
             padding-top: calc(7 / 16 * 100%);
             content: '';
         }
 
-        .ar-16-7::after, .ar-16x7-DS::after {
+        .ar-16-7::after {
             display: block;
             content: '';
             clear: both;
         }
     }
 
-    .ar-4-3, .ar-4x3-DS {
+    .ar-4-3 {
         aspect-ratio: 4 / 3;
     }
 
     @supports not (aspect-ratio: 4 / 3) {
-        .ar-4-3::before, .ar-4x3-DS::before {
+        .ar-4-3::before {
             float: left;
             padding-top: calc(3 / 4 * 100%);
             content: '';
         }
 
-        .ar-4-3::after, .ar-4x3-DS::after {
+        .ar-4-3::after {
             display: block;
             content: '';
             clear: both;
         }
     }
 
-    .ar-1-1, .ar-100-DS {
+    .ar-1-1 {
         aspect-ratio: 1 / 1;
     }
 
     @supports not (aspect-ratio: 1 / 1) {
-        .ar-1-1::before, .ar-100-DS::before {
+        .ar-1-1::before {
             float: left;
             padding-top: 100%;
             content: '';
         }
 
-        .ar-1-1::after, .ar-100-DS::after {
+        .ar-1-1::after {
             display: block;
             content: '';
             clear: both;
         }
     }
-    .ar-100-27, .ar-100x27 {
+    .ar-100-27 {
         aspect-ratio: 100 / 27.1;
     }
 
     @supports not (aspect-ratio: 100 / 27.1) {
-        .ar-100-27::before, .ar-100x27::before {
+        .ar-100-27::before {
             float: left;
             padding-top: calc(27.1 / 100 * 100%);
             content: '';
         }
 
-        .ar-100-27::after, .ar-100x27::after {
+        .ar-100-27::after {
+            display: block;
+            content: '';
+            clear: both;
+        }
+    }
+
+    .ar-9-16 {
+        aspect-ratio: 9 / 16;
+    }
+    @supports not (aspect-ratio: 9 / 16) {
+        .ar-9-16::before {
+            float: left;
+            padding-top: calc(16 / 9 * 100%);
+            content: '';
+        }
+
+        .ar-9-16::after {
+            display: block;
+            content: '';
+            clear: both;
+        }
+    }
+
+    .ar-7-16 {
+        aspect-ratio: 7 / 16;
+    }
+    @supports not (aspect-ratio: 7 / 16) {
+        .ar-7-16::before {
+            float: left;
+            padding-top: calc(16 / 7 * 100%);
+            content: '';
+        }
+
+        .ar-7-16::after {
             display: block;
             content: '';
             clear: both;

package/src/assets/fixtures/content/copytext/copytext_externalservice.json

@@ -274,5 +274,48 @@
                 }
             }
         }                                                                                                                                        
-    ]
+    ],
+    "dataPolicy": {
+        "serviceList" :[
+            {   "key" : "ard_mediathek",
+                "value" : "ARD Mediathek (Video)"
+            },
+            {   "key" : "arte_concert",
+                "value" : "Arte Concert"
+            },
+            {   "key" : "arte_concert_new",
+                "value" : "Arte Concert 2.0"
+            },
+            {   "key" : "datawrapper_cdn",
+                "value" : "Datawrapper (Datengrafik)"
+            },
+            {   "key" : "esri",
+                "value" : "Esri (Notfallkarte)"
+            },
+            {   "key" : "facebook-post",
+                "value" : "Facebook"
+            },
+            {   "key" : "flourish",
+                "value" : "Flourish (Datengrafik)"
+            },
+            {   "key" : "giphy",
+                "value" : "Giphy (animiertes GIF)"
+            },
+            {   "key" : "instagram",
+                "value" : "Instagram"
+            },
+            {   "key" : "twitter-post",
+                "value" : "Twitter"
+            },
+            {   "key" : "vimeo",
+                "value" : "Vimeo (Video)"
+            },
+            {   "key" : "youtube",
+                "value" : "YouTube (Video)"
+            },
+            {   "key" : "youtube360",
+                "value" : "YouTube 360 (360° Video)"
+            }
+        ]
+    }
 }

package/src/assets/fixtures/external_service/external_service.inc.json

@@ -92,7 +92,7 @@
             "externalServiceEmbedType": "js",
             "externalServiceName": "Facebook"
         },
-        "serviceUrl": "https://www.facebook.com/v10.0/plugins/post.php?app_id=&channel=https%3A%2F%2Fstaticxx.facebook.com%2Fx%2Fconnect%2Fxd_arbiter%2F%3Fversion%3D46%23cb%3Df000f487949b618db%26domain%3Dhessenschau-dev-red.hr.de%26is_canvas%3Dfalse%26origin%3Dhttps%253A%252F%252Fhessenschau-dev-red.hr.de%252Ffac8e6f0732031392%26relation%3Dparent.parent&container_width=1&href=https%3A%2F%2Fwww.facebook.com%2FZooFFM%2Fposts%2F1926440010874354&lazy=true&locale=de_DE&sdk=joey&width=660",
+        "serviceUrl": "https://www.facebook.com/ZooFFM/posts/1926440010874354",
         "setResponsiveIframe": false,
         "setTimedReloadIframe": false,
         "setTimeForReload": ""
@@ -132,7 +132,7 @@
             "externalServiceEmbedType": "js",
             "externalServiceName": "Instagram"
         },
-        "serviceUrl": "https://www.instagram.com/p/CjZzvIOs7PK/embed/captioned/?cr=1&v=14&wp=658&rd=https%3A%2F%2Fhessenschau-dev-red.hr.de&rp=%2Ftest-externe-dienste-v1%2Cexternedienste-100.html#%7B%22ci%22%3A0%2C%22os%22%3A5421.799999999814%2C%22ls%22%3A4354.700000000186%2C%22le%22%3A4357.600000000559%7D",
+        "serviceUrl": "https://www.instagram.com/p/CEjxNt8lW4K/",
         "setResponsiveIframe": false,
         "setTimedReloadIframe": false,
         "setTimeForReload": ""
@@ -145,7 +145,7 @@
             "externalServiceEmbedType": "js",
             "externalServiceName": "X"
         },
-        "serviceUrl": "https://platform.twitter.com/embed/Tweet.html?creatorScreenName=hessenschau&creatorUserId=17360630&dnt=false&embedId=twitter-widget-0&features=eyJ0ZndfdGltZWxpbmVfbGlzdCI6eyJidWNrZXQiOltdLCJ2ZXJzaW9uIjpudWxsfSwidGZ3X2ZvbGxvd2VyX2NvdW50X3N1bnNldCI6eyJidWNrZXQiOnRydWUsInZlcnNpb24iOm51bGx9LCJ0ZndfdHdlZXRfZWRpdF9iYWNrZW5kIjp7ImJ1Y2tldCI6Im9uIiwidmVyc2lvbiI6bnVsbH0sInRmd19yZWZzcmNfc2Vzc2lvbiI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9LCJ0ZndfZm9zbnJfc29mdF9pbnRlcnZlbnRpb25zX2VuYWJsZWQiOnsiYnVja2V0Ijoib24iLCJ2ZXJzaW9uIjpudWxsfSwidGZ3X21peGVkX21lZGlhXzE1ODk3Ijp7ImJ1Y2tldCI6InRyZWF0bWVudCIsInZlcnNpb24iOm51bGx9LCJ0ZndfZXhwZXJpbWVudHNfY29va2llX2V4cGlyYXRpb24iOnsiYnVja2V0IjoxMjA5NjAwLCJ2ZXJzaW9uIjpudWxsfSwidGZ3X3Nob3dfYmlyZHdhdGNoX3Bpdm90c19lbmFibGVkIjp7ImJ1Y2tldCI6Im9uIiwidmVyc2lvbiI6bnVsbH0sInRmd19kdXBsaWNhdGVfc2NyaWJlc190b19zZXR0aW5ncyI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9LCJ0ZndfdXNlX3Byb2ZpbGVfaW1hZ2Vfc2hhcGVfZW5hYmxlZCI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9LCJ0ZndfdmlkZW9faGxzX2R5bmFtaWNfbWFuaWZlc3RzXzE1MDgyIjp7ImJ1Y2tldCI6InRydWVfYml0cmF0ZSIsInZlcnNpb24iOm51bGx9LCJ0ZndfbGVnYWN5X3RpbWVsaW5lX3N1bnNldCI6eyJidWNrZXQiOnRydWUsInZlcnNpb24iOm51bGx9LCJ0ZndfdHdlZXRfZWRpdF9mcm9udGVuZCI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9fQ%3D%3D&frame=false&hideCard=false&hideThread=false&id=1578122540362465299&lang=de&origin=https%3A%2F%2Fhessenschau-dev-red.hr.de%2Ftest-externe-dienste-v1%2Cexternedienste-100.html&sessionId=56b29ff8ee6fd214d71e8ef5924dbf80fbc2d6cd&siteScreenName=hessenschau&siteUserId=17360630&theme=light&widgetsVersion=2615f7e52b7e0%3A1702314776716&width=550px",
+        "serviceUrl": "https://twitter.com/tagesthemen/status/1578122540362465299",
         "setResponsiveIframe": false,
         "setTimedReloadIframe": false,
         "setTimeForReload": ""

package/src/assets/fixtures/teaser/teaser_labels.inc.json

@@ -81,6 +81,7 @@
                 "firstInstant": {
                     "hasStatus": false,
                     "statusDescriptionForLabelShort": "event_status_cancelled",
+                    "hasStartTime": true,
                     "startDateTime": {
                         "date": "14.10.22",
                         "time": "20:00"

package/src/stories/views/components/content/copytext/components/externalservice.hbs

@@ -1,80 +1,5 @@
-{{~#if (isStorybook)~}}
-    
-    {{#with this.toModel.externalService}}
-    
-        <!--div>serviceUrl: <b>{{this.serviceUrl}}</b></div-->
-        <div>externalServiceName: <b>{{this.externalServiceConfig.externalServiceName}}</b></div>
-        <div>makeConfigurable: <b>{{this.externalServiceConfig.makeConfigurable}}</b></div>
-        <div>externalServiceId: <b>{{this.externalServiceConfig.externalServiceId}}</b></div>
-        <div>externalServiceEmbedType: <b>{{this.externalServiceConfig.externalServiceEmbedType}}</b></div>
-        <div>embedAsIFrame: <b>{{this.externalServiceConfig.embedAsIFrame}}</b></div>
-        <div>fixedHeight: <b>{{this.fixedHeight}}</b></div>
-        <div>aspectRatio: <b>{{this.aspectRatio}}</b></div>
-        <div>setResponsiveIframe: <b>{{this.setResponsiveIframe}}</b></div>
-        <div>setTimedReloadIframe: <b>{{this.setTimedReloadIframe}}</b></div>
-        <div>setTimeForReload: <b>{{this.setTimeForReload}}</b></div>
-        <div>externalServiceCaption: <b>{{this.externalServiceCaption}}</b></div>
-        
-        {{> components/externalService/externalservice }}
+{{#with this.toModel.externalService}}
 
-    {{/with}}
+    {{> components/externalService/external_service }}
 
-{{~else~}}
-    {{#with this.toModel.externalService}}
-        {{#if this.externalServiceConfig.makeConfigurable}}
-            {{~> modules/externalService/externalService~}}
-        {{else}}
-            {{#if this.externalServiceConfig.embedAsIFrame}}
-                {{#if this.fixedHeight}}
-                    {{#if this.serviceUrl}}
-                        <div class="copytext__externalService">
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_intro_sr" ~}}
-                            <div class="copytext__scrollWrapper -fixedHeight"
-                                    style="height:{{this.fixedHeight}}px;">
-                                <iframe frameborder="0" width="100%" height="100%"
-                                        src="{{{this.serviceUrl}}}" webkitallowfullscreen mozallowfullscreen
-                                        allowfullscreen scrolling='no'></iframe>
-                            </div>
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_outro_sr" ~}}
-                            {{#with this.externalServiceCaption}}
-                                <div class="copytext__captionLine">
-                                    <span class="figcaption">{{this}}</span>
-                                </div>
-                            {{/with}}
-                        </div>
-                    {{/if}}
-                {{else}}
-                    {{#if this.serviceUrl}}
-                        <div class="copytext__externalService">
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_intro_sr" ~}}
-                            <div class="copytext__scrollWrapper">
-                                <div class="ar--{{defaultIfEmpty this.aspectRatio "auto"}}">
-                                    <iframe frameborder="0" class="ar__content" width="100%" height="100%"
-                                            src="{{{this.serviceUrl}}}" webkitallowfullscreen
-                                            mozallowfullscreen allowfullscreen></iframe>
-                                </div>
-                            </div>
-                            {{#with this.externalServiceCaption}}
-                                <div class="copytext__captionLine">
-                                    <span class="figcaption">{{this}}</span>
-                                </div>
-                            {{/with}}
-                            {{~> base/a11y/hiddenText _locaTag="story_externalservice_outro_sr" ~}}
-                        </div>
-                    {{/if}}
-                {{/if}}
-            {{else}}
-                <div class="copytext__externalService">
-                    <div class="c-externalService__{{this.externalServiceConfig.externalServiceId}} js-load"
-                            data-hr-external-service='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}", "embedType": "{{this.externalServiceConfig.externalServiceEmbedType}}", "dataPolicyCheck": false, "iFrameConfig":{}}'>
-                    </div>
-                    {{#with this.externalServiceCaption}}
-                        <div class="copytext__captionLine js-externalservice__caption">
-                            <span class="figcaption">{{this}}</span>
-                        </div>
-                    {{/with}}
-                </div>
-            {{/if}}
-        {{/if}}
-    {{/with}}
-{{~/if~}}
+{{/with}}

package/src/stories/views/components/content/copytext/copytext.hbs

@@ -127,4 +127,13 @@
             {{> components/content/copytext/components/jobposting }}
         {{/if}}
     {{/each}}
-</div>
+</div>
+{{! Globaler Einstellungsbutton; nur für Copytext/Externe Dienste Story; 
+damit der Einstellungsdialog aufgerufen werden kann }}
+{{~#if (isStorybook)~}}
+    {{#with @root.dataPolicy}}
+        <div class="p-4 bg-footer-bg mt-14">
+            {{~> components/dataPolicySettings/data_policy_settings ~}}
+        </div>
+    {{/with}}
+{{~/if~}}