WordPress.org
Get WordPress

Plugin Directory

Changeset 947438


Ignore:
Timestamp:
07/12/2014 11:57:34 AM (12 years ago)
Author:
der_maddis
Message:

added new icons and new marker possibilities, updated to version 1.4.0

Location:
wp-travelermap/trunk
Files:
698 added
11 edited

Legend:

Unmodified
Added
Removed

  • wp-travelermap/trunk/README.md

    r940307 r947438  
    5151https://github.com/phstc/jquery-dateFormat
    5252License: MIT & GPL
     53
     54Map Icons Collection
     55Creative Commons 3.0 BY-SA
     56Author : Nicolas Mollet
     57http://mapicons.nicolasmollet.com/

  • wp-travelermap/trunk/admin/js/travelermap-admin.js

    r940411 r947438  
    3030        var _map = null;
    3131        var _fileFrame;
    32 
    33         function _tm_init() {
     32        var _pluginUrl;
     33
     34        var _mapsymbols = ["2hand.png","360degrees.png","abduction.png","aboriginal.png","accesdenied.png","acupuncture.png","administration.png","administrativeboundary.png","aed-2.png","agritourism.png","aircraftcarrier.png","aircraftsmall.png","air_fixwing.png","airport_apron.png","airport.png","airport_runway.png","airport_terminal.png","airshow-2.png","algae.png","alien.png","alligator.png","amphitheater-2.png","amphitheater.png","anchorpier.png","anemometer_mono.png","animal-shelter-export.png","anniversary.png","ant-export.png","anthropo.png","apartment-3.png","apple.png","aquarium.png","archery.png","arch.png","army.png","artgallery.png","art-museum-2.png","atm-2.png","atv.png","audio.png","australianfootball.png","avalanche1.png","award.png","badminton-2.png","bags.png","bank.png","barbecue.png","barber.png","bar_coktail.png","bar_juice.png","bar.png","barrier.png","baseball.png","basketball.png","bats.png","battlefield.png","battleship-3.png","beach.png","beachvolleyball.png","beautifulview.png","beautysalon.png","bed_breakfast1-2.png","beergarden.png","bicycle_shop.png","bigcity.png","bike_downhill.png","bike_rising.png","billiard-2.png","binoculars.png","birds-2.png","blast.png","boardercross.png","boatcrane.png","boat.png","bobsleigh.png","bollie.png","bomber-2.png","bomb.png","bouddha.png","bowling.png","boxing.png","bread.png","brewery1.png","bridge_modern.png","bridge_old.png","bulldozer.png","bullfight.png","bunker-2-2.png","bus.png","busstop.png","bustour.png","butcher-2.png","butterfly-2.png","cabin-2.png","cablecar.png","cafetaria.png","calendar-3.png","campfire-2.png","camping-2.png","candy.png","canyon-2.png","caraccident.png","car.png","carrental.png","carwash.png","casino-2.png","castle-2.png","cathedral.png","catholicgrave.png","caution.png","cave-2.png","cctv.png","cemetary.png","channelchange.png","chapel-2.png","chart-2.png","cheese.png","chemistry-2.png","chicken-2.png","childmuseum01.png","chiropractor.png","christmasmarket.png","church-2.png","cinema.png","circus.png","citysquare.png","citywalls.png","climbing.png","clock.png","closedroad.png","clothers_female.png","clothers_male.png","cloudy.png","cloudysunny.png","coffee.png","coins.png","comedyclub.png","comics.png","comment-map-icon.png","communitycentre.png","company.png","compost.png","computers.png","condominium.png","conference.png","congress.png","constructioncrane.png","construction.png","contract.png","conveniencestore.png","convent-2.png","conversation-map-icon.png","convertible.png","corral.png","country.png","court.png","cowabduction.png","cow-export.png","craftstore.png","cramschool.png","cricket.png","crimescene.png","cromlech.png","cropcircles.png","cross-2.png","crossingguard.png","cruiseship.png","cup.png","curling-2.png","currencyexchange.png","customs.png","cycling_feed.png","cycling.png","cycling_sprint.png","dam.png","dance_class.png","dancinghall.png","database.png","daycare.png","deepseafishing.png","deer.png","dentist.png","departmentstore.png","desert-2.png","dinopark.png","direction_down.png","disability.png","diving.png","dogs_leash.png","dolphins.png","doublebendright.png","downloadicon.png","drinkingfountain.png","drinkingwater.png","drugstore.png","duck-export.png","earthquake-3.png","eggs.png","elephants.png","elevator_down.png","elevator.png","elevator_up.png","embassy.png","entrance.png","exchequer.png","exit.png","expert.png","factory.png","fallingrocks.png","family.png","farm-2.png","farmstand.png","fastfood.png","female-2.png","ferriswheel.png","ferry.png","festival.png","fetalalcoholsyndrom.png","field.png","fillingstation.png","findajob.png","finish.png","fireexstinguisher.png","fire-hydrant-2.png","firemen.png","fire.png","fireworks.png","firstaid.png","fishchips.png","fishingboat.png","fishing.png","fishingstore.png","fitness.png","fjord-2.png","flag-export.png","flood.png","flowers.png","folder-2.png","fooddeliveryservice.png","foodtruck.png","footprint.png","ford-2.png","forest2.png","forest.png","fossils.png","foundry-2.png","fountain-2.png","fourbyfour.png","freqchg.png","frog-2.png","fruits.png","ft.png","funicolar-22x22.png","gas_cylinder1.png","gay-female.png","gay-male.png","geocaching-3.png","geothermal-site.png","geyser-2.png","ghosttown.png","gifts.png","glacier-2.png","glasses.png","golfing.png","gondola-2.png","gourmet_0star.png","grass.png","grocery.png","group-2.png","gumball_machine.png","handball.png","hanggliding.png","harbor.png","hare1.png","hats.png","haybale.png","headstone-2.png","helicopter.png","highhills.png","highschool.png","highway.png","hiking.png","historical_museum.png","historicalquarter.png","hoergeraeteakustiker_22px.png","home-2.png","homecenter.png","honeycomb.png","hookah_final.png","horseriding.png","hospital-building.png","hostel_0star.png","hotairbaloon.png","hotel_0star.png","hotspring.png","house.png","hunting.png","hut.png","icecream.png","icehockey.png","iceskating.png","icy_road.png","indoor-arena.png","information.png","iobridge.png","jacuzzi.png","japanese-food.png","japanese-lantern.png","japanese-sake.png","japanese-sweet-2.png","japanese-temple.png","jazzclub.png","jeep.png","jetfighter.png","jewelry.png","jewishgrave.png","jewishquarter.png","jogging.png","judo.png","junction.png","karate.png","karting.png","kayak1.png","kayaking.png","kebab.png","kingair.png","kiosk.png","kitesurfing.png","laboratory.png","lake.png","landfill.png","landmark.png","laterne.png","laundromat.png","levelcrossing.png","library.png","lifeguard-2.png","lighthouse-2.png","linedown.png","lingerie.png","liquor.png","lobster-export.png","lockerrental.png","lock.png","lodging_0star.png","love_date.png","loveinterest.png","magicshow.png","mainroad.png","male-2.png","mall.png","mapicon.png","map.png","marina-2.png","market.png","massage.png","mastcrane1.png","medicalstore.png","medicine.png","megalith.png","memorial.png","metronetwork.png","military.png","mine.png","missile-2.png","mobilephonetower.png","modernmonument.png","moderntower.png","monkey-export.png","monument-historique-icon-white-22x22.png","monument.png","moonstar.png","mosquee.png","mosquito-2.png","motel-2.png","motorbike.png","motorcycle.png","mountainbiking-3.png","mountain-pass-locator-diagonal-reverse-export.png","mountains.png","movierental.png","moving-walkway-enter-export.png","muffin_bagle.png","mural.png","museum_archeological.png","museum_art.png","museum_crafts.png","museum_industry.png","museum_naval.png","museum_openair.png","museum_science.png","museum_war.png","mushroom.png","music_choral.png","music_classical.png","music_hiphop.png","music_live.png","music.png","music_rock.png","nanny.png","ne_barn-2.png","newsagent.png","no-nuke-export.png","nordicski.png","notvisited.png","nursery.png","nursing_home_icon.png","observatory.png","office-building.png","oil-2.png","oilpumpjack.png","oilrig2.png","olympicsite.png","ophthalmologist.png","outlet2.png","out.txt","oyster-3.png","pagoda-2.png","paintball.png","paint.png","palace-2.png","palm-tree-export.png","panoramicview.png","paragliding.png","parasailing.png","parkandride.png","parkinggarage.png","parking-meter-export.png","party-2.png","patisserie.png","peace.png","pedestriancrossing.png","penguin-2.png","pens.png","perfumery.png","petanque.png","petroglyphs-2.png","pets.png","phantom.png","phones.png","photography.png","photo.png","picnic-2.png","pig.png","pin-export.png","pirates.png","pizzaria.png","planecrash.png","planetarium-2.png","playground.png","pleasurepier.png","poker.png","police.png","postal.png","powerlinepole.png","poweroutage.png","powerplant.png","powersubstation.png","prayer.png","presentation.png","price-tag-export.png","printer-2.png","prison.png","publicart.png","pyramid.png","quadrifoglio.png","radar.png","radiation.png","radio-control-model-car.png","radio-station-2.png","rainy.png","rape.png","reatorlogowhite-22x22.png","recycle.png","regroup.png","repair.png","rescue-2.png","resort.png","restaurant_african.png","restaurant_breakfast.png","restaurant_buffet.png","restaurant_chinese.png","restaurant_fish.png","restaurant_greek.png","restaurant_indian.png","restaurant_italian.png","restaurant_korean.png","restaurant_mediterranean.png","restaurant_mexican.png","restaurant.png","restaurant_romantic.png","restaurant_steakhouse.png","restaurant_tapas.png","restaurant_thai.png","restaurant_turkish.png","restaurant_vegetarian.png","revolt.png","riparianhabitat.png","river-2.png","road.png","roadtype_gravel.png","rockhouse.png","rodent.png","rollerskate.png","ropescourse.png","rowboat.png","rugbyfield.png","ruins-2.png","sailing.png","sandwich-2.png","sauna.png","sawmill-2.png","school.png","schreibwaren_web.png","scoutgroup.png","scubadiving.png","seals.png","segway.png","seniorsite.png","septic_tank.png","share.png","shark-export.png","shintoshrine.png","shipwreck.png","shoes.png","shooting.png","shootingrange.png","shore-2.png","shower.png","sight-2.png","signpost-2.png","sikh.png","skiing.png","skijump.png","skilifting.png","ski_shoe1.png","skis.png","skull.png","sledge.png","sledgerental.png","sledge_summer.png","slipway.png","smallcity.png","smiley_happy.png","smoking.png","snail.png","snakes.png","sneakers.png","snorkeling.png","snowboarding.png","snowmobiling.png","snowpark_arc.png","snowshoeing.png","snowy-2.png","soccer.png","solarenergy.png","sozialeeinrichtung.png","spaceport-2.png","spa.png","speed_50.png","speedhump.png","speedriding.png","spelunking.png","spider.png","splice.png","sportscar.png","sportutilityvehicle.png","square-compass.png","squash-2.png","stadium.png","stairs.png","star-3.png","stargate-raw.png","start-race-2.png","statue-2.png","steamtrain.png","stop.png","strike.png","stripclub2.png","submarine-2.png","sugar-shack.png","summercamp.png","sumo-2.png","sunny.png","sunsetland.png","supermarket.png","surfacelift.png","surfing.png","surfpaddle.png","surveying-2.png","swimming.png","synagogue-2.png","taekwondo-2.png","tailor.png","takeaway.png","targ.png","taxiboat.png","taxi.png","taxiway.png","teahouse.png","tebletennis.png","telephone.png","temple-2.png","templehindu.png","tennis.png","terrace.png","textiles.png","text.png","theater.png","theft.png","themepark.png","therapy.png","theravadapagoda.png","theravadatemple.png","thunderstorm.png","ticket_office2.png","tidaldiamond.png","tiger-2.png","tires.png","toilets.png","tollstation.png","tools.png","tornado-2.png","torture.png","tower.png","townhouse.png","toys.png","trafficcamera.png","trafficlight.png","train.png","tramway.png","trash.png","travel_agency.png","treasure-mark.png","treedown.png","triskelion.png","trolley.png","truck3.png","tsunami.png","tunnel.png","turtle-2.png","tweet.png","ufo.png","umbrella-2.png","underground.png","university.png","u-pick_stand.png","usfootball.png","van.png","vespa.png","veterinary.png","videogames.png","video.png","villa.png","vineyard-2.png","volcano-2.png","volleyball.png","waiting.png","walkingtour.png","warehouse-2.png","war.png","watercraft.png","waterfall-2.png","watermill-2.png","waterpark.png","water.png","waterskiing.png","watertower.png","waterwell.png","waterwellpump.png","webcam.png","wedding.png","weights.png","wetlands.png","whale-2.png","wifi.png","wiki-export.png","wildlifecrossing.png","wind-2.png","windmill-2.png","windsurfing.png","windturbine.png","winebar.png","winetasting.png","woodshed.png","workoffice.png","workshop.png","worldheritagesite.png","world.png","worldwildway.png","wrestling-2.png","yoga.png","yooner.png","you-are-here-2.png","youthhostel.png","zombie-outbreak1.png","zoom.png","zoo.png"];
     35
     36        function _tm_init(data) {
     37            if(data) {
     38                _pluginUrl = data['pluginurl'];
     39            }
    3440            // create a map in the "map" div, set the view to a given place and zoom
    3541            _map = L.map('tm_map').setView([0, 0], 3);
    … …  
    5763            //$('#tm_icon').combobox();
    5864            $('#tm_type').on('change', function() {
    59                 _tm_enableControls({type: $('#tm_type').val()});
    60             });
    61         }
     65                _tm_enableControls($.extend(_currentSelection.data('point'),{type: $('#tm_type').val()}));
     66            });
     67            $('#tm_icon').on('change', function() {
     68                _tm_enableControls($.extend(_currentSelection.data('point'),{icon: $('#tm_icon').val()}));
     69            });
     70            $('#tm_mapsymbols').find('a').on('click', function() {
     71                var dialog = $('<div></div>');
     72
     73                var onclick = function(evt) {
     74                    $('#tm_mapsymbols').find('img').attr('src', $(this).attr('data-url'));
     75                    dialog.dialog('destroy');
     76                };
     77
     78                var ul = $('<ul></ul>');
     79                for(var i = 0; i < _mapsymbols.length; i++) {
     80                    var url = _pluginUrl + 'media/mapsymbols/' + _mapsymbols[i];
     81                    var li = $('<li style="cursor:pointer;" data-url="'+ url +'"><img src="'+url+'"></img>'+_mapsymbols[i]+'</li>')
     82                    ul.append(li);
     83                    li.on('click', onclick);
     84                }
     85                dialog.append(ul);
     86                dialog.dialog({buttons: [
     87                        {text: "Cancel", click: function() {
     88                                $(this).dialog("destroy");
     89                            }}
     90                    ], minHeight:400, minWidth: 400, maxHeight:400});
     91                dialog.on('close', function() {
     92                    dialog.dialog('destroy');
     93                });
     94            });
     95            $('#tm_mapsymbols').find('img').attr('src', _pluginUrl + 'media/mapsymbols/information.png');
     96        }
    6297
    6398        function _tm_editPoint(elem) {
    … …  
    70105            $('#tm_type').val(data.type);
    71106            $('#tm_title').val(data.title);
     107            if(data.icon === undefined || data.icon === "" || data.icon === null) {
     108                data.icon = "_default";
     109            }
    72110            $('#tm_icon').val(data.icon);
    73111            $('#tm_icon_color').val(data.iconColor);
     112            $('#tm_mapsymbols').find('img').attr('src', data.mapsymbols);
    74113            $('#tm_thumbnail').val(data.thumbnail);
    75114            if (data.date) {
    … …  
    123162            $('#tm_date').prop('disabled', true);
    124163            $('#tm_icon').prop('disabled', true);
     164            $('#tm_mapsymbols').css('display', 'none');
    125165            $('#tm_icon_color').prop('disabled', true);
    126166            $('#tm_thumbnail').prop('disabled', true);
    … …  
    139179            $('#tm_place_at_address').prop('disabled', true);
    140180
     181            if(data.icon !== null && data.icon !== undefined && data.icon.charAt(0) !== "_") {
     182                $('#tm_icon_color').prop('disabled', false);
     183            }
     184            if(data.icon === "_mapsymbols") {
     185                $('#tm_mapsymbols').css('display', '');
     186            }
     187
    141188            if (data.type === 'marker' || data.type === 'post' || data.type === 'media') {
    142189                $('#tm_type').prop('disabled', false);
    143190                $('#tm_icon').prop('disabled', false);
    144                 $('#tm_icon_color').prop('disabled', false);
    145191                $('#tm_title').prop('disabled', false);
    146192                $('#tm_date').prop('disabled', false);
    … …  
    160206                $('#tm_save_changes').prop('disabled', false);
    161207            } else if (data.type === 'waypoint') {
     208                $('#tm_icon').prop('disabled', false);
    162209                $('#tm_type').prop('disabled', false);
    163210                $('#tm_title').prop('disabled', false);
    … …  
    170217                $('#tm_save_changes').prop('disabled', false);
    171218            } else if (data.type === 'endsection') {
     219                $('#tm_icon').prop('disabled', false);
    172220                $('#tm_type').prop('disabled', false);
    173221                $('#tm_title').prop('disabled', false);
    … …  
    180228                $('#tm_save_changes').prop('disabled', false);
    181229            } else if (data.type === 'startsection' || data.type === 'startendsection') {
     230                $('#tm_icon').prop('disabled', false);
    182231                $('#tm_type').prop('disabled', false);
    183232                $('#tm_title').prop('disabled', false);
    … …  
    207256                "icon": $('#tm_icon').val(),
    208257                "iconColor": $('#tm_icon_color').val(),
     258                "mapsymbols" : $('#tm_mapsymbols').find('img').attr('src'),
    209259                "thumbnail": $('#tm_thumbnail').val(),
    210260                "fullsize": $('#tm_fullsize').val(),
    … …  
    311361        function _tm_generateMap() {
    312362            var obj = {};
    313             obj['version'] = "1.3.0";
     363            obj['version'] = "1.4.0";
    314364            obj['mapid'] = $('#tm_map').data('mapid');
    315365            obj['name'] = $('#tm_map_name').val();

  • wp-travelermap/trunk/admin/travelermap-admin.php

    r940411 r947438  
    4545    wp_enqueue_script('spectrum', TM_URL . "js/spectrum.js" , array('jquery'), '1.3.4', false);
    4646    wp_enqueue_script('json2');
    47     wp_enqueue_script('travelermap-admin', TM_URL . "admin/js/travelermap-admin.js" , array('jquery', 'jquery-ui-core', 'jquery-ui-widget'), '1.3.0', false);
    48     wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.3.0', false);
     47    wp_enqueue_script('travelermap-admin', TM_URL . "admin/js/travelermap-admin.js" , array('jquery', 'jquery-ui-core', 'jquery-ui-widget'), '1.4.0', false);
     48    wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.4.0', false);
    4949    wp_enqueue_style('tm-admin', TM_URL . "media/tm-admin.css" );
    5050    wp_enqueue_style('tm-frontend', TM_URL . "media/tm-frontend.css" );

  • wp-travelermap/trunk/admin/travelermap-editmap.php

    r940336 r947438  
    4444    (function($) {
    4545    $(document).ready(function() {
    46     window.tm_init();
     46    window.tm_init({"pluginurl" : "<?php echo TM_URL ?>"});
    4747    window.tm_loadAdminMap('<?php echo $map->map ?>');   
    4848    });
    … …  
    148148                <option value="endsection">End Section</option>
    149149            </select><br />
    150                         <label for="tm_icon">Marker Symbol</label>
    151                         <select style="font-family: FontAwesome;" id="tm_icon" disabled=""><option value=""> Default</option><option value="adjust">adjust </option><option value="adn">adn </option><option value="align-center">align-center </option><option value="align-justify">align-justify </option><option value="align-left">align-left </option><option value="align-right">align-right </option><option value="ambulance">ambulance </option><option value="anchor">anchor </option><option value="android">android </option><option value="angle-double-down">angle-double-down </option><option value="angle-double-left">angle-double-left </option><option value="angle-double-right">angle-double-right </option><option value="angle-double-up">angle-double-up </option><option value="angle-down">angle-down </option><option value="angle-left">angle-left </option><option value="angle-right">angle-right </option><option value="angle-up">angle-up </option><option value="apple">apple </option><option value="archive">archive </option><option value="arrow-circle-down">arrow-circle-down </option><option value="arrow-circle-left">arrow-circle-left </option><option value="arrow-circle-o-down">arrow-circle-o-down </option><option value="arrow-circle-o-left">arrow-circle-o-left </option><option value="arrow-circle-o-right">arrow-circle-o-right </option><option value="arrow-circle-o-up">arrow-circle-o-up </option><option value="arrow-circle-right">arrow-circle-right </option><option value="arrow-circle-up">arrow-circle-up </option><option value="arrow-down">arrow-down </option><option value="arrow-left">arrow-left </option><option value="arrow-right">arrow-right </option><option value="arrow-up">arrow-up </option><option value="arrows">arrows </option><option value="arrows-alt">arrows-alt </option><option value="arrows-h">arrows-h </option><option value="arrows-v">arrows-v </option><option value="asterisk">asterisk </option><option value="automobile">automobile </option><option value="backward">backward  </option><option value="ban">ban </option><option value="bank">bank </option><option value="bar-chart-o">bar-chart-o  </option><option value="barcode">barcode </option><option value="bars">bars </option><option value="beer">beer </option><option value="behance">behance </option><option value="behance-square">behance-square </option><option value="bell">bell </option><option value="bell-o">bell-o </option><option value="bitbucket">bitbucket </option><option value="bitbucket-square">bitbucket-square </option><option value="bitcoin">bitcoin </option><option value="bold">bold  </option><option value="bolt">bolt </option><option value="bomb">bomb </option><option value="book">book </option><option value="bookmark">bookmark </option><option value="bookmark-o">bookmark-o </option><option value="briefcase">briefcase </option><option value="btc">btc </option><option value="bug">bug </option><option value="building">building </option><option value="building-o">building-o </option><option value="bullhorn">bullhorn </option><option value="bullseye">bullseye </option><option value="cab">cab </option><option value="calendar">calendar  </option><option value="calendar-o">calendar-o </option><option value="camera">camera </option><option value="camera-retro">camera-retro </option><option value="car">car </option><option value="caret-down">caret-down </option><option value="caret-left">caret-left </option><option value="caret-right">caret-right </option><option value="caret-square-o-down">caret-square-o-down </option><option value="caret-square-o-left">caret-square-o-left </option><option value="caret-square-o-right">caret-square-o-right </option><option value="caret-square-o-up">caret-square-o-up </option><option value="caret-up">caret-up </option><option value="certificate">certificate </option><option value="chain">chain </option><option value="chain-broken">chain-broken  </option><option value="check">check </option><option value="check-circle">check-circle </option><option value="check-circle-o">check-circle-o </option><option value="check-square">check-square </option><option value="check-square-o">check-square-o </option><option value="chevron-circle-down">chevron-circle-down </option><option value="chevron-circle-left">chevron-circle-left </option><option value="chevron-circle-right">chevron-circle-right </option><option value="chevron-circle-up">chevron-circle-up </option><option value="chevron-down">chevron-down </option><option value="chevron-left">chevron-left </option><option value="chevron-right">chevron-right </option><option value="chevron-up">chevron-up </option><option value="child">child </option><option value="circle">circle </option><option value="circle-o">circle-o </option><option value="circle-o-notch">circle-o-notch </option><option value="circle-thin">circle-thin </option><option value="clipboard">clipboard </option><option value="clock-o">clock-o </option><option value="cloud">cloud </option><option value="cloud-download">cloud-download </option><option value="cloud-upload">cloud-upload </option><option value="cny">cny </option><option value="code">code  </option><option value="code-fork">code-fork </option><option value="codepen">codepen </option><option value="coffee">coffee </option><option value="cog">cog </option><option value="cogs">cogs </option><option value="columns">columns </option><option value="comment">comment </option><option value="comment-o">comment-o </option><option value="comments">comments </option><option value="comments-o">comments-o </option><option value="compass">compass </option><option value="compress">compress </option><option value="copy">copy </option><option value="credit-card">credit-card  </option><option value="crop">crop </option><option value="crosshairs">crosshairs </option><option value="css3">css3 </option><option value="cube">cube </option><option value="cubes">cubes </option><option value="cut">cut </option><option value="cutlery">cutlery  </option><option value="dashboard">dashboard </option><option value="database">database  </option><option value="dedent">dedent </option><option value="delicious">delicious  </option><option value="desktop">desktop </option><option value="deviantart">deviantart </option><option value="digg">digg </option><option value="dollar">dollar </option><option value="dot-circle-o">dot-circle-o  </option><option value="download">download </option><option value="dribbble">dribbble </option><option value="dropbox">dropbox </option><option value="drupal">drupal </option><option value="edit">edit </option><option value="eject">eject  </option><option value="ellipsis-h">ellipsis-h </option><option value="ellipsis-v">ellipsis-v </option><option value="empire">empire </option><option value="envelope">envelope </option><option value="envelope-o">envelope-o </option><option value="envelope-square">envelope-square </option><option value="eraser">eraser </option><option value="eur">eur </option><option value="euro">euro </option><option value="exchange">exchange  </option><option value="exclamation">exclamation </option><option value="exclamation-circle">exclamation-circle </option><option value="exclamation-triangle">exclamation-triangle </option><option value="expand">expand </option><option value="external-link">external-link </option><option value="external-link-square">external-link-square </option><option value="eye">eye </option><option value="eye-slash">eye-slash </option><option value="facebook">facebook </option><option value="facebook-square">facebook-square </option><option value="fast-backward">fast-backward </option><option value="fast-forward">fast-forward </option><option value="fax">fax </option><option value="female">female </option><option value="fighter-jet">fighter-jet </option><option value="file">file </option><option value="file-archive-o">file-archive-o </option><option value="file-audio-o">file-audio-o </option><option value="file-code-o">file-code-o </option><option value="file-excel-o">file-excel-o </option><option value="file-image-o">file-image-o </option><option value="file-movie-o">file-movie-o </option><option value="file-o">file-o  </option><option value="file-pdf-o">file-pdf-o </option><option value="file-photo-o">file-photo-o </option><option value="file-picture-o">file-picture-o  </option><option value="file-powerpoint-o">file-powerpoint-o  </option><option value="file-sound-o">file-sound-o </option><option value="file-text">file-text  </option><option value="file-text-o">file-text-o </option><option value="file-video-o">file-video-o </option><option value="file-word-o">file-word-o </option><option value="file-zip-o">file-zip-o </option><option value="files-o">files-o  </option><option value="film">film </option><option value="filter">filter </option><option value="fire">fire </option><option value="fire-extinguisher">fire-extinguisher </option><option value="flag">flag </option><option value="flag-checkered">flag-checkered </option><option value="flag-o">flag-o </option><option value="flash">flash </option><option value="flask">flask  </option><option value="flickr">flickr </option><option value="floppy-o">floppy-o </option><option value="folder">folder </option><option value="folder-o">folder-o </option><option value="folder-open">folder-open </option><option value="folder-open-o">folder-open-o </option><option value="font">font </option><option value="forward">forward </option><option value="foursquare">foursquare </option><option value="frown-o">frown-o </option><option value="gamepad">gamepad </option><option value="gavel">gavel </option><option value="gbp">gbp </option><option value="ge">ge </option><option value="gear">gear  </option><option value="gears">gears  </option><option value="gift">gift  </option><option value="git">git </option><option value="git-square">git-square </option><option value="github">github </option><option value="github-alt">github-alt </option><option value="github-square">github-square </option><option value="gittip">gittip </option><option value="glass">glass </option><option value="globe">globe </option><option value="google">google </option><option value="google-plus">google-plus </option><option value="google-plus-square">google-plus-square </option><option value="graduation-cap">graduation-cap </option><option value="group">group </option><option value="h-square">h-square  </option><option value="hacker-news">hacker-news </option><option value="hand-o-down">hand-o-down </option><option value="hand-o-left">hand-o-left </option><option value="hand-o-right">hand-o-right </option><option value="hand-o-up">hand-o-up </option><option value="hdd-o">hdd-o </option><option value="header">header </option><option value="headphones">headphones </option><option value="heart">heart </option><option value="heart-o">heart-o </option><option value="history">history </option><option value="home">home </option><option value="hospital-o">hospital-o </option><option value="html5">html5 </option><option value="image">image </option><option value="inbox">inbox  </option><option value="indent">indent </option><option value="info">info </option><option value="info-circle">info-circle </option><option value="inr">inr </option><option value="instagram">instagram </option><option value="institution">institution </option><option value="italic">italic  </option><option value="joomla">joomla </option><option value="jpy">jpy </option><option value="jsfiddle">jsfiddle </option><option value="key">key </option><option value="keyboard-o">keyboard-o </option><option value="krw">krw </option><option value="language">language </option><option value="laptop">laptop </option><option value="leaf">leaf </option><option value="legal">legal </option><option value="lemon-o">lemon-o  </option><option value="level-down">level-down </option><option value="level-up">level-up </option><option value="life-bouy">life-bouy </option><option value="life-ring">life-ring  </option><option value="life-saver">life-saver </option><option value="lightbulb-o">lightbulb-o  </option><option value="link">link </option><option value="linkedin">linkedin </option><option value="linkedin-square">linkedin-square </option><option value="linux">linux </option><option value="list">list </option><option value="list-alt">list-alt </option><option value="list-ol">list-ol </option><option value="list-ul">list-ul </option><option value="location-arrow">location-arrow </option><option value="lock">lock </option><option value="long-arrow-down">long-arrow-down </option><option value="long-arrow-left">long-arrow-left </option><option value="long-arrow-right">long-arrow-right </option><option value="long-arrow-up">long-arrow-up </option><option value="magic">magic </option><option value="magnet">magnet </option><option value="mail-forward">mail-forward </option><option value="mail-reply">mail-reply  </option><option value="mail-reply-all">mail-reply-all  </option><option value="male">male  </option><option value="map-marker">map-marker </option><option value="maxcdn">maxcdn </option><option value="medkit">medkit </option><option value="meh-o">meh-o </option><option value="microphone">microphone </option><option value="microphone-slash">microphone-slash </option><option value="minus">minus </option><option value="minus-circle">minus-circle </option><option value="minus-square">minus-square </option><option value="minus-square-o">minus-square-o </option><option value="mobile">mobile </option><option value="mobile-phone">mobile-phone </option><option value="money">money  </option><option value="moon-o">moon-o </option><option value="mortar-board">mortar-board </option><option value="music">music  </option><option value="navicon">navicon </option><option value="openid">openid  </option><option value="outdent">outdent </option><option value="pagelines">pagelines </option><option value="paper-plane">paper-plane </option><option value="paper-plane-o">paper-plane-o </option><option value="paperclip">paperclip </option><option value="paragraph">paragraph </option><option value="paste">paste </option><option value="pause">pause  </option><option value="paw">paw </option><option value="pencil">pencil </option><option value="pencil-square">pencil-square </option><option value="pencil-square-o">pencil-square-o </option><option value="phone">phone </option><option value="phone-square">phone-square </option><option value="photo">photo </option><option value="picture-o">picture-o  </option><option value="pied-piper">pied-piper </option><option value="pied-piper-alt">pied-piper-alt </option><option value="pied-piper-square">pied-piper-square </option><option value="pinterest">pinterest  </option><option value="pinterest-square">pinterest-square </option><option value="plane">plane </option><option value="play">play </option><option value="play-circle">play-circle </option><option value="play-circle-o">play-circle-o </option><option value="plus">plus </option><option value="plus-circle">plus-circle </option><option value="plus-square">plus-square </option><option value="plus-square-o">plus-square-o </option><option value="power-off">power-off </option><option value="print">print </option><option value="puzzle-piece">puzzle-piece </option><option value="qq">qq </option><option value="qrcode">qrcode </option><option value="question">question </option><option value="question-circle">question-circle </option><option value="quote-left">quote-left </option><option value="quote-right">quote-right </option><option value="ra">ra </option><option value="random">random  </option><option value="rebel">rebel </option><option value="recycle">recycle </option><option value="reddit">reddit </option><option value="reddit-square">reddit-square </option><option value="refresh">refresh </option><option value="renren">renren </option><option value="reorder">reorder </option><option value="repeat">repeat  </option><option value="reply">reply </option><option value="reply-all">reply-all </option><option value="retweet">retweet </option><option value="rmb">rmb </option><option value="road">road  </option><option value="rocket">rocket </option><option value="rotate-left">rotate-left </option><option value="rotate-right">rotate-right  </option><option value="rouble">rouble  </option><option value="rss">rss  </option><option value="rss-square">rss-square </option><option value="rub">rub </option><option value="ruble">ruble </option><option value="rupee">rupee  </option><option value="save">save  </option><option value="scissors">scissors  </option><option value="search">search </option><option value="search-minus">search-minus </option><option value="search-plus">search-plus </option><option value="send">send </option><option value="send-o">send-o  </option><option value="share">share  </option><option value="share-alt">share-alt </option><option value="share-alt-square">share-alt-square </option><option value="share-square">share-square </option><option value="share-square-o">share-square-o </option><option value="shield">shield </option><option value="shopping-cart">shopping-cart </option><option value="sign-in">sign-in </option><option value="sign-out">sign-out </option><option value="signal">signal </option><option value="sitemap">sitemap </option><option value="skype">skype </option><option value="slack">slack </option><option value="sliders">sliders </option><option value="smile-o">smile-o </option><option value="sort">sort </option><option value="sort-alpha-asc">sort-alpha-asc </option><option value="sort-alpha-desc">sort-alpha-desc </option><option value="sort-amount-asc">sort-amount-asc </option><option value="sort-amount-desc">sort-amount-desc </option><option value="sort-asc">sort-asc </option><option value="sort-desc">sort-desc </option><option value="sort-down">sort-down </option><option value="sort-numeric-asc">sort-numeric-asc  </option><option value="sort-numeric-desc">sort-numeric-desc </option><option value="sort-up">sort-up </option><option value="soundcloud">soundcloud  </option><option value="space-shuttle">space-shuttle </option><option value="spinner">spinner </option><option value="spoon">spoon </option><option value="spotify">spotify </option><option value="square">square </option><option value="square-o">square-o </option><option value="stack-exchange">stack-exchange </option><option value="stack-overflow">stack-overflow </option><option value="star">star </option><option value="star-half">star-half </option><option value="star-half-empty">star-half-empty </option><option value="star-half-full">star-half-full  </option><option value="star-half-o">star-half-o  </option><option value="star-o">star-o </option><option value="steam">steam </option><option value="steam-square">steam-square </option><option value="step-backward">step-backward </option><option value="step-forward">step-forward </option><option value="stethoscope">stethoscope </option><option value="stop">stop </option><option value="strikethrough">strikethrough </option><option value="stumbleupon">stumbleupon </option><option value="stumbleupon-circle">stumbleupon-circle </option><option value="subscript">subscript </option><option value="suitcase">suitcase </option><option value="sun-o">sun-o </option><option value="superscript">superscript </option><option value="support">support </option><option value="table">table  </option><option value="tablet">tablet </option><option value="tachometer">tachometer </option><option value="tag">tag </option><option value="tags">tags </option><option value="tasks">tasks </option><option value="taxi">taxi </option><option value="tencent-weibo">tencent-weibo </option><option value="terminal">terminal </option><option value="text-height">text-height </option><option value="text-width">text-width </option><option value="th">th </option><option value="th-large">th-large </option><option value="th-list">th-list </option><option value="thumb-tack">thumb-tack </option><option value="thumbs-down">thumbs-down </option><option value="thumbs-o-down">thumbs-o-down </option><option value="thumbs-o-up">thumbs-o-up </option><option value="thumbs-up">thumbs-up </option><option value="ticket">ticket </option><option value="times">times </option><option value="times-circle">times-circle </option><option value="times-circle-o">times-circle-o </option><option value="tint">tint </option><option value="toggle-down">toggle-down </option><option value="toggle-left">toggle-left  </option><option value="toggle-right">toggle-right  </option><option value="toggle-up">toggle-up  </option><option value="trash-o">trash-o  </option><option value="tree">tree </option><option value="trello">trello </option><option value="trophy">trophy </option><option value="truck">truck </option><option value="try">try </option><option value="tumblr">tumblr </option><option value="tumblr-square">tumblr-square </option><option value="turkish-lira">turkish-lira </option><option value="twitter">twitter  </option><option value="twitter-square">twitter-square </option><option value="umbrella">umbrella </option><option value="underline">underline </option><option value="undo">undo </option><option value="university">university </option><option value="unlink">unlink </option><option value="unlock">unlock  </option><option value="unlock-alt">unlock-alt </option><option value="unsorted">unsorted </option><option value="upload">upload  </option><option value="usd">usd </option><option value="user">user </option><option value="user-md">user-md </option><option value="users">users </option><option value="video-camera">video-camera </option><option value="vimeo-square">vimeo-square </option><option value="vine">vine </option><option value="vk">vk </option><option value="volume-down">volume-down </option><option value="volume-off">volume-off </option><option value="volume-up">volume-up </option><option value="warning">warning </option><option value="wechat">wechat  </option><option value="weibo">weibo  </option><option value="weixin">weixin </option><option value="wheelchair">wheelchair </option><option value="windows">windows </option><option value="won">won </option><option value="wordpress">wordpress  </option><option value="wrench">wrench </option><option value="xing">xing </option><option value="xing-square">xing-square </option><option value="yahoo">yahoo </option><option value="yen">yen </option><option value="youtube">youtube  </option><option value="youtube-play">youtube-play </option><option value="youtube-square">youtube-square </option></select><br />
    152                         <label for="tm_icon_color">Icon Color</label>
     150            <label for="tm_icon">Marker Symbol</label>
     151            <select style="font-family: FontAwesome;" id="tm_icon" disabled=""><optgroup label="Default"><option value="_default">Default</option><option value="_thumbnail">Thumbnail</option><option value="_none">None</option><option value="_mapsymbols">MapSymbols</option><option value="_dot">Dot</option></optgroup><optgroup label="Font Awesome" style="font-family: FontAwesome;"><option value="adjust">adjust </option><option value="adn">adn </option><option value="align-center">align-center </option><option value="align-justify">align-justify </option><option value="align-left">align-left </option><option value="align-right">align-right </option><option value="ambulance">ambulance </option><option value="anchor">anchor </option><option value="android">android </option><option value="angle-double-down">angle-double-down </option><option value="angle-double-left">angle-double-left </option><option value="angle-double-right">angle-double-right </option><option value="angle-double-up">angle-double-up </option><option value="angle-down">angle-down </option><option value="angle-left">angle-left </option><option value="angle-right">angle-right </option><option value="angle-up">angle-up </option><option value="apple">apple </option><option value="archive">archive </option><option value="arrow-circle-down">arrow-circle-down </option><option value="arrow-circle-left">arrow-circle-left </option><option value="arrow-circle-o-down">arrow-circle-o-down </option><option value="arrow-circle-o-left">arrow-circle-o-left </option><option value="arrow-circle-o-right">arrow-circle-o-right </option><option value="arrow-circle-o-up">arrow-circle-o-up </option><option value="arrow-circle-right">arrow-circle-right </option><option value="arrow-circle-up">arrow-circle-up </option><option value="arrow-down">arrow-down </option><option value="arrow-left">arrow-left </option><option value="arrow-right">arrow-right </option><option value="arrow-up">arrow-up </option><option value="arrows">arrows </option><option value="arrows-alt">arrows-alt </option><option value="arrows-h">arrows-h </option><option value="arrows-v">arrows-v </option><option value="asterisk">asterisk </option><option value="automobile">automobile </option><option value="backward">backward  </option><option value="ban">ban </option><option value="bank">bank </option><option value="bar-chart-o">bar-chart-o  </option><option value="barcode">barcode </option><option value="bars">bars </option><option value="beer">beer </option><option value="behance">behance </option><option value="behance-square">behance-square </option><option value="bell">bell </option><option value="bell-o">bell-o </option><option value="bitbucket">bitbucket </option><option value="bitbucket-square">bitbucket-square </option><option value="bitcoin">bitcoin </option><option value="bold">bold  </option><option value="bolt">bolt </option><option value="bomb">bomb </option><option value="book">book </option><option value="bookmark">bookmark </option><option value="bookmark-o">bookmark-o </option><option value="briefcase">briefcase </option><option value="btc">btc </option><option value="bug">bug </option><option value="building">building </option><option value="building-o">building-o </option><option value="bullhorn">bullhorn </option><option value="bullseye">bullseye </option><option value="cab">cab </option><option value="calendar">calendar  </option><option value="calendar-o">calendar-o </option><option value="camera">camera </option><option value="camera-retro">camera-retro </option><option value="car">car </option><option value="caret-down">caret-down </option><option value="caret-left">caret-left </option><option value="caret-right">caret-right </option><option value="caret-square-o-down">caret-square-o-down </option><option value="caret-square-o-left">caret-square-o-left </option><option value="caret-square-o-right">caret-square-o-right </option><option value="caret-square-o-up">caret-square-o-up </option><option value="caret-up">caret-up </option><option value="certificate">certificate </option><option value="chain">chain </option><option value="chain-broken">chain-broken  </option><option value="check">check </option><option value="check-circle">check-circle </option><option value="check-circle-o">check-circle-o </option><option value="check-square">check-square </option><option value="check-square-o">check-square-o </option><option value="chevron-circle-down">chevron-circle-down </option><option value="chevron-circle-left">chevron-circle-left </option><option value="chevron-circle-right">chevron-circle-right </option><option value="chevron-circle-up">chevron-circle-up </option><option value="chevron-down">chevron-down </option><option value="chevron-left">chevron-left </option><option value="chevron-right">chevron-right </option><option value="chevron-up">chevron-up </option><option value="child">child </option><option value="circle">circle </option><option value="circle-o">circle-o </option><option value="circle-o-notch">circle-o-notch </option><option value="circle-thin">circle-thin </option><option value="clipboard">clipboard </option><option value="clock-o">clock-o </option><option value="cloud">cloud </option><option value="cloud-download">cloud-download </option><option value="cloud-upload">cloud-upload </option><option value="cny">cny </option><option value="code">code  </option><option value="code-fork">code-fork </option><option value="codepen">codepen </option><option value="coffee">coffee </option><option value="cog">cog </option><option value="cogs">cogs </option><option value="columns">columns </option><option value="comment">comment </option><option value="comment-o">comment-o </option><option value="comments">comments </option><option value="comments-o">comments-o </option><option value="compass">compass </option><option value="compress">compress </option><option value="copy">copy </option><option value="credit-card">credit-card  </option><option value="crop">crop </option><option value="crosshairs">crosshairs </option><option value="css3">css3 </option><option value="cube">cube </option><option value="cubes">cubes </option><option value="cut">cut </option><option value="cutlery">cutlery  </option><option value="dashboard">dashboard </option><option value="database">database  </option><option value="dedent">dedent </option><option value="delicious">delicious  </option><option value="desktop">desktop </option><option value="deviantart">deviantart </option><option value="digg">digg </option><option value="dollar">dollar </option><option value="dot-circle-o">dot-circle-o  </option><option value="download">download </option><option value="dribbble">dribbble </option><option value="dropbox">dropbox </option><option value="drupal">drupal </option><option value="edit">edit </option><option value="eject">eject  </option><option value="ellipsis-h">ellipsis-h </option><option value="ellipsis-v">ellipsis-v </option><option value="empire">empire </option><option value="envelope">envelope </option><option value="envelope-o">envelope-o </option><option value="envelope-square">envelope-square </option><option value="eraser">eraser </option><option value="eur">eur </option><option value="euro">euro </option><option value="exchange">exchange  </option><option value="exclamation">exclamation </option><option value="exclamation-circle">exclamation-circle </option><option value="exclamation-triangle">exclamation-triangle </option><option value="expand">expand </option><option value="external-link">external-link </option><option value="external-link-square">external-link-square </option><option value="eye">eye </option><option value="eye-slash">eye-slash </option><option value="facebook">facebook </option><option value="facebook-square">facebook-square </option><option value="fast-backward">fast-backward </option><option value="fast-forward">fast-forward </option><option value="fax">fax </option><option value="female">female </option><option value="fighter-jet">fighter-jet </option><option value="file">file </option><option value="file-archive-o">file-archive-o </option><option value="file-audio-o">file-audio-o </option><option value="file-code-o">file-code-o </option><option value="file-excel-o">file-excel-o </option><option value="file-image-o">file-image-o </option><option value="file-movie-o">file-movie-o </option><option value="file-o">file-o  </option><option value="file-pdf-o">file-pdf-o </option><option value="file-photo-o">file-photo-o </option><option value="file-picture-o">file-picture-o  </option><option value="file-powerpoint-o">file-powerpoint-o  </option><option value="file-sound-o">file-sound-o </option><option value="file-text">file-text  </option><option value="file-text-o">file-text-o </option><option value="file-video-o">file-video-o </option><option value="file-word-o">file-word-o </option><option value="file-zip-o">file-zip-o </option><option value="files-o">files-o  </option><option value="film">film </option><option value="filter">filter </option><option value="fire">fire </option><option value="fire-extinguisher">fire-extinguisher </option><option value="flag">flag </option><option value="flag-checkered">flag-checkered </option><option value="flag-o">flag-o </option><option value="flash">flash </option><option value="flask">flask  </option><option value="flickr">flickr </option><option value="floppy-o">floppy-o </option><option value="folder">folder </option><option value="folder-o">folder-o </option><option value="folder-open">folder-open </option><option value="folder-open-o">folder-open-o </option><option value="font">font </option><option value="forward">forward </option><option value="foursquare">foursquare </option><option value="frown-o">frown-o </option><option value="gamepad">gamepad </option><option value="gavel">gavel </option><option value="gbp">gbp </option><option value="ge">ge </option><option value="gear">gear  </option><option value="gears">gears  </option><option value="gift">gift  </option><option value="git">git </option><option value="git-square">git-square </option><option value="github">github </option><option value="github-alt">github-alt </option><option value="github-square">github-square </option><option value="gittip">gittip </option><option value="glass">glass </option><option value="globe">globe </option><option value="google">google </option><option value="google-plus">google-plus </option><option value="google-plus-square">google-plus-square </option><option value="graduation-cap">graduation-cap </option><option value="group">group </option><option value="h-square">h-square  </option><option value="hacker-news">hacker-news </option><option value="hand-o-down">hand-o-down </option><option value="hand-o-left">hand-o-left </option><option value="hand-o-right">hand-o-right </option><option value="hand-o-up">hand-o-up </option><option value="hdd-o">hdd-o </option><option value="header">header </option><option value="headphones">headphones </option><option value="heart">heart </option><option value="heart-o">heart-o </option><option value="history">history </option><option value="home">home </option><option value="hospital-o">hospital-o </option><option value="html5">html5 </option><option value="image">image </option><option value="inbox">inbox  </option><option value="indent">indent </option><option value="info">info </option><option value="info-circle">info-circle </option><option value="inr">inr </option><option value="instagram">instagram </option><option value="institution">institution </option><option value="italic">italic  </option><option value="joomla">joomla </option><option value="jpy">jpy </option><option value="jsfiddle">jsfiddle </option><option value="key">key </option><option value="keyboard-o">keyboard-o </option><option value="krw">krw </option><option value="language">language </option><option value="laptop">laptop </option><option value="leaf">leaf </option><option value="legal">legal </option><option value="lemon-o">lemon-o  </option><option value="level-down">level-down </option><option value="level-up">level-up </option><option value="life-bouy">life-bouy </option><option value="life-ring">life-ring  </option><option value="life-saver">life-saver </option><option value="lightbulb-o">lightbulb-o  </option><option value="link">link </option><option value="linkedin">linkedin </option><option value="linkedin-square">linkedin-square </option><option value="linux">linux </option><option value="list">list </option><option value="list-alt">list-alt </option><option value="list-ol">list-ol </option><option value="list-ul">list-ul </option><option value="location-arrow">location-arrow </option><option value="lock">lock </option><option value="long-arrow-down">long-arrow-down </option><option value="long-arrow-left">long-arrow-left </option><option value="long-arrow-right">long-arrow-right </option><option value="long-arrow-up">long-arrow-up </option><option value="magic">magic </option><option value="magnet">magnet </option><option value="mail-forward">mail-forward </option><option value="mail-reply">mail-reply  </option><option value="mail-reply-all">mail-reply-all  </option><option value="male">male  </option><option value="map-marker">map-marker </option><option value="maxcdn">maxcdn </option><option value="medkit">medkit </option><option value="meh-o">meh-o </option><option value="microphone">microphone </option><option value="microphone-slash">microphone-slash </option><option value="minus">minus </option><option value="minus-circle">minus-circle </option><option value="minus-square">minus-square </option><option value="minus-square-o">minus-square-o </option><option value="mobile">mobile </option><option value="mobile-phone">mobile-phone </option><option value="money">money  </option><option value="moon-o">moon-o </option><option value="mortar-board">mortar-board </option><option value="music">music  </option><option value="navicon">navicon </option><option value="openid">openid  </option><option value="outdent">outdent </option><option value="pagelines">pagelines </option><option value="paper-plane">paper-plane </option><option value="paper-plane-o">paper-plane-o </option><option value="paperclip">paperclip </option><option value="paragraph">paragraph </option><option value="paste">paste </option><option value="pause">pause  </option><option value="paw">paw </option><option value="pencil">pencil </option><option value="pencil-square">pencil-square </option><option value="pencil-square-o">pencil-square-o </option><option value="phone">phone </option><option value="phone-square">phone-square </option><option value="photo">photo </option><option value="picture-o">picture-o  </option><option value="pied-piper">pied-piper </option><option value="pied-piper-alt">pied-piper-alt </option><option value="pied-piper-square">pied-piper-square </option><option value="pinterest">pinterest  </option><option value="pinterest-square">pinterest-square </option><option value="plane">plane </option><option value="play">play </option><option value="play-circle">play-circle </option><option value="play-circle-o">play-circle-o </option><option value="plus">plus </option><option value="plus-circle">plus-circle </option><option value="plus-square">plus-square </option><option value="plus-square-o">plus-square-o </option><option value="power-off">power-off </option><option value="print">print </option><option value="puzzle-piece">puzzle-piece </option><option value="qq">qq </option><option value="qrcode">qrcode </option><option value="question">question </option><option value="question-circle">question-circle </option><option value="quote-left">quote-left </option><option value="quote-right">quote-right </option><option value="ra">ra </option><option value="random">random  </option><option value="rebel">rebel </option><option value="recycle">recycle </option><option value="reddit">reddit </option><option value="reddit-square">reddit-square </option><option value="refresh">refresh </option><option value="renren">renren </option><option value="reorder">reorder </option><option value="repeat">repeat  </option><option value="reply">reply </option><option value="reply-all">reply-all </option><option value="retweet">retweet </option><option value="rmb">rmb </option><option value="road">road  </option><option value="rocket">rocket </option><option value="rotate-left">rotate-left </option><option value="rotate-right">rotate-right  </option><option value="rouble">rouble  </option><option value="rss">rss  </option><option value="rss-square">rss-square </option><option value="rub">rub </option><option value="ruble">ruble </option><option value="rupee">rupee  </option><option value="save">save  </option><option value="scissors">scissors  </option><option value="search">search </option><option value="search-minus">search-minus </option><option value="search-plus">search-plus </option><option value="send">send </option><option value="send-o">send-o  </option><option value="share">share  </option><option value="share-alt">share-alt </option><option value="share-alt-square">share-alt-square </option><option value="share-square">share-square </option><option value="share-square-o">share-square-o </option><option value="shield">shield </option><option value="shopping-cart">shopping-cart </option><option value="sign-in">sign-in </option><option value="sign-out">sign-out </option><option value="signal">signal </option><option value="sitemap">sitemap </option><option value="skype">skype </option><option value="slack">slack </option><option value="sliders">sliders </option><option value="smile-o">smile-o </option><option value="sort">sort </option><option value="sort-alpha-asc">sort-alpha-asc </option><option value="sort-alpha-desc">sort-alpha-desc </option><option value="sort-amount-asc">sort-amount-asc </option><option value="sort-amount-desc">sort-amount-desc </option><option value="sort-asc">sort-asc </option><option value="sort-desc">sort-desc </option><option value="sort-down">sort-down </option><option value="sort-numeric-asc">sort-numeric-asc  </option><option value="sort-numeric-desc">sort-numeric-desc </option><option value="sort-up">sort-up </option><option value="soundcloud">soundcloud  </option><option value="space-shuttle">space-shuttle </option><option value="spinner">spinner </option><option value="spoon">spoon </option><option value="spotify">spotify </option><option value="square">square </option><option value="square-o">square-o </option><option value="stack-exchange">stack-exchange </option><option value="stack-overflow">stack-overflow </option><option value="star">star </option><option value="star-half">star-half </option><option value="star-half-empty">star-half-empty </option><option value="star-half-full">star-half-full  </option><option value="star-half-o">star-half-o  </option><option value="star-o">star-o </option><option value="steam">steam </option><option value="steam-square">steam-square </option><option value="step-backward">step-backward </option><option value="step-forward">step-forward </option><option value="stethoscope">stethoscope </option><option value="stop">stop </option><option value="strikethrough">strikethrough </option><option value="stumbleupon">stumbleupon </option><option value="stumbleupon-circle">stumbleupon-circle </option><option value="subscript">subscript </option><option value="suitcase">suitcase </option><option value="sun-o">sun-o </option><option value="superscript">superscript </option><option value="support">support </option><option value="table">table  </option><option value="tablet">tablet </option><option value="tachometer">tachometer </option><option value="tag">tag </option><option value="tags">tags </option><option value="tasks">tasks </option><option value="taxi">taxi </option><option value="tencent-weibo">tencent-weibo </option><option value="terminal">terminal </option><option value="text-height">text-height </option><option value="text-width">text-width </option><option value="th">th </option><option value="th-large">th-large </option><option value="th-list">th-list </option><option value="thumb-tack">thumb-tack </option><option value="thumbs-down">thumbs-down </option><option value="thumbs-o-down">thumbs-o-down </option><option value="thumbs-o-up">thumbs-o-up </option><option value="thumbs-up">thumbs-up </option><option value="ticket">ticket </option><option value="times">times </option><option value="times-circle">times-circle </option><option value="times-circle-o">times-circle-o </option><option value="tint">tint </option><option value="toggle-down">toggle-down </option><option value="toggle-left">toggle-left  </option><option value="toggle-right">toggle-right  </option><option value="toggle-up">toggle-up  </option><option value="trash-o">trash-o  </option><option value="tree">tree </option><option value="trello">trello </option><option value="trophy">trophy </option><option value="truck">truck </option><option value="try">try </option><option value="tumblr">tumblr </option><option value="tumblr-square">tumblr-square </option><option value="turkish-lira">turkish-lira </option><option value="twitter">twitter  </option><option value="twitter-square">twitter-square </option><option value="umbrella">umbrella </option><option value="underline">underline </option><option value="undo">undo </option><option value="university">university </option><option value="unlink">unlink </option><option value="unlock">unlock  </option><option value="unlock-alt">unlock-alt </option><option value="unsorted">unsorted </option><option value="upload">upload  </option><option value="usd">usd </option><option value="user">user </option><option value="user-md">user-md </option><option value="users">users </option><option value="video-camera">video-camera </option><option value="vimeo-square">vimeo-square </option><option value="vine">vine </option><option value="vk">vk </option><option value="volume-down">volume-down </option><option value="volume-off">volume-off </option><option value="volume-up">volume-up </option><option value="warning">warning </option><option value="wechat">wechat  </option><option value="weibo">weibo  </option><option value="weixin">weixin </option><option value="wheelchair">wheelchair </option><option value="windows">windows </option><option value="won">won </option><option value="wordpress">wordpress  </option><option value="wrench">wrench </option><option value="xing">xing </option><option value="xing-square">xing-square </option><option value="yahoo">yahoo </option><option value="yen">yen </option><option value="youtube">youtube  </option><option value="youtube-play">youtube-play </option><option value="youtube-square">youtube-square </option></optgroup></select><br />
     152            <div id="tm_mapsymbols" style="display:none;">
     153                <label>Map Symbols</label><img></img><a href="#">change</a>
     154            </div>
     155            <label for="tm_icon_color">Icon Color</label>
    153156            <select id="tm_icon_color" disabled="true">
    154157                <option value="red">red</option>

  • wp-travelermap/trunk/admin/travelermap-upgrade.php

    r940411 r947438  
    3131    }
    3232    $currentVersion = get_option("travelermap_version");
    33     if( version_compare($currentVersion, '1.2.0', '<')) {
    34         travelermap_upgrade_1_1_0_to_1_2_0();
    35     }
    36     $currentVersion = get_option("travelermap_version");
    37     if( version_compare($currentVersion, '1.3.0', '<')) {
    38         travelermap_upgrade_1_2_0_to_1_3_0();
     33    if( version_compare($currentVersion, '1.4.0', '<')) {
     34        travelermap_upgrade_x_x_x_to_1_4_0();
    3935    }
    4036}
    … …  
    5450}
    5551
    56 function travelermap_upgrade_1_1_0_to_1_2_0() {
    57     $settings = get_option('travelermap_settings');
    58    
    59     if (!$settings) {
    60         $settings = array(
    61         );
    62         update_option('travelermap_settings', $settings);
    63     }
    64 
    65     update_option("travelermap_version", '1.2.0');
    66     update_option("travelermap_db_version", '1.2.0');
    67 
    68 }
    69 
    70 function travelermap_upgrade_1_2_0_to_1_3_0() {
    71     $settings = get_option('travelermap_settings');
    72    
    73     if (!$settings) {
    74         $settings = array(
    75         );
    76         update_option('travelermap_settings', $settings);
    77     }
    78 
    79     update_option("travelermap_version", '1.3.0');
    80     update_option("travelermap_db_version", '1.3.0');
    81 
     52function travelermap_upgrade_x_x_x_to_1_4_0() {
     53    update_option("travelermap_version", '1.4.0');
     54    update_option("travelermap_db_version", '1.4.0');
    8255}
    8356

  • wp-travelermap/trunk/frontend/js/travelermap-frontend.js

    r940411 r947438  
    2424    $(document).ready(function() {
    2525       
     26        var tm_thumbnailIcon = L.Icon.extend({
     27            options: {
     28                iconSize:     [50, 50],
     29                iconAnchor:   [25, 25],
     30                popupAnchor:  [0, -25]
     31            }
     32        });
     33
     34        var tm_mapSymbols = L.Icon.extend({
     35            options: {
     36                iconSize:     [32, 37],
     37                iconAnchor:   [16, 35],
     38                popupAnchor:  [0, -35]
     39            }
     40        });
     41
     42
    2643        function tm_loadMap(data ,element, options) {
    2744            return new tm_map(data, element, options);
    … …  
    309326                for(var i = 0; i < data.length; i++) {
    310327                    var feature = data[i];
    311                     if(feature.type === 'waypoint') {
    312                         if(feature.title) {
    313                             var wp = L.circleMarker([feature.lat, feature.lng], {radius: 5, fillOpacity:1, color:lineColor}).bindPopup(feature.title);
    314                             markerLayer.addLayer(wp);
    315                         }
    316                     } else if(feature.type === 'startsection' || feature.type === 'endsection' || feature.type === 'startendsection') {
    317                         var wp = L.circleMarker([feature.lat, feature.lng], {radius: 5, fillOpacity:1, color:lineColor});
     328                    if(feature.type === 'waypoint' || feature.type === 'startsection' || feature.type === 'endsection' || feature.type === 'startendsection') {
     329                        var wp = null;
     330                        if(feature.icon === '_none') continue;
     331                        if(feature.icon === '_thumbnail' && feature.thumbnail) {
     332                            var icon = new tm_thumbnailIcon({
     333                                iconUrl: feature.thumbnail
     334                            });
     335                            wp = L.marker([feature.lat, feature.lng], {icon:icon});
     336                        } else if(feature.icon === '_mapsymbols' && feature.mapsymbols) {
     337                            var icon = new tm_mapSymbols({
     338                                iconUrl: feature.mapsymbols
     339                            });
     340                            wp = L.marker([feature.lat, feature.lng], {icon:icon});
     341                        } else if(feature.icon.charAt(0) !== "_") {
     342                            iconName = feature.icon;
     343                            if(!iconName) {
     344                                iconName="circle";
     345                            }
     346
     347                            var icon = L.AwesomeMarkers.icon({
     348                                icon: iconName,
     349                                markerColor: feature.iconColor,
     350                                prefix: 'fa'
     351                            });
     352                            wp = L.marker([feature.lat, feature.lng], {icon:icon});
     353                        } else {
     354                            feature.icon = "_default";
     355                        }
     356                        if(feature.icon === '_default' || feature.icon === '_dot') {
     357                            wp = L.circleMarker([feature.lat, feature.lng], {radius: 5, fillOpacity:1, color:lineColor});
     358                        }
    318359                        if(feature.title) {
    319360                            wp.bindPopup(feature.title)
    320361                        }
     362                        if(feature.title && feature.type === 'waypoint') {
     363                            wp['tm_data'] = feature;
     364                            feature['_lf_object'] = wp;
     365                        }
    321366                        markerLayer.addLayer(wp);
    322367                    } else if(feature.type === 'marker' || feature.type === 'media' || feature.type === 'post') {
    323                         var iconName = feature.icon;
    324                         if(!iconName) {
    325                             iconName="circle";
    326                         }
    327                         var icon = L.AwesomeMarkers.icon({
    328                             icon: iconName,
    329                             markerColor: feature.iconColor,
    330                             prefix: 'fa'
    331                         });
     368                        var iconName = 'circle';
     369                        if(iconName === '_none') feature.icon = '_default';
     370                        if(feature.icon === '_thumbnail' && !feature.thumbnail) {
     371                            feature.icon === '_default';
     372                        }
     373                        if(feature.icon === '_mapsymbols' && !feature.mapsymbols) {
     374                            feature.icon === '_default';
     375                        }
     376                        if(feature.icon === '_default') {
     377                            if(!iconName) {
     378                                iconName="circle";
     379                            }
     380                        } else {
     381                            iconName = feature.icon;
     382                        }
    332383                        var popupElement = feature.title;
    333384                        if(feature.type === 'media') {
    334                             var pop = $('<div><a class="tm_popup fancybox" href="'+feature.fullsize+'" title="'+feature.title+'"><img src="'+feature.thumbnail+'" /></a><div>'+feature.title+'</divp></div>');
     385                            var pop = $('<div><a class="tm_popup" href="'+feature.fullsize+'" title="'+feature.title+'"><img src="'+feature.thumbnail+'" /></a><div>'+feature.title+'</div></div>');
    335386                            pop.find('a').colorbox({maxWidth:'95%', maxHeight:'95%'});
    336387                            popupElement = pop[0];
    337388                        }
    338                         var marker = L.marker([feature.lat, feature.lng], {icon:icon}).bindPopup(popupElement);
     389                        var marker = null;
     390                        if(feature.icon === '_dot') {
     391                            marker = L.circleMarker([feature.lat, feature.lng], {radius: 5, fillOpacity:1, color:lineColor});
     392                        } else if(feature.icon === '_thumbnail') {
     393                            var icon = new tm_thumbnailIcon({
     394                                iconUrl: feature.thumbnail
     395                            });
     396                            marker = L.marker([feature.lat, feature.lng], {icon:icon});
     397                        } else if(feature.icon === '_mapsymbols') {
     398                            var icon = new tm_mapSymbols({
     399                                iconUrl: feature.mapsymbols
     400                            });
     401                            marker = L.marker([feature.lat, feature.lng], {icon:icon});
     402                        } else {
     403                            var icon = L.AwesomeMarkers.icon({
     404                                icon: iconName,
     405                                markerColor: feature.iconColor,
     406                                prefix: 'fa'
     407                            });
     408                            marker = L.marker([feature.lat, feature.lng], {icon:icon})
     409                        }
     410                        marker.bindPopup(popupElement);
    339411                        marker['tm_data'] = feature;
    340412                        feature['_lf_object'] = marker;
    … …  
    391463                    for(var j = 0; j < data[i].data.length; j++) {
    392464                        var feature = data[i].data[j];
    393                         if(feature.type === 'endsection' || feature.type === 'waypoint') continue;
     465                        if(feature.type === 'endsection' || (feature.type === 'waypoint' && !feature._lf_object) ) continue;
    394466                        var markerInfo = _createMarkerInfo(feature, data[i].data, j);
    395467                        _markerInfoMapping[data[i].name].push({marker: feature._lf_object, info: markerInfo});

  • wp-travelermap/trunk/frontend/travelermap-frontend.php

    r940411 r947438  
    8787    wp_enqueue_script('jquery-dateFormat', TM_URL . "js/jquery-dateFormat.min.js" , array('jquery'), '1.0.0', false);
    8888    wp_enqueue_script('json2');
    89     wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.3.0', false);
     89    wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.4.0', false);
    9090}
    9191

  • wp-travelermap/trunk/media/tm-admin.css

    r940336 r947438  
    128128}
    129129
    130 .tm_form > label {
     130.tm_form label {
    131131    width: 130px;
    132132    display: inline-block;
    … …  
    152152}
    153153
     154.wp_travelermap ul.ui-autocomplete {
     155    z-index: 100000;
     156    max-height: 400px;
     157    overflow-y: auto;
     158}
    154159
    155160.tm_list {

  • wp-travelermap/trunk/media/tm-frontend.css

    r940307 r947438  
    113113    z-index: 100001 !important;
    114114}
     115
     116.tm_map .leaflet-popup-content-wrapper {
     117    border-radius: 0px;
     118    padding: 10px;
     119}
     120
     121.tm_map .leaflet-popup-content {
     122    margin: 0;
     123}
     124
     125.tm_map a.leaflet-popup-close-button {
     126    background-color: #fff;
     127    border: 1px solid #000;
     128    border-radius: 9px;
     129    color: #000;
     130    font: bold 16px/14px Tahoma,Verdana,sans-serif;
     131    height: 18px;
     132    padding: 0;
     133    position: absolute;
     134    right: -9px;
     135    text-align: center;
     136    text-decoration: none;
     137    top: -9px;
     138    width: 18px;
     139}
     140
     141.tm_map .leaflet-popup-tip-container {
     142    margin: -1px auto;
     143}

  • wp-travelermap/trunk/readme.txt

    r940411 r947438  
    55Requires at least: 3.9.0
    66Tested up to: 3.9.1
    7 Stable tag: 1.3.0
     7Stable tag: 1.4.0
    88License: MIT
    99License URI: http://opensource.org/licenses/MIT
    … …  
    5151
    5252== Changelog ==
     53
     54= 1.4.0 =
     55* Added more marker possibities
    5356
    5457= 1.3.0 =
    … …  
    115118https://github.com/phstc/jquery-dateFormat
    116119License: MIT & GPL
     120
     121Map Icons Collection
     122Creative Commons 3.0 BY-SA
     123Author : Nicolas Mollet
     124http://mapicons.nicolasmollet.com/

  • wp-travelermap/trunk/wp-travelermap.php

    r940411 r947438  
    44Plugin URI: http://bitschubser.org/projects/wp-travelermap
    55Description: A simple Plugin to create travel routes and manage maps
    6 Version: 1.3.0
     6Version: 1.4.0
    77Author: Mathis Zeiher
    88Author URI: http://bitschubser.org/
    … …  
    3232
    3333if ( ! defined( 'TM_VERSION' ) )   
    34     define( 'TM_VERSION', '1.3.0' );
     34    define( 'TM_VERSION', '1.4.0' );
    3535   
    3636if ( ! defined( 'TM_URL' ) )
Note: See TracChangeset for help on using the changeset viewer.