[Mapbender-commits] r6832 - trunk/mapbender/http/php

Mon Aug 30 04:34:57 EDT 2010

Author: verenadiewald
Date: 2010-08-30 08:34:57 +0000 (Mon, 30 Aug 2010)
New Revision: 6832

Modified:
   trunk/mapbender/http/php/mod_SelectKeyword.php
   trunk/mapbender/http/php/mod_gazetteerMetadata.php
Log:
http://trac.osgeo.org/mapbender/ticket/679

Modified: trunk/mapbender/http/php/mod_SelectKeyword.php
===================================================================

--- trunk/mapbender/http/php/mod_SelectKeyword.php	2010-08-29 22:31:27 UTC (rev 6831)
+++ trunk/mapbender/http/php/mod_SelectKeyword.php	2010-08-30 08:34:57 UTC (rev 6832)
@@ -39,7 +39,7 @@
 </script>
 </head>
 
-<body  >
+<body>
 
 <?php
 $sql = "Select keyword_id, ltrim(keyword) as keyword from keyword order by upper(ltrim(keyword));";

Modified: trunk/mapbender/http/php/mod_gazetteerMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_gazetteerMetadata.php	2010-08-29 22:31:27 UTC (rev 6831)
+++ trunk/mapbender/http/php/mod_gazetteerMetadata.php	2010-08-30 08:34:57 UTC (rev 6832)
@@ -36,8 +36,6 @@
 include_once(dirname(__FILE__) . "/../include/dyn_css.php");
 ?>
 
-
-
 <script type="text/javascript">
 <?php
 $sql = "SELECT e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
@@ -106,10 +104,7 @@
 -->
 </style>
 <script type="text/javascript">
-var keywordPopup;
-var metadataPopup;
 
-
 function i18nInit(){
         parent.Mapbender.events.localize.register(function(){
                 window.location.reload();
@@ -227,33 +222,29 @@
 
 
 function openKeywordPopup () {
-	if(typeof(keywordPopup) != "undefined") {
- 		keywordPopup.destroy();
- 	}
-	keywordPopup = new parent.mb_popup({
-		title : "<?php echo _mb("Select a keyword"); ?>",
-		url : "../php/mod_SelectKeyword.php",
-		width : 550, 
-		height : 260,
-		left : 300, 
-		top : 100
+	var $keywordPopup = parent.$('<div><iframe style="width:99%;height:99%;" src="../php/mod_SelectKeyword.php"></iframe></div>');
+	$keywordPopup.dialog({
+		title: "<?php echo _mb("Select a keyword"); ?>",
+		bgiframe: true,
+		autoOpen: true,
+		modal: false,
+		width: 550,
+		height: 450,
+		pos: [300,100]
 	});
-	keywordPopup.show();
 }
 
 function openMetadataPopup (layerId) {
-//	if(typeof(metadataPopup) != "undefined") {
-// 		metadataPopup.destroy();
-// 	}
-	metadataPopup = new parent.mb_popup({
+	var $metadataPopup = parent.$('<div><iframe style="width:100%;height:98%;" src="../php/mod_layerMetadata.php?id=' + layerId + '"></iframe></div>');
+	$metadataPopup.dialog({
 		title : "<?php echo _mb("Metadata"); ?>",
-		url : "../php/mod_layerMetadata.php?id=" + layerId,
-		width : 450, 
-		height : 600,
-		left : 400, 
-		top : 100
+		bgiframe: true,
+		autoOpen: true,
+		modal: false,
+		width: 450,
+		height: 600,
+		pos: [400,100]
 	});
-	metadataPopup.show();
 }
 
 function validate(){

