Various improvments

diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css
index 27787c3ccffca5d98c4642f08850b32d33bc6051..074be51eeb673e37f79a3aebd695c8c84e279747 100755 (executable)
--- a/app/festival/static/css/index.css
+++ b/app/festival/static/css/index.css
@@ -3093,7 +3093,6 @@ th {
   font-weight: 700;
   text-transform: uppercase;
   color: #000;
-  margin-bottom: 1rem;
   font-size: 0.7rem;
 }
 
@@ -3106,6 +3105,17 @@ th {
 }
 
 /* line 77, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+.event__meta + .event__meta, .event__meta--alt + .event__meta, .event__meta + .event__meta--alt, .event__meta--alt + .event__meta--alt {
+  padding-top: 0;
+  margin-top: -.3rem;
+}
+
+/* line 80, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+.event__meta + .event__meta .event__meta__inner, .event__meta--alt + .event__meta .event__meta__inner, .event__meta + .event__meta--alt .event__meta__inner, .event__meta--alt + .event__meta--alt .event__meta__inner {
+  border-top: none;
+}
+
+/* line 85, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
 .event__meta--alt {
   padding: 0;
   margin: 0;
@@ -3113,18 +3123,18 @@ th {
   font-size: 1rem;
 }
 
-/* line 84, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+/* line 92, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
 .event__meta--alt .event__meta__inner {
   border-top: none;
   border-bottom: none;
 }
 
-/* line 89, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+/* line 97, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
 .event__meta--alt .event__meta__location {
   color: white;
 }
 
-/* line 94, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+/* line 102, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
 .event__meta__location {
   display: block;
   text-decoration: none;
@@ -3132,7 +3142,7 @@ th {
   font-weight: 400;
 }
 
-/* line 104, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+/* line 112, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
 .event__meta__cta {
   text-transform: uppercase;
   display: block;
@@ -3140,15 +3150,14 @@ th {
   background: #fff;
 }
 
-/* line 112, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+/* line 120, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
 .event__meta__btn {
-  width: 50%;
   display: block;
   text-align: center;
   margin: 1rem auto;
 }
 
-/* line 119, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
+/* line 127, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */
 .event__detail,
 .event__detail a {
   text-align: right;
@@ -3213,6 +3222,11 @@ th {
   content: "";
 }
 
+/* line 154, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/icons.scss */
+.icon__calendar:before {
+  content: "";
+}
+
 /* line 179, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/icons.scss */
 .icon__sign-out:before {
   content: "";
@@ -3234,6 +3248,11 @@ th {
   content: "";
 }
 
+/* line 425, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/icons.scss */
+.icon__windows:before {
+  content: "";
+}
+
 /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/bk-news.scss */
 .bk__news {
   display: block;
@@ -3323,13 +3342,13 @@ th {
 }
 
 /* line 12, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/share-links.scss */
-.share__link__item {
+.share__link__item, .push__calendar__item {
   text-transform: uppercase;
   margin-right: 1rem;
 }
 
 /* line 15, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/share-links.scss */
-.share__link__item .icon {
+.share__link__item .icon, .push__calendar__item .icon {
   color: #9f7f3c;
   font-size: 1.1rem;
   margin-right: .4rem;
@@ -3359,6 +3378,11 @@ th {
   background-color: #2d4373;
 }
 
+/* line 1, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/push-calendar.scss */
+.push__calendar {
+  margin-top: -2rem;
+}
+
 /* line 1, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/calendar.scss */
 .calendar__month {
   width: 100%;

diff --git a/app/festival/static/scss/index.scss b/app/festival/static/scss/index.scss
index d630d2f201c8af403b028859fffeec3322d1936c..b5642dc88d9d78aa3e642d79f951a54d3acdf831 100755 (executable)
--- a/app/festival/static/scss/index.scss
+++ b/app/festival/static/scss/index.scss
@@ -80,5 +80,6 @@
         'modules/bk-news',
         'modules/hero-slider',
         'modules/share-links',
+        'modules/push-calendar',
         'modules/calendar',
         'modules/user';
\ No newline at end of file

diff --git a/app/festival/static/scss/modules/event-card.scss b/app/festival/static/scss/modules/event-card.scss
index 0bca48efe2da3d4030af200480cf8f6453042d03..2d04ccae314181c909920210abbd2350b94c21b7 100644 (file)
--- a/app/festival/static/scss/modules/event-card.scss
+++ b/app/festival/static/scss/modules/event-card.scss
@@ -62,7 +62,7 @@
   font-weight: $bold;
   text-transform: uppercase;
   color: $black;
-  margin-bottom: 1rem;
+  // margin-bottom: 1rem;
   font-size: 0.7rem;
 
   &__inner {
@@ -74,6 +74,14 @@
   }
 }
 
+.event__meta + .event__meta {
+  padding-top: 0;
+  margin-top: -.3rem;
+  .event__meta__inner {
+      border-top: none;
+  }
+}
+
 .event__meta--alt {
   @extend .event__meta;
   padding: 0;
@@ -110,7 +118,7 @@
 }
 
 .event__meta__btn {
-  width: 50%;
+  // width: 50%;
   display: block;
   text-align: center;
   margin: 1rem auto;

diff --git a/app/festival/static/scss/modules/icons.scss b/app/festival/static/scss/modules/icons.scss
index 6b06f65184b1d039a5b8c1206824095b391644c4..57eff3289184616c23a99ced5c0a21a9e9359c05 100755 (executable)
--- a/app/festival/static/scss/modules/icons.scss
+++ b/app/festival/static/scss/modules/icons.scss
@@ -151,7 +151,7 @@
 // .icon__warning:before,
 // .icon__exclamation-triangle:before { content: $fa-var-exclamation-triangle; }
 // .icon__plane:before { content: $fa-var-plane; }
-// .icon__calendar:before { content: $fa-var-calendar; }
+.icon__calendar:before { content: $fa-var-calendar; }
 // .icon__random:before { content: $fa-var-random; }
 // .icon__comment:before { content: $fa-var-comment; }
 // .icon__magnet:before { content: $fa-var-magnet; }
@@ -422,7 +422,7 @@
 // .icon__long-arrow-left:before { content: $fa-var-long-arrow-left; }
 // .icon__long-arrow-right:before { content: $fa-var-long-arrow-right; }
 // .icon__apple:before { content: $fa-var-apple; }
-// .icon__windows:before { content: $fa-var-windows; }
+.icon__windows:before { content: $fa-var-windows; }
 // .icon__android:before { content: $fa-var-android; }
 // .icon__linux:before { content: $fa-var-linux; }
 // .icon__dribbble:before { content: $fa-var-dribbble; }

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index d4f56a71ccca9c2e7dd73de0a6a85c8b290b0c4b..4745146d146c9bced9683bbba136224e047c5441 100644 (file)
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -76,22 +76,32 @@
     {% include "includes/share_buttons.html" %}
   {% endwith %}
 {% endblock %}
+{% block event_detail_calendar %}
+<div class="push__calendar">
+    <a href='{{ event|google_calendar_url }}' target="_blank" class="push__calendar__item">
+        <i class="icon icon__calendar"></i>
+        Add to Google Calendar
+    </a>
+    <a href='{% icalendar_url %}' class="push__calendar__item">
+        <i class="icon icon__windows"></i>
+        Add to Outlook/iCal
+    </a>
+</div>
+{% endblock %}
 
 {% if event.location %}
 <h3 class="section__title--inverse">Le lieu :</h3>
 {% block event_detail_location %}
 {% editable event.location %}
-<div class="event__card--full">
-    <p>
-        {{ event.location.address|linebreaksbr }}<br />
-        <a href="{{ event|google_nav_url }}" target="_blank" class="">
-            Get Directions
-        </a>
-    </p>
-    <a href="{{ event|google_nav_url }}" target="_blank" class="">
-     {% google_static_map event 900 300 15 %}
-    </a/>
-</div>
+<p>
+    <p>{{ event.location }} {{ event.location.address|linebreaksbr }}</p>
+    <a href="{{ event|google_nav_url }}" target="_blank">
+        Get Directions
+    </a>
+</p>
+<a href="{{ event|google_nav_url }}" target="_blank" class="">
+ {% google_static_map event 900 300 15 %}
+</a/>
 {% endeditable %}
 {% endblock %}
 {% endif %}
@@ -120,17 +130,6 @@
 {% endblock %}
 {% endcomment %}
 
-{% block event_detail_calendar %}
-<p>
-    <a href='{{ event|google_calendar_url }}' target="_blank" class="btn btn-small">
-        Add to Google Calendar
-    </a>
-    <a href='{% icalendar_url %}' class="btn btn-small">
-        Add to Outlook/iCal
-    </a>
-</p>
-{% endblock %}
-
 {% block event_previous_next %}
 <ul class="split-container pager">
     {% with event.get_previous_by_publish_date as previous %}

diff --git a/app/templates/agenda/event_location_list.html b/app/templates/agenda/event_location_list.html
index dbe648e7b2c60bdc319d84e558778c4cde77e1a0..0d226e4f8637cb6b4ca9a720fa39567ba6d26c9a 100644 (file)
--- a/app/templates/agenda/event_location_list.html
+++ b/app/templates/agenda/event_location_list.html
@@ -28,27 +28,27 @@
 
 {% block main %}
 
-<ul>
 {% for location in object_list %}
- <li><h3>{{ location.title }}</h3>
+    {{ location.title }} <br>
+{% endfor %}
+
+
+{% for location in object_list %}
+    <h3>{{ location.title }}</h3>
      {% block event_detail_location %}
      {% editable event.location %}
-     <div class="event__card--full">
-         <p>
-             {{ location.address|linebreaksbr }}<br />
-             <a href="{{ location|google_nav_url }}" target="_blank" class="">
-                 Get Directions
-             </a>
-         </p>
+     <p>
+         {{ location.address|linebreaksbr }}<br />
          <a href="{{ location|google_nav_url }}" target="_blank" class="">
-          {% google_static_map location 900 300 15 %}
-         </a/>
-     </div>
+             Get Directions
+         </a>
+     </p>
+     <a href="{{ location|google_nav_url }}" target="_blank" class="">
+      {% google_static_map location 900 300 15 %}
+     </a/>
      {% endeditable %}
      {% endblock %}
- </li>
 {% endfor %}
-</ul>
 
 {% endblock %}
 

diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index ceb66f686d6cb8aec27212a58195bc09bd7a439a..6dfec63fc5cff2509bd99e07ed3df0ce573d8972 100644 (file)
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@ -4,15 +4,16 @@
         {{ event.start }}
         {% if event.end %}
         {% if event.end|date == event.start|date and event.end.hour|subtract:event.start.hour > 3 %}{{ event.end|time:"TIME_FORMAT" }}{% endif %}
+        {% if unit_booking %}
+        /
+        <a href="{% url 'event_booking' event.slug %}">
+            {% trans "Booking" %}
+        </a>
+        {% endif %}
         {% endif %}
         {% if event.location %}
         {# <a href="{% url "event_list_location" event.location.slug %}" class="event__meta__location">{{ event.location }}</a>#}
         <span class="event__meta__location">{{ event.location }}</span>
-        {% if unit_booking %}
-        <a href="{% url 'event_booking' event.slug %}" class="btn event__meta__btn">
-            <i class="icon icon__bookmark"></i> {% trans "Booking" %}
-        </a>
-        {% endif %}
         {% endif %}
     </div>
 </div>