diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 52 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/categories.html | 2 |
2 files changed, 29 insertions, 25 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 4b498c8..b41f516 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -44,15 +44,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { return v; }; })( jQuery ); -/* preload images */ -(function ($) { - $.fn.preload = function() { - this.each(function(){ - $('<img/>')[0].src = this; - }); - } -})( jQuery ); - (function ($) { /* * Chimere jQuery plugin @@ -118,7 +109,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { 'http://www.openlayers.org/dev/img/marker-green.png', new OpenLayers.Size(21, 25), new OpenLayers.Pixel(-(21/2), -25)), - cluster_icon: null + cluster_icon: null, + icon_start: null, + icon_step: null, + icon_end: null }; var settings = {}; /* @@ -137,6 +131,24 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { new OpenLayers.Size(36, 39), new OpenLayers.Pixel(-(36/2), -(39/2))); } + if (defaults.icon_start == null && typeof STATIC_URL != 'undefined'){ + defaults.icon_start = new OpenLayers.Icon( + STATIC_URL + "chimere/img/flag-start.png", + new OpenLayers.Size(32, 32), + new OpenLayers.Pixel(0, -32)); + } + if (defaults.icon_step == null && typeof STATIC_URL != 'undefined'){ + defaults.icon_step = new OpenLayers.Icon( + STATIC_URL + "chimere/img/flag-step.png", + new OpenLayers.Size(32, 32), + new OpenLayers.Pixel(0, -32)); + } + if (defaults.icon_end == null && typeof STATIC_URL != 'undefined'){ + defaults.icon_end = new OpenLayers.Icon( + STATIC_URL + "chimere/img/flag-finish.png", + new OpenLayers.Size(32, 32), + new OpenLayers.Pixel(0, -32)); + } settings = $.extend({}, defaults); if ( options ) $.extend(settings, options); var map_element = $(this).get(0); @@ -235,29 +247,15 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { settings.routing_start = null; settings.routing_steps = new Array(); settings.routing_end = null; - settings.icon_start = new OpenLayers.Icon( - STATIC_URL + "chimere/img/flag-start.png", - new OpenLayers.Size(32, 32), - new OpenLayers.Pixel(0, -32)); - settings.icon_step = new OpenLayers.Icon( - STATIC_URL + "chimere/img/flag-step.png", - new OpenLayers.Size(32, 32), - new OpenLayers.Pixel(0, -32)); - settings.icon_end = new OpenLayers.Icon( - STATIC_URL + "chimere/img/flag-finish.png", - new OpenLayers.Size(32, 32), - new OpenLayers.Pixel(0, -32)); $('#map_menu_from').bind("click", methods.routingFrom); $('#map_menu_step').bind("click", methods.routingAddStep); $('#map_menu_to').bind("click", methods.routingTo); $('#map_menu_clear').bind("click", methods.routingClear); settings.layerRoute = new OpenLayers.Layer.Vector("Route Layer"); settings.map.addLayer(settings.layerRoute); - settings.layerRoute.setOpacity(0.8); settings.layerRouteMarker = new OpenLayers.Layer.Markers( 'Route markers'); settings.map.addLayer(settings.layerRouteMarker); - settings.layerRouteMarker.setOpacity(0.8); } /* Vectors layer */ settings.layerVectors = new OpenLayers.Layer.Vector("Vector Layer"); @@ -645,6 +643,12 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { if($(this).is(':checked')){ methods.subcategory_detail(c_name); } + var par = $(this).parent(); + if ($(this).attr('checked')){ + par.addClass('selected'); + } else { + par.removeClass('selected'); + } methods.hidePopup(); methods.loadGeoObjects(); _toggle_categories($(this)); diff --git a/chimere/templates/chimere/blocks/categories.html b/chimere/templates/chimere/blocks/categories.html index 490b453..62d909b 100644 --- a/chimere/templates/chimere/blocks/categories.html +++ b/chimere/templates/chimere/blocks/categories.html @@ -8,7 +8,7 @@ <img id="zoom_to_category_{{category.id}}" class="zoom_image zoom_to_category" alt='{% trans "Zoom to" %} {{category.name}}' src='{{ STATIC_URL }}chimere/img/zoom.png' /> <ul class='subcategories' id='maincategory_{{category.id}}'{% if not category.selected %} style='display:None'{% endif %}> {% for sub_category in lst_sub_categories %} - <li id='li_sub_{{sub_category.id}}'> + <li id='li_sub_{{sub_category.id}}' class='subcategory'> <input type='checkbox' name='category_{{sub_category.id}}' id='category_{{sub_category.id}}'{% if sub_category.selected %} checked='checked'{% endif %}/> <label for='category_{{sub_category.id}}'> <img alt='{{ sub_category.name }}' src='{{ MEDIA_URL }}{{sub_category.icon.image}}'/> |