summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-02-24 20:43:35 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-02-24 20:43:35 +0100
commit4e306ce4c5686c3741ba1dcf6a0c17ad6778f084 (patch)
treea86dc7692f39dd2a11bf58bc83357dd90a67b1c8
parented6c1559c44bdc3214cd2dffb377359601b28a33 (diff)
downloadChimère-4e306ce4c5686c3741ba1dcf6a0c17ad6778f084.tar.bz2
Chimère-4e306ce4c5686c3741ba1dcf6a0c17ad6778f084.zip
Small fixes on teh default layout
-rw-r--r--chimere/static/chimere/css/styles.css15
-rw-r--r--chimere/static/chimere/js/base.js1
-rw-r--r--chimere/templates/chimere/blocks/areas.html2
-rw-r--r--chimere/templates/chimere/detail.html1
4 files changed, 17 insertions, 2 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 5a638c7..704509c 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -265,6 +265,11 @@ ul#action-2 {
padding:0.3em;
}
+#areas-div label{
+ color: #777;
+ font-variant:small-caps;
+}
+
#areas{
position:absolute;
z-index:5;
@@ -307,6 +312,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 18394de..d7a9695 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
index a1ebe76..268912c 100644
--- a/chimere/templates/chimere/blocks/areas.html
+++ b/chimere/templates/chimere/blocks/areas.html
@@ -1,7 +1,7 @@
{% load i18n %}
{% if areas and areas.count > 1 %}
<div id='areas-div'>
- <label for='areas-select'>{% trans "Areas:" %}</label>
+ <label for='areas-select'>{% trans "Maps" %}</label>
<select id='areas-select'>
{% if not has_default_area %}<option value=''>--</option>{% endif %}
{% for area in areas %}
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index ed0ea5c..5fec6fa 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%}