# HG changeset patch # User verrierj # Date 1327510782 -3600 # Node ID a6ea89e72f41e2a78203c7ac6b575bdff8b49da2 # Parent 8e9494006e7be0c1c560db2d429084fec769310b# Parent 29f990eb014488f105d54164324c7faa4a271119 Merge with 29f990eb014488f105d54164324c7faa4a271119 diff -r 8e9494006e7b -r a6ea89e72f41 crea/inte-crea/css/ldt-commun.css --- a/crea/inte-crea/css/ldt-commun.css Wed Jan 25 17:57:01 2012 +0100 +++ b/crea/inte-crea/css/ldt-commun.css Wed Jan 25 17:59:42 2012 +0100 @@ -117,6 +117,36 @@ margin: 10px; } +.img_and_polemic { + float: left; position: relative; +} + +.polemics { + position: absolute; bottom: 5px; list-style: none; z-index: 2; + width: 95%; font-size: 9px; color: #ffffff; +} + +.polemics li { + text-align: left; overflow: hidden; padding: 0 0 0 3px; margin: 2px 0; clear: both; + width: 100%; box-shadow: 2px 2px 2px #000000; +} + +.pol-positive { + background: #00a000; +} + +.pol-negative { + background: #ff0000; +} + +.pol-reference { + background: #e0e000; color: #000000; +} + +.pol-question { + background: #0040ff; +} + .img_media { background: #000000; border: 2px solid #ffffff; padding: 1px; } diff -r 8e9494006e7b -r a6ea89e72f41 crea/inte-crea/home.html --- a/crea/inte-crea/home.html Wed Jan 25 17:57:01 2012 +0100 +++ b/crea/inte-crea/home.html Wed Jan 25 17:59:42 2012 +0100 @@ -68,7 +68,13 @@

Médias les plus annotés

  • - + +
    120

    Lorem Ipsum

    par Ars Industrialis | 1h30

    diff -r 8e9494006e7b -r a6ea89e72f41 src/ldt/ldt/ldt_utils/templates/front/front_home.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html Wed Jan 25 17:57:01 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html Wed Jan 25 17:59:42 2012 +0100 @@ -46,7 +46,15 @@
  • {% for content in most_contents %}
  • - {% thumbnail content.image "134x75" format="PNG" crop="center" as im %}{% trans 'open this media' %}{% endthumbnail %} + + {% thumbnail content.image "134x75" format="PNG" crop="center" as im %}{% trans 'open this media' %}{% endthumbnail %} + +
    {{ content.nb_annotation }}

    {% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}

    {% trans 'by' %} IRI | {{content.duration|str_duration:"h"}}

    diff -r 8e9494006e7b -r a6ea89e72f41 src/ldt/ldt/ldt_utils/templates/front/front_search_results.html diff -r 8e9494006e7b -r a6ea89e72f41 src/ldt/ldt/static/ldt/css/front_common.css --- a/src/ldt/ldt/static/ldt/css/front_common.css Wed Jan 25 17:57:01 2012 +0100 +++ b/src/ldt/ldt/static/ldt/css/front_common.css Wed Jan 25 17:59:42 2012 +0100 @@ -132,6 +132,35 @@ .img_media { background: #000000; border: 2px solid #ffffff; padding: 1px; } +.img_and_polemic { + float: left; position: relative; +} + +.polemics { + position: absolute; bottom: 8px; list-style: none; z-index: 2; + width: 95%; font-size: 9px; color: #ffffff; +} + +.polemics li { + text-align: left; overflow: hidden; padding: 0 0 0 3px; margin: 2px 0; clear: both; + width: 100%; box-shadow: 2px 2px 2px #000000; +} + +.pol-positive { + background: #00a000; +} + +.pol-negative { + background: #ff0000; +} + +.pol-reference { + background: #e0e000; color: #000000; +} + +.pol-question { + background: #0040ff; +} .under, a.under { text-decoration: underline;