]> git.parisson.com Git - mezzo.git/commitdiff
readd footer page menu
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 9 Mar 2016 23:05:58 +0000 (00:05 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 9 Mar 2016 23:05:58 +0000 (00:05 +0100)
app/festival/templates/festival/artist_detail.html
app/festival/templates/festival/video_detail.html
app/sandbox/settings.py
app/templates/base.html

index 15263365ce66733f26c8a188f623a9c2b6e6a88b..bc7b5d678627aedc01a4d131c075a88cddf229ec 100644 (file)
@@ -8,13 +8,13 @@
 
 {% block main %}
 <div class="artist__detail">
- <p>
-  {% if artist.photo %}
-   <img class="artist__portrait{% if artist.photo_alignment == 'left' %}--left{% elif artist.photo_alignment == 'right' %}--right{% else %}--center{% endif %}" src="{{ MEDIA_URL }}/{% if artist.photo_featured %}{{ artist.photo_featured }}{% else %}{{ artist.photo }}{% endif %}" />
-  {% endif %}
-  {{ artist.bio|safe }}
-  <br style="clear: both;" />
- </p>
   <p>
+    {% if artist.photo %}
+        <img class="artist__portrait{% if artist.photo_alignment == 'left' %}--left{% elif artist.photo_alignment == 'right' %}--right{% else %}--center{% endif %}" src="{{ MEDIA_URL }}/{% if artist.photo_featured %}{{ artist.photo_featured }}{% else %}{{ artist.photo }}{% endif %}" />
+    {% endif %}
+    {{ artist.bio|safe }}
+    <br style="clear: both;" />
   </p>
 </div>
 
 <div class="artist__event">
index 3b8b527a8d24341a5a2f56351b84cb9bc78a1fa7..73c05aa7a097325d736694215208a91aa1bbf9c6 100644 (file)
@@ -7,18 +7,19 @@
 {% endblock %}
 
 {% block main %}
+
 <div class="video-description">
- {{ video.description }}
   {{ video.description }}
 </div>
 
 <div class="video-html">
-  {{ video.content|safe }}
+    {{ video.content|safe }}
 </div>
 
 <iframe width="480" height="360" src="http://medias.ircam.fr/embed/media/{{ video.media_id }}" frameborder="0" allowfullscreen=""></iframe>
 
 <div class="video-event">
-  <h2>{% trans 'Related event' %}</h2>
+    <h2>{% trans 'Related event' %}</h2>
     <a href="{% url 'event_detail' video.event.slug %}"{{ video.event.title }}</a>
 </div>
 
index 71f2f0bc0b09bb75583e69b41b18cd2628d0f41c..0043e1707b55fa2fd6903ec9e8bfd232b0276ee7 100644 (file)
@@ -44,7 +44,7 @@ from django.utils.translation import ugettext_lazy as _
 PAGE_MENU_TEMPLATES = (
     (1, _("Top navigation bar"), "pages/menus/dropdown.html"),
     # (2, _("Left-hand tree"), "pages/menus/tree.html"),
-    # (3, _("Footer"), "pages/menus/footer.html"),
+    (2, _("Footer"), "pages/menus/footer.html"),
 )
 
 # A sequence of fields that will be injected into Mezzanine's (or any
index 1b2b89ea9a50cd222d0ecdd21b9b97c47e1c6298..3f1abafa168ba7b23dd811c63bdf1180b50c9810 100644 (file)
@@ -93,7 +93,7 @@
 
             <h2 class="page__title">{% block title %}{% endblock %}</h2>
 
-            {% comment - Remove breadcrumbs %}
+            {% comment %}
             <ul class="breadcrumb">
             {% spaceless %}
             {% block breadcrumb_menu %}{% page_menu "pages/menus/breadcrumb.html" %}{% endblock %}
             <div class="footer-logo">
                 <img src="{% static "img/logo_manifeste16_black.png" %}" alt="Logo Manifeste 2016 ircam" width="80">
             </div>
-        {% page_menu "pages/menus/footer.html" %}
+            {% page_menu "pages/menus/footer.html" %}
             <div class="footer-legals">
                 <p>
                     {# {% trans "Powered by" %} #}