Merge branch 'v2.2'

Conflicts:
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/blocks/areas.html

4 files changed, 13 insertions, 6 deletions

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 98bc7ab..2dc0841 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -294,15 +294,13 @@ ul#action-2 {
 }
 
 #maps-div label{
-    font-weight:bold;
+    color: #777;
+    font-variant:small-caps;
 }
 
 #maps{
     position:absolute;
     z-index:5;
-}
-
-#maps{
     bottom:105px;
     left:18px;
     padding:0;
@@ -339,6 +337,16 @@ ul#action-2 {
     margin:4px 8px;
 }
 
+#close-detail{
+    position: absolute;
+    right: 10px;
+    font-weight:bold;
+}
+
+#close-detail:hover{
+    cursor:pointer;
+}
+
 #news_content{
     overflow:auto;
 }
diff --git a/chimere/static/chimere/js/base.js b/chimere/static/chimere/js/base.js
index b26d9f3..49751b2 100644
--- a/chimere/static/chimere/js/base.js
+++ b/chimere/static/chimere/js/base.js
@@ -60,7 +60,6 @@ function open_window(url){
     return false;
 }
 
-
 function saveExtent() {
     /* save the current extent in a cookie */
     if(!map) return;
diff --git a/chimere/templates/chimere/blocks/areas.html b/chimere/templates/chimere/blocks/areas.html
deleted file mode 120000
index 0883da9..0000000
--- a/chimere/templates/chimere/blocks/areas.html
+++ /dev/null
@@ -1 +0,0 @@
-maps.html
\ No newline at end of file
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index 259df31..854789d 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -1,4 +1,5 @@
 {% load i18n sanitize chimere_tags %}
+<button onclick='$("#detail").fadeOut();return false;' type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
 <h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{{ marker.name }}</h2>
 <div class='detail_content'>
     {% if marker.default_pictures or marker.default_pictures or marker.default_multimedia_items%}