[Phpgroupware-cvs] phpgroupware header.inc.php.template, 1.47 login.php, 1.100

[skwashd]

Update of phpgroupware

Modified Files:
     Branch: MAIN
            header.inc.php.template lines: +3 -3
            login.php lines: +4 -2

Log Message:
new tpl layout fixes

====================================================
Index: phpgroupware/header.inc.php.template
diff -u phpgroupware/header.inc.php.template:1.46 
phpgroupware/header.inc.php.template:1.47
--- phpgroupware/header.inc.php.template:1.46   Thu Dec 30 10:46:22 2004
+++ phpgroupware/header.inc.php.template        Mon Jan  3 22:06:56 2005
@@ -47,8 +47,8 @@
        */
        $GLOBALS['phpgw_info']['server']['sessions_type'] = '{SESSIONS_TYPE}';

-       /* Select which login template set you want, most people will use 
default */
-       $GLOBALS['phpgw_info']['login_template_set'] = 'default';
+       /* Select which login template set you want, most people will use 
simple */
+       $GLOBALS['phpgw_info']['login_template_set'] = 'simple';

        /* This is used to control mcrypt's use */
        $GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};

====================================================
Index: phpgroupware/login.php
diff -u phpgroupware/login.php:1.99 phpgroupware/login.php:1.100
--- phpgroupware/login.php:1.99 Thu Dec 30 10:46:22 2004
+++ phpgroupware/login.php      Mon Jan  3 22:06:56 2005
@@ -31,6 +31,8 @@
                exit;
        }

+       $GLOBALS['phpgw_info']['server']['template_set'] = 
$GLOBALS['phpgw_info']['login_template_set'];
+
        $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT
                                                        . '/phpgwapi/templates/'
                                                        . 
$GLOBALS['phpgw_info']['login_template_set'];
@@ -366,7 +368,7 @@
        
$tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF'));
        
$tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591'));
        
$tmpl->set_var('logo_url',($GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'www.phpgroupware.org'));
-       
$tmpl->set_var('logo_file',($GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo.gif'));
+       
$tmpl->set_var('logo_file',($GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo.png'));
        
$tmpl->set_var('logo_title',($GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'phpGroupWare
 --> home'));
        $tmpl->set_var('autocomplete', 
($GLOBALS['phpgw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' 
: ''));