[Mapbender-commits] r4578 - in trunk/mapbender: http/frames resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: tbaschetti
Date: 2009-08-31 03:55:42 -0400 (Mon, 31 Aug 2009)
New Revision: 4578

Modified:
   trunk/mapbender/http/frames/index.php
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql
Log:
enable favicon per gui using element_var
http://trac.osgeo.org/mapbender/ticket/514



Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php	2009-08-29 14:12:12 UTC (rev 4577)
+++ trunk/mapbender/http/frames/index.php	2009-08-31 07:55:42 UTC (rev 4578)
@@ -51,6 +51,16 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET;?>">
 <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'";
+$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'";
 $v = array($gui_id);
 $t = array('s');

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql	2009-08-29 14:12:12 UTC (rev 4577)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql	2009-08-31 07:55:42 UTC (rev 4578)
@@ -116,3 +116,23 @@
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui2', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui_digitize', 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var');
 
+ALTER TABLE gui_element ALTER COLUMN e_pos SET DEFAULT 2;
+ALTER TABLE gui_element ALTER COLUMN e_pos SET NOT NULL;
+
+ALTER TABLE gui_element ALTER COLUMN e_public SET DEFAULT 1;
+ALTER TABLE gui_element ALTER COLUMN e_public SET NOT NULL;
+
+-- new columns for table mb_user (more information fields + validity date fields)
+ALTER TABLE mb_user ADD COLUMN mb_user_realname varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_street varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_housenumber varchar(50);
+ALTER TABLE mb_user ADD COLUMN mb_user_reference varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_for_attention_of varchar(100);
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_from date;
+ALTER TABLE mb_user ADD COLUMN mb_user_valid_to date;
+ALTER TABLE mb_user ADD COLUMN mb_user_password_ticket varchar(100);
+
+-- enable favicon per gui using element_var
+-- http://trac.osgeo.org/mapbender/ticket/514
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'body', 'favicon', '../img/favicon.png', 'favicon' ,'php_var');
+