Merge branch 'master' into saclay

Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/templates/chimere/blocks/multimedia_file.html
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/views.py

3 files changed, 49 insertions, 9 deletions

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index bfdf36e..caee1a6 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -320,16 +320,22 @@ ul#action-2 {
     margin:4px 8px;
 }
 
-#detail_content{
+#news_content{
+    overflow:auto;
+}
+
+.detail_content{
     overflow:auto;
     height:80%;
 }
 
-#detail_content img{
+#news_content img,
+.detail_content img{
     max-width:280px;
 }
 
-#detail_content p{
+#news_content p,
+.detail_content p{
     padding:0.2em 0;
     margin:0;
 }
@@ -705,8 +711,13 @@ p.warning{
 }
 
 #no-js-message{
-    z-index:1000;
+    z-index:5000;
     text-align:center;
+    position:absolute;
+    top:0;
+    bottom:0;
+    height:100%;
+    width:100%;
 }
 
 
@@ -914,8 +925,11 @@ ul#multimedia_list_content li.multimedia{
 
 .small-gallery{
     width:320px;
-    min-height:30px;
+    min-height:35px;
     text-align:center;
+    margin-left:auto;
+    margin-right:auto;
+    margin-top:15px;
 }
 
 .small-gallery .media-player,
@@ -924,11 +938,37 @@ ul#multimedia_list_content li.multimedia{
 {
     width:300px;
     min-height:50px;
-    /*height:180px;*/
+}
+
+p.legend{
+    padding:0;
+    margin:0;
+    text-align:center;
+}
+.small-gallery p.legend{
+    font-size:0.9em;
+}
+
+.ui-tabs-panel{
+    overflow:auto;
+}
+
+.media-img{
+    max-height:400px;
+}
+
+.media-video,
+.media-img,
+.media-player{
+    display:block;
+    margin-left:auto;
+    margin-right:auto;
+    margin-top:10px;
 }
 
 /** jme **/
 
+
 /*overlay controls*/
 .media-controls-wrapper {
     position: absolute;
diff --git a/chimere/static/chimere/js/base.js b/chimere/static/chimere/js/base.js
index 4482879..ba2ffc2 100644
--- a/chimere/static/chimere/js/base.js
+++ b/chimere/static/chimere/js/base.js
@@ -69,7 +69,7 @@ function saveExtent() {
     var extent = map.getExtent().transform(map.getProjectionObject(),
                                            epsg_display_projection);
     document.cookie = extent_key + "=" + extent.toArray().join('_')
-                      + ';path="/"';
+                      + ';path=/';
 }
 
 function getExtent() {
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 381f8bb..24d4af1 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -1391,8 +1391,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             if (!settings.map) return;
             var extent = settings.map.getExtent().transform(EPSG_PROJECTION,
                                                    EPSG_DISPLAY_PROJECTION);
-            document.cookie = extent_key + "=" + extent.toArray().join('_')
-                              + ';path="/"';
+            document.cookie = extent_key + '=' + extent.toArray().join('_')
+                              + ';path=/';
         }
     }; // End of public methods
     var helpers = {