Linked websites with LinkType

diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss
index edfb589de7bc65a3eb64d86372e57a3cbb90262d..0564062e28b8aab1c9e9cec6a787099e9106dc02 100755 (executable)
--- a/app/static/src/sass/global/_typography.scss
+++ b/app/static/src/sass/global/_typography.scss
@@ -46,7 +46,7 @@ h3 {
     @include margin-top(1);
 }
 
-p {
+p, ul {
     @include margin-top(0);
     @include margin-bottom(1);
        @include line-height(1.25);

diff --git a/app/templates/core/inc/link.html b/app/templates/core/inc/link.html
index af2721d8418353a4b1a02059281d9fe01395c436..90476c96bf9754d504c918df42fab8c1892fbd6f 100644 (file)
--- a/app/templates/core/inc/link.html
+++ b/app/templates/core/inc/link.html
@@ -1,6 +1,9 @@
-{% load mezzanine_tags %}
-<ul>
-{% for link in links %}
-  <li><a class="fa fa-{{ link.link_type.name }}" href="{{ link.url }}" title="">{{ link.url }}</a></li>
-{% endfor %}
+{% load mezzanine_tags i18n %}
+<p>
+    <strong>{% trans "Linked websites" %}</strong>
+</p>
+<ul class="unstyled-list">
+    {% for link in links %}
+      <li><a href="{{ link.url }}" title=""><i class="fa fa-{{ link.link_type.name }}"></i> {{ link.url }}</a></li>
+    {% endfor %}
 </ul>

diff --git a/app/templates/pages/custompage.html b/app/templates/pages/custompage.html
index a9d18eb38526754a9dd1211307799031ba03f6ce..a6eca743e93b806be9c2d6184924702532588398 100644 (file)
--- a/app/templates/pages/custompage.html
+++ b/app/templates/pages/custompage.html
@@ -66,6 +66,14 @@
 
 {% endblock %}
 
+{% block page_link %}
+    {% with page.custompage.links.all as links %}
+        {% if links %}
+            {% include 'core/inc/link.html' %}
+        {% endif %}
+    {% endwith %}
+{% endblock %}
+
 {% block page_audio %}
   {% with page.custompage.audios.all as audios %}
     {% if audios %}
@@ -90,14 +98,6 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_link %}
-{% with page.custompage.links.all as links %}
-  {% if links %}
-    {% include 'core/inc/link.html' %}
-  {% endif %}
-{% endwith %}
-{% endblock %}
-
 {% block page_person_list %}
     {% for page_custom_person_list_block_inline in page.custompage.page_custom_person_list_block_inlines.all  %}
       {% with page_custom_person_list_block_inline.person_list_block as person_list_block %}

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index c73d3f2aef831be769a78553b93468428106ed4d..bbe572728c06fe25afc1859bde1746810af59093 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -54,6 +54,8 @@
                     {% block page_content %}
                         {{ page.content }}
                     {% endblock %}
+                    {% block page_link %}
+                    {% endblock %}
                     {% block page_audio %}
                     {% endblock %}
                 </div>
@@ -65,8 +67,6 @@
         {% endblock %}
         {% block page_video %}
         {% endblock %}
-        {% block page_link %}
-        {% endblock %}
         {% block page_person_list %}
         {% endblock %}
         {% block page_sub_content %}