[Mapbender-commits] r6857 - in trunk/mapbender: http/print http/print/img resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: marc
Date: 2010-08-31 17:55:42 +0000 (Tue, 31 Aug 2010)
New Revision: 6857

Modified:
   trunk/mapbender/http/print/img/mapbender_logo.png
   trunk/mapbender/http/print/printPDF.conf
   trunk/mapbender/http/print/printPDF_b.conf
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql
Log:
added new Mapbender logo to print and gui_2

Modified: trunk/mapbender/http/print/img/mapbender_logo.png
===================================================================
(Binary files differ)

Modified: trunk/mapbender/http/print/printPDF.conf
===================================================================
--- trunk/mapbender/http/print/printPDF.conf	2010-08-31 16:57:18 UTC (rev 6856)
+++ trunk/mapbender/http/print/printPDF.conf	2010-08-31 17:55:42 UTC (rev 6857)
@@ -29,9 +29,10 @@
 $legendFilenameUserPolygon = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
 $legendText = $admin->char_decode(_mb("Legend"));
 $legendFooter = $admin->char_decode(_mb("powered by Mapbender"));
-$legendImage = "./img/mapbender_logo.png";
-$legendImage_width = 90;
-$legendImage_height = 13;
+//Please consider your own logo doesn't contain transparency layer(s)!!
+$legendImage = "./img/mapbender_logo_and_text.png";
+$legendImage_width = 60;
+$legendImage_height = 15;
 
 
 # log requests, class 'class_log.php' required
@@ -266,7 +267,8 @@
 * Northarrow
 */
 $northarrow = true;
-$northarrowImage = "./img/northarrow.png";
+//Please consider your own logo doesn't contain transparency layer(s)!!
+$northarrowImage = "./img/northarrow_old.png";
 
 $a4p_northarrow_left = $a4p_mapOffset_left + 160;
 $a4p_northarrow_bottom = $a4p_mapOffset_bottom +2 ;
@@ -305,7 +307,7 @@
 * special image for the map-page
 */
 $special = true;
-$specialImage = "../img/mapbender_oo.png";
+$specialImage = "./img/Mapbender_logo_and_text.png";
 
 $a4p_special_left = $a4p_mapOffset_left + $a4p_map_width - 50 ;
 $a4p_special_bottom = $a4p_mapOffset_bottom + $a4p_map_height + 80; 
@@ -337,7 +339,7 @@
 $a0l_special_left = $a0l_mapOffset_left + $a0l_map_width - $a0l_header_width + 0.2 * $DPC ;
 $a0l_special_bottom = $a0l_mapOffset_bottom + 110; 
 
-$specialImage_width = 65; 
+$specialImage_width = 60; 
 $specialImage_height = 15;  
 
 

Modified: trunk/mapbender/http/print/printPDF_b.conf
===================================================================
--- trunk/mapbender/http/print/printPDF_b.conf	2010-08-31 16:57:18 UTC (rev 6856)
+++ trunk/mapbender/http/print/printPDF_b.conf	2010-08-31 17:55:42 UTC (rev 6857)
@@ -29,9 +29,10 @@
 $legendFilenameUserPolygon = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
 $legendText = $admin->char_decode(_mb("Legend"));
 $legendFooter = $admin->char_decode(_mb("powered by Mapbender"));
-$legendImage = "./img/mapbender_logo.png";
-$legendImage_width = 90;
-$legendImage_height = 13;
+//Please consider your own logo doesn't contain transparency layer(s)!!
+$legendImage = "./img/mapbender_logo_and_text.png";
+$legendImage_width = 60;
+$legendImage_height = 15;
 
 
 # log requests, class 'class_log.php' required
@@ -265,7 +266,7 @@
 * Northarrow
 */
 $northarrow = true;
-$northarrowImage = "./img/northarrow.png";
+$northarrowImage = "./img/northarrow_old.png";
 
 $a4p_northarrow_left = $a4p_mapOffset_left + 160;
 $a4p_northarrow_bottom = $a4p_mapOffset_bottom +2 ;
@@ -304,7 +305,7 @@
 * special image for the map-page
 */
 $special = true;
-$specialImage = "../img/mapbender_oo.png";
+$specialImage = "./img/Mapbender_logo_and_text.png";
 
 $a4p_special_left = $a4p_mapOffset_left + $a4p_map_width - 50 ;
 $a4p_special_bottom = $a4p_mapOffset_bottom + $a4p_map_height + 80; 
@@ -336,7 +337,7 @@
 $a0l_special_left = $a0l_mapOffset_left + $a0l_map_width - $a0l_header_width + 0.2 * $DPC ;
 $a0l_special_bottom = $a0l_mapOffset_bottom + 110; 
 
-$specialImage_width = 65; 
+$specialImage_width = 60; 
 $specialImage_height = 15;  
 
 

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql	2010-08-31 16:57:18 UTC (rev 6856)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql	2010-08-31 17:55:42 UTC (rev 6857)
@@ -2700,3 +2700,10 @@
 -- see Ticket http://trac.osgeo.org/mapbender/ticket/697
 --
 UPDATE gui_element set e_more_styles=replace(e_more_styles, 'filter:Chroma(color=#C2CBCF);', '');
+
+--
+--Add new Mapbender Logo to gui_2
+--
+DELETE FROM gui_element WHERE fkey_gui_id='gui2' AND e_id='logo';
+INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('gui2','logo',2,1,'Logo','Logo','img','../img/Mapbender_logo_and_text.png','',40,38,120,30,5,'','','','','','','','');
+