[Phpgroupware-cvs] phpgwapi/templates/idots head.inc.php head.tpl ...

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/04/12 10:41:13

Modified files:
        templates/idots: head.inc.php head.tpl navbar.tpl 
        templates/idots/css: idots.css 

Log message:
        more tweaks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.inc.php.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/head.tpl.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/navbar.tpl.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/css/idots.css.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: phpgwapi/templates/idots/css/idots.css
diff -u phpgwapi/templates/idots/css/idots.css:1.9 
phpgwapi/templates/idots/css/idots.css:1.10
--- phpgwapi/templates/idots/css/idots.css:1.9  Sun Apr  9 01:24:34 2006
+++ phpgwapi/templates/idots/css/idots.css      Wed Apr 12 10:41:13 2006
@@ -3,7 +3,7 @@
    Originally written by Pim Snel
    Currently Maintained by Dave Hall
 
-   $Id: idots.css,v 1.9 2006/04/09 01:24:34 skwashd Exp $
+   $Id: idots.css,v 1.10 2006/04/12 10:41:13 skwashd Exp $
 */
 
 #articlecontent 
@@ -30,11 +30,11 @@
        text-align: center;
 }
 
-.box 
+#box 
 {
        background-color: #fff;
        border: 1px solid #98aab1;
-       height: 90%;
+       min-height: 90%;
        margin: 0px;
        padding: 0px;
        vertical-align: top;
@@ -357,25 +357,25 @@
 {
 /*     border-width: 0px 0px 1px 0px;
        border-style: solid;
-       border-color: #000000;*/
+       border-color: #000;*/
        width: 100%;
 }
 
 /* nextmatch values */
 .row_off
 {
-       background-color: #E8F0F0;
-       color: #000000;
+       background-color: #e8f0f0;
+       color: #000;
 }
 
 .row_on
 {
-       background-color: #DDDDDD;
-       color: #000000;
+       background-color: #ddd;
+       color: #000;
 }
 
-.th
+.th, thead tr
 {
-       background-color: #D3DCE3;
-       color: #000000;
+       background-color: #d3dce3;
+       color: #000;
 }
Index: phpgwapi/templates/idots/head.inc.php
diff -u phpgwapi/templates/idots/head.inc.php:1.7 
phpgwapi/templates/idots/head.inc.php:1.8
--- phpgwapi/templates/idots/head.inc.php:1.7   Sat Apr  8 13:30:14 2006
+++ phpgwapi/templates/idots/head.inc.php       Wed Apr 12 10:41:12 2006
@@ -7,11 +7,12 @@
        * @subpackage gui
        * @version $Id: head.inc.php,v 1.4 2004/12/30 06:47:34 skwashd Exp 
        */
-       $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
-       $tpl->set_unknowns('remove');
-       $tpl->set_file(array('head' => 'head.tpl'));
-       $tpl->set_block('head', 'theme_stylesheet', 'theme_stylesheets');
+       $GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
+       $GLOBALS['phpgw']->template->set_unknowns('remove');
+       $GLOBALS['phpgw']->template->set_file('head', 'head.tpl');
+       $GLOBALS['phpgw']->template->set_block('head', 'theme_stylesheet', 
'theme_stylesheets');
 
+       $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
        if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/idots/css/' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
        {
                $theme_styles[] = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/idots/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
@@ -39,14 +40,13 @@
 
        foreach ( $theme_styles as $style )
        {
-               $tpl->set_var('theme_style', $style);
-               $tpl->parse('theme_stylesheets', 'theme_stylesheet', true);
+               $GLOBALS['phpgw']->template->set_var('theme_style', $style);
+               $GLOBALS['phpgw']->template->parse('theme_stylesheets', 
'theme_stylesheet', true);
        }
 
-       $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
        $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? 
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
 
-       $var = array
+       $GLOBALS['phpgw']->template->set_var(array
        (
                'css'                   => $GLOBALS['phpgw']->common->get_css(),
                'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),
@@ -56,8 +56,6 @@
                'str_base_url'  => $GLOBALS['phpgw']->link('/'),                
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'].$app,
                'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
-       );
-       $tpl->set_var($var);
-       $tpl->pfp('out','head');
-       unset($tpl);
+       ));
+       $GLOBALS['phpgw']->template->pfp('out','head');
 ?>
Index: phpgwapi/templates/idots/head.tpl
diff -u phpgwapi/templates/idots/head.tpl:1.6 
phpgwapi/templates/idots/head.tpl:1.7
--- phpgwapi/templates/idots/head.tpl:1.6       Sat Apr  8 13:30:14 2006
+++ phpgwapi/templates/idots/head.tpl   Wed Apr 12 10:41:12 2006
@@ -20,8 +20,8 @@
 
                        var strBaseURL = '{str_base_url}';
 
-                       {win_on_events}
                        //]]>
+                       {win_on_events}
                </script>
        </head>
        <body>
Index: phpgwapi/templates/idots/navbar.tpl
diff -u phpgwapi/templates/idots/navbar.tpl:1.9 
phpgwapi/templates/idots/navbar.tpl:1.10
--- phpgwapi/templates/idots/navbar.tpl:1.9     Mon Apr 10 02:17:16 2006
+++ phpgwapi/templates/idots/navbar.tpl Wed Apr 12 10:41:12 2006
@@ -1,5 +1,5 @@
 <!-- BEGIN navbar_header -->
-<div class="box">
+<div id="box">
        <div id="navpanel">
                <ul id="nav">
                        <li class="phpgw_logo">