[Phpgroupware-cvs] [18558] streamline and fix little layout issues

[Dave Hall]

Revision: 18558
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18558
Author:   skwashd
Date:     2008-06-01 01:08:37 +0000 (Sun, 01 Jun 2008)

Log Message:
-----------
streamline and fix little layout issues

Modified Paths:
--------------
    trunk/phpgwapi/templates/idots/css/base.css
    trunk/phpgwapi/templates/idots/css/idots.css
    trunk/phpgwapi/templates/idots/head.inc.php

Modified: trunk/phpgwapi/templates/idots/css/base.css
===================================================================
--- trunk/phpgwapi/templates/idots/css/base.css 2008-06-01 01:07:55 UTC (rev 
18557)
+++ trunk/phpgwapi/templates/idots/css/base.css 2008-06-01 01:08:37 UTC (rev 
18558)
@@ -1,7 +1,7 @@
 body, div, input, p, select, textarea
 {
        color: #069;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Liberation Sans", Verdana, sans-serif;
        font-size: 11px;
 }
 

Modified: trunk/phpgwapi/templates/idots/css/idots.css
===================================================================
--- trunk/phpgwapi/templates/idots/css/idots.css        2008-06-01 01:07:55 UTC 
(rev 18557)
+++ trunk/phpgwapi/templates/idots/css/idots.css        2008-06-01 01:08:37 UTC 
(rev 18558)
@@ -11,7 +11,7 @@
        background-color: #efefef;
        color: #069;
        font-size: 12px;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Liberation Sans", Verdana, sans-serif;
        min-height: 600px;
        padding: 10px; 
 }
@@ -22,7 +22,7 @@
        background-repeat: repeat-x; 
        color: #000;
        height: 21px;
-       font-family: Verdana, Arial, Helvetica, sans-serif; 
+       font-family: "Liberation Sans", Verdana, sans-serif; 
        font-weight: bold; 
        font-size: 12px; 
        margin: 0px;
@@ -74,7 +74,7 @@
 {
        background-color: #fff;
        color: #069; 
-       font-family: Arial, Helvetica, sans-serif;
+       font-family: sans-serif;
        font-size: 12px;
        height: 20px;
        margin: 5px;
@@ -172,7 +172,7 @@
        background-image: url(../images/boxbg.png);
        background-repeat: repeat-x;
        color: #000;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Liberation Sans", Verdana, sans-serif;
        font-weight: bold;
        font-size: 12px;                                                
 }
@@ -194,7 +194,7 @@
 ul.sideboxcontent
 {
        background-color: #efefef;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Liberation Sans", Verdana, sans-serif;
        font-size: 12px;
        margin: 0px;
        padding: 5px;
@@ -212,7 +212,7 @@
        background-image: url(../images/boxbg.png);
        background-position: center 50%;
        color: #000;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Liberation Sans", Verdana, sans-serif;
        font-size: 12px; 
        font-weight: bold;
        height: 24px;
@@ -276,7 +276,7 @@
 
 body, div, form, input, li, p, select, td, textarea  
 {
-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Liberation Sans", Verdana, sans-serif;
        font-size: 12px;
 }
 

Modified: trunk/phpgwapi/templates/idots/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/idots/head.inc.php 2008-06-01 01:07:55 UTC (rev 
18557)
+++ trunk/phpgwapi/templates/idots/head.inc.php 2008-06-01 01:08:37 UTC (rev 
18558)
@@ -1,10 +1,11 @@
 <?php
        /**
-       * Template header
-       * @copyright Copyright (C) 2003-2007 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * phpGroupWare - idots template - header
+       *
+       * @copyright Copyright (C) 2003-2008 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-       * @package phpgwapi
-       * @subpackage gui
+       * @package phpgroupware
+       * @subpackage phpgwapi
        * @version $Id: head.inc.php,v 1.4 2004/12/30 06:47:34 skwashd Exp 
        */
        
@@ -30,8 +31,9 @@
        $theme_styles = array
        (
                '/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css',
-               '/phpgwapi/js/yahoo/build/menu/assets/skins/sam/menu.css',
-               '/phpgwapi/js/yahoo/build/tabview/assets/skins/sam/tabview.css',
+               '/phpgwapi/js/yahoo/menu/assets/skins/sam/menu.css',
+               '/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css',
+               '/phpgwapi/templates/base/css/base.css',
                '/phpgwapi/templates/idots/css/base.css',
                
"/phpgwapi/templates/idots/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css",
                "/{$app}/templates/base/css/base.css",
@@ -43,11 +45,11 @@
        {
 
                if( file_exists( PHPGW_SERVER_ROOT . $style ) )
-       {
-                       $GLOBALS['phpgw']->template->set_var('theme_style', 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}$style");
-               $GLOBALS['phpgw']->template->parse('theme_stylesheets', 
'theme_stylesheet', true);
+               {
+                               
$GLOBALS['phpgw']->template->set_var('theme_style', 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}$style");
+                       $GLOBALS['phpgw']->template->parse('theme_stylesheets', 
'theme_stylesheet', true);
+               }
        }
-       }
        
        $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? 
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
 
@@ -63,4 +65,3 @@
        ));
 
        $GLOBALS['phpgw']->template->pfp('out','head');
-?>