fix info-page design issues

liqd · Feb 18, 2025 · b8a333b · b8a333b
1 parent 5e898bd
commit b8a333b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/meinberlin/apps/projects/templates/meinberlin_projects/includes/contact_organisation.html b/meinberlin/apps/projects/templates/meinberlin_projects/includes/contact_organisation.html
@@ -11,10 +11,10 @@ <h3 id="responsible-body">{% trans 'Responsible body' %}</h3>
       {% endif %}
 
       {% if organisation.url %}
-      <p>{% trans "Website" %}: 
-         <a href="{{ organisation.url }}" target="_blank" rel="noopener noreferrer">{{ organisation.url }}</a>
-      </p>
-    {% endif %}
+        <p>{% trans "Website" %}: 
+          <a href="{{ organisation.url }}" target="_blank" rel="noopener noreferrer">{{ organisation.url }}</a>
+        </p>
+      {% endif %}
     </address>
   </div>
 {% endif %}
diff --git a/meinberlin/apps/projects/templates/meinberlin_projects/includes/contact_person.html b/meinberlin/apps/projects/templates/meinberlin_projects/includes/contact_person.html
@@ -5,6 +5,10 @@
     <h3 id="contact-questions">{% trans "Contact for questions" %}</h3>
     <address aria-labelledby="contact-questions" class="mt-2">
       <p>{{ contact.contact_name }}</p>
+
+      {% if contact.contact_address_text %}
+        <p>{{ contact.contact_address_text|linebreaksbr }}</p>
+      {% endif %}
 
       {% if contact.contact_email %}
         <p>{% trans "Email" %}: 
@@ -17,6 +21,12 @@ <h3 id="contact-questions">{% trans "Contact for questions" %}</h3>
            <a href="tel:{{ contact.contact_phone }}" aria-label="{% trans 'Call' %} {{ contact.contact_name }}">{{ contact.contact_phone }}</a>
         </p>
       {% endif %}
+
+      {% if contact.contact_url %}
+        <p>{% trans "Website" %}: 
+          <a href="{{ contact.contact_url }}" target="_blank" rel="noopener noreferrer">{{ contact.contact_url }}</a>
+        </p>
+      {% endif %}
     </address>
   </div>
 {% endif %}
diff --git a/meinberlin/apps/projects/templates/meinberlin_projects/project_information.html b/meinberlin/apps/projects/templates/meinberlin_projects/project_information.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
+{% load i18n ckeditor_tags %}
 
 {% block title %}
   {{ project.name }} -{% trans 'Information' %}
@@ -38,7 +38,9 @@ <h2 id="description-title">
           <span class="aural">{% trans 'Project Description' %}</span>
           {{ project.name }}
         </h2>
-        <div>{{ project.information|safe }}</div>
+        <div class="ck-content">
+          {{ project.information | transform_collapsibles | disable_iframes | safe }}
+        </div>
       </section>
 
       {% if project.has_contact_details or project.organisation %}