From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 5 Apr 2016 13:30:29 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=01fa524d1e18ecc209d74eecd1457144da073239;p=mezzo.git

merge
---

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index 4d113b21..443cee3b 100755
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -833,12 +833,12 @@ pre > p {
   border-bottom: 1px solid #fff;
 }
 
-/* line 53, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
+/* line 56, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
 .site__content__header {
-  padding-top: 3rem;
+  padding-top: 3em;
 }
 
-/* line 57, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
+/* line 63, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
 .site__content__header__inner {
   padding-right: 1rem;
 }
@@ -1623,7 +1623,7 @@ th {
 .nav__complementary {
   display: block;
   list-style: none;
-  text-align: right;
+  text-align: left;
   position: absolute;
   z-index: 200;
   top: 100%;
@@ -1642,35 +1642,36 @@ th {
   margin: 0 .1rem;
   text-align: center;
   border-radius: 0 0 3px 3px;
+  box-shadow: 0 2px 4px -2px black;
 }
 
-/* line 206, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
+/* line 207, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
 .nav__complementary__item a, .nav__complementary__item--facebook a, .nav__complementary__item--twitter a, .nav__complementary__item__lang a {
   color: white;
 }
 
-/* line 210, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
+/* line 211, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
 .nav__complementary__item--facebook {
   background: #3b5998;
 }
 
-/* line 215, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
+/* line 216, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
 .nav__complementary__item--twitter {
   background: #55acee;
   margin-right: 1rem;
 }
 
-/* line 221, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
+/* line 222, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
 .nav__complementary__item__lang {
   opacity: .6;
 }
 
-/* line 224, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
+/* line 225, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
 .nav__complementary__item__lang a {
   color: #bdc3c7;
 }
 
-/* line 228, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
+/* line 229, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */
 .nav__complementary__item__lang.is-active {
   opacity: 1;
 }
@@ -2000,34 +2001,33 @@ th {
 
 /* line 16, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
 .media-img {
-  float: left;
   margin-right: 0.9rem;
 }
 
-/* line 21, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
+/* line 23, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
 .media-img-inverse {
   float: right;
   margin-left: 0.9rem;
 }
 
-/* line 26, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
+/* line 28, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
 .media-img img,
 .media-img-inverse img {
   display: block;
 }
 
-/* line 31, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
+/* line 33, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
 .media-content {
   overflow: hidden;
 }
 
-/* line 35, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
+/* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
 .media-content,
 .media-content > :last-child {
   margin-bottom: 0;
 }
 
-/* line 40, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
+/* line 42, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
 .media-content > p {
   margin-top: 0;
 }
@@ -2941,32 +2941,18 @@ th {
   box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.4);
 }
 
-/* line 39, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
-.artist__item .artist__img {
-  position: relative;
-  padding: 0;
+/* line 38, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+.artist__item__img {
   margin: 0;
+  padding: 0;
 }
 
 /* line 43, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
-.artist__item .artist__img__copyright {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  display: block;
-  width: 100%;
-  padding: .2rem;
-  text-align: right;
-  font: 400 0.6rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: white;
-}
-
-/* line 56, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
 .artist__item img {
   display: block;
 }
 
-/* line 60, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+/* line 47, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
 .artist__item__name {
   display: block;
   width: 100%;
@@ -2976,7 +2962,7 @@ th {
   margin: 0;
 }
 
-/* line 71, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+/* line 59, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
 .artist__item__name span {
   display: inline-block;
   *display: inline;
@@ -2988,6 +2974,33 @@ th {
   font: 700 0.7rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
+/* line 75, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+.artist__figure {
+  position: relative;
+  padding: 0;
+  margin: 0;
+}
+
+/* line 79, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+.artist__figure img {
+  display: block;
+  position: relative;
+}
+
+/* line 84, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+.artist__figure__copyright {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  display: block;
+  width: 100%;
+  padding: .2rem;
+  text-align: right;
+  font: 400 0.6rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: white;
+  text-shadow: 1px 1px 1px #000;
+}
+
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */
 .artist__event {
   display: block;
@@ -3494,7 +3507,15 @@ th {
     margin: 0 0 3rem;
     border-bottom: none;
   }
-  /* line 57, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
+  /* line 50, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
+  .aside.aside-home{
+    margin-top: -2rem;
+  }
+  /* line 56, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
+  .site__content__header{
+    padding-top: 5rem;
+  }
+  /* line 63, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */
   .site__content__header__inner{
     max-width: 70%;
   }
@@ -3584,6 +3605,10 @@ th {
   .menu__toggle{
     display: none;
   }
+  /* line 16, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_media-object.scss */
+  .media-img{
+    float: left;
+  }
   /* line 9, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
   .artist__sizer,
   .msry__sizer,
@@ -3604,11 +3629,12 @@ th {
     -webkit-transform: scale(1.01);
     transform: scale(1.01);
   }
-  /* line 60, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+  /* line 47, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
   .artist__item__name{
     padding: 0.8rem;
+    line-height: 1;
   }
-  /* line 71, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
+  /* line 59, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-card.scss */
   .artist__item__name span{
     font: 700 0.8rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif;
   }
@@ -3639,7 +3665,7 @@ th {
   }
   /* line 15, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/bk-news.scss */
   .bk__news__inner{
-    width: 60%;
+    width: 80%;
     margin: 0 auto;
   }
 }
diff --git a/app/festival/static/scss/base/_layout.scss b/app/festival/static/scss/base/_layout.scss
index 28254088..6463647f 100755
--- a/app/festival/static/scss/base/_layout.scss
+++ b/app/festival/static/scss/base/_layout.scss
@@ -47,11 +47,17 @@
     width: 25%;
     margin: 0 0 3rem;
     border-bottom: none;
+    &.aside-home {
+      margin-top: -2rem;
+    }
   }
 }
 
 .site__content__header {
-  padding-top: 3rem;
+  padding-top: 3em;
+  @media (min-width : $desktop ) {
+      padding-top: 5rem;
+  }
 }
 
 .site__content__header__inner {
diff --git a/app/festival/static/scss/components/_headers.scss b/app/festival/static/scss/components/_headers.scss
index 5d499fd6..43543bfe 100755
--- a/app/festival/static/scss/components/_headers.scss
+++ b/app/festival/static/scss/components/_headers.scss
@@ -184,7 +184,7 @@
 .nav__complementary {
   display: block;
   list-style: none;
-  text-align: right;
+  text-align: left;
   position: absolute;
   z-index: $zi_2;
   top: 100%;
@@ -202,6 +202,7 @@
     margin: 0 .1rem;
     text-align: center;
     border-radius: 0 0 3px 3px;
+    box-shadow: 0 2px 4px -2px black;
 
     a {
       color: white;
diff --git a/app/festival/static/scss/components/_media-object.scss b/app/festival/static/scss/components/_media-object.scss
index 59ed0f55..825e7a99 100755
--- a/app/festival/static/scss/components/_media-object.scss
+++ b/app/festival/static/scss/components/_media-object.scss
@@ -14,7 +14,9 @@
 }
 
 .media-img{
-    float:left;
+    @media (min-width : $desktop ) {
+        float:left;
+    }
     margin-right:$base_font_size;
 }
 
diff --git a/app/festival/static/scss/modules/artist-card.scss b/app/festival/static/scss/modules/artist-card.scss
index 4230d84b..24eef380 100644
--- a/app/festival/static/scss/modules/artist-card.scss
+++ b/app/festival/static/scss/modules/artist-card.scss
@@ -35,22 +35,9 @@
           }
       }
   }
-
-  .artist__img {
-    position: relative;
-    padding: 0;
+  &__img {
     margin: 0;
-    &__copyright {
-      position: absolute;
-      bottom: 0;
-      left: 0;
-      display: block;
-      width: 100%;
-      padding: .2rem;
-      text-align: right;
-      font: $regular .6rem $base_font_family;
-      color: white;
-    }
+    padding: 0;
   }
 
   img {
@@ -66,6 +53,7 @@
       margin: 0;
       @media (min-width : $desktop ) {
           padding: 0.8rem;
+          line-height: 1;
       }
 
       span {
@@ -82,4 +70,27 @@
         }
       }
   }
-}
\ No newline at end of file
+}
+
+  .artist__figure {
+    position: relative;
+    padding: 0;
+    margin: 0;
+    img {
+      display: block;
+      position: relative;
+    }
+    // @extend .clearfix;
+    &__copyright {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      display: block;
+      width: 100%;
+      padding: .2rem;
+      text-align: right;
+      font: $regular .6rem $base_font_family;
+      color: white;
+      text-shadow: 1px 1px 1px $black;
+    }
+  }
\ No newline at end of file
diff --git a/app/festival/static/scss/modules/bk-news.scss b/app/festival/static/scss/modules/bk-news.scss
index 5503d1a7..5ebdec06 100755
--- a/app/festival/static/scss/modules/bk-news.scss
+++ b/app/festival/static/scss/modules/bk-news.scss
@@ -18,7 +18,7 @@
     border: 1px solid $main_color;
     border-left: 1rem solid $main_color;
     @media (min-width : $desktop ) {
-        width: 60%;
+        width: 80%;
         margin: 0 auto;
     }
   }
diff --git a/app/festival/templates/festival/artist_detail.html b/app/festival/templates/festival/artist_detail.html
index 898ba976..458a2868 100644
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@ -10,9 +10,9 @@
 <div class="artist__detail">
     <p>
     {% if artist.photo %}
-    <figure class="artist__img">
-        <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 %}" />
-        <figcaption class="artist__img__copyright">
+    <figure class="artist__figure img__align{% if artist.photo_alignment == 'left' %}--left{% elif artist.photo_alignment == 'right' %}--right{% else %}--center{% endif %}">
+        <img src="{{ MEDIA_URL }}/{% if artist.photo_featured %}{{ artist.photo_featured }}{% else %}{{ artist.photo }}{% endif %}" />
+        <figcaption class="artist__figure__copyright">
            {{ artist.photo_credits }}
         </figcaption>
     </figure>
diff --git a/app/festival/templates/festival/inc/artist_card.html b/app/festival/templates/festival/inc/artist_card.html
index d627244a..c867038e 100644
--- a/app/festival/templates/festival/inc/artist_card.html
+++ b/app/festival/templates/festival/inc/artist_card.html
@@ -1,7 +1,7 @@
 <div class="artist__item msry__item">
     <div class="artist__item__inner">
         <a href="{% url 'festival-artist-detail' artist.slug %}" class="artist__item__inner">
-            <figure class="artist__img">
+            <figure class="artist__item__img">
                 <img src="{% if artist.photo_featured %}{{ MEDIA_URL }}/{{ artist.photo_featured }}{% elif artist.photo %}{{ MEDIA_URL }}/{{ artist.photo }}{% else %}{% endif %}" alt="Portrait {{ artist.name }}">
             </figure>
             <h3 class="artist__item__name">
diff --git a/app/templates/base.html b/app/templates/base.html
index e5ff9df8..dda3cc3c 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -126,38 +126,37 @@
     {% endcomment %}
 
     <div class="site__content">
-        {% if on_home %}
-            <div class="container">
-                <div class="bk__news">
-                    <div class="media bk__news__inner">
-                        <div class="media-img">
-                            <span class="bk__news__title">
-                                Dernière <br> minute !
-                            </span>
-                        </div>
-                        <div class="media-content bk__news__content">
-                            <p>
-                                <strong>Partagez, twittez, commentez, publiez vos photos…</strong> <br>
-                                et réservez dès maintenant vos places ou abonnements pour bénéficier de tarifs privilégiés.
-                            </p>
+        <div class="container">
+            <main class="main" role="main">
+                {% if on_home %}
+                    <div class="container">
+                        <div class="bk__news">
+                            <div class="media bk__news__inner">
+                                <div class="media-img">
+                                    <span class="bk__news__title">
+                                        Dernière <br> minute !
+                                    </span>
+                                </div>
+                                <div class="media-content bk__news__content">
+                                    <p>
+                                        <strong>Partagez, twittez, commentez, publiez vos photos…</strong> <br>
+                                        et réservez dès maintenant vos places ou abonnements pour bénéficier de tarifs privilégiés.
+                                    </p>
+                                </div>
+
+                            </div>
                         </div>
-
+                    </div>
+                {% endif %}
+                <div class="site__content__header">
+                    <div class="site__content__header__inner">
+                        <h2 class="page__title">{% block title %}{% endblock %}</h2>
                     </div>
                 </div>
-            </div>
-        {% endif %}
-
-        <div class="container">
-            <div class="site__content__header">
-                <div class="site__content__header__inner">
-                    <h2 class="page__title">{% block title %}{% endblock %}</h2>
-                </div>
-            </div>
-            <main class="main" role="main">
                 {% block main %}{% endblock %}
             </main>
 
-            <aside class="aside">
+            <aside class="aside {% if on_home %}aside-home{% endif %}">
                 <div class="search__form">
                     {% search_form "all" %}
                 </div>
diff --git a/app/templates/includes/calendar.html b/app/templates/includes/calendar.html
index 32002862..89deac34 100644
--- a/app/templates/includes/calendar.html
+++ b/app/templates/includes/calendar.html
@@ -1,9 +1,15 @@
-{% load i18n %}
+{% load i18n event_tags %}
+{% event_months as events %}
 
-<h2 class="sidebar__title">Calendrier du festival</h2>
+
+<h2 class="sidebar__title">{% trans "Festival calendar" %}</h2>
 
 <ul class="calendar">
     <li class="calendar__month">
+
+        {% for event in envents %}
+         {{ event.title }}
+        {% endfor %}
         {# <div class="calendar__month__title">Juin / Juillet</div> #}
         <div class="calendar__day calendar__day-name">
             <div class="calendar__day-inner"><span>L</span></div>
@@ -136,4 +142,4 @@
             <div class="calendar__day-inner"></div>
         </div>
     </li>
-</ul>
\ No newline at end of file
+</ul>