[Phpgroupware-cvs] CVS: phpgwapi/templates/default parts.inc.php,1.1,1.2 parts.tpl,1.1,1.2 phpgw.tpl,1.1,1.2

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/default
In directory subversions:/tmp/cvs-serv9844/phpgwapi/templates/default

Modified Files:
        parts.inc.php parts.tpl phpgw.tpl 
Log Message:
updated phpgwapi/inc/functions.inc.php to follow a nice and orderly loadup 
process. Added back in the support for CSS, added support for preloading 
images, fixed javascript problems, updated themes to use , overall just got 
this api nice and tight in the loadup and template areas. Now we need to update 
all the template sets and apps to follow suit

Index: parts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/parts.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** parts.inc.php       30 May 2002 09:44:38 -0000      1.1
--- parts.inc.php       30 May 2002 21:13:07 -0000      1.2
***************
*** 12,19 ****
    /* $Id$ */
  
!       $GLOBALS['phpgw']->template->set_var('phpgw_top_height','10%');
!       $GLOBALS['phpgw']->template->set_var('phpgw_left_width','0');
!       $GLOBALS['phpgw']->template->set_var('phpgw_right_width','0');
!       $GLOBALS['phpgw']->template->set_var('phpgw_bottom_height','5%');
  
        function parse_toppart($output)
--- 12,19 ----
    /* $Id$ */
  
!       $GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','10%');
!       $GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','45');
!       $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','5%');
!       $GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','40');
  
        function parse_toppart($output)
***************
*** 65,69 ****
                if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 
'text')
                {
-                       $var['navbar_color'] = 
$GLOBALS['phpgw_info']['theme']['bg_color'];
                        $var['align'] = 'right';
                        $var['value'] = 
$GLOBALS['phpgw']->common->create_tabs($tabs,$selected,-1);
--- 65,68 ----
***************
*** 91,111 ****
  //                            . $GLOBALS['phpgw']->common->show_date($now,'d, 
Y');
  
-               // 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')
-                               . '<br> Click this image on the navbar: <img 
src="'
-                               . 
$GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
-               }
-               elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < 
time() - (86400*30))
-               {
-                       $api_messages = lang('it has been more then x days 
since you changed your password',30);
-               }
-  
                // This is gonna change
                if (isset($cd))
                {
!                       $var['messages'] = $api_messages . '<br>' . 
checkcode($cd);
                }
                $GLOBALS['phpgw']->template->set_var($var);
--- 90,97 ----
  //                            . $GLOBALS['phpgw']->common->show_date($now,'d, 
Y');
  
                // This is gonna change
                if (isset($cd))
                {
!                       $var['messages'] = checkcode($cd);
                }
                $GLOBALS['phpgw']->template->set_var($var);
***************
*** 120,124 ****
                        
$GLOBALS['phpgw']->template->set_block('parts','bottom_part');
                        $var = Array(
-                               'bg_color' => 
$GLOBALS['phpgw_info']['theme']['bg_color'],
                                'msg'                   => 
"<p><p>\n".lang('Powered by phpGroupWare version 
x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
                                'version'               => 
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
--- 106,109 ----

Index: parts.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/parts.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** parts.tpl   30 May 2002 09:47:09 -0000      1.1
--- parts.tpl   30 May 2002 21:13:07 -0000      1.2
***************
*** 1,5 ****
  <!-- BEGIN top_part -->
  <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
!       <TR bgcolor="{navbar_color}">
                <TD align="left" nowrap>{user_info}</TD>
                <TD align="right">{applications}</TD>
--- 1,5 ----
  <!-- BEGIN top_part -->
  <TABLE width="100%" border="0" cellspacing="0" cellpadding="0">
!       <TR bgcolor="{navbar_bg}">
                <TD align="left" nowrap>{user_info}</TD>
                <TD align="right">{applications}</TD>
***************
*** 16,20 ****
  
  <!-- BEGIN bottom_part -->
! <TABLE border="0" cellspacing="0" cellpadding="0" width="100%" 
bgcolor="{bg_color}">
    <TR>
      <TD align="CENTER">{msg}<BR></TD>
--- 16,20 ----
  
  <!-- BEGIN bottom_part -->
! <TABLE border="0" cellspacing="0" cellpadding="0" width="100%" 
bgcolor="{navbar_bg}">
    <TR>
      <TD align="CENTER">{msg}<BR></TD>

Index: phpgw.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/phpgw.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** phpgw.tpl   30 May 2002 09:44:38 -0000      1.1
--- phpgw.tpl   30 May 2002 21:13:07 -0000      1.2
***************
*** 12,60 ****
        <LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
        <TITLE>{phpgw_head_website_title}</TITLE>
!       <script language="JavaScript" type="text/javascript">
                <!--
                function MM_swapImgRestore() { //v3.0
!                 var i,x,a=document.MM_sr; 
for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
                }
                function MM_preloadImages() { //v3.0
!               var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
!           var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; 
i<a.length; i++)
!           if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; 
d.MM_p[j++].src=a[i];}}
                }
                function MM_findObj(n, d) { //v4.0
!               var p,i,x;  if(!d) d=document; 
if((p=n.indexOf("?"))>0&&parent.frames.length) {
!           d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
!               if(!(x=d[n])&&d.all) x=d.all[n]; for 
(i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
!               for(i=0;!x&&d.layers&&i<d.layers.length;i++) 
x=MM_findObj(n,d.layers[i].document);
!               if(!x && document.getElementById) x=document.getElementById(n); 
return x;
                }
                function MM_swapImage() { //v3.0
!               var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; 
for(i=0;i<(a.length-2);i+=3)
!               if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; 
if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
                }
  
                function 
multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc) {
!                       if(top_doc != null){parent.top.location.href=top_doc;}
!                       if(left_doc != 
null){parent.left.location.href=left_doc;}
!                       if(body_doc != 
null){parent.body.location.href=body_doc;}
!                       if(right_doc != 
null){parent.right.location.href=right_doc;}
!                       if(bottom_doc != 
null){parent.bottom.location.href=bottom_doc;}
                }
                //-->
!       </script>
        {phpgw_head_tags}
  </HEAD>
! <BODY {phpgw_body_tags} onLoad="{phpgw_body_onload}">
        <TABLE border="0" width="100%" height="%100" cellspacing="0" 
cellpadding="0">
                <TR>
!                       <TD width="100%" height="{phpgw_top_height}" 
align="left" valign="top" colspan="3">{phpgw_top}</TD>
                </TR>
                <TR>
!                       <TD width="{phpgw_left_width}" height="100%" 
align="left" valign="top">{phpgw_left}</TD>
                        <TD width="100%" height="100%" align="left" 
valign="top">{phpgw_msgbox}{phpgw_body}</TD>
!                       <TD width="{phpgw_right_width}" height="100%" 
align="right" valign="top">{phpgw_right}</TD>
                </TR>
                <TR>
!                       <TD width="100%" height="{phpgw_bottom_height}" 
align="left" valign="top" colspan="3">{phpgw_bottom}</TD>
                </TR>
        </TABLE>
--- 12,61 ----
        <LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
        <TITLE>{phpgw_head_website_title}</TITLE>
!       <SCRIPT language="JavaScript" type="text/javascript">
                <!--
                function MM_swapImgRestore() { //v3.0
!                       var i,x,a=document.MM_sr; 
for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
                }
                function MM_preloadImages() { //v3.0
!                       var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new 
Array();
!                       var i,j=d.MM_p.length,a=MM_preloadImages.arguments; 
for(i=0; i<a.length; i++)
!                       if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; 
d.MM_p[j++].src=a[i];}}
                }
                function MM_findObj(n, d) { //v4.0
!                       var p,i,x;  if(!d) d=document; 
if((p=n.indexOf("?"))>0&&parent.frames.length) {
!                       d=parent.frames[n.substring(p+1)].document; 
n=n.substring(0,p);}
!                       if(!(x=d[n])&&d.all) x=d.all[n]; for 
(i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
!                       for(i=0;!x&&d.layers&&i<d.layers.length;i++) 
x=MM_findObj(n,d.layers[i].document);
!                       if(!x && document.getElementById) 
x=document.getElementById(n); return x;
                }
                function MM_swapImage() { //v3.0
!                       var i,j=0,x,a=MM_swapImage.arguments; 
document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
!                       if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; 
if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
                }
  
                function 
multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc) {
!                       if(top_doc != null){ parent.top.location.href=top_doc; }
!                       if(left_doc != null){ 
parent.left.location.href=left_doc; }
!                       if(body_doc != null){ 
parent.body.location.href=body_doc; }
!                       if(right_doc != null){ 
parent.right.location.href=right_doc; }
!                       if(bottom_doc != null){ 
parent.bottom.location.href=bottom_doc; }
                }
                //-->
!       </SCRIPT>
!       {phpgw_css}
        {phpgw_head_tags}
  </HEAD>
! <BODY {phpgw_body_tags} onLoad="{phpgw_preload_images}{phpgw_body_onload}">
        <TABLE border="0" width="100%" height="%100" cellspacing="0" 
cellpadding="0">
                <TR>
!                       <TD width="100%" height="{phpgw_top_table_height}" 
align="left" valign="top" colspan="3">{phpgw_top}</TD>
                </TR>
                <TR>
!                       <TD width="{phpgw_left_table_width}" height="100%" 
align="left" valign="top">{phpgw_left}</TD>
                        <TD width="100%" height="100%" align="left" 
valign="top">{phpgw_msgbox}{phpgw_body}</TD>
!                       <TD width="{phpgw_right_table_width}" height="100%" 
align="right" valign="top">{phpgw_right}</TD>
                </TR>
                <TR>
!                       <TD width="100%" height="{phpgw_bottom_table_height}" 
align="left" valign="top" colspan="3">{phpgw_bottom}</TD>
                </TR>
        </TABLE>
***************
*** 76,113 ****
        <LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
        <TITLE>{phpgw_head_website_title}</TITLE>
!       <script language="JavaScript" type="text/javascript">
                <!--
                function MM_swapImgRestore() { //v3.0
!                 var i,x,a=document.MM_sr; 
for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
                }
                function MM_preloadImages() { //v3.0
!               var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
!           var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; 
i<a.length; i++)
!           if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; 
d.MM_p[j++].src=a[i];}}
                }
                function MM_findObj(n, d) { //v4.0
!               var p,i,x;  if(!d) d=document; 
if((p=n.indexOf("?"))>0&&parent.frames.length) {
!           d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
!               if(!(x=d[n])&&d.all) x=d.all[n]; for 
(i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
!               for(i=0;!x&&d.layers&&i<d.layers.length;i++) 
x=MM_findObj(n,d.layers[i].document);
!               if(!x && document.getElementById) x=document.getElementById(n); 
return x;
                }
                function MM_swapImage() { //v3.0
!               var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; 
for(i=0;i<(a.length-2);i+=3)
!               if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; 
if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
                }
  
                function 
multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc) {
!                       if(top_doc != null){parent.top.location.href=top_doc;}
!                       if(left_doc != 
null){parent.left.location.href=left_doc;}
!                       if(body_doc != 
null){parent.body.location.href=body_doc;}
!                       if(right_doc != 
null){parent.right.location.href=right_doc;}
!                       if(bottom_doc != 
null){parent.bottom.location.href=bottom_doc;}
                }
                //-->
!       </script>
        {phpgw_head_tags}
  </HEAD>
! <BODY {phpgw_body_tags} onLoad="{phpgw_body_onload}">
        {phpgw_msgbox}
        {phpgw_body}
--- 77,115 ----
        <LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
        <TITLE>{phpgw_head_website_title}</TITLE>
!       <SCRIPT language="JavaScript" type="text/javascript">
                <!--
                function MM_swapImgRestore() { //v3.0
!                       var i,x,a=document.MM_sr; 
for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
                }
                function MM_preloadImages() { //v3.0
!                       var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new 
Array();
!                       var i,j=d.MM_p.length,a=MM_preloadImages.arguments; 
for(i=0; i<a.length; i++)
!                       if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; 
d.MM_p[j++].src=a[i];}}
                }
                function MM_findObj(n, d) { //v4.0
!                       var p,i,x;  if(!d) d=document; 
if((p=n.indexOf("?"))>0&&parent.frames.length) {
!                       d=parent.frames[n.substring(p+1)].document; 
n=n.substring(0,p);}
!                       if(!(x=d[n])&&d.all) x=d.all[n]; for 
(i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
!                       for(i=0;!x&&d.layers&&i<d.layers.length;i++) 
x=MM_findObj(n,d.layers[i].document);
!                       if(!x && document.getElementById) 
x=document.getElementById(n); return x;
                }
                function MM_swapImage() { //v3.0
!                       var i,j=0,x,a=MM_swapImage.arguments; 
document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
!                       if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; 
if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
                }
  
                function 
multiLoad(top_doc,left_doc,body_doc,right_doc,bottom_doc) {
!                       if(top_doc != null){ parent.top.location.href=top_doc; }
!                       if(left_doc != null){ 
parent.left.location.href=left_doc; }
!                       if(body_doc != null){ 
parent.body.location.href=body_doc; }
!                       if(right_doc != null){ 
parent.right.location.href=right_doc; }
!                       if(bottom_doc != null){ 
parent.bottom.location.href=bottom_doc; }
                }
                //-->
!       </SCRIPT>
!       {phpgw_css}
        {phpgw_head_tags}
  </HEAD>
! <BODY {phpgw_body_tags} onLoad="{phpgw_preload_images}{phpgw_body_onload}">
        {phpgw_msgbox}
        {phpgw_body}
***************
*** 129,143 ****
        <LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
        <TITLE>{phpgw_head_website_title}</TITLE>
!       <FRAMESET frameborder="0" border="0" framespacing="0" 
ROWS="{phpgw_top_height},*,{phpgw_bottom_height}">
!               <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_top_link}" 
NAME="top" SCROLLING=NO>
!               <FRAMESET frameborder="0" border="0" framespacing="0" 
COLS="{phpgw_left_width},*,{phpgw_right_width}">
!                       <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 
SRC="{phpgw_left_link}" NAME="left" SCROLLING=NO>
                        <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 
SRC="{phpgw_body_link}" NAME="body">
!                       <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 
SRC="{phpgw_right_link}" NAME="right" SCROLLING=NO>
                </FRAMESET>
!               <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_bottom_link}" 
NAME="bottom" SCROLLING=NO>
                <NOFRAMES>
                        <P>phpGroupWare is configured to use frames, but your 
browser does not support them.<BR>
!                       <A href="{phpgw_link}&framepart=unsupported">click here 
to force non-frames mode</A>
                </NOFRAMES>
        </FRAMESET>
--- 131,145 ----
        <LINK REL="SHORTCUT ICON" href="{phpgw_head_browser_ico}">
        <TITLE>{phpgw_head_website_title}</TITLE>
!       <FRAMESET frameborder="0" border="0" framespacing="0" 
ROWS="{phpgw_top_frame_height},*,{phpgw_bottom_frame_height}">
!               <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_top_link}" 
NAME="top" SCROLLING="{phpgw_top_scrolling}">
!               <FRAMESET frameborder="0" border="0" framespacing="0" 
COLS="{phpgw_left_frame_width},*,{phpgw_right_frame_width}">
!                       <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 
SRC="{phpgw_left_link}" NAME="left" SCROLLING="{phpgw_left_scrolling}">
                        <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 
SRC="{phpgw_body_link}" NAME="body">
!                       <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 
SRC="{phpgw_right_link}" NAME="right" SCROLLING="{phpgw_right_scrolling}">
                </FRAMESET>
!               <FRAME MARGINWIDTH=0 MARGINHEIGHT=0 SRC="{phpgw_bottom_link}" 
NAME="bottom" SCROLLING="{phpgw_bottom_scrolling}">
                <NOFRAMES>
                        <P>phpGroupWare is configured to use frames, but your 
browser does not support them.<BR>
!                       <A href="{phpgw_unupported_link}">click here to force 
non-frames mode</A>
                </NOFRAMES>
        </FRAMESET>
***************
*** 145,147 ****
  </HTML>
  <!-- END phpgw_main_frames -->
- 
--- 147,148 ----