[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11.2.2.2.2,1.11.2.2.2.3head.tpl,1.10.2.2,1.10.2.2.2.1 navbar.inc.php,1.30.2.7.2.1,1.30.2.7.2.2navbar.tpl,1.18.4.1,1.18.4.2

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/idsociety
In directory subversions:/tmp/cvs-serv17853/idsociety

Modified Files:
      Tag: Version-0_9_16-branch
        head.inc.php head.tpl navbar.inc.php navbar.tpl 
Log Message:
updated app-header


Index: head.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/idsociety/Attic/head.inc.php,v
retrieving revision 1.11.2.2.2.2
retrieving revision 1.11.2.2.2.3
diff -C2 -r1.11.2.2.2.2 -r1.11.2.2.2.3
*** head.inc.php        28 Mar 2003 15:08:22 -0000      1.11.2.2.2.2
--- head.inc.php        19 Apr 2003 21:10:05 -0000      1.11.2.2.2.3
***************
*** 23,27 ****
        }
  
!       $app_css = '';
        if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
        {
--- 23,27 ----
        }
  
!       $app_css = $java_script = '';
        if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
        {
***************
*** 31,34 ****
--- 31,46 ----
                        $app_css = $GLOBALS[$class]->css();
                }
+               if(is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['java_script'])
+               {
+                       $java_script = $GLOBALS[$class]->java_script();
+               }
+       }
+       if (isset($GLOBALS['phpgw_info']['flags']['css']))
+       {
+               $app_css .= $GLOBALS['phpgw_info']['flags']['css'];
+       }
+       if (isset($GLOBALS['phpgw_info']['flags']['java_script']))
+       {
+               $java_script .= $GLOBALS['phpgw_info']['flags']['java_script'];
        }
  
***************
*** 56,60 ****
                'css_vlink'             => 
$GLOBALS['phpgw_info']['theme']['vlink'],
                'css_hovlink'   => $csshover,
!               'app_css'               => $app_css
        );
        $tpl->set_var($var);
--- 68,73 ----
                'css_vlink'             => 
$GLOBALS['phpgw_info']['theme']['vlink'],
                'css_hovlink'   => $csshover,
!               'app_css'               => $app_css,
!               'java_script'   => $java_script
        );
        $tpl->set_var($var);

Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/Attic/head.tpl,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.2.2.1
diff -C2 -r1.10.2.2 -r1.10.2.2.2.1
*** head.tpl    28 Mar 2002 18:56:56 -0000      1.10.2.2
--- head.tpl    19 Apr 2003 21:10:05 -0000      1.10.2.2.2.1
***************
*** 40,44 ****
  //-->
  </script>
! 
  <TITLE>{website_title}</TITLE>
  </HEAD>
--- 40,44 ----
  //-->
  </script>
! {java_script}
  <TITLE>{website_title}</TITLE>
  </HEAD>

Index: navbar.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/idsociety/Attic/navbar.inc.php,v
retrieving revision 1.30.2.7.2.1
retrieving revision 1.30.2.7.2.2
diff -C2 -r1.30.2.7.2.1 -r1.30.2.7.2.2
*** navbar.inc.php      28 Mar 2003 15:08:22 -0000      1.30.2.7.2.1
--- navbar.inc.php      19 Apr 2003 21:10:05 -0000      1.30.2.7.2.2
***************
*** 183,187 ****
                // Maybe we should create a common function in the 
phpgw_accounts_shared.inc.php file
                // to get rid of duplicate code.
! /*            if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
                {
                        $api_messages = lang('You are required to change your 
password during your first login')
--- 183,187 ----
                // Maybe we should create a common function in the 
phpgw_accounts_shared.inc.php file
                // to get rid of duplicate code.
!               if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
                {
                        $api_messages = lang('You are required to change your 
password during your first login')
***************
*** 199,203 ****
                        $var['messages'] = $api_messages . '<br>' . 
checkcode($cd);
                }
! */
                $tpl->set_var($var);
                // check if user is allowed to change his prefs
--- 199,214 ----
                        $var['messages'] = $api_messages . '<br>' . 
checkcode($cd);
                }
! 
!               $var['th_bg'] = $GLOBALS['phpgw_info']['theme']['th_bg'];
!               if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
!               {
!                       $var['current_app_header'] = 
$GLOBALS['phpgw_info']['flags']['app_header'];
!               }
!               else
!               {
!                       $tpl->set_block('navbar','app_header','app_header');
!                       $var['app_header'] = '<br>';
!               }
! 
                $tpl->set_var($var);
                // check if user is allowed to change his prefs

Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/Attic/navbar.tpl,v
retrieving revision 1.18.4.1
retrieving revision 1.18.4.2
diff -C2 -r1.18.4.1 -r1.18.4.2
*** navbar.tpl  28 Mar 2003 15:08:22 -0000      1.18.4.1
--- navbar.tpl  19 Apr 2003 21:10:05 -0000      1.18.4.2
***************
*** 29,33 ****
                                </tr>
                        </table>
!                       <table width="100%" height="29" cellpadding="0" 
cellspacing="0" border="0" valign="bottom">
                                <tr>
                                        <td width="50%" align="left" 
valign="bottom">
--- 29,33 ----
                                </tr>
                        </table>
!                       <table width="100%" cellpadding="0" cellspacing="0" 
border="0" valign="bottom">
                                <tr>
                                        <td width="50%" align="left" 
valign="bottom">
***************
*** 73,75 ****
                <td width="100%" align="left" valign="top">
                        <!-- this TD background image moved to body element -->
!                       <br>
--- 73,78 ----
                <td width="100%" align="left" valign="top">
                        <!-- this TD background image moved to body element -->
!                       <!-- BEGIN app_header -->
!                       <div style="text-align: left; font-weight: bold; 
background-color: {th_bg}; padding:5px">{current_app_header}</div>
!                       <!-- END app_header -->
!                       <div align="center">{messages}</div>