NewsLink & URLs

diff --git a/panikweb/urls.py b/panikweb/urls.py
index 9c218973d4b3d05e23e19c0745e5435bdca7e95f..51173a7a76bc4b1bbab0c9ba09612c652633e440 100644 (file)
--- a/panikweb/urls.py
+++ b/panikweb/urls.py
@@ -17,6 +17,7 @@ urlpatterns = patterns('',
     url(r'^get$', 'panikweb.views.get', name='get'),
     url(r'^listen$', 'panikweb.views.listen', name='listen'),
     url(r'^news/', 'panikweb.views.news', name='news'),
+    url(r'^news/(?P<slug>[\w,-]+)/$','panikweb.views.news', name='news-view'),
 
     (r'^api/v2/', include('fiber.rest_api.urls')),
     (r'^admin/fiber/', include('fiber.admin_urls')),

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index cf944bdfe1e4f739b4f91e66262a6289af642c2f..f360d44602e921fcea62fc03cbbf22d8eeca43c1 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -407,6 +407,11 @@ button.tag {
        border-style:solid;
        border-width:1px 0;
 }
+.list.news a{
+       max-height:350px;
+   text-overflow: ellipsis;
+   overflow: hidden;
+}
 .news .date{padding:1em;}
 .news .title{
        margin-bottom:1em;

diff --git a/panikweb_templates/templates/includes/player.html b/panikweb_templates/templates/includes/player.html
index f54fa377e59f75cf4cd90bfe37b7e1e63dd16a14..58a8768862579a8f88e74f2f923bb1ba444eca85 100644 (file)
--- a/panikweb_templates/templates/includes/player.html
+++ b/panikweb_templates/templates/includes/player.html
@@ -23,7 +23,7 @@
                                <li><button title="Show/Hidden HTML5 audio player" onclick="$('#DirectStreamPanik').toggleClass('hidden');$(this).toggleClass('icon-eye-open icon-eye-close');return false;" class="icon-eye-open"></button></li>
                                <li><button title="Need some help?" onclick="$('#PlayerHelp').toggle();" class="icon-question-sign"></button></li>
                        </ul>
-                       <article id="PlayerHelp" class="hidden help">
+                       <article id="PlayerHelp" class="small hidden help">
                                <p>Le contenu des émissions n&#8217;étant pas limité à un niveau local, le stream permet de les écouter aux quatre coins du monde. Mais aussi et surtout, à Bruxelles, dans les zones où la radio n&#8217;est pas captée facilement.</p>
                                <p>Le serveur de streaming a été mis en place par l&#8217;asbl A.C.T.I.C et est hébergé par <a href="http://www.domainepublic.net/" class='spip_out' rel='external'>Domainepublic.net</a> . Il fonctionne exclusivement grâce à des logiciels libres.</p>
                                <p>Si votre logiciel ne parvient pas à lire le stream de Radio Panik, nous vous conseillons de télécharger  <a href="http://framakey.org/Portables/PortableVLC" class='spip_out' rel='external'>VLC Media Player</a>, un lecteur multimedia impressionnant de par ses nombreuses fonctionnalités (supporte de nombreux formats de stream, d&#8217;audio, de vidéo, peut servir de relais streamcast), qui fonctionne aussi bien sous Linux que sous Windows ou Mac OS.</p>
@@ -75,50 +75,5 @@
                                });
                        </script>  
                </div>
-               <!--
-               <div class="direct">
-                       <button class="control play symbol huge" onclick="$('#DirectStreamPanik').play();">G</button>
-                       <div class="label relative">en direct</div>
-                       <div class="playlist img">
-                               <img src="http://placehold.it/210X130"/>
-                       </div>
-                       <audio id="DirectStreamPanik" tabindex="0" src="http://streaming.domainepublic.net:8000/radiopanik.ogg" controls="controls">
-                       </audio>
-               </div>
-               <div class="current">
-                       <h5>Elles en parlent encore</h5>
-                       <div class="date">
-                               <div class="day">Mardi 2 février 2013</div>
-                               <div class="time">07:00 - 09:00</div>
-                       </div>
-               </div>
-               <div class="playlist">
-                       <div class="controls">
-                               <a  class="icon-link" href="http://streaming.domainepublic.net:8000/radiopanik.ogg"></a>
-                               <a  class="resymbol icon-download" href="http://streaming.domainepublic.net:8000/radiopanik.ogg.m3u"></a>
-                               <button class="symbol">H</button>
-                               <button class="resymbol icon-step-forward">E</button>
-                               <button class="resymbol icon-play"></button>
-                               <button class="resymbol icon-step-backward"></button>
-                               <button class="resymbol icon-volume-up"></button>
-                               <span class="resymbol icon-volume-off"></span>
-                       </div>    
-                       <div class="item">
-                               <img src="http://placehold.it/50X50" />
-                               <h5>The croissant fertile</h5>
-                               <p>The sound of the RCA electronic music synthesizer</p>
-                       </div>
-                       <div class="item">
-                               <img src="http://placehold.it/50X50" />
-                               <h5>The croissant fertile</h5>
-                               <p>The sound of the RCA electronic music synthesizer</p>
-                       </div>
-                       <div class="item">
-                               <img src="http://placehold.it/50X50" />
-                               <h5>The croissant fertile</h5>
-                               <p>The sound of the RCA electronic music synthesizer</p>
-                       </div>
-               </div>
-               -->
        </div>
 </div>

diff --git a/panikweb_templates/templates/news/inline.html b/panikweb_templates/templates/news/inline.html
index ec9f19223c03769b9ca207d8680d76b460c8cb98..dad4017b47585f372815ea82dc1682d54816ba19 100644 (file)
--- a/panikweb_templates/templates/news/inline.html
+++ b/panikweb_templates/templates/news/inline.html
@@ -13,7 +13,7 @@
                                <img class="logo right" src="{{ content.image|thumbnail:'60x60' }}"/>   
                        {% endif %}                     
                {% endif %}
-               <a class="link bloc" href="{% url 'emission-view' slug=content.slug %}">
+               <a class="link bloc" href="{% url 'news-view' slug=content.slug %}">
                
                        <h5 class="title {% if not class %}ellipsis{% endif %}">{{ content.title }}</h5>
                        <div class="description {% if not class %}ellipsis{% endif %}">                         

diff --git a/panikweb_templates/templates/news/link.html b/panikweb_templates/templates/news/link.html
new file mode 100644 (file)
index 0000000..9afd91b
--- /dev/null
+++ b/panikweb_templates/templates/news/link.html
@@ -0,0 +1,3 @@
+<a href="#">
+       <span class="title"><strong>{{ NewsItem.datetime|date:"D m/M" }}</strong>&nbsp;-&nbsp;{{ content.title }}</span>
+</a>