]> git.0d.be Git - panikweb.git/commitdiff
teInline emissions add text cutted as default description
authorlaron <simon@surlaterre.org>
Wed, 14 Aug 2013 20:15:26 +0000 (22:15 +0200)
committerlaron <simon@surlaterre.org>
Wed, 14 Aug 2013 20:15:26 +0000 (22:15 +0200)
panikweb_templates/static/css/style.less
panikweb_templates/templates/emissions/detail.html
panikweb_templates/templates/emissions/inline.html

index eb9d68988da7773f47d598308701439c43699411..c67f5a1f4373589a21317f5b7644a9a1aae4b5d3 100644 (file)
@@ -352,6 +352,16 @@ a, .menuEmissions a, a:visited, .menuEmissions a:visited, a:active, .menuEmissio
 .emission .control .listen{
        line-height:5em;
 }
+.emission .URL{
+       white-space: nowrap;
+       text-overflow: ellipsis;
+       overflow: hidden;
+}
+.emission .contact{
+       white-space: nowrap;
+       text-overflow: ellipsis;
+       overflow: hidden;
+}
 
 .emission .mainHeader {
     overflow: hidden;
index 68d0f2989d7859238dfd66bb6fd9ccf59d7a1659..7bac3e3f66c725319e9b87610f26b3c97d7c71c5 100644 (file)
@@ -30,8 +30,8 @@
                        {{ emission.description|safe|striptags }}
                </h4>
                {% endif %}
-               <div class="link">www.lecroissantfertile.com</div>
-               <div class="link">info@lecroissantfertile.com </div>
+               <div class="URL">http://www.lecroissantfertile.com</div>
+               <div class="contact">info@lecroissantfertile.com </div>
        </div>
 
        <img class="logo" src="http://placehold.it/280X180"/>
index a7c83e1c0daeff7e5fd673b4ac1e3f277f8430e5..06051936d194758acc119986c2114934d4400f4c 100644 (file)
                
                        <h5 class="title">{{ emission.title }}</h5>
                        {% if emission.description %}
-                       <div class="description">
-                               {{ emission.description|safe|striptags }}
-                       </div>
+                               <div class="description">
+                                       {{ emission.description|safe|striptags }}
+                               </div>
+                       {% elif emission.text %}
+                               <div class="description">
+                                       {{ emission.text|safe|striptags|truncatewords:20}}
+                               </div>
                        {% endif %}
                </a>
        </div>