Mercurial Mercurial > platform / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with Jacques last revision
authorveltr
Fri, 27 Jan 2012 15:18:36 +0100
changeset 473 a400c401f78b
parent 472 7810c6775b2f (diff)
parent 471 c54a7864a22f (current diff)
child 474 5e7942f049a6
Merge with Jacques last revision
src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/templates/front/front_home.html file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html	Fri Jan 27 14:56:11 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html	Fri Jan 27 15:18:36 2012 +0100
@@ -27,19 +27,19 @@
         {% else %}<h2>{% trans 'All medias' %}</h2>{% endif %}
     </li>
     {% for content in content_list %}
-    <li class="li_media">        
+    <li class="li_media">
         <div class="img_and_overlay">
             <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">
                 {% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}
             </a>
             <div class="overlay">
                 <ul class="polemics">
-                    <li class="pol-negative" style="width:{{content.pol_positive_rate }}%">{{content.pol_positive_rate }}%</li>
-                    <li class="pol-positive" style="width:{{content.pol_negative_rate}}%">{{content.pol_negative_rate}}%</li>
-                    <li class="pol-reference" style="width:0%">0%</li>
-                    <li class="pol-question" style="width:0%">0%</li>
+                    <li class="pol-negative" style="width:{{content.pol_negative_rate}}%"><span>{{content.pol_negative_rate}}%</span></li>
+                    <li class="pol-positive" style="width:{{content.pol_positive_rate}}%"><span>{{content.pol_positive_rate}}%</span></li>
+                    <li class="pol-reference" style="width:{{content.pol_reference_rate}}%"><span>{{content.pol_reference_rate}}%</span></li>
+                    <li class="pol-question" style="width:{{content.pol_question_rate}}%"><span>{{content.pol_question_rate}}%</span></li>
                 </ul>
-                <span class="graph_annotation" id="sp_{{ content.iri_id }}">{{ content.stat_annotation }}</span>
+                <span class="graph_annotation" id="sp_{{ content.iri_id }}">{{ content.annotation_volume|list2str }}</span>
             </div>
         </div>
         <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html	Fri Jan 27 14:56:11 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html	Fri Jan 27 15:18:36 2012 +0100
@@ -34,17 +34,17 @@
     {% for content in last_contents %}
     <li class="li_media">
         <div class="img_and_overlay">
-            <a class="img_and_overlay" href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">
+            <a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">
                 {% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}
             </a>
             <div class="overlay">
                 <ul class="polemics">
-                    <li class="pol-negative" style="width:{{content.pol_negative_rate}}%">{{content.pol_negative_rate}}%</li>
-                    <li class="pol-positive" style="width:{{content.pol_positive_rate}}%">{{content.pol_positive_rate}}%</li>
-                    <li class="pol-reference" style="width:0%">0%</li>
-                    <li class="pol-question" style="width:0%">0%</li>
+                    <li class="pol-negative" style="width:{{content.pol_negative_rate}}%"><span>{{content.pol_negative_rate}}%</span></li>
+                    <li class="pol-positive" style="width:{{content.pol_positive_rate}}%"><span>{{content.pol_positive_rate}}%</span></li>
+                    <li class="pol-reference" style="width:{{content.pol_reference_rate}}%"><span>{{content.pol_reference_rate}}%</span></li>
+                    <li class="pol-question" style="width:{{content.pol_question_rate}}%"><span>{{content.pol_question_rate}}%</span></li>
                 </ul>
-                <span class="graph_annotation" id="sp_{{ content.iri_id }}">{{ content.stat_annotation }}</span>
+                <span class="graph_annotation" id="sp_{{ content.iri_id }}">{{ content.annotation_volume|list2str }}</span>
             </div>
         </div>
         <div class="bulle_annot" title="{% blocktrans count nb=content.nb_annotation %}{{nb}} annotation on this media{% plural %}{{nb}} annotations on this media{% endblocktrans %}">{{ content.nb_annotation }}</div>
@@ -71,10 +71,10 @@
             {% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" alt="{% trans 'open this media' %}" title="{% trans 'open this media' %}">{% endthumbnail %}</a>
             <div class="overlay">
                 <ul class="polemics">
-                    <li class="pol-negative" style="width:{{content.pol_negative_rate}}%">{{content.pol_negative_rate}}%</li>
-                    <li class="pol-positive" style="width:{{content.pol_positive_rate}}%">{{content.pol_positive_rate}}%</li>
-                    <li class="pol-reference" style="width:0%">0%</li>
-                    <li class="pol-question" style="width:0%">0%</li>
+                    <li class="pol-negative" style="width:{{content.pol_negative_rate}}%"><span>{{content.pol_negative_rate}}%</span></li>
+                    <li class="pol-positive" style="width:{{content.pol_positive_rate}}%"><span>{{content.pol_positive_rate}}%</span></li>
+                    <li class="pol-reference" style="width:{{content.pol_reference_rate}}%"><span>{{content.pol_reference_rate}}%</span></li>
+                    <li class="pol-question" style="width:{{content.pol_question_rate}}%"><span>{{content.pol_question_rate}}%</span></li>
                 </ul>
             </div>
         </div>
--- a/src/ldt/ldt/static/ldt/js/Ldt_front_sparkline.js	Fri Jan 27 14:56:11 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/Ldt_front_sparkline.js	Fri Jan 27 15:18:36 2012 +0100
@@ -33,4 +33,11 @@
             "stroke" : "#808080"
         });
     });
+
+    $(".polemics li").each(function(_i,_e) {
+        var _sp = $(_e).find("span");
+        if (parseInt(_sp.text())) {
+            $(_e).css("width",(2 + _sp.width())+"px");
+        }
+    });
 });
\ No newline at end of file
platform