[Mapbender-commits] r6892 - trunk/mapbender/http/frames

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-09-03 14:53:46 +0000 (Fri, 03 Sep 2010)
New Revision: 6892

Modified:
   trunk/mapbender/http/frames/index.php
Log:
load all css, not only body css

Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php	2010-09-03 14:53:24 UTC (rev 6891)
+++ trunk/mapbender/http/frames/index.php	2010-09-03 14:53:46 UTC (rev 6892)
@@ -65,7 +65,19 @@
 	// 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";
+	$sql = <<<SQL
+	
+SELECT DISTINCT e_id, e_element, var_value, var_name, var_type FROM gui_element, gui_element_vars 
+WHERE 
+	e_id = fkey_e_id 
+	AND e_element <> 'iframe' 
+	AND gui_element.fkey_gui_id = $1 
+	AND gui_element_vars.fkey_gui_id = $1 
+	AND var_type='file/css' 
+ORDER BY var_name
+
+SQL;
+
 	$v = array($gui_id);
 	$t = array('s');
 	$res = db_prep_query($sql,$v,$t);
@@ -76,11 +88,20 @@
 ?>
 <style type="text/css">
 <!--
-.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";
+	$sql = <<<SQL
+	
+SELECT DISTINCT e_id, e_element, var_value, var_name, var_type FROM gui_element, gui_element_vars 
+WHERE 
+	e_id = fkey_e_id 
+	AND e_element <> 'iframe' 
+	AND gui_element.fkey_gui_id = $1 
+	AND gui_element_vars.fkey_gui_id = $1 
+	AND var_type = 'text/css' 
+ORDER BY var_name
+
+SQL;
+
 	$v = array($gui_id);
 	$t = array('s');
 	$res = db_prep_query($sql,$v,$t);