summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-19 17:18:33 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-19 17:19:44 +0100
commitc59fab0a514630d67182ddf7cb3a11dc00c6eba3 (patch)
tree95365b250f9dbf3d916b41e9e0371814bcadf71e
parent2b61d7725c0c4d0444a3b5ea815ca2085e39df79 (diff)
downloadChimère-c59fab0a514630d67182ddf7cb3a11dc00c6eba3.tar.bz2
Chimère-c59fab0a514630d67182ddf7cb3a11dc00c6eba3.zip
Fix display of searches
-rw-r--r--chimere/static/chimere/css/styles.css18
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js24
2 files changed, 16 insertions, 26 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 1330297..4cdc31e 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -1299,7 +1299,7 @@ table.inline-table td input[type=file]{
top: auto;
border: 0px solid transparent;
display: block;
- margin-top: 3px;
+ margin: 0;
}
#search-result,
@@ -1318,10 +1318,11 @@ table.inline-table td input[type=file]{
margin:0;
padding:4px;
padding-bottom: 70px;
+ overflow: auto;
}
#search-listing ul li{
- padding:4px;
+ padding: 0;
}
#search-listing a{
@@ -1349,14 +1350,6 @@ table.inline-table td input[type=file]{
padding: 5px 10px;
}
-#search-listing ul{
- padding:4px;
-}
-
-#search-listing ul li {
- padding: 0;
-}
-
#search-form{
background-color: transparent;
margin: 0;
@@ -1367,7 +1360,8 @@ table.inline-table td input[type=file]{
#search-form input{
width: 100%;
border: 0;
- font-size: 0.85em;
+ font-size: 1.2em;
+ text-transform: uppercase;
}
#haystack-search{
@@ -3508,7 +3502,7 @@ ul#roadmap_toolbar, ul#roadmap_toolbar ul, ul#roadmap_toolbar li{
padding: 0;
width: 282px;
position: fixed;
- bottom: 26px;
+ bottom: 0;
left: 0;
font-family: 'Numans';
z-index: 10;
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 84205a8..06f437b 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -2049,7 +2049,7 @@ function transformCoordToLonLat(coord) {
settings[map_id].iconStyles[properties.icon_path] = iconStyle;
return iconStyle;
},
- _getExtraIconStyle: function(map_id, extra_icons){
+ _getExtraIconStyle: function(map_id){
var extra_icons_style;
for (var i in settings[map_id].iconStyles){
if (i == "extra_icons"){
@@ -2079,25 +2079,22 @@ function transformCoordToLonLat(coord) {
_addMarker: function (map_id, mark) {
/*
* Default Feature configuration
- * This can be overrided in on_marker_click, using settings[map_id].current_feature
+ * This can be override in on_marker_click, using settings[map_id].current_feature
*/
var lat = mark.geometry.coordinates[1];
var lon = mark.geometry.coordinates[0];
- var extra_icons = [];
- for (idx=0 ; idx < mark.properties.extra_icons.length ; idx++){
- extra_icons.push(mark.properties.extra_icons[idx].icon_path);
- }
-
- var iconStyle = methods._getIconStyle(map_id, mark.properties, MEDIA_URL);
var hover_div = "";
- if (extra_icons.length){
+ var iconStyle = methods._getIconStyle(map_id, mark.properties, MEDIA_URL);
+ if (mark.properties.extra_icons.length > 0){
iconStyle = [
- iconStyle, methods._getExtraIconStyle(map_id, extra_icons)
+ iconStyle, methods._getExtraIconStyle(map_id)
];
- hover_div = "<div>"
- for (idx=0 ; idx < extra_icons.length ; idx ++){
- hover_div += "<img src='" + MEDIA_URL + extra_icons[idx] + "'/>";
+ hover_div = "<div>";
+ for (idx in mark.properties.extra_icons){
+ if(mark.properties.extra_icons[idx] && mark.properties.extra_icons[idx].icon_path){
+ hover_div += "<img src='" + MEDIA_URL + mark.properties.extra_icons[idx].icon_path + "'/>";
+ }
}
hover_div += "</div>";
}
@@ -2108,7 +2105,6 @@ function transformCoordToLonLat(coord) {
pk: mark.properties.pk,
key: mark.properties.key,
icon_path: mark.properties.icon_path,
- extra_icons: extra_icons,
hover_div: hover_div,
popup_offset_x: mark.properties.icon_popup_offset_x,
popup_offset_y: mark.properties.icon_popup_offset_y