Merge branch 'v2.1' into ecopole

2 files changed, 27 insertions, 18 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index b1bc9e9..e132e41 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -11,7 +11,7 @@ html, h1, h2,
 }
 
 /* light */
-h2, .cloud h4, #layer_selection, #layer_selection h4,
+h2, .cloud h4, #layer_selection, #layer_selection h4, #permalink a,
 #chimere_itinerary_panel label, .ui-menu .ui-menu-item a, #submited-window,
 #welcome .footer a, label, .map_button a, #marker_hover_content, .notice{
     color:#929288;
@@ -138,9 +138,9 @@ div.warning, .errorlist{
 }
 
 /* blank */
-#edit-panel,
+#edit-panel, #permalink,
 #layer_selection h4, #chimere_itinerary_content div.n,
-edit h4{
+.edit h4{
     background-color:#fff;
 }
 
@@ -156,20 +156,14 @@ h2, h3{
 /*
  * Borders
  */
-#layer_selection h4, ul#multimedia_list_content li,
-#layer_selection #layer_list,
-#layer_selection #layer_list li,
-.itinerary_label .label, #footer-panel,
-#detail_footer,
-#areas, #detail, #main-map, div.warning,
-#content, .action li.selected,
-#content .olControlLayerSwitcher .layersDiv,
-#panel, #map-footer, #utils-div, #action,
-#panel #categories, .main_category, #page_title,
-#ul_categories .subcategories li, #action-panel,
-ul.ui-autocomplete.ui-menu.ui-corner-all.ui-widget-content,
-.extra-criteria,
-#chimere_itinerary_form, .welcome-logo{
+#layer_selection h4, ul#multimedia_list_content li, #layer_selection #layer_list,
+#layer_selection #layer_list li, .itinerary_label .label, #footer-panel,
+#detail_footer, #areas, #detail, #main-map, div.warning, #content,
+.action li.selected, #content .olControlLayerSwitcher .layersDiv, #panel,
+#map-footer, #utils-div, #action, #panel #categories, .main_category,
+#page_title, #ul_categories .subcategories li, #action-panel,
+ul.ui-autocomplete.ui-menu.ui-corner-all.ui-widget-content, .extra-criteria,
+#chimere_itinerary_form, .welcome-logo, #permalink{
     border-color:#999;
 }
 
@@ -224,6 +218,21 @@ h3.warn{
     margin:0;
 }
 
+#permalink{
+    position:absolute;
+    z-index:20;
+    right:280px;
+    top:36px;
+    width:auto;
+    border-width:1px;
+    border-style:solid;
+    padding:2px 12px;
+}
+
+#permalink a{
+    font-weight:normal;
+}
+
 /* no title bar dialog */
 .no-titlebar.ui-dialog,
 .no-titlebar-simple.ui-dialog,
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index fe07aa9..9b1bef9 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -87,7 +87,7 @@
             {% trans "Draw" %}
         </a>
     </div>{% endif %}
-    <div id='permalink' style='display:none'></div>
+    <div id='permalink'></div>
     {% display_welcome news_visible %}
     {% display_news news_visible %}
     {{ block.super }}