affichage mediafile, overflow pour spectrogram

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 40081dadfd7a972d478264446c9892a6030ee91d..64d30e870dc795e5e5407c5bd354913e2a4f86bf 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -29,14 +29,18 @@ h3 {
     color: #353535;
 }
 #content ul, #content ol {
-    padding: 5px;
-    padding-left: 15px;
-    font-size: 0.9em;
+    list-style: square;
+    padding: .7em;
+    padding-left: 2em;
+    font-size: 0.8em;
 }
 #content li {
-    padding: 3px;
+    padding: .2em;
+    padding-left: 0;
+}
+#content li a {
+    padding: .1em 0;
 }
-
 #header {
     padding: 0.2em 0;
     margin-bottom: .9em;
@@ -74,34 +78,50 @@ h3 {
 
 #leftcol {
     position: relative;
-    margin-right: 340px;
+    margin-right: 345px;
+    min-height: 450px;
 }
 #rightcol {
     clear: both;
     position: absolute;
-    right: 1.3em;
-    width: 320px;
-    border-left: 1px solid #ddd;
-}
-#rightcol {
+    right: .3em;
+    width: 308px;
+    text-align: right;
     margin-top: 10px;
+    border: 1px dotted #999;
+    padding: 6px;
+    background-color: #eee;
 }
-
-/*.item_visualization, #collection_player {
-  padding: 1ex;
-  margin-top: 1em;
-  margin-left: 1em;
+#rightcol div {
+    text-align: left;
+    position: relative;
+}
+#rightcol form {
+    width: 305px;
+    margin-top: 5px;
+    background-color: #fff;
+    border: 1px solid #adadad;
 }
-.item_visualization select { width: 200px; }
-.item_visualization .viewport { width: 305px; border: solid 1px black; overflow: auto; }
+#item_player_c {
+    width: 305px;
+    padding: 2px 0 0;
+    border: 1px solid #adadad;
+    text-align: center;
+}
+.item_visualization select { width: 210px; }
+.item_visualization .viewport { width: 305px; border: 1px solid #adadad; overflow: auto; margin-top: 5px; background-color: #fff;}
 
 .exporter {
-    width: 295px;
-    border: solid 1px black;
-    padding: 0.5em;
-    margin: 5px;
+    background-color: #fff;
+    color: #555;
+    border: 1px solid #adadad;
+    width: 301px;
+    padding: 2px;
+    height: 17px;
+    margin: 5px 0 0;
     overflow: auto;
-}*/
+    font-size: 1em;
+}
 
 /* Geographic navigator */
 ul.continents, ul.continents ul { list-style: none; margin: 0; padding: 0;}

diff --git a/telemeta/templates/collection_detail.html b/telemeta/templates/collection_detail.html
index e43ab70bb82d8656343a39e055c882217ddad3f6..5936b9c52857a17d0ac6df3211c74a3710b2653f 100644 (file)
--- a/telemeta/templates/collection_detail.html
+++ b/telemeta/templates/collection_detail.html
@@ -48,7 +48,7 @@
     {% endif %}
     <div id="leftcol">
         <div class="intro">
-            <span>{% if object.items.count %}{{ object.items.count }} {% ifequal object.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
+            <span>{% if object.items.count %}{{ object.items.count }} {% ifequal object.items.count '1' %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
         </div>
         <div class="infos">
             <dl class="listing">

diff --git a/telemeta/templates/mediaitem_detail.html b/telemeta/templates/mediaitem_detail.html
index 17d89d86cd17c08cebdbc2d6e2798fd9aa3da9c2..22c6b56c5159abfa0c152b4d6b3873fc748c5331 100644 (file)
--- a/telemeta/templates/mediaitem_detail.html
+++ b/telemeta/templates/mediaitem_detail.html
@@ -48,10 +48,10 @@
         </form>\r
     </div>\r
     <div class="exporter">\r
-        Download:\r
+        <p>Download:\r
         {% for format in export_formats %}\r
         <a href="{% url telemeta-item-export item.id|urlencode,format.extension %}">{{ format.name }}</a>\r
-        {% endfor %}\r
+        {% endfor %}</p>\r
     </div>\r
 </div>\r
 {% endif %}\r