[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11.2.2.2.4,1.11.2.2.2.5head.tpl,1.10.2.2.2.1,1.10.2.2.2.2

[Dave Hall <address@hidden>]

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

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/idsociety/Attic/head.inc.php,v
retrieving revision 1.11.2.2.2.4
retrieving revision 1.11.2.2.2.5
diff -C2 -r1.11.2.2.2.4 -r1.11.2.2.2.5
*** head.inc.php        21 Apr 2003 15:22:50 -0000      1.11.2.2.2.4
--- head.inc.php        30 May 2003 02:34:26 -0000      1.11.2.2.2.5
***************
*** 12,34 ****
    /* $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 = $java_script = '';
        if(@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['css'])
-               {
-                       $app_css = $GLOBALS[$class]->css();
-               }
                if(is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['java_script'])
                {
--- 12,19 ----
    /* $Id$ */
  
!       $java_script = '';
        if(@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['java_script'])
                {
***************
*** 36,43 ****
                }
        }
-       if (isset($GLOBALS['phpgw_info']['flags']['css']))
-       {
-               $app_css .= $GLOBALS['phpgw_info']['flags']['css'];
-       }
        if (isset($GLOBALS['phpgw_info']['flags']['java_script']))
        {
--- 21,24 ----
***************
*** 46,54 ****
  
        $bodyheader = 
'bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'" 
alink="'.$GLOBALS['phpgw_info']['theme']['alink'].'" 
link="'.$GLOBALS['phpgw_info']['theme']['link'].'" 
vlink="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
-       if (!$GLOBALS['phpgw_info']['server']['htmlcompliant'])
-       {
-               $bodyheader .= ' topmargin="0" marginheight="0" marginwidth="0" 
leftmargin="0"';
-       }
- 
  
        $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
--- 27,30 ----
***************
*** 65,73 ****
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                '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,
                'java_script'   => $java_script
        );
--- 41,45 ----
                '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/idsociety/Attic/head.tpl,v
retrieving revision 1.10.2.2.2.1
retrieving revision 1.10.2.2.2.2
diff -C2 -r1.10.2.2.2.1 -r1.10.2.2.2.2
*** head.tpl    19 Apr 2003 21:10:05 -0000      1.10.2.2.2.1
--- head.tpl    30 May 2003 02:34:26 -0000      1.10.2.2.2.2
***************
*** 10,24 ****
  <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">
--- 10,14 ----
  <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
! {css}
  </STYLE>
  <script language="JavaScript">