[20955] Fix: configurable logo at frontent

Revision: 20955
          http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20955
Author:   sigurdne
Date:     2010-01-13 19:09:35 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Fix: configurable logo at frontent

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css
    people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php
    people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.tpl

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css	2010-01-13 19:07:40 UTC (rev 20954)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css	2010-01-13 19:09:35 UTC (rev 20955)
@@ -32,7 +32,6 @@
 	float: left;
 }
 div#logo {
-    background: url(../images/bergen_logo.png) no-repeat;
     width: 125px;
     height: 114px;
     margin-left: 10px;

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php	2010-01-13 19:07:40 UTC (rev 20954)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php	2010-01-13 19:09:35 UTC (rev 20955)
@@ -82,8 +82,10 @@
 	}
 
 	$_navbar_config			= json_encode($navbar_config);
+	$config	= CreateObject('phpgwapi.config','booking');
+	$config->read();
+	$logofile_frontend = isset($config->config_data['logopath_frontend']) && $config->config_data['logopath_frontend'] ? $config->config_data['logopath_frontend'] : "/phpgwapi/templates/bkbooking/images/bergen_logo.png";
 
-
 	$app = lang($app);
 	$tpl_vars = array
 	(
@@ -96,6 +98,7 @@
 		'win_on_events'	=> $GLOBALS['phpgw']->common->get_on_events(),
 		'navbar_config' => $_navbar_config,
 		'lbl_search'   	=> lang('Search'),
+		'logofile'		=> $logofile_frontend,
 		'header_search_class'	=> (isset($_GET['menuaction']) && $_GET['menuaction'] == 'bookingfrontend.uisearch.index' ? 'hidden' : '')
 	);
 	$bouser = CreateObject('bookingfrontend.bouser');

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.tpl
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.tpl	2010-01-13 19:07:40 UTC (rev 20954)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.tpl	2010-01-13 19:09:35 UTC (rev 20955)
@@ -35,7 +35,7 @@
 	<div id="login-bar">
 		<a href="{login_url}">{login_text}</a>
 	</div>
-        <a href="index.php?menuaction=bookingfrontend.uisearch.index"><div id="logo"></div></a>
+        <a href="index.php?menuaction=bookingfrontend.uisearch.index"><div id="logo" style="background: url({logofile}) no-repeat"></div></a>
 		<div id="centerimage"></div>
 		<form action="index.php" method="get" id="header-search" class="{header_search_class}">
 			<input type="hidden" name="menuaction" value="bookingfrontend.uisearch.index" />