add photo credits

diff --git a/app/festival/templates/festival/artist_detail.html b/app/festival/templates/festival/artist_detail.html
index bc7b5d678627aedc01a4d131c075a88cddf229ec..b7fcc2257721e6728de6c719e6224fe126cb608d 100644 (file)
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@ -11,6 +11,7 @@
     <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;" />

diff --git a/app/festival/templates/festival/artist_list.html b/app/festival/templates/festival/artist_list.html
index c8e718d17fa7589693fbb55d0729855cc5675d38..2b0af85c426d784bdbe597b131b332ce273008bf 100644 (file)
--- a/app/festival/templates/festival/artist_list.html
+++ b/app/festival/templates/festival/artist_list.html
@@ -13,7 +13,8 @@
         <div class="artist__item">
             <div class="artist__item__inner">
                 <a href="{% url 'festival-artist-detail' artist.slug %}" class="artist__item__inner">
-                    <img src="{% if artist.photo %}{{ MEDIA_URL }}/{{ artist.photo }}{% elif artist.photo_featured %}{{ MEDIA_URL }}/{{ artist.photo_featured }}{% else %}{% endif %}" alt="Portrait {{ artist.name }}">
+                    <img src="{% if artist.photo_featured %}{{ MEDIA_URL }}/{{ artist.photo_featured }}{% elif artist.photo %}{{ MEDIA_URL }}/{{ artist.photo }}{% else %}{% endif %}" alt="Portrait {{ artist.name }}">
+                    <p>{{ artist.photo_credits }}</p>
                     <h3 class="artist__item__name">
                         <span>
                             {{ artist.name }}

diff --git a/app/sandbox/local_settings.py b/app/sandbox/local_settings.py
index 3cc0a20640ab50d095a4c09fe355c43933a48e75..770a4fc0418cf770b41ffe03af3cd81bdd343992 100644 (file)
--- a/app/sandbox/local_settings.py
+++ b/app/sandbox/local_settings.py
@@ -96,3 +96,5 @@ warnings.filterwarnings(
         RuntimeWarning, r'django\.db\.models\.fields')
 
 EVENT_GOOGLE_MAPS_DOMAIN = 'maps.google.fr'
+
+TINYMCE_SETUP_JS = ''

diff --git a/app/templates/base.html b/app/templates/base.html
index c7a05cc1263ca31cb6c96e23bec8895d4e82739b..882431f78b879d9e31a25d5f906cb0fd4108abcb 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -93,7 +93,7 @@
             {% for event in events %}
               <li class="hero__slider__item" style="background-image: url({{ event.featured_image_header.url }});">
                   <div class="container">
-                      <button>Content here !</button>
+                      <button></button>
                   </div>
               </li>
             {% endfor %}