diff --git a/README.md b/README.md index 8ccd3e1..d38b1f8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Donate link: http://dhpress.org/ Tags: plugin, map, open layers, markers, humanities, toolkit, video, historical, tours Requires at least: 3.4 Tested up to: 3.8 -Stable tag: 1.8.3 +Stable tag: 1.8.4 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/trunk/css/ol-map.css b/trunk/css/ol-map.css index dfa9512..c41eb25 100644 --- a/trunk/css/ol-map.css +++ b/trunk/css/ol-map.css @@ -56,7 +56,9 @@ body.fullscreen { right: 10px; } - +#dhp-visual.olMap{ + background: #eeeeee; +} /* Overrides most theme settings for img tags in the map only */ .entry-content .olMap img, .widget .olMap img { diff --git a/trunk/dhpress.php b/trunk/dhpress.php index 6385f25..fc984d6 100644 --- a/trunk/dhpress.php +++ b/trunk/dhpress.php @@ -3,7 +3,7 @@ Plugin Name: DH Press | Digital Humanities Toolkit Plugin URI: http://dhpress.org/download Description: DHPress is a flexible, repurposable, fully extensible digital humanities toolkit designed for non-technical users. -Version: 1.8.3 +Version: 1.8.4 Author: DHPress Team: Joe E Hope, Michael Newton, Pam Lach, Bryan Gaston Author URI: http://dhpress.org/team License: GPLv2 @@ -30,7 +30,7 @@ define( 'DHP_REQUIRED_WP_VERSION', '3.1' ); define( 'DHP_PLUGIN_URL', plugins_url('', __FILE__ ) ); define( 'DHP_MAPS_TABLE_VERSION', '0.1' ); -define( 'DHP_PLUGIN_VERSION', '1.8.3' ); +define( 'DHP_PLUGIN_VERSION', '1.8.4' ); define( 'SCRIPT_DEBUG', true ); /** diff --git a/trunk/js/dhp-maps-view.js b/trunk/js/dhp-maps-view.js index 4359edc..9f6699d 100644 --- a/trunk/js/dhp-maps-view.js +++ b/trunk/js/dhp-maps-view.js @@ -92,15 +92,16 @@ var dhpMapsView = { }; dhpMapsView.catFilter = new Object(); - // Create layers for maps as well as controls for each _.each(mapEP.layers, function(theLayer, index) { - opacity = 1; if(theLayer['opacity']) { opacity = theLayer['opacity']; } switch (theLayer['mapType']) { + case 'type-Blank': + newLayer = new OpenLayers.Layer("Blank Base Layer", {numZoomLevels: 20, isBaseLayer: true}); + break; case 'type-OSM': var thisLayer = dhpData.vizParams.layerData[index]; var arrayOSM = thisLayer.dhp_map_url.split(','); @@ -624,7 +625,6 @@ var dhpMapsView = { var layerSettings = dhpMapsView.mapEP.layers; _.each(dhpMapsView.olMap.layers,function(thisLayer,index) { - //console.log(layer.name) layerOpacity = 1; if(layerSettings[index]) { layerOpacity = layerSettings[index]['opacity']; @@ -646,7 +646,7 @@ var dhpMapsView = { step:.05, values: [ layerOpacity ], slide: function( event, ui ) { - thisLayer.setOpacity(ui.values[ 0 ]); + thisLayer.setOpacity(ui.values[ 0 ]); } }); // Handle turning on and off map layer diff --git a/trunk/php/dhp-map-library.php b/trunk/php/dhp-map-library.php index c39ec99..6399655 100644 --- a/trunk/php/dhp-map-library.php +++ b/trunk/php/dhp-map-library.php @@ -186,6 +186,9 @@ function show_dhp_map_settings_box() case 'WMS': $selectWMS = 'selected'; break; + case 'Blank': + $selectBlank = 'selected'; + break; case 'KML': $selectKML = 'selected'; break; @@ -224,7 +227,7 @@ function show_dhp_map_settings_box() echo '