[Phpgroupware-cvs] phpgwapi/templates/idots navbar.inc.php navbar.tpl

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   07/08/23 09:41:46

Modified files:
        templates/idots: navbar.inc.php navbar.tpl 

Log message:
        allow custom logo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/navbar.inc.php?cvsroot=phpgwapi&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/navbar.tpl?cvsroot=phpgwapi&r1=1.13&r2=1.14

Patches:
Index: navbar.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/idots/navbar.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- navbar.inc.php      10 Aug 2007 07:35:56 -0000      1.22
+++ navbar.inc.php      23 Aug 2007 09:41:46 -0000      1.23
@@ -5,7 +5,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: navbar.inc.php,v 1.22 2007/08/10 07:35:56 sigurdne Exp $
+       * @version $Id: navbar.inc.php,v 1.23 2007/08/23 09:41:46 sigurdne Exp $
        */
 
 
@@ -29,6 +29,10 @@
                
$GLOBALS['phpgw']->template->set_block('navbar','navbar_footer','navbar_footer');
 
                $var['img_root'] = 
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/phpgwapi/templates/idots/images';
+               $var['logo'] = 
isset($GLOBALS['phpgw_info']['server']['logo_file']) && 
$GLOBALS['phpgw_info']['server']['logo_file'] ? 
$GLOBALS['phpgw_info']['server']['logo_file'] : 'logo.png';
+               $var['logo_alt'] = 
isset($GLOBALS['phpgw_info']['server']['login_logo_title']) && 
$GLOBALS['phpgw_info']['server']['login_logo_title'] ? 
$GLOBALS['phpgw_info']['server']['login_logo_title'] : 'phpGroupWare Logo';
+               $var['logo_title'] = 
isset($GLOBALS['phpgw_info']['server']['login_logo_title']) && 
$GLOBALS['phpgw_info']['server']['login_logo_title'] ? 
$GLOBALS['phpgw_info']['server']['login_logo_title'] : 'phpGroupWare Logo';
+               $var['logo_url'] = 
isset($GLOBALS['phpgw_info']['server']['login_logo_url']) && 
$GLOBALS['phpgw_info']['server']['login_logo_url'] ? 
$GLOBALS['phpgw_info']['server']['login_logo_url'] : 
'http://www.phpgroupware.org';
 
                $applications = '';
                $items = 0;

Index: navbar.tpl
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/idots/navbar.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- navbar.tpl  7 Mar 2007 22:29:32 -0000       1.13
+++ navbar.tpl  23 Aug 2007 09:41:46 -0000      1.14
@@ -23,7 +23,7 @@
        <div id="navpanel">
                <ul id="nav">
                        <li class="phpgw_logo">
-                               <a href="http://www.phpgroupware.org"; 
rel="external"><img src="{img_root}/logo.png" alt="phpGroupWare Logo" 
title="www.phpGroupWare.org"></a>
+                               <a href="{logo_url}" rel="external"><img 
src="{img_root}/{logo}" alt="{logo_alt}" title="{logo_alt}"></a>
                        </li>
                        <!-- BEGIN navbar_item -->
                        <li>