[Mapbender-commits] r6688 - in trunk/mapbender/http: css frames

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-08-04 10:22:09 +0000 (Wed, 04 Aug 2010)
New Revision: 6688

Added:
   trunk/mapbender/http/css/reset.css
Modified:
   trunk/mapbender/http/frames/index.php
Log:
created a reset.css, which will be loaded in every application

Added: trunk/mapbender/http/css/reset.css
===================================================================
--- trunk/mapbender/http/css/reset.css	                        (rev 0)
+++ trunk/mapbender/http/css/reset.css	2010-08-04 10:22:09 UTC (rev 6688)
@@ -0,0 +1,6 @@
+html, body {
+    width: 100%;
+    height: 100%;
+    padding: 0;
+    margin: 0;
+} 
\ No newline at end of file

Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php	2010-08-04 10:17:00 UTC (rev 6687)
+++ trunk/mapbender/http/frames/index.php	2010-08-04 10:22:09 UTC (rev 6688)
@@ -48,66 +48,62 @@
 <meta http-equiv="pragma" content="no-cache">
 <meta http-equiv="expires" content="0">
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET;?>">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Script-Type" content="text/javascript">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
 <title><?php echo  $gui_id;?> - presented by Mapbender</title>
 <?php
-$sql = "SELECT * FROM gui_element_vars WHERE fkey_e_id = 'body' AND fkey_gui_id = $1 and var_name='favicon' ORDER BY var_name";
-$v = array($gui_id);
-$t = array('s');
-$res = db_prep_query($sql,$v,$t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
-	echo "<link rel=\"shortcut icon\" type=\"image/png\" href=\"".$row["var_value"]."\">\n";
-}
+	$sql = "SELECT * FROM gui_element_vars WHERE fkey_e_id = 'body' AND fkey_gui_id = $1 and var_name='favicon' ORDER BY var_name";
+	$v = array($gui_id);
+	$t = array('s');
+	$res = db_prep_query($sql,$v,$t);
+	$cnt = 0;
+	while($row = db_fetch_array($res)){
+		echo "<link rel=\"shortcut icon\" type=\"image/png\" href=\"".$row["var_value"]."\">\n";
+	}
 ?> 
 <?php
-$sql = "SELECT * FROM gui_element_vars WHERE fkey_e_id = 'body' AND fkey_gui_id = $1 and var_type='file/css' ORDER BY var_name";
-$v = array($gui_id);
-$t = array('s');
-$res = db_prep_query($sql,$v,$t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
-	echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"".$row["var_value"]."\">\n";
-}
+	// reset CSS
+	echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../css/reset.css\">\n";
+
+	$sql = "SELECT * FROM gui_element_vars WHERE fkey_e_id = 'body' AND fkey_gui_id = $1 and var_type='file/css' ORDER BY var_name";
+	$v = array($gui_id);
+	$t = array('s');
+	$res = db_prep_query($sql,$v,$t);
+	$cnt = 0;
+	while($row = db_fetch_array($res)){
+		echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"".$row["var_value"]."\">\n";
+	}
 ?>
 <style type="text/css">
 <!--
-html, body {
-    width: 100%;
-    height: 100%;
-    padding: 0;
-    margin: 0;
-} 
-
 .hide-during-splash {
 	display: none;
 }
 <?php
-$sql = "SELECT var_value FROM gui_element_vars WHERE fkey_gui_id = $1 and var_type='text/css' ORDER BY var_name";
-$v = array($gui_id);
-$t = array('s');
-$res = db_prep_query($sql,$v,$t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
-	echo $row["var_value"] . "\n";
-}
+	$sql = "SELECT var_value FROM gui_element_vars WHERE fkey_gui_id = $1 and var_type='text/css' ORDER BY var_name";
+	$v = array($gui_id);
+	$t = array('s');
+	$res = db_prep_query($sql,$v,$t);
+	$cnt = 0;
+	while($row = db_fetch_array($res)){
+		echo $row["var_value"] . "\n";
+	}
 ?>
 -->
 </style>
 <script type='text/javascript' src='../javascripts/core.php'></script>
 </head>
 <?php
-if (defined(LOAD_JQUERY_FROM_GOOGLE) && LOAD_JQUERY_FROM_GOOGLE) {
-	echo "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js'></script>";
-}
-$currentApplication = new gui($gui_id);
-echo $currentApplication->toHtml();
+	if (defined(LOAD_JQUERY_FROM_GOOGLE) && LOAD_JQUERY_FROM_GOOGLE) {
+		echo "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js'></script>";
+	}
+	$currentApplication = new gui($gui_id);
+	echo $currentApplication->toHtml();
+	
+	$mapPhpParameters = htmlentities($urlParameters, ENT_QUOTES, CHARSET);
+	$mapPhpParameters .= "&amp;".htmlentities($_SERVER["QUERY_STRING"]);
+	
+	echo "<script type='text/javascript' src='../javascripts/map.php?".$mapPhpParameters."'></script>";
 
-$mapPhpParameters = htmlentities($urlParameters, ENT_QUOTES, CHARSET);
-$mapPhpParameters .= "&amp;".htmlentities($_SERVER["QUERY_STRING"]);
-
-echo "<script type='text/javascript' src='../javascripts/map.php?".$mapPhpParameters."'></script>";
-
 ?>
 </html>