From: Philippe Barbosa <contact@philippebarbosa.com>
Date: Wed, 23 Mar 2016 18:52:46 +0000 (+0100)
Subject: Related event for artist detail page
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cbbe5097c9237578807b7de80775a9c25ff0dfe8;p=mezzo.git

Related event for artist detail page
---

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index ba844e94..4f676513 100755
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -516,7 +516,8 @@ body {
 }
 
 /* line 30, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_defaults.scss */
-.clearfix:after, .container:after, .row:after, .row-box:after, .event__card:after, .event__card--alt:after, .event__card--full:after, .calendar__month:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .media:after, .split-container:after {
+.clearfix:after, .container:after, .row:after, .sidebar__title--inverse:after,
+.page__related__title--inverse:after, .row-box:after, .event__card:after, .event__card--alt:after, .event__card--full:after, .calendar__month:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .media:after, .split-container:after {
   content: "";
   display: table;
   clear: both;
@@ -805,7 +806,8 @@ pre > p {
 }
 
 /* line 22, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
-.row, .row-box, .event__card, .event__card--alt, .event__card--full, .calendar__month {
+.row, .sidebar__title--inverse,
+.page__related__title--inverse, .row-box, .event__card, .event__card--alt, .event__card--full, .calendar__month {
   display: block;
 }
 
@@ -1788,7 +1790,9 @@ th {
 }
 
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
-.sidebar__title, .sidebar__title--inverse {
+.sidebar__title, .sidebar__title--inverse,
+.page__related__title--inverse,
+.page__related__title {
   text-transform: uppercase;
   display: inline-block;
   *display: inline;
@@ -1801,12 +1805,16 @@ th {
   border-bottom: 1px solid #fff;
 }
 
-/* line 16, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
-.sidebar__title--inverse {
+/* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+.sidebar__title--inverse,
+.page__related__title--inverse {
   color: #000;
+  border-top-color: #000;
+  border-bottom-color: #000;
+  margin-bottom: 2rem;
 }
 
-/* line 22, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
+/* line 28, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */
 .sidebar__entry {
   font-size: 1rem;
   margin: 0;
diff --git a/app/festival/static/scss/components/_sidebar.scss b/app/festival/static/scss/components/_sidebar.scss
index 02556195..abad1323 100755
--- a/app/festival/static/scss/components/_sidebar.scss
+++ b/app/festival/static/scss/components/_sidebar.scss
@@ -2,7 +2,8 @@
 // _Sidebar
 // ****************************************************************
 
-.sidebar__title {
+.sidebar__title,
+.page__related__title {
   text-transform: uppercase;
   display: inline-block;
   *display: inline;
@@ -14,8 +15,13 @@
   border-top: 1px solid #fff;
   border-bottom: 1px solid #fff;
   &--inverse {
-    color: $black;
     @extend .sidebar__title;
+    @extend .row;
+    color: $black;
+    border-top-color: $black;
+    border-bottom-color: $black;
+    margin-bottom: 2rem;
+
   }
 }
 
diff --git a/app/festival/templates/festival/artist_detail.html b/app/festival/templates/festival/artist_detail.html
index b7fcc225..a6f929ea 100644
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@ -11,20 +11,51 @@
     <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">
- {# <h3>{% trans 'Events' %}</h3> #}
-   <h3 class="artist__event__title">Entendre {{ artist.name }} :</h3>
 
-    {% for event in artist.events.all %}
-        {{ event.title }}
-    {% endfor %}
-    <a href="#" class="artist__event__cta">Réserver</a>
+<h3 class="page__related__title--inverse">Événement lié à {{ artist.name }} :</h3> <br>
+
+<div class="event__card">
+    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="event__thumbnail">
+        <img src="/media/uploads/images/events/.thumbnails/simplexity_featured.jpg/simplexity_featured-500x500.jpg">
+    </a>
+    <h3 class="event__name">
+        <a href="/events/simplexity-la-beaut%C3%A9-du-geste/">SIMPLEXITY - La beauté du geste</a>
+    </h3>
+    <div class="event__meta">
+        <div class="event__meta__inner">
+            2 juin 2016 20:30
+            <br> 3 juin 2016 22:00
+            <a href="/events/location/centre-pompidou-grande-salle/" class="event__meta__location">Centre Pompidou, Grande salle</a>
+        </div>
+    </div>
+    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="btn btn-full">
+        <i class="icon icon__bookmark"></i> Réserver
+    </a>
+</div>
+
+<div class="event__card">
+    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="event__thumbnail">
+        <img src="/media/uploads/images/events/.thumbnails/simplexity_featured.jpg/simplexity_featured-500x500.jpg">
+    </a>
+    <h3 class="event__name">
+        <a href="/events/simplexity-la-beaut%C3%A9-du-geste/">SIMPLEXITY - La beauté du geste</a>
+    </h3>
+    <div class="event__meta">
+        <div class="event__meta__inner">
+            2 juin 2016 20:30
+            <br> 3 juin 2016 22:00
+            <a href="/events/location/centre-pompidou-grande-salle/" class="event__meta__location">Centre Pompidou, Grande salle</a>
+        </div>
+    </div>
+    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="btn btn-full">
+        <i class="icon icon__bookmark"></i> Réserver
+    </a>
 </div>
 {% endblock %}