[Mapbender-commits] r9038 - trunk/mapbender/http/plugins

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-08-08 03:37:44 -0700 (Fri, 08 Aug 2014)
New Revision: 9038

Modified:
   trunk/mapbender/http/plugins/mb_metadata_addon.php
   trunk/mapbender/http/plugins/mb_metadata_gml_import.js
   trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js
Log:
some bugfixes

Modified: trunk/mapbender/http/plugins/mb_metadata_addon.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_addon.php	2014-08-08 10:18:21 UTC (rev 9037)
+++ trunk/mapbender/http/plugins/mb_metadata_addon.php	2014-08-08 10:37:44 UTC (rev 9038)
@@ -230,7 +230,7 @@
 		</fieldset>
 		<fieldset>
 			<legend><?php echo _mb("User defined region");?><img class="help-dialog" title="<?php echo _mb("Help");?>" help="{text:'<?php echo _mb("You can define your own bounding box or region if you upload an gml geometry object. Only bbox and polygons are accepted at the moment!");?>'}" src="../img/questionmark.png" alt="" /></legend>
-			<table id='geometryuploadtable' name='geometryuploadtable'><tr><td><img id="uploadgmlimage" name= "uploadgmlimage" onclick='initUploadGmlForm();' src='../img/button_blue_red/up.png' id='uploadImage' title='upload'  /></td><td><?php echo _mb("Upload a surronding geometry for this dataset");?><img class="help-dialog" title="<?php echo _mb("Help");?>" help="{text:'<?php echo _mb("Help for geometry upload possibility");?>'}" src="../img/questionmark.png" alt="" /><img class="delete_polygon" id="delete_existing_polygon" onclick="alert('test');" name="delete_existing_polygon" src='../img/cross.png' type="hidden" style="display: none" title="<?php echo _mb("Delete actual polygon");?>"/></td></tr></table>
+			<table id='geometryuploadtable' name='geometryuploadtable'><tr><td><img id="uploadgmlimage" name= "uploadgmlimage" onclick='initUploadGmlForm();' src='../img/button_blue_red/up.png' id='uploadImage' title='upload'  /></td><td><?php echo _mb("Upload a surronding geometry for this dataset");?><img class="help-dialog" title="<?php echo _mb("Help");?>" help="{text:'<?php echo _mb("Help for geometry upload possibility");?>'}" src="../img/questionmark.png" alt="" /><img class="delete_polygon" id="delete_existing_polygon" onclick="" name="delete_existing_polygon" src='../img/cross.png' type="hidden" style="display: none" title="<?php echo _mb("Delete actual polygon");?>"/></td></tr></table>
 		</fieldset>
 		<fieldset>
 			<legend><?php echo _mb("Extent on map");?><img class="help-dialog" title="<?php echo _mb("Help");?>" help="{text:'<?php echo _mb("Here you can see the extent and a possibly given surrounding polygon on an overview map.");?>'}" src="../img/questionmark.png" alt="" /></legend>

Modified: trunk/mapbender/http/plugins/mb_metadata_gml_import.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_gml_import.js	2014-08-08 10:18:21 UTC (rev 9037)
+++ trunk/mapbender/http/plugins/mb_metadata_gml_import.js	2014-08-08 10:37:44 UTC (rev 9038)
@@ -36,7 +36,11 @@
 				$gmlImport.dialog("close");
 				//alter the url to the overview image to force reload!
 				//alert($("#extent_preview").attr('src'));
-				$("#extent_preview").attr('src',$("#extent_preview").attr('src')+"&imagetime="+ new Date().getTime());
+				//show delete button
+				$("#delete_existing_polygon").css("display","block");
+				//alert($("#extent_preview").attr('src'));
+				urlstring = $("#extent_preview").attr('src')+"&time="+ new Date().getTime();
+				$("#extent_preview").attr('src',urlstring);
 				//invoke external script from mb_metadata_showMetadataAddon.js
 				//that.fillLayerForm(layerId);
 				//Mapbender.modules.mb_md_showMetadataAddon.fillLayerForm(layerId);

Modified: trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js	2014-08-08 10:18:21 UTC (rev 9037)
+++ trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js	2014-08-08 10:37:44 UTC (rev 9038)
@@ -130,7 +130,8 @@
 				$(".charset_selectbox").val(obj.inspire_charset);
 				$(".ref_system_selectbox").val(obj.ref_system);
 				$(".cyclic_selectbox").val(obj.update_frequency);
-				$("#extent_preview").attr('src',obj.overview_url+"&time="+ new Date().getTime());
+				urlstring = obj.overview_url+"&time="+ new Date().getTime();
+				$("#extent_preview").attr('src',urlstring);
 				$(".radioRes").filter('[value='+obj.spatial_res_type+']').attr('checked', true);
 				if (obj.has_polygon) {
 					$("#delete_existing_polygon").css("display","block"); 
@@ -348,7 +349,8 @@
 				//hide delete image
 				$("#delete_existing_polygon").css("display","none"); 
 				//update preview
-				$("#extent_preview").attr('src',obj.overview_url+"&time="+ new Date().getTime());
+				urlstring = $("#extent_preview").attr('src')+"&time="+ new Date().getTime();
+				$("#extent_preview").attr('src',urlstring);
 				$("<div></div>").text(message).dialog({
 					modal: true
 				});