[Mapbender-commits] r2474 - in branches/beck_dev/mapbender: http/classes http/frames http/javascripts http/php lib

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Wed May 28 07:57:02 EDT 2008 

Author: christoph
Date: 2008-05-28 07:57:02 -0400 (Wed, 28 May 2008)
New Revision: 2474

Modified:
   branches/beck_dev/mapbender/http/classes/class_wms.php
   branches/beck_dev/mapbender/http/frames/index.php
   branches/beck_dev/mapbender/http/javascripts/mod_adminNavigation.js
   branches/beck_dev/mapbender/http/javascripts/mod_loadwmc.js
   branches/beck_dev/mapbender/http/php/mb_listGUIs.php
   branches/beck_dev/mapbender/lib/core.js
Log:
some enhancements

Modified: branches/beck_dev/mapbender/http/classes/class_wms.php
===================================================================
--- branches/beck_dev/mapbender/http/classes/class_wms.php	2008-05-27 13:37:12 UTC (rev 2473)
+++ branches/beck_dev/mapbender/http/classes/class_wms.php	2008-05-28 11:57:02 UTC (rev 2474)
@@ -1921,7 +1921,8 @@
 		if($this->wms_getcapabilities == '' || $this->wms_getmap == '' ){
 			echo "<br>Missing parameters: <br>";
 			$this->displayWMS();
-			echo "<br> Data not commited<br>";
+			print_r($this);
+			echo "<br> Data not committed<br>";
 			die();
 		}
 	}

Modified: branches/beck_dev/mapbender/http/frames/index.php
===================================================================
--- branches/beck_dev/mapbender/http/frames/index.php	2008-05-27 13:37:12 UTC (rev 2473)
+++ branches/beck_dev/mapbender/http/frames/index.php	2008-05-28 11:57:02 UTC (rev 2474)
@@ -44,8 +44,10 @@
 
 $localeObj = new Mb_locale($_SESSION["mb_lang"]);
 
-
-
+$htmlWhileLoading = "<img src='../img/indicator_wheel.gif'>&nbsp;" . 
+	"<b>Ma<font color='#0000CE'>p</font><font color='#C00000'>b</font>ender " . 
+	MB_VERSION_NUMBER . " " . strtolower(MB_VERSION_APPENDIX) . "</b>..." .
+	"loading application '" . $gui_id . "'";
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -150,11 +152,16 @@
     	echo db_result($res,$i,"e_more_styles");
 	}
 	echo "' >";
+	if (db_result($res,$i,"e_element") == "body" && USE_LOAD_MESSAGE) {
+		echo "<div id='loading_mapbender' style='position:absolute;top:100;left:100'>" . 
+			$htmlWhileLoading . "</div>" . 
+			"<div id='complete_mapbender' style='display:none'>";
+	}
 	if(db_result($res,$i,"e_content") != ""){
 		echo " ".stripslashes(db_result($res,$i,"e_content"));
 	}
 	if(db_result($res,$i,"e_closetag") != "" && db_result($res,$i,"e_closetag") != "body"){
-		echo " </".db_result($res,$i,"e_closetag").">";
+		echo "</".db_result($res,$i,"e_closetag").">";
 	}
 	$i++;
 }
@@ -166,5 +173,5 @@
 #echo "<script type='text/javascript' src='../javascripts/map.php?gui_id=".$_REQUEST["gui_id"]."&zoomToLayer=".$_REQUEST["zoomToLayer"]."&portal_services=".$_REQUEST['portal_services']."&portal_services_wfs=".$_REQUEST['portal_services_wfs']."&layer_preview=".$_REQUEST['layer_preview']."&".strip_tags(SID)."&mb_myBBOX=".$_REQUEST["mb_myBBOX"]."'></script>";
 echo "<script type='text/javascript' src='../javascripts/map.php?".$urlParameters."&mb_myBBOX=".$_REQUEST["mb_myBBOX"]."'></script>";
 ?>
-</body>
+</div></body>
 </html>
\ No newline at end of file

Modified: branches/beck_dev/mapbender/http/javascripts/mod_adminNavigation.js
===================================================================
--- branches/beck_dev/mapbender/http/javascripts/mod_adminNavigation.js	2008-05-27 13:37:12 UTC (rev 2473)
+++ branches/beck_dev/mapbender/http/javascripts/mod_adminNavigation.js	2008-05-28 11:57:02 UTC (rev 2474)
@@ -1,4 +1,5 @@
 function mod_adminNavigation_init(){
+	eventInit.trigger();
 	for (var i=0; i< document.getElementsByTagName("a").length; i++){
 		document.getElementsByTagName("a")[i].onclick = new Function("mod_adminNavigation(this)");
 	}

Modified: branches/beck_dev/mapbender/http/javascripts/mod_loadwmc.js
===================================================================
--- branches/beck_dev/mapbender/http/javascripts/mod_loadwmc.js	2008-05-27 13:37:12 UTC (rev 2473)
+++ branches/beck_dev/mapbender/http/javascripts/mod_loadwmc.js	2008-05-28 11:57:02 UTC (rev 2474)
@@ -83,6 +83,7 @@
 		(function () {
 			var currentId = wmcObj.wmc[i].id;
 			var $tr = $("<tr onmouseover='this.style.backgroundColor = \"#F08080\"' onmouseout='this.style.backgroundColor = \"#ffffff\"'></tr>").appendTo($("#loadwmc_list"));
+			$tr.hide();
 			var $td;
 			
 			$tr.append($("<td>" + wmcObj.wmc[i].title + "</td>"));
@@ -276,6 +277,8 @@
 			});
 			$td = $("<td></td>").append($deleteWmc);
 			$tr.append($td);
+
+			$tr.fadeIn("slow");
 		}());
 	}
 }
\ No newline at end of file

Modified: branches/beck_dev/mapbender/http/php/mb_listGUIs.php
===================================================================
--- branches/beck_dev/mapbender/http/php/mb_listGUIs.php	2008-05-27 13:37:12 UTC (rev 2473)
+++ branches/beck_dev/mapbender/http/php/mb_listGUIs.php	2008-05-28 11:57:02 UTC (rev 2474)
@@ -36,7 +36,7 @@
 		}
 		$sql_list_guis .= ") ORDER BY gui_name";
 		$res_list_guis = db_prep_query($sql_list_guis,$v,$t);
-		if ($_SESSION["mb_user_name"] != "test" && $_SESSION["mb_user_name"] != "demo") {
+		if ($_SESSION["mb_user_name"] != "test" && $_SESSION["mb_user_name"] != "demo" && $_SESSION["mb_user_name"] != "guest") {
 			echo "<a href=\"../php/mod_editSelf.php?".SID."\" class='list_guis' target=_blank>Change personal settings</a>";
 		}
 		echo "</td><td align = 'right'>";

Modified: branches/beck_dev/mapbender/lib/core.js
===================================================================
--- branches/beck_dev/mapbender/lib/core.js	2008-05-27 13:37:12 UTC (rev 2473)
+++ branches/beck_dev/mapbender/lib/core.js	2008-05-28 11:57:02 UTC (rev 2474)
@@ -47,6 +47,13 @@
  */
 var eventInitMap = new MapbenderEvent();
 
+eventInit.register(function() {
+	$lm = $("#loading_mapbender");
+	$cm = $("#complete_mapbender");
+	$lm.empty();
+	$cm.show();
+});
+
 /**
  * Switches the locale. Triggered by module switch_locale or onload(?) 
  */

More information about the Mapbender_commits mailing list