apps/organisation: wrap richtext content in ck-content div and add ds…

…gvo-embed to organisation info page
liqd · Mar 28, 2024 · 910f82b · 910f82b
1 parent f2784fb
commit 910f82b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/apps/organisations/templates/a4_candy_organisations/organisation_data_protection.html b/apps/organisations/templates/a4_candy_organisations/organisation_data_protection.html
@@ -14,7 +14,9 @@
                     </div>
                 </div>
                 <h1>{% translate 'Data protection' %}</h1>
-                {{ organisation.data_protection|richtext }}
+                <div class="ck-content">
+                    {{ organisation.data_protection|richtext }}
+                 </div>
             </div>
         </div>
     {% include 'footer_upper.html' with organisation=organisation %}

diff --git a/apps/organisations/templates/a4_candy_organisations/organisation_imprint.html b/apps/organisations/templates/a4_candy_organisations/organisation_imprint.html
@@ -14,7 +14,9 @@
                     </div>
                 </div>
                 <h1>{% translate 'Imprint' %}</h1>
-                {{ organisation.imprint|richtext }}
+                <div class="ck-content">
+                    {{ organisation.imprint|richtext }}
+                </div>
             </div>
         </div>
     {% include 'footer_upper.html' with organisation=organisation %}

diff --git a/apps/organisations/templates/a4_candy_organisations/organisation_information.html b/apps/organisations/templates/a4_candy_organisations/organisation_information.html
@@ -1,5 +1,16 @@
 {% extends 'base.html' %}
-{% load ckeditor_tags i18n thumbnail wagtailcore_tags %}
+{% load static ckeditor_tags i18n thumbnail wagtailcore_tags %}
+
+<!-- ensure cookie overlay for embedded videos -->
+{% block extra_css %}
+  {{ block.super }}
+    <link rel="stylesheet" href="{% static 'dsgvo_video_embed.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
+  {{ block.super }}
+    <script type="text/javascript" src="{% static 'dsgvo_video_embed.js' %}"></script>
+{% endblock %}
 
 {% block title %}{% translate 'Information' %} &mdash; {{ block.super }}{% endblock %}
 
@@ -17,7 +28,9 @@
             <div class="row">
                 <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
                     <h1>{% translate 'Information' %}</h1>
-                    {{ organisation.information | transform_collapsibles | richtext }}
+                    <div class="ck-content">
+                        {{ organisation.information | transform_collapsibles | richtext }}
+                    </div>
                 </div>
             </div>
 

diff --git a/apps/organisations/templates/a4_candy_organisations/organisation_netiquette.html b/apps/organisations/templates/a4_candy_organisations/organisation_netiquette.html
@@ -14,7 +14,9 @@
                     </div>
                 </div>
                 <h1>{% translate 'Netiquette' %}</h1>
-                {{ organisation.netiquette|richtext }}
+                <div class="ck-content">
+                    {{ organisation.netiquette|richtext }}
+                </div>
             </div>
         </div>
     {% include 'footer_upper.html' with organisation=organisation %}

diff --git a/apps/organisations/templates/a4_candy_organisations/organisation_terms_of_use.html b/apps/organisations/templates/a4_candy_organisations/organisation_terms_of_use.html
@@ -14,7 +14,9 @@
                     </div>
                 </div>
                 <h1>{% translate 'Terms of use' %}</h1>
-                {{ organisation.terms_of_use|richtext }}
+                <div class="ck-content">
+                    {{ organisation.terms_of_use|richtext }}
+                </div>
             </div>
         </div>
         {% include 'footer_upper.html' with organisation=organisation %}