phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.php


From: Dave Hall <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.php,1.3.2.1.2.3,1.3.2.1.2.4head.tpl,1.4.2.4.2.1,1.4.2.4.2.2
Date: Thu, 29 May 2003 22:34:29 -0400

Update of /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de
In directory subversions:/tmp/cvs-serv21085/templates/linux-at-work.de

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/linux-at-work.de/head.inc.php,v
retrieving revision 1.3.2.1.2.3
retrieving revision 1.3.2.1.2.4
diff -C2 -r1.3.2.1.2.3 -r1.3.2.1.2.4
*** head.inc.php        21 Apr 2003 15:22:50 -0000      1.3.2.1.2.3
--- head.inc.php        30 May 2003 02:34:26 -0000      1.3.2.1.2.4
***************
*** 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,53 ****
  
        $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"';
-       }
  
        if ($fp = @fopen(PHPGW_APP_TPL."/app.css","r"))
--- 27,30 ----
***************
*** 74,88 ****
                '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_name'      => $app,
                'body_tags'     => $bodyheader,
                'bg_color'      => $GLOBALS['phpgw_info']['theme']['bg_color'],
-               'css_link'      => $GLOBALS['phpgw_info']['theme']['link'],
-               'css_alink'     => $GLOBALS['phpgw_info']['theme']['alink'],
-               'css_vlink'     => $GLOBALS['phpgw_info']['theme']['vlink'],
-               'css_hovlink'   => $csshover,
                'refreshTime'   => $refreshTime,
!               'app_css'               => $app_css,
                'java_script'   => $java_script
        );
--- 51,60 ----
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
                'charset'       => lang('charset'),
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'],
                'app_name'      => $app,
                'body_tags'     => $bodyheader,
                'bg_color'      => $GLOBALS['phpgw_info']['theme']['bg_color'],
                'refreshTime'   => $refreshTime,
!               'css'                   => $GLOBALS['phpgw']->common->get_css(),
                'java_script'   => $java_script
        );

Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/head.tpl,v
retrieving revision 1.4.2.4.2.1
retrieving revision 1.4.2.4.2.2
diff -C2 -r1.4.2.4.2.1 -r1.4.2.4.2.2
*** head.tpl    19 Apr 2003 21:10:05 -0000      1.4.2.4.2.1
--- head.tpl    30 May 2003 02:34:26 -0000      1.4.2.4.2.2
***************
*** 10,199 ****
  <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
! <MMETA http-equiv="Refresh" content="{refreshTime}">
! <STYLE type="text/css">
! <!--
!       A.main_menu, A.main_menu:LINK, A.main_menu:VISITED 
!       {
!               color: White;
!               text-decoration: none;
!               display : block;
!       }
! 
!       A.main_menu:HOVER 
!       {
!               background-color: #7C92FC;
!               display : block;
!       }
! 
!       INPUT.text
!       {
!               BACKGROUND : #FFFFCC; 
!               COLOR: #000000; 
!               BORDER: 1px solid #000000; 
!               FONT-SIZE: 10px;  
!               border-collapse : collapse;
!       }
! 
!       TEXTAREA.text
!       {
!               BACKGROUND : #FFFFCC; 
!               COLOR: #000000; 
!               BORDER: 1px solid #000000; 
!               FONT-SIZE: 12px;  
!               border-collapse : collapse;
!       }
! 
!       SELECT
!       {
!               BACKGROUND : #FFFFCC; 
!               COLOR: #000000; 
!               BORDER: 1px solid #000000; 
!               FONT-SIZE: 10px;  
!               border-collapse : collapse;
!       }
! 
! 
! 
!       DIV.main_menu 
!       {
!               position : absolute;
!               border : 0px dotted;
!               background : #7C92BC;
!               padding : 0px 0px 0px 0px;
!               padding-bottom : 0px;
!               padding-left : 0px;
!               padding-right : 0px;
!               padding-top : 0px;
!       }
! 
!       DIV.main_body {
!               position : absolute;
!               border-width : 1px;
!               background-color : #7C92BC;
!               padding-bottom : 0px;
!               padding-left : 0px;
!               padding-right : 0px;
!               padding-top : 0px;
!       }
! 
!       TD.main_menu 
!       {
!               border-top : 0px hidden #EAE17B;
!               border-left : 0px hidden #EAE17B;
!               border-bottom : 1px solid #4242B3;
!               border-right : 1px solid #4242B3;
!               width : 100%;
!               height: 22px;
!               font-family : Arial;
!               font-size : 12px;
!               color : White;
!               padding-right: 10px;
!               margin-right: 10px;
!               vertical-align:middle;
!               text-align:right;
!               white-space: nowrap;
!       }
! 
!       TD.main_menu_bottom 
!       {
!               border-top : 0px hidden #EAE17B;
!               border-left : 0px hidden #EAE17B;
!               border-bottom : 0px solid #4242B3;
!               border-right : 0px solid #4242B3;
!               width : 100%;
!               height: 22px;
!               font-family : Arial;
!               font-size : 10px;
!               color : White;
!               padding-right: 10px;
!               margin-right: 10px;
!               vertical-align:middle;
!               text-align:left;
!               white-space: nowrap;
!       }
! 
!       TD.main_menu_apps 
!       {
!               border-top : 0px hidden #EAE17B;
!               border-left : 0px hidden #EAE17B;
!               border-bottom : 1px solid #6157D5;
!               border-right : 1px solid #6157D5;
!               width : 100%;
!               height: 12px;
!               font-family : Arial;
!               font-size : 12px;
!               color : White;
!               padding-right: 10px;
!               margin-right: 10px;
!               vertical-align:middle;
!               text-align:right;
!       }
! 
!       TD.body 
!       {
!               border-top : 0px hidden #EAE17B;
!               border-left : 0px hidden #EAE17B;
!               border-bottom : 1px solid #6157D5;
!               border-right : 0px solid #6157D5;
!               wwidth : 100%;
!               height: 12px;
!               font-family : Arial;
!               font-size : 12px;
!               color : White;
!               ppadding-right: 10px;
!               mmargin-right: 10px;
!               vertical-align:middle;
!               ttext-align:right;
!       }
! 
!       INPUT.body
!       {
!               BACKGROUND : #FFFFCC; 
!               COLOR: #000000; 
!               BORDER: 1px solid #000000; 
!               FONT-SIZE: 10px;  
!               border-collapse : collapse;
!       }
! 
!       TD.main_menu_info 
!       {
!               border-top : 0px hidden #EAE17B;
!               border-left : 0px hidden #EAE17B;
!               border-bottom : 1px solid #4242B3;
!               border-right : 1px solid #4242B3;
!               width : 100%;
!               height: 22px;
!               font-family : Arial;
!               font-size : 10px;
!               color : White;
!               padding-right: 10px;
!               margin-right: 10px;
!               vertical-align:middle;
!               text-align:right;
!       }
! 
!       a { text-decoration:none; color: black; }
!       A:link{ text-decoration:none; color: black; }
!       A:visted{ text-decoration:none; color: black; }
!       A:active{ text-decoration:none; color: black; }
!       A:hover 
!       {
!               bbackground-color: #7C92FC;
!       }
!       
!       body 
!       {
!               margin-top: 0px; 
!               margin-right: 0px; 
!               margin-left: 0px; 
!               font-family: "{font_family}";
!               FONT-SIZE: 10px;
!               background-color : #7C92BC;
!       }
!       
!       .tablink { color: #000000; }
! {app_css}
! -->
! </STYLE>
  <script language="JavaScript">
  <!--
--- 10,15 ----
  <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
  <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
! <META http-equiv="Refresh" content="{refreshTime}">
! {css}
  <script language="JavaScript">
  <!--





reply via email to

[Prev in Thread] Current Thread [Next in Thread]