[Phpgroupware-cvs] phpgwapi/templates/verdilak head.tpl, 1.10 navbar.tpl, 1.15 head.inc.php, 1.16 footer.tpl, 1.8 navbar.inc.php, 1.32

[fipsfuchs]

Update of phpgwapi/templates/verdilak

Modified Files:
     Branch: MAIN
            head.tpl lines: +1 -1
            navbar.tpl lines: +5 -6
            head.inc.php lines: +14 -1
            footer.tpl lines: +5 -5
            navbar.inc.php lines: +31 -3

Log Message:
patch 3986
css support for verdilak
gifs replaced with pngs

====================================================
Index: phpgwapi/templates/verdilak/head.tpl
diff -u phpgwapi/templates/verdilak/head.tpl:1.9 
phpgwapi/templates/verdilak/head.tpl:1.10
--- phpgwapi/templates/verdilak/head.tpl:1.9    Thu Dec 30 07:22:21 2004
+++ phpgwapi/templates/verdilak/head.tpl        Mon May  9 08:20:27 2005
@@ -10,7 +10,7 @@
 <meta name="robots" content="none">
 <LINK REL="ICON" href="{img_icon}" type="image/x-ico">
 <LINK REL="SHORTCUT ICON" href="{img_shortcut}">
-{css}
+<link href="{theme_css}" type="text/css" rel="StyleSheet" />
 {java_script}
 <TITLE>{website_title}</TITLE>
 </HEAD>

====================================================
Index: phpgwapi/templates/verdilak/navbar.tpl
diff -u phpgwapi/templates/verdilak/navbar.tpl:1.14 
phpgwapi/templates/verdilak/navbar.tpl:1.15
--- phpgwapi/templates/verdilak/navbar.tpl:1.14 Thu Dec 30 07:22:21 2004
+++ phpgwapi/templates/verdilak/navbar.tpl      Mon May  9 08:20:27 2005
@@ -1,12 +1,11 @@
-
 <!-- BEGIN navbar -->

 <table border="0" cellspacing="0" cellpadding="0" width="100%" 
bgcolor="{table_bg_color}">
-<tr background="{img_root}/bg_filler.gif">
-<td background="{img_root}/bg_filler.gif" align="left" valign="bottom"><a 
href="http://www.phpgroupware.org"; target="_new"><img src="{img_root}/{logo}" 
border="0" alt="phpGroupWare"></a></td>
-<td background="{img_root}/bg_filler.gif" align="center" valign="bottom" 
width="100%"><!--<font color="{navbar_text}" 
size="-1">{user_info}</font>--></td>
-<td background="{img_root}/bg_filler.gif" align="right" valign="bottom" 
rowspan="2" nowrap><a href="{home_link}"><img src="{welcome_img}" border="0" 
alt="Welcome"></a>{preferences_icon}<a href="{logout_link}"><img 
src="{logout_img}" border="0" alt="Logout"></a><a href="{help_link}"><img 
src="{img_root}/help.gif" border="0" alt="Help"></a></td></tr>
-<tr background="{img_root}/bg_filler.gif">
+<tr background="{img_root}/bg_filler.png">
+<td background="{img_root}/bg_filler.png" align="left" valign="bottom"><a 
href="http://www.phpgroupware.org"; target="_new"><img src="{img_root}/{logo}" 
border="0" alt="phpGroupWare"></a></td>
+<td background="{img_root}/bg_filler.png" align="center" valign="bottom" 
width="100%"><!--<font color="{navbar_text}" 
size="-1">{user_info}</font>--></td>
+<td background="{img_root}/bg_filler.png" align="right" valign="bottom" 
rowspan="2" nowrap><a href="{home_link}"><img src="{welcome_img}" border="0" 
alt="Welcome"></a>{preferences_icon}<a href="{logout_link}"><img 
src="{logout_img}" border="0" alt="Logout"></a><a href="{help_link}"><img 
src="{img_root}/help.png" border="0" alt="Help"></a></td></tr>
+<tr background="{img_root}/bg_filler.png">
 <td align="center" width="100%" valign="bottom" colspan="2"><img 
src="{img_root}/greybar.jpg" height="6"  width="100%" alt="bar"></td></tr>
 </table>


====================================================
Index: phpgwapi/templates/verdilak/head.inc.php
diff -u phpgwapi/templates/verdilak/head.inc.php:1.15 
phpgwapi/templates/verdilak/head.inc.php:1.16
--- phpgwapi/templates/verdilak/head.inc.php:1.15       Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/verdilak/head.inc.php    Mon May  9 08:20:27 2005
@@ -12,6 +12,18 @@
                        . $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' 
. $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
                        . $GLOBALS['phpgw_info']['theme']['vlink'] . '"';

+       // css file handling
+       $css_file = PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/verdilak/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+       if (file_exists($css_file))
+       {
+               $css_ref = $GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/phpgwapi/templates/verdilak/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+       }
+       else
+       {
+               $css_ref = $GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/phpgwapi/templates/verdilak/css/styles.css';
+       }
+
+
        $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
        $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? 
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';

@@ -23,6 +35,7 @@
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
                'charset'       => lang('charset'),
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
+               'theme_css'     => $css_ref,
                'body_tags'     => $bodyheader . 
$GLOBALS['phpgw']->common->get_body_attribs(),
                'css'           => $GLOBALS['phpgw']->common->get_css(),
                'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),

====================================================
Index: phpgwapi/templates/verdilak/footer.tpl
diff -u phpgwapi/templates/verdilak/footer.tpl:1.7 
phpgwapi/templates/verdilak/footer.tpl:1.8
--- phpgwapi/templates/verdilak/footer.tpl:1.7  Thu Dec 30 07:22:21 2004
+++ phpgwapi/templates/verdilak/footer.tpl      Mon May  9 08:20:27 2005
@@ -4,15 +4,15 @@
     </table>

    </td>
-   <td background="{img_root}/endbar.gif">&nbsp;</td>
+   <td background="{img_root}/endbar.png">&nbsp;</td>
   </tr>
 </table>

-<table border="0" cellspacing="0" cellpadding="0" width="100%" 
bgcolor="{table_bg_color}">
+<table border="0" cellspacing="0" cellpadding="0" width="100%" 
class="{table_bg_color}">
  <tr>
-  <td background="{img_root}/bg_filler.gif"><font 
color=white>{user_info}</font>&nbsp;</td>
-  <td background="{img_root}/bg_filler.gif" align="center">{current_users}</td>
-  <td background="{img_root}/bg_filler.gif" align="right"><font 
color=white>{powered_by}</font></td>
+  <td background="{img_root}/bg_filler.png"><font 
color=white>{user_info}</font>&nbsp;</td>
+  <td background="{img_root}/bg_filler.png" align="center">{current_users}</td>
+  <td background="{img_root}/bg_filler.png" align="right"><font 
color=white>{powered_by}</font></td>
  </tr>
 </table>
 <!-- END footer -->

====================================================
Index: phpgwapi/templates/verdilak/navbar.inc.php
diff -u phpgwapi/templates/verdilak/navbar.inc.php:1.31 
phpgwapi/templates/verdilak/navbar.inc.php:1.32
--- phpgwapi/templates/verdilak/navbar.inc.php:1.31     Thu Apr 28 08:11:59 2005
+++ phpgwapi/templates/verdilak/navbar.inc.php  Mon May  9 08:20:27 2005
@@ -17,6 +17,34 @@
        */
        function parse_navbar($force = False)
        {
+
+               $GLOBALS['phpgw_info']['theme']['bg_color']    = '#FFFFFF';
+               $GLOBALS['phpgw_info']['theme']['bg_text']     = '#000000';
+               $GLOBALS['phpgw_info']['theme']['vlink']       = 'blue';
+               $GLOBALS['phpgw_info']['theme']['alink']       = 'red';
+               $GLOBALS['phpgw_info']['theme']['link']        = 'blue';
+               $GLOBALS['phpgw_info']['theme']['row_on']      = '#CCEEFF';
+               $GLOBALS['phpgw_info']['theme']['row_off']     = '#DDF0FF';
+               $GLOBALS['phpgw_info']['theme']['row_text']    = '#000000';
+               $GLOBALS['phpgw_info']['theme']['th_bg']       = '#80BBFF';
+               $GLOBALS['phpgw_info']['theme']['th_text']     = '#000000';
+               $GLOBALS['phpgw_info']['theme']['navbar_bg']   = '#80CCFF';
+               $GLOBALS['phpgw_info']['theme']['navbar_text'] = '#FFFFFF';
+               $GLOBALS['phpgw_info']['theme']['table_bg']    = '#7090FF';
+               $GLOBALS['phpgw_info']['theme']['table_text']  = '#000000';
+               $GLOBALS['phpgw_info']['theme']['font']        = 'Arial, 
Helvetica, san-serif';
+               $GLOBALS['phpgw_info']['theme']['bg01']        = '#dadada';
+               $GLOBALS['phpgw_info']['theme']['bg02']        = '#dad0d0';
+               $GLOBALS['phpgw_info']['theme']['bg03']        = '#dacaca';
+               $GLOBALS['phpgw_info']['theme']['bg04']        = '#dac0c0';
+               $GLOBALS['phpgw_info']['theme']['bg05']        = '#dababa';
+               $GLOBALS['phpgw_info']['theme']['bg06']        = '#dab0b0';
+               $GLOBALS['phpgw_info']['theme']['bg07']        = '#daaaaa';
+               $GLOBALS['phpgw_info']['theme']['bg08']        = '#da9090';
+               $GLOBALS['phpgw_info']['theme']['bg09']        = '#da8a8a';
+               $GLOBALS['phpgw_info']['theme']['bg10']        = '#da7a7a';
+
+
                $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);

                $tpl->set_file(
@@ -63,7 +91,7 @@
                }
                else
                {
-                       $var['logo'] = 'logo.gif';
+                       $var['logo'] = 'logo.png';
                }

                $var['home_link'] = 
$GLOBALS['phpgw_info']['navbar']['home']['url'];
@@ -111,7 +139,7 @@
                {
                        $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').'">';
+                      . 
$GLOBALS['phpgw']->common->image('preferences','navbar.png').'">';
                }
                else if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < 
time() - (86400*30))
                {