V 0.5

diff --git a/panikweb_airlibre/static/css/emissions.scss b/panikweb_airlibre/static/css/emissions.scss
index 744c86e8bc00604f89bcfec9b89d7e4e19a72cfb..a8abf7a781096b02488a5a8fec227927e27a453d 100644 (file)
--- a/panikweb_airlibre/static/css/emissions.scss
+++ b/panikweb_airlibre/static/css/emissions.scss
@@ -25,6 +25,8 @@
       background-position: 50% 50%;
       float: left;
       margin-right: 2%;
+      border: 2px solid black;
+      box-sizing: border-box;
     }
 
     .emission-content{
@@ -78,6 +80,10 @@
 }
 
 .emission {
+  img {
+       border: 2px solid black;
+       box-sizing: border-box;
+  }
 
   .emission-entete{
     display: inline-block;
@@ -99,6 +105,7 @@
     float: left;
     border: 2px solid #333;
     padding: 1em;
+    box-sizing: border-box;
   }
 
   .emission-text{
@@ -119,6 +126,7 @@
 }
 .episode.resume img {
        border: 2px solid black;
+  box-sizing: border-box;
 }
 
 .episode.resume .title{
@@ -192,6 +200,10 @@
        font-size:80%;
 }
 
+.episode-header .sound {
+  margin-bottom: 1em;
+}
+
 div.extra-soundfiles h3 {
        margin-top: 1em;
        font-size: 2.5em;

diff --git a/panikweb_airlibre/static/css/home.scss b/panikweb_airlibre/static/css/home.scss
index 30a51d93272951195ce7087904520227767f2b06..db9d1972a374a98b44252bcc8cf39df2717c4379 100644 (file)
--- a/panikweb_airlibre/static/css/home.scss
+++ b/panikweb_airlibre/static/css/home.scss
@@ -18,7 +18,7 @@
   }
 
   .program-week.list {
-    
+
     li {
       clear: both;
 
@@ -60,6 +60,8 @@
                background-position: center;
                background-repeat: no-repeat;
           text-align: center;
+          border: 2px solid black;
+          box-sizing: border-box;
         }
 
         .content,

diff --git a/panikweb_airlibre/static/css/player.scss b/panikweb_airlibre/static/css/player.scss
index cf58b506f65930aecee2d285d8cbacbfdb7bf818..84ccbdcfee2d4932359a4596c57195b8bd5e0fac 100644 (file)
--- a/panikweb_airlibre/static/css/player.scss
+++ b/panikweb_airlibre/static/css/player.scss
@@ -21,18 +21,22 @@
        max-height: calc(100vh - 435px);
        width: 90%;
 }
-#myPlaylist li {
-  color: #fff;
-  font-weight: bold;
-  font-size: 16px;
-  text-align: left;
-  padding: 5px;
-  margin-bottom: 5px;
-       border: 1px solid #f02;
-       background: #e74c3c;
+#myPlaylist {
+  padding: 0;
 
-  button {
+  li {
     color: #fff;
-    font-size: 20px;
+    font-weight: bold;
+    font-size: 16px;
+    text-align: left;
+    padding: 5px;
+    margin-bottom: 5px;
+       border: 1px solid #f02;
+       background: #e74c3c;
+
+    button {
+      color: #fff;
+      font-size: 20px;
+    }
   }
 }

diff --git a/panikweb_airlibre/static/css/podcasts.scss b/panikweb_airlibre/static/css/podcasts.scss
index bfed63dba238c22188ff6265a30fd490882100bf..8521ffefe5c82fcd16370803449c8909dd7fc2bd 100644 (file)
--- a/panikweb_airlibre/static/css/podcasts.scss
+++ b/panikweb_airlibre/static/css/podcasts.scss
@@ -19,6 +19,8 @@
       max-width: 100%;
       max-height: 244px;
       height: 244px;
+                       border: 2px solid black;
+                       box-sizing: border-box;
     }
   }
 

diff --git a/panikweb_airlibre/static/css/programme.scss b/panikweb_airlibre/static/css/programme.scss
index fa75a71cfaea096c798c62a959016d7ad2dfcd49..6562d537a640e6e63fc670b8987c18e44e5c94db 100644 (file)
--- a/panikweb_airlibre/static/css/programme.scss
+++ b/panikweb_airlibre/static/css/programme.scss
@@ -51,12 +51,12 @@ ul.program-week {
        border-bottom: 3px solid #fff;
        margin-bottom: 6em;
        background-color: #efefef;
-       
+
        li {
                border-top: 3px solid #fff;
                padding: 0.8em 0 0.7em 0;
                &.past {
-                       opacity: 0.6;
+                       opacity: 0.5;
                }
                .programCellTitle {
                        margin-left: 3em;

diff --git a/panikweb_airlibre/templates/episodes/detail.html b/panikweb_airlibre/templates/episodes/detail.html
new file mode 100644 (file)
index 0000000..455bf41
--- /dev/null
+++ b/panikweb_airlibre/templates/episodes/detail.html
@@ -0,0 +1,115 @@
+{% load thumbnail paniktags %}
+<div class="episode detail episode-detail cf">
+       {% if episode.first_diffusion %}
+       <div class="dateBloc">
+               <div class="date">
+                       <div class="day">
+                           {{ episode.first_diffusion|date:"D"|slice:":2"}}
+                       </div>
+                       <div class="number">
+                           {{ episode.first_diffusion|date:"d" }}
+                       </div>
+                       {% if date != "daytime" %}
+                       <div class="month">
+                           {{ episode.first_diffusion|date:"M y" }}
+                       </div>
+                       {% endif %}
+                       <div class="time">
+                           {{ episode.first_diffusion|date:"H:i" }}
+                       </div>
+               </div>
+       </div>
+       {% endif %}
+
+       <header class="episode-header">
+               {% if episode.image %}
+               {% thumbnail episode.image "1200" upscale=False as im_large %}
+               {% thumbnail episode.image "640x480" crop="50% 25%" as im %}
+               <img class="logo right button" data-toggle-img="{{im_large.url}}" src="{{im.url}}"/>
+               {% endthumbnail %}
+               {% endthumbnail %}
+               {% endif %}
+               <h3 class="episode-title">{{ episode.title }}</h3>
+               {% if episode.subtitle %}
+               <h3 class="episode-subtitle">{{ episode.subtitle }}</h3>
+               {% endif %}
+               {% if diffusions %}
+               <div class="episode-diffusions">
+               {% if diffusions|length > 1 %}
+               <div class="label">Diffusions</div>
+               {% else %}
+               <div class="label">Diffusion</div>
+               {% endif %}
+               <ul class="diffusions custom">
+                       {% for schedule in diffusions %}
+                               <li><span class="date">{{ schedule.datetime|date:"l d M Y à H:i" }}</span></li>
+                       {% endfor %}
+               </ul>
+               </div>
+               {% endif %}
+       </header>
+       {% if episode.main_sound %}
+               <div class="sound">
+                       {% audio sound=episode.main_sound %}
+               </div>
+       {% endif %}
+       <div class="content userContent marged">
+               {% if episode.text %}
+               <article class="text">
+                       {{ episode.text|safe}}
+                       {% include "includes/image-attribution.html" with obj=episode %}
+               </article>
+               {% endif %}
+        </div>
+{% block topik %}
+{% for topik in topik_pages %}
+  {% topik topik=topik %}
+{% endfor %}
+{% endblock %}
+
+        {% block extra-links %}
+        {% if episode.extra_links %}
+        <div class="contacts box">
+                {% for kind, url in episode.get_extra_links_and_kind %}
+                <div class="contact ellipsis">
+                        <span class="icon-{% firstof kind 'globe' %}"></span>
+                        <a href="{{ url }}">{{ url }}</a>
+                </div>
+                {% endfor %}
+        </div>
+        {% endif %}
+        {% endblock %}
+
+
+               {% if episode.serie or episode.tags.all or episode.auteur or episode.redif %}
+               <div class="metas">
+                       {% if episode.serie  or episode.auteur or episode.redif %}
+                       <dl class="credits cf">
+                           {% if episode.serie %}<dt>Serie</dt><dd>{{ serie }}</dd>{% endif %}
+                           {% if episode.auteur %}<dt>Auteur</dt><dd>{{ auteur }}</dd>{% endif %}
+                           {% if episode.redif %}<dt>Redifusion</dt><dd>{{ redif }}</dd>{% endif %}
+                       </dl>
+                       {% endif %}
+                       {% if episode.tags.all %}
+                       <ul class="custom inline tags">
+                               {% for tag in episode.tags.all %}
+                               <li><a class="tag" href="{% url 'search' %}?selected_facets=tags_exact:{{tag|facet_tag}}">{{ tag }}</a></li>
+                               {% endfor %}
+                       </ul>
+                       {% endif %}
+               </div>
+               {% endif %}
+
+       {% if soundfiles.count %}
+       <div class="wrapper extra-soundfiles">
+               <h3>Fragments sonores</h3>
+               <ul class="padded custom list">
+       {% for soundfile in soundfiles %}
+       <li><strong>{{ soundfile.title }}</strong> {% audio sound=soundfile %}
+       </li>
+       {% endfor %}
+               </ul>
+       </div>
+       {% endif %}
+
+</div>