]> git.0d.be Git - panikweb.git/commitdiff
Setting inline view for emission
authorlaron <simon@surlaterre.org>
Thu, 29 Aug 2013 05:37:58 +0000 (07:37 +0200)
committerlaron <simon@surlaterre.org>
Thu, 29 Aug 2013 05:37:58 +0000 (07:37 +0200)
panikweb_templates/templates/emissions.html
panikweb_templates/templates/emissions/inline.html
panikweb_templates/templates/emissions/resume.html

index 999401f5c669b2aa16aec2c5958aba16c0eec83d..22adf39171d0c8669a0f423078707a7d61e61cad 100644 (file)
@@ -9,7 +9,7 @@
 <div class="emissions padded">
                <ul class="custom list columns padded">
                {% for emission in emissions %}
-                       <li>{% emission_resume %}</li>
+                       <li>{% emission_inline %}</li>
                {% endfor %}
                </ul>
 </div>
index 761e78aea6112d11c85e78fbf8a201b4c14106c2..2716c22ee97491db774b60f109eb5a2fc46df668 100644 (file)
@@ -1,20 +1,13 @@
 <div class="emission emission-inline inline">
        <div class=" {% if emission.archived %}archived{% endif %}">
-               {% if emission.date %}
-                       <div class="date cf">
-                               <span class="day">XX</span>
-                               <span class="day-number">00</span>
-                               <span class="year">0000</span>
-                       </div>
-               {% endif %}
-               {% if controls %}
-               <div class="controls todo">
-                       <button class="control symbol play">A</button>
-                       <button class="control symbol add">B</button>
-               </div>
-               {% endif %}
                <a class="block" href="{% url 'emission-view' slug=emission.slug %}">
-               
+                       <div class="logo left">
+                               {% if emission.image %}
+                                       <img width="50" height="50" src="{{ emission.image|thumbnail:'50x50' }}"/>
+                               {% else %}
+                                       <img src="http://placehold.it/50x50">
+                               {% endif %}
+                       </div>
                        <h5 class="title ellipsis">{{ emission.title }}</h5>
                        {% if emission.description %}
                                <div class="description ellipsis">
index 0aa5cad5a49542df081205c2f4dc95e2b84ec80b..b44088d9c457169be89a7b2cafd897975324456b 100644 (file)
@@ -1,23 +1,14 @@
+{% load thumbnails %}
 <div class="emission emission-resume resume">
        <div class="{% if emission.archived %}archived{% endif %}">
-               {% if emission.date %}
-                       <div class="date cf">
-                               <span class="day">XX</span>
-                               <span class="day-number">00</span>
-                               <span class="year">0000</span>
-                       </div>
-               {% endif %}
                <a class="block" href="{% url 'emission-view' slug=emission.slug %}">
-                       {% if emission.image %}
                        <div class="logo left">
-                               {% if model = "inline" %}
-                               <img width="50" height="50" src="{{ emissionimage|thumbnail:'50x50' }}"/>
+                               {% if emission.image %}
+                                       <img width="50" height="50" src="{{ emission.image|thumbnail:'50x50' }}"/>
                                {% else %}
-               
-                               <img src="http://placehold.it/50x50">
+                                       <img src="http://placehold.it/50x50">
                                {% endif %}
                        </div>
-                       {% endif %}
                        <h5 class="title ellipsis">{{ emission.title }}</h5>
                        {% if emission.description %}
                                <div class="description ellipsis">