summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-02 18:58:34 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-02 18:58:34 +0200
commitf33f91b23551c0e77232380025148b4ba7c02cb4 (patch)
treee8df5b7cf7d1495e31b67e636186fc77e8fd11b9
parent078c1045613f45f596bcfa4cb49d1529802d0cf9 (diff)
downloadChimère-f33f91b23551c0e77232380025148b4ba7c02cb4.tar.bz2
Chimère-f33f91b23551c0e77232380025148b4ba7c02cb4.zip
Simplify the JS "loading" message
-rw-r--r--chimere/static/chimere/css/styles.css13
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js2
-rw-r--r--chimere/templates/chimere/blocks/map.html1
3 files changed, 7 insertions, 9 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 24dcef1..3c2b2e7 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -890,13 +890,12 @@ ul#multimedia_list_content li.multimedia{
}
#waiting-content {
- width:95px;
- position:relative;
- margin:0 auto;
- background-color:white;
- padding:10px 5px 0 5px;
- border:1px solid black;
- text-align:center;
+ width: 35px;
+ position: relative;
+ margin: 0 auto;
+ padding: 0;
+ border: 1px solid #ccc;
+ text-align: center;
}
/* openlayer customisation */
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index ca918e0..4275eb1 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -2261,7 +2261,7 @@ function transform(obj) {
/* put the marker on the map and update latitude and longitude fields */
putEditMarker: function (lonlat, zoom){
if (settings.features.getLength()) settings.features.pop();
- console.log(lonlat);
+ // console.log(lonlat);
var point = new ol.geom.Point(lonlat);
point.transform(EPSG_DISPLAY_PROJECTION, EPSG_PROJECTION);
var feature = new ol.Feature({
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 007f507..9a39647 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -25,7 +25,6 @@ $(function(){
<div id="waiting">
<div id="waiting-content">
<img alt='Ajax loader' src='{{STATIC_URL}}chimere/img/ajax-loader.gif'/>
- <p>{% trans "Loading of the map in progress" %}</p>
</div>
</div>
<div id="layer_selection">