[Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak head.inc.php,1.12.4.4,1.12.4.5 head.tpl,1.6.2.1.2.1,1.6.2.1.2.2

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/verdilak
In directory subversions:/tmp/cvs-serv21085/templates/verdilak

Modified Files:
      Tag: Version-0_9_16-branch
        head.inc.php head.tpl 
Log Message:
changed css in tpls and dos2unix the api

Index: head.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/head.inc.php,v
retrieving revision 1.12.4.4
retrieving revision 1.12.4.5
diff -C2 -r1.12.4.4 -r1.12.4.5
*** head.inc.php        21 Apr 2003 15:22:50 -0000      1.12.4.4
--- head.inc.php        30 May 2003 02:34:26 -0000      1.12.4.5
***************
*** 16,23 ****
        {
                list($app,$class,$method) = 
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
-               if(is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['css'])
-               {
-                       $app_css = $GLOBALS[$class]->css();
-               }
                if(is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['java_script'])
                {
--- 16,19 ----
***************
*** 25,32 ****
                }
        }
-       if (isset($GLOBALS['phpgw_info']['flags']['css']))
-       {
-               $app_css .= $GLOBALS['phpgw_info']['flags']['css'];
-       }
        if (isset($GLOBALS['phpgw_info']['flags']['java_script']))
        {
--- 21,24 ----
***************
*** 38,46 ****
                        . $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
  
-       if (! $GLOBALS['phpgw_info']['server']['htmlcompliant'])
-       {
-               $bodyheader .= ' topmargin="0" bottommargin="0" 
marginheight="0" marginwidth="0" leftmargin="0" rightmargin="0"';
-       }
- 
        $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
        $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? 
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
--- 30,33 ----
***************
*** 53,60 ****
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
                'charset'               => lang('charset'),
-               'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                'body_tags'             => $bodyheader,
!               'app_css'               => $app_css,
                'java_script'   => $java_script
        );
--- 40,46 ----
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
                'charset'               => lang('charset'),
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                'body_tags'             => $bodyheader,
!               'css'                   => $GLOBALS['phpgw']->common->get_css(),
                'java_script'   => $java_script
        );

Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/head.tpl,v
retrieving revision 1.6.2.1.2.1
retrieving revision 1.6.2.1.2.2
diff -C2 -r1.6.2.1.2.1 -r1.6.2.1.2.2
*** head.tpl    19 Apr 2003 21:10:05 -0000      1.6.2.1.2.1
--- head.tpl    30 May 2003 02:34:26 -0000      1.6.2.1.2.2
***************
*** 11,25 ****
  <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 }
!   A:visted{ text-decoration:none }
!   A:active{ text-decoration:none }
!   body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: 
{font_family} }
!   .tablink { color: #000000; }
!   {app_css}
! -->
! </STYLE>
  {java_script}
  <TITLE>{website_title}</TITLE>
--- 11,15 ----
  <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
! {css}
  {java_script}
  <TITLE>{website_title}</TITLE>