diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-25 02:40:38 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-25 02:40:38 +0100 |
| commit | 3dca534692d18ba7bfc0db6c0e2ba4aedcaef2b0 (patch) | |
| tree | dfaa5853a4823e05b1897fe75cb7462de177d481 | |
| parent | 825ad994eb056e7be67f723016e2b4cd7a41e75e (diff) | |
| parent | 7c87d7ce34280965502a0c81f183ebfae7f62ebb (diff) | |
| download | Chimère-3dca534692d18ba7bfc0db6c0e2ba4aedcaef2b0.tar.bz2 Chimère-3dca534692d18ba7bfc0db6c0e2ba4aedcaef2b0.zip | |
Merge branch 'v2.2'
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 3 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail.html | 2 | ||||
| -rw-r--r-- | chimere/templates/search/search_js.html | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 2dc0841..d79bd0e 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -183,10 +183,11 @@ fieldset{ display:block; } +a:link[disabled], a[disabled] { pointer-events: none; cursor: default; - color: gray; + color: #ccc; } #page_title{ diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html index 854789d..b2210e2 100644 --- a/chimere/templates/chimere/detail.html +++ b/chimere/templates/chimere/detail.html @@ -1,6 +1,6 @@ {% 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> +<h2>{{ marker.name }}</h2> <div class='detail_content'> {% if marker.default_pictures or marker.default_pictures or marker.default_multimedia_items%} <div class='small-gallery'> diff --git a/chimere/templates/search/search_js.html b/chimere/templates/search/search_js.html index c8d9812..dc95007 100644 --- a/chimere/templates/search/search_js.html +++ b/chimere/templates/search/search_js.html @@ -18,7 +18,9 @@ $(function(){ geo_objects[idx]); } } - window.setTimeout(function(){$("#main-map").chimere("zoomToMarkerExtent")}, 500); + if (geo_objects.length){ + window.setTimeout(function(){$("#main-map").chimere("zoomToMarkerExtent")}, 500); + } }); </script> |