[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety footer.tpl,1.5,1.6

phpgroupware-cvs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety footer.tpl,1.5,1.6

From:	Dan Kuykendall <address@hidden>
Subject:	[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety footer.tpl,1.5,1.6 head.inc.php,1.13,1.14 head.tpl,1.12,1.13 navbar.inc.php,1.32,1.33
Date:	Fri, 24 May 2002 06:38:06 -0400

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

Modified Files:
        footer.tpl head.inc.php head.tpl navbar.inc.php 
Log Message:
made changes to the loading of the header, navbar, appheader, and footers

Index: footer.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/footer.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** footer.tpl  4 Jan 2002 22:06:12 -0000       1.5
--- footer.tpl  24 May 2002 10:38:02 -0000      1.6
***************
*** 14,16 ****
--- 14,18 ----
        </tr>
  </table>
+ </BODY>
  <!-- END footer -->
+ </HTML>

Index: head.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/head.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** head.inc.php        15 Mar 2002 01:20:53 -0000      1.13
--- head.inc.php        24 May 2002 10:38:02 -0000      1.14
***************
*** 12,26 ****
    /* $Id$ */
  
-       // needed until hovlink is specified in all theme files
-       if (isset($GLOBALS['phpgw_info']['theme']['hovlink'])
-        && ($GLOBALS['phpgw_info']['theme']['hovlink'] != ''))
-       {
-               $csshover = 'A:hover{ text-decoration:none; color: ' 
.$GLOBALS['phpgw_info']['theme']['hovlink'] .'; }';
-       }
-       else
-       {
-               $csshover = '';
-       }
- 
        $app_css = '';
        if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
--- 12,15 ----
***************
*** 49,56 ****
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'],
                'body_tags'             => $bodyheader,
-               'css_link'              => 
$GLOBALS['phpgw_info']['theme']['link'],
-               'css_alink'             => 
$GLOBALS['phpgw_info']['theme']['alink'],
-               'css_vlink'             => 
$GLOBALS['phpgw_info']['theme']['vlink'],
-               'css_hovlink'   => $csshover,
                'app_css'               => $app_css
        );
--- 38,41 ----

Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/head.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** head.tpl    28 Mar 2002 19:00:38 -0000      1.12
--- head.tpl    24 May 2002 10:38:02 -0000      1.13
***************
*** 1,4 ****
- <!-- BEGIN head -->
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  <HTML>
  <HEAD>
--- 1,4 ----
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <!-- BEGIN head -->
  <HTML>
  <HEAD>
***************
*** 7,26 ****
  <META NAME="description" CONTENT="phpGroupWare">
  <META NAME="keywords" CONTENT="phpGroupWare">
! <meta name="robots" content="none">
  <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
! <STYLE type="text/css">
! <!--
!   a { text-decoration:none; }
!   A:link{ text-decoration:none; color: {css_link}; }
!   A:visted{ text-decoration:none; color: {css_vlink}; }
!   A:active{ text-decoration:none; color: {css_alink}; }
!   {css_hovlink}
!   body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: 
"{font_family}" }
!   .tablink { color: #000000; }
!   {app_css}
! -->
! </STYLE>
! <script language="JavaScript">
  <!--
  function MM_preloadImages()
--- 7,15 ----
  <META NAME="description" CONTENT="phpGroupWare">
  <META NAME="keywords" CONTENT="phpGroupWare">
! <META NAME="robots" content="none">
  <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
! <STYLE type="text/css">{phpgw_css}</STYLE>
! <SCRIPT language="JavaScript">
  <!--
  function MM_preloadImages()
***************
*** 39,46 ****
  }
  //-->
! </script>
  
  <TITLE>{website_title}</TITLE>
  </HEAD>
  <!-- idsociety body tags continue into navbar.tpl, so the closing bracket 
here is there END Head -->
! <BODY {body_tags} 
--- 28,35 ----
  }
  //-->
! </SCRIPT>
  
  <TITLE>{website_title}</TITLE>
  </HEAD>
  <!-- idsociety body tags continue into navbar.tpl, so the closing bracket 
here is there END Head -->
! <BODY {body_tags}

Index: navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/navbar.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** navbar.inc.php      15 Mar 2002 03:53:54 -0000      1.32
--- navbar.inc.php      24 May 2002 10:38:02 -0000      1.33
***************
*** 204,220 ****
                $tpl->set_var($var);
                $tpl->pfp('out','navbar');
-               // If the application has a header include, we now include it
-               if (address@hidden'phpgw_info']['flags']['noappheader'] && 
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
-               {
-                       list($app,$class,$method) = 
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
-                       if (is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['header'])
-                       {
-                               $GLOBALS[$class]->header();
-                       }
-               }
-               $GLOBALS['phpgw']->hooks->process('after_navbar');
                return;
        }
  
        function parse_navbar_end()
        {
--- 204,215 ----
                $tpl->set_var($var);
                $tpl->pfp('out','navbar');
                return;
        }
  
+       function parse_nonavbar()
+       {
+               echo '>';
+       }
+       
        function parse_navbar_end()
        {

[Prev in Thread]

Current Thread

[Next in Thread]

[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety footer.tpl,1.5,1.6 head.inc.php,1.13,1.14 head.tpl,1.12,1.13 navbar.inc.php,1.32,1.33, Dan Kuykendall <address@hidden> <=