diff options
Diffstat (limited to 'chimere/static')
| -rw-r--r-- | chimere/static/chimere/css/forms.css | 96 | ||||
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 12 | ||||
| -rw-r--r-- | chimere/static/chimere/js/edit_route_map.js | 2 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 10 |
4 files changed, 67 insertions, 53 deletions
diff --git a/chimere/static/chimere/css/forms.css b/chimere/static/chimere/css/forms.css index c1c3eca..499a615 100644 --- a/chimere/static/chimere/css/forms.css +++ b/chimere/static/chimere/css/forms.css @@ -1,94 +1,96 @@ /* colors definition */ .map_button .toggle-button-inactive{ -color: #5b80b2; -background-color:#fff; + color: #5b80b2; + background-color:#fff; + color:#54c200; } .map_button .toggle-button-active, .toggle-button:hover{ -background-color: #5b80b2; -color:#fff; + background-color: #5b80b2; + background-color:#54c200; + color:#fff; } - - /**/ #map_edit{ -border: 1px solid black; -width:100%; -height:500px; + margin:0; + border: 1px solid black; + width:100%; + height:500px; } .map_button{ -position:absolute; -z-index:1000; -text-align:center; -width:100%; -margin:0; -padding:0; -margin-top:10px; -font-size:16px; + position:absolute; + z-index:1000; + text-align:center; + width:100%; + margin:0; + padding:0; + margin-top:10px; + font-size:16px; } .map_button a{ -margin:8px; -padding:4px; --moz-border-radius: 4px; --webkit-border-radius: 4px; -border-radius: 4px; + margin:8px; + padding:4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } #live_lonlat{ -margin:1em; -float:left; + margin:1em; + float:left; } .toggle-button{ -margin:4px 0; -padding:2px 0; + margin:4px 0; + padding:2px 0; } #upload, #draw-label{ -vertical-align:center; -background-repeat:no-repeat; -font-size:20px; -padding:30px 0; -padding-left:80px; + vertical-align:center; + background-repeat:no-repeat; + font-size:20px; + margin:0; + padding:30px 0; + padding-left:80px; } #upload{ -background-image:url('img/upload.png'); + background-image:url('../img/upload.png'); } #draw-label{ -background-image:url('img/drawing.png'); + background-image:url('../img/drawing.png'); } #draw-or{ -padding:0; -padding-left:80px; -margin:0; -font-size:16px; + padding:0; + padding-left:80px; + margin:0; + font-size:16px; } .help-route{ -width:98%; -background-color:#EEF;; -margin: 10px 0; -padding:0 4px; --moz-border-radius: 4px; --webkit-border-radius: 4px; -border-radius: 4px; -border:1px solid grey; + width:98%; + background-color:#EEF;; + margin: 10px 0; + padding:0 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + border:1px solid grey; } #help-route-create{ -display:None + display:None } #help-route-modify{ -display:None + display:None } diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index e9c03ad..744f920 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -9,7 +9,7 @@ a, a:link, a:visited, legend, color:#54c200; } -h2, .action li, .action li a, +h2, h3, .action li, .action li a, .action li li a, #footer a, #footer a:link, #footer a:visited, .ui-widget-header, a#welcome_button, a:visited#welcome_button, a:link#welcome_button, @@ -135,6 +135,12 @@ h2{ position: relative; } +h3{ + text-align:center; + margin:6px; + padding: 0.1em; +} + .draggable h2{ cursor:move; } @@ -178,6 +184,10 @@ ul.action{ padding-bottom:0; } +ul#action-2 { + padding-bottom:12px; +} + .action li{ font-weight:normal; display:inline; diff --git a/chimere/static/chimere/js/edit_route_map.js b/chimere/static/chimere/js/edit_route_map.js index 11af258..628e9fd 100644 --- a/chimere/static/chimere/js/edit_route_map.js +++ b/chimere/static/chimere/js/edit_route_map.js @@ -164,5 +164,5 @@ function uploadFile(error_msg) { alert(error_msg); return; } - open_window(extra_url + 'upload_file'); + open_window(extra_url + 'upload_file/'); } diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index fb0e0bd..bd38a70 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -138,7 +138,8 @@ See the file COPYING for details. settings.layerMarkers.setOpacity(0.8); if (settings.dynamic_categories){ - settings.map.events.register('moveend', settings.map, methods.loadCategories); + settings.map.events.register('moveend', settings.map, + methods.loadCategories); } /* TODO make a function */ if (settings.display_submited) { @@ -193,8 +194,9 @@ See the file COPYING for details. * Update the categories div in ajax */ loadCategories: function () { - var current_extent = settings.map.getExtent().transform(settings.map.getProjectionObject(), - EPSG_DISPLAY_PROJECTION); + var current_extent = settings.map.getExtent().transform( + settings.map.getProjectionObject(), + EPSG_DISPLAY_PROJECTION); current_extent = current_extent.toArray().join('_') current_extent = current_extent.replace(/\./g, 'D'); current_extent = current_extent.replace(/-/g, 'M'); @@ -489,7 +491,7 @@ See the file COPYING for details. } if ($(this).attr('checked') == 'checked'){ cat_id = $(this).attr('id').split('_').pop(); - settings.checked_categories.push(cat_id); + settings.checked_categories.push(parseInt(cat_id)); } }); if(initialized && $('#display_submited_check').attr("checked") == "checked"){ |