[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates base/config.tpl base/css/bas...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/templates base/config.tpl base/css/bas... |
|
Date: |
Sun, 15 Oct 2006 11:09:46 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/10/15 11:09:45
Modified files:
templates/base : config.tpl
templates/base/css: base.css
templates/desktop: footer.tpl head.inc.php head.tpl
navbar.inc.php navbar.tpl
templates/desktop/css: desktop.css
templates/desktop/images: cal.png first.png home.png last.png
left.png logout.png right.png
title-bg.png
templates/probusiness: head.inc.php
Log message:
make index nicer
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/base/config.tpl?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/base/css/base.css?cvsroot=phpgwapi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/footer.tpl?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/head.inc.php?cvsroot=phpgwapi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/head.tpl?cvsroot=phpgwapi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/navbar.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/navbar.tpl?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/css/desktop.css?cvsroot=phpgwapi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/cal.png?cvsroot=phpgwapi&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/first.png?cvsroot=phpgwapi&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/home.png?cvsroot=phpgwapi&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/last.png?cvsroot=phpgwapi&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/left.png?cvsroot=phpgwapi&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/logout.png?cvsroot=phpgwapi&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/right.png?cvsroot=phpgwapi&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/images/title-bg.png?cvsroot=phpgwapi&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/probusiness/head.inc.php?cvsroot=phpgwapi&r1=1.5&r2=1.6
Patches:
Index: base/config.tpl
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/base/config.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- base/config.tpl 30 Dec 2004 06:47:34 -0000 1.2
+++ base/config.tpl 15 Oct 2006 11:09:45 -0000 1.3
@@ -1,9 +1,12 @@
<!-- BEGIN header -->
<form method="POST" action="{action_url}">
-<table border="0" align="center" width="85%">
- <tr bgcolor="{th_bg}">
- <td colspan="2"><font color="{th_text}"> <b>{title}</b></font></td>
+<table>
+ <thead>
+ <tr>
+ <th colspan="2">{title}</th>
</tr>
+ </thead>
+ <tbody>
<!-- END header -->
<!-- BEGIN body -->
<tr bgcolor="{th_bg}">
@@ -88,17 +91,11 @@
<!-- END body -->
<!-- BEGIN footer -->
- <tr bgcolor="{th_bg}">
- <td colspan="2">
-
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input type="submit" name="submit" value="Submit">
- <input type="submit" name="cancel" value="Cancel">
- </td>
- </tr>
+ </tbody>
</table>
+<div class="button_group">
+ <input type="submit" name="cancel" value="{lang_cancel}">
+ <input type="submit" name="submit" value="{lang_save}">
+</div>
</form>
<!-- END footer -->
Index: base/css/base.css
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/base/css/base.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- base/css/base.css 3 Oct 2006 14:05:03 -0000 1.2
+++ base/css/base.css 15 Oct 2006 11:09:45 -0000 1.3
@@ -21,13 +21,14 @@
label, input[type=text], input[type=password], input[type=checkbox],
input[type=radio], select, textarea
{
- display: block;
- float: left;
margin-bottom: 8px;
}
-input[type=text], input[type=password], select
+label, input[type=text], input[type=password], select, textarea
{
+ display: block;
+ float: left;
+ margin-bottom: 8px;
width: 250px;
}
@@ -39,6 +40,11 @@
font-weight: bold;
}
+textarea
+{
+ white-space: normal;
+}
+
br
{
clear: left;
Index: desktop/footer.tpl
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/footer.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- desktop/footer.tpl 15 May 2005 02:10:56 -0000 1.4
+++ desktop/footer.tpl 15 Oct 2006 11:09:45 -0000 1.5
@@ -1,12 +1,15 @@
<!-- BEGIN footer -->
</div>
</div>
+ </div>
<div id="footer">
+ <!--
<ul>
<li class="first">{powered_by}</li>
<li> </li>
<li class="last">{current_users}</li>
</ul>
+ -->
</div>
<!-- END footer -->
</body>
Index: desktop/head.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/head.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- desktop/head.inc.php 24 Apr 2006 09:49:25 -0000 1.7
+++ desktop/head.inc.php 15 Oct 2006 11:09:45 -0000 1.8
@@ -9,35 +9,81 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: head.inc.php,v 1.7 2006/04/24 09:49:25 sigurdne Exp $ */
+ /* $Id: head.inc.php,v 1.8 2006/10/15 11:09:45 skwashd Exp $ */
- $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+ $tpl =& $GLOBALS['phpgw']->template; //
CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+ $tpl->set_root(PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
$tpl->set_file(array('head' => 'head.tpl'));
+ $tpl->set_block('head', 'theme_stylesheet', 'theme_stylesheets');
- $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
- $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
+ $app =& $GLOBALS['phpgw_info']['flags']['currentapp'];
+ $title = "{$GLOBALS['phpgw_info']['server']['site_title']} [" .
lang($GLOBALS['phpgw_info']['flags']['currentapp']);
+
+ if ( isset($GLOBALS['phpgw_info']['flags']['app_header']) )
+ {
+ $title .= " - {$GLOBALS['phpgw_info']['flags']['app_header']}";
+ }
+ $title .= ']';
+
+ $theme_styles = array();
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/desktop/css/base.css";
if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/desktop/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
{
- $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url']
.
'/phpgwapi/templates/desktop/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/desktop/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
else
{
- $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url']
. '/phpgwapi/templates/desktop/css/desktop.css';
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/desktop/css/dekstop.css";
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 'desktop';
+ }
+
+ if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/base/css/base.css"))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/base/css/base.css";
+ }
+
+ if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/desktop/css/base.css"))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/desktop/css/base.css";
+ }
+
+ if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/desktop/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css"))
+ {
+ $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/desktop/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+ }
+
+ foreach ( $theme_styles as $style )
+ {
+ $tpl->set_var('theme_style', $style);
+ $tpl->parse('theme_stylesheets', 'theme_stylesheet', true);
}
if( !is_object($GLOBALS['phpgw']->js) )
{
$GLOBALS['phpgw']->js = createObject('phpgwapi.javascript');
}
- $GLOBALS['phpgw']->js->set_onload('initPage();');
if ( ! (isset($GLOBALS['phpgw_info']['theme']) &&
is_array($GLOBALS['phpgw_info']['theme']) &&
count($GLOBALS['phpgw_info']['theme']) ) )
{
$GLOBALS['phpgw_info']['theme'] = array('font' => '');
}
+<<<<<<< head.inc.php
+ $tpl->set_var(array
+ (
+ 'img_icon' => PHPGW_IMAGES_DIR .
'/favicon.ico',
+ 'img_shortcut' => PHPGW_IMAGES_DIR .
'/favicon.ico',
+ 'font_family' =>
$GLOBALS['phpgw_info']['theme']['font'],
+ 'css' =>
$GLOBALS['phpgw']->common->get_css(),
+ 'java_script' =>
$GLOBALS['phpgw']->common->get_java_script(),
+ 'str_base_url' => $GLOBALS['phpgw']->link('/'),
+ 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'website_title' => $title,
+ 'win_on_events' =>
$GLOBALS['phpgw']->common->get_on_events()
+ ));
+=======
$var = Array (
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
@@ -49,6 +95,7 @@
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
);
$tpl->set_var($var);
+>>>>>>> 1.7
$tpl->pfp('out','head');
unset($tpl);
?>
Index: desktop/head.tpl
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/head.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- desktop/head.tpl 24 Apr 2006 09:49:25 -0000 1.5
+++ desktop/head.tpl 15 Oct 2006 11:09:45 -0000 1.6
@@ -8,88 +8,31 @@
<meta name="description" content="phpGroupWare" />
<meta name="keywords" content="phpGroupWare" />
<meta name="robots" content="none" />
+ <!--[if lt IE 7]>
+ <style type="text/css">
+ /* IE7 is meant to support :hover so we won't
need this! */
+ body
+ {
+
behavior:url('{webserver_url}/phpgwapi/templates/desktop/behaviours/csshover.htc');
+ }
+ </style>
+ <![endif]-->
<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" />
+ <!-- BEGIN theme_stylesheet -->
+ <link href="{theme_style}" type="text/css" rel="StyleSheet" />
+ <!-- END theme_stylesheet -->
<title>{website_title}</title>
{java_script}
- <script>
+ <script type="text/javascript">
//<![CDATA[
- //Parts based public doman code from ALA -
http://www.alistapart.com/articles/dropdowns/
- function fixIE()
- {
- if( document.all && document.getElementById )
- {
- navRoot =
document.getElementById('navbar_ul');
- for( i=0; i <
navRoot.childNodes.length; i++ )
- {
- node = navRoot.childNodes[i];
- if( node.nodeName == 'LI' )
- {
-
node.onmouseover=function()
- {
- this.className
+= ' over';
- }
-
node.onmouseout=function()
- {
- this.className
= this.className.replace(' over', '');
- }
- if(
node.childNodes.length )
- {
- for( j=0; j <
node.childNodes.length; j++)
- {
- subNode
= node.childNodes[j];
- if(
subNode.nodeName == 'UL' )
- {
-
if( subNode.childNodes.length )
-
{
-
for( k = 0; k < subNode.childNodes.length; k++)
-
{
-
if( subNode.childNodes[k].nodeName == 'LI' )
-
{
-
subNode.childNodes[k].onmouseover=function()
-
{
-
this.className += ' over';
-
}
-
-
subNode.childNodes[k].onmouseout=function()
-
{
-
this.className = this.className.replace('
over', '');
-
}
+ var strBaseURL = '{str_base_url}';
-
}
-
}
-
}
- }
-
- }
- }
- }
- }
- }
- }
-
- function updateClock()
- {
- var oDate = new Date();
-
- strHr = oDate.getHours();
- strMin = ( oDate.getMinutes() < 10 ? "0" +
oDate.getMinutes() : oDate.getMinutes() );
-
- document.getElementById('clock').innerHTML =
strHr + ':' + strMin;
-
- setTimeout('updateClock()', 1000);
- }
-
- function initPage()
- {
- fixIE();
- updateClock();
- }
+ {win_on_events}
//]]>
</script>
</head>
-<body {body_tags}>
+<body>
<!-- END Head -->
Index: desktop/navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/navbar.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- desktop/navbar.inc.php 14 Feb 2006 10:01:05 -0000 1.6
+++ desktop/navbar.inc.php 15 Oct 2006 11:09:45 -0000 1.7
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: navbar.inc.php,v 1.6 2006/02/14 10:01:05 skwashd Exp $ */
+ /* $Id: navbar.inc.php,v 1.7 2006/10/15 11:09:45 skwashd Exp $ */
function parse_navbar($force = False)
{
@@ -109,8 +109,14 @@
$var['logout_url'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
$var['lang_about'] = lang('about');
$var['about_url'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
- $var['cur_app_title'] =
$GLOBALS['phpgw_info']['navbar'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title'];
+ $var['cur_app_title'] =
lang($GLOBALS['phpgw_info']['flags']['currentapp']);
+ if ( isset($GLOBALS['phpgw_info']['flags']['app_header']) )
+ {
+ $var['cur_app_title'] .= " -
{$GLOBALS['phpgw_info']['flags']['app_header']}";
+ }
+
$var['cur_app_icon'] =
$GLOBALS['phpgw_info']['navbar'][$GLOBALS['phpgw_info']['flags']['currentapp']]['icon'];
+ $var['cur_app_icon_alt'] = lang('%1 icon',
lang($GLOBALS['phpgw_info']['flags']['currentapp']));
if ( isset($GLOBALS['phpgw_info']['server']['showpoweredbyon'])
&& $GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top')
{
@@ -147,17 +153,6 @@
$var['messages'] = $api_messages . '<br />' .
checkcode($cd);
}
- if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
- {
- $var['current_app_header'] =
$GLOBALS['phpgw_info']['flags']['app_header'];
- $var['th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
- }
- else
- {
- $tpl->set_block('navbar','app_header','app_header');
- $var['app_header'] = '';
- }
-
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
Index: desktop/navbar.tpl
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/navbar.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- desktop/navbar.tpl 15 May 2005 02:10:56 -0000 1.4
+++ desktop/navbar.tpl 15 Oct 2006 11:09:45 -0000 1.5
@@ -24,14 +24,15 @@
</ul>
</div>
<div id="about"><a href="{about_url}">?</a></div>
- <div id="user">{user_info} <span
id="clock"></span></div>
+ <div id="user">{user_info}</div>
</div>
<div id="content">
- <div id="content_title">
- <img src="{cur_app_icon}" alt="{cur_app_title}
icon" height="16" width="16" /> {cur_app_title}</div>
- <!-- BEGIN app_header -->
- <strong>{current_app_header}</strong><hr />
- <!-- END app_header -->
- {messages}<br />
+ <div class="content_title">
+ <img class="app_icon" src="{cur_app_icon}"
alt="{cur_app_icon_alt}" />
+ <h1>{cur_app_title}</h1>
+ </div>
<div id="content_body">
+ <!-- FIXME move this somewhere where it is
actually useful! -->
+ <!--<p class="msg">{messages}</p>-->
+ <div>
<!-- END navbar -->
Index: desktop/css/desktop.css
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/css/desktop.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- desktop/css/desktop.css 15 May 2005 02:12:13 -0000 1.4
+++ desktop/css/desktop.css 15 Oct 2006 11:09:45 -0000 1.5
@@ -1,259 +1,609 @@
/**
* phpGroupWare desktop template
-* @author Dave Hall dave.hall at mbox.com.au
-* @internal parts based on idots css written by Pim Snel and myself
-* @TODO this still needs work - clean up and simplify
-* @copyright Copyright (C) 2004 Free Software Foundation http://www.fsf.org/
+* @author Dave Hall dave.hall at skwashd.com
+* @copyright Copyright (C) 2004-2006 Free Software Foundation
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
-* @version $Id: desktop.css,v 1.4 2005/05/15 02:12:13 skwashd Exp $
+* @version $Id: desktop.css,v 1.5 2006/10/15 11:09:45 skwashd Exp $
*/
- a, a:visited
- {
- color: #f93;
+a, a:visited
+{
+ color: #00f;
text-decoration: none;
- }
+}
- a:hover, a:hover
- {
- color: #f90;
+a:hover, a:hover
+{
+ color: #f00;
text-decoration: underline;
- }
+}
- body, div, p
- {
- font-family: Verdana, Arial, Helvetica,
sans-serif;
- font-size: 11px;
- }
+body, div, label, input, p, select, span, textarea
+{
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 14px;
+}
- body
- {
+body
+{
padding: 0px;
margin: 0px;
- }
+}
- img
- {
+img
+{
border: 0px;
- }
+}
- h1
- {
- }
-
- h2, h2 a, h2 a:hover, h2 a:active
- {
- background-color: #f93;
- color: #ddd;
- text-decoration: none;
- }
+h1
+{
+}
- #header
- {
- background-color: #eee;
+h2, h2 a, h2 a:hover, h2 a:active
+{
+ background-color: #628cb2;
+ color: #fff;
+}
+
+#header
+{
+ background-color: #efebe7;
border-bottom: 1px solid #000;
height: 23px;
left: 0px;
+ padding: 4px 0px 0px 1px;
position: fixed;
right: 0px;
top: 0px;
z-index: 20;
- }
+}
- #header ul
- {
+#header ul
+{
display: block;
float: left;
list-style: none;
margin: 0px;
+ position: absolute;
padding: 0px;
- }
+ z-index: 50;
+}
- #header ul a, #header ul a:hover, #header ul a:active,
#header ul a:visited
- {
+#header ul a
+{
+ display: block;
color: #000;
text-decoration: none;
- }
+}
+
+#header ul ul li:hover a
+{
+ color: #fff;
+}
- #header ul img
- {
+#header ul img
+{
vertical-align: middle;
- }
+}
- #header ul li
- {
+#header ul li
+{
display: block;
float: left;
- font-size: 120%;
+ font-size: 14px;
position: relative;
+ margin: 0px;
+ padding: 0px;
width: 150px;
- }
+}
- #header ul ul
- {
- border: 1px solid #ddd;
- background-color: #eee;
+#header ul ul
+{
+ border: 1px solid #000;
+ background-color: #efebe7;
display: none;
- left: 0;
- position: absolute;
- top: 18px;
- }
+ left: 0px;
+ margin: 0px;
+ position: relative;
+ top: 2px;
+}
- #header ul ul img
- {
- background-color: #ccc;
+#header ul ul img
+{
+ height: 24px;
padding: 2px;
- }
+ width: 24px;
+}
- #header ul li:hover ul, #header ul li.over ul
- {
+#header ul li:hover ul
+{
display: block;
- }
+}
- #header ul ul li
- {
- font-size: 100%;
+#header ul ul li
+{
+ height: 29px;
padding: 2px;
- width: 145px;
- }
-
- #header ul ul li:hover, #header ul ul li.over
- {
- background-color: #f93;
- color: #999;
- }
+ width: 200px;
+}
- #header ul ul li:hover img, #header ul ul li.over img
- {
- background-color: #fff;
- }
+#header ul ul li:hover, #header ul ul li.over
+{
+ background: transparent url('../images/hover-bg.png') repeat-x 0 0;
+ color: #fff;
+}
- #user
- {
+#user
+{
float: right;
font-size: smaller;
margin: 3px;
text-align: right;
width: 210px;
white-space: nowrap;
- }
+}
- #about
- {
+#about
+{
float: right;
text-align: right;
width: 10px;
- }
+}
- #content, #portal
- {
- border: 2px ridge #999;
- margin: 30px auto;
- width: 95%;
- }
-
- #content_title, #portal_title
- {
- background: #eee url('../images/title-bg.png')
repeat-x;
- border-bottom: 1px solid #000;
- height: 18px;
+#content
+{
+ background-color: #efebe7;
+ margin: 30px;
+ position: relative;
+}
+
+.content_title, #portal_title
+{
+ background: transparent url('../images/title-bg.png') repeat-x;
+ height: 24px;
padding: 1px;
- }
+}
+
+.content_title .app_icon
+{
+ background: transparent url('../images/title-tl.png') no-repeat 0 0;
+ display: block;
+ float: left;
+ height: 16px;
+ margin: -1px;
+ padding: 4px;
+ width: 16px;
+}
+
+.content_title h1
+{
+ background: transparent url('../images/title-tr.png') no-repeat top
right;
+ color: #fff;
+ font-size: 14px;
+ margin: -1px -1px 0px 25px;
+ padding: 3px 0px 0px 0px;
+ text-align: center;
+}
- #content_body, #portal_content
- {
- margin: 10px;
- }
+#content_body, #portal_content
+{
+ margin: 0px;
+ padding: 0px;
+ overflow: auto;
+}
- #portal_controls
- {
+#portal_controls
+{
float: right;
text-align: right;
width: 100px;
- }
+}
- #footer
- {
- background-color: #eee;
+#footer
+{
+ background-color: #efebe7;
border-top: 1px solid #000;
bottom: 0px;
height: 25px;
left: 0px;
margin: 0px;
padding: 0px;
- position: fixed;
+ position: absolute;
right: 0px;
- }
+}
- #footer ul
- {
+#footer ul
+{
list-style: none;
- }
+}
- #footer ul li
- {
+#footer ul li
+{
float: left;
text-align: center;
width: 33%;
- }
+}
- #footer ul li.first
- {
+#footer ul li.first
+{
text-align: left;
- }
+}
+
+#footer ul li.last
+{
+ text-align: right;
+}
+
+
+button img
+{
+ vertical-align: middle;
+}
+
+.btngrp
+{
+ clear: both;
+ text-align: right;
+}
+
+input, label, select, textarea, .mock_label, .mock_input
+{
+ display: block;
+ float: left;
+ width: 300px;
+}
+
+input, select, textarea
+{
+ border: 1px solid #9f9284;
+ margin: 1px 21px 11px 1px;
+}
+
+input:focus, select:focus, textarea:focus
+{
+ border: 2px solid #5b85ab;
+ margin: 0px 20px 10px 0px;
+}
+
+label, .mock_label
+{
+ margin-right: 6px;
+ text-align: right;
+ width: 150px;
+}
+
+.even label, .even .mock_label
+{
+ text-align: left;
+}
+
+input[disabled=disabled], select[disabled=disabled],
textarea[disabled=disabled]
+{
+ background-color: #efebe7;
+ color: #b5b3ac;
+}
+
+input[hidden=hidden], input.hidden, tr.hidden, .InputHidden
+{
+ display: none;
+}
+
+form br
+{
+ clear: left;
+}
+
+button
+{
+ height: 28px;
+}
+
+button.help
+{
+ float: left;
+}
+
+#modal_bg
+{
+ background-color: #999;
+ bottom: 0px;
+ display: none;
+ filter: alpha(opacity=50); /* IE crap */
+ left: 0px;
+ opacity: .5;
+ position: fixed;
+ right: 0px;
+ top: 0px;
+ z-index: 25;
+}
- #footer ul li.last
- {
+.btngrp
+{
text-align: right;
- }
+}
+.dialog
+{
+ background-color: #efebe7;
+ display: none;
+ height: 250px;
+ margin: auto;
+ position: fixed;
+ width: 450px;
+ z-index: 30;
+}
-/* Used by tabs */
-th.activetab
+.dialog .close
+{
+ position: absolute;
+ right: 3px;
+ top: 3px;
+}
+
+.dialog_content h1
+{
+ background-color: #628cb2;
+ color: #fff;
+ display: block;
+ margin: 0px 0px 10px 0px;
+ padding: 5px 3px;
+}
+
+.dialog_content p
+{
+ padding: 5px 10px;
+}
+
+.popup_buttons
+{
+ bottom: 10px;
+ position: absolute;
+ right: 10px;
+}
+
+/* Check boxes */
+input.cbStyled, input.check
+{
+ width: 15px;
+}
+
+.mock_checkbox, .mock_checkbox_checked, .Checkbox, .CheckboxChecked
+{
+ background-position: center center;
+ background-repeat: no-repeat;
+ display: block;
+ float: left;
+ height:16px;
+ vertical-align: middle;
+ width: 40px;
+}
+
+.mock_checkbox, .Checkbox
+{
+ background-image: url('../images/stock_form-checkbox_unchecked.png');
+}
+
+.mock_checkbox_checked, .CheckboxChecked
+{
+ background-image: url('../images/stock_form-checkbox.png');
+}
+
+/* Get our tables looking right */
+table
{
background-color: #fff;
- border-color: #000;
- border-radius-topleft: 10px;
- border-radius-topright: 10px;
- border-style: solid;
- border-width: 1px 1px 0px 1px;
- height: 20px;
- padding: 0px 5px 0px 5px;
- white-space: nowrap;
+ border: 1px solid #c0b5a9;
+ border-collapse: collapse;
+ margin: 5px;
+ padding: 0px;
}
-th.inactivetab
+thead
{
- background-color:#CCCCCC;
- border: 1px solid #000000;
- border-radius-topleft: 10px;
- border-radius-topright: 10px;
- color:#006699;
+ border-bottom: 1px solid #aa9c8f;
+ background-color: #efebe7;
+}
+
+thead td, thead th
+{
+ border-right: 1px solid #c0b5a9;
height: 20px;
- padding: 0px 5px 0px 5px;
+ margin-right: 3px;
+ overflow: hidden;
+ padding: 0px 5px;
+ text-align: center;
+}
+
+thead td.last
+{
+ border-right: 0px;
+ margin-right: 0px;
+}
+
+/* tabs */
+ul.tabs
+{
+ display: block;
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+}
+
+ul.tabs li
+{
+ background-color: transparent;
+ background-position: left top;
+ background-repeat: repeat-x;
+ display: block;
+ float: left;
+ height: 29px;
+ padding: 0px;
+ text-align: center;
white-space: nowrap;
+ width: 100px;
+}
+
+div.tabsholder
+{
+ background-color: #eae4df;
+ background-image: url('../images/tab-bg.png');
+ background-position: left top;
+ background-repeat: repeat-x;
+ height: 29px;
+}
+
+div.activetab
+{
+ display: block;
+ height: 400px;
+ overflow: auto;
+}
+
+div.inactivetab
+{
+ display: none;
+}
+
+ul.tabs li a, ul.tabs li a:hover, ul.tabs li a:active
+{
+ background-position: left top;
+ background-repeat: no-repeat;
+ color: #000;
+ display: block;
+ height: 29px;
+ padding-left: 5px;
+ text-decoration: none;
}
-th.tablast
+ul.tabs li a span
{
- width: 100%;
+ background-position: right top;
+ background-repeat: no-repeat;
+ display: block;
+ height: 29px;
+ padding-right: 5px;
+ padding-top: 5px;
+}
+
+li.activetab
+{
+ background-image: url('../images/tab-active-bg.png');
+}
+
+li.activetab a
+{
+ background-image: url('../images/tab-active-left.png');
+}
+
+li.activetab a span
+{
+ background-image: url('../images/tab-active-right.png');
+}
+
+li.inactivetab
+{
+ background-image: url('../images/tab-inactive-bg.png');
+}
+
+li.inactivetab a
+{
+ background-image: url('../images/tab-inactive-left.png');
+}
+
+li.inactivetab a span
+{
+ background-image: url('../images/tab-inactive-right.png');
}
/* nextmatch values */
.row_off
{
- background-color: #E8F0F0;
- color: #000000;
+ background-color: #eee;
+ color: #000;
}
.row_on
{
- background-color: #DDDDDD;
- color: #000000;
+ background-color: #fff;
+ color: #000;
}
-.th
+.highlight
{
- background-color: #D3DCE3;
- color: #000000;
+ background-color: #587ea0;
+ color: #fff;
+}
+
+/** Application buttons styling **/
+/** TODO Add some nice gradients here? **/
+.app_buttons
+{
+ background-color: transparent;
+ border-bottom: 1px solid #c0b5a9;
+ border-top: 1px solid #c0b5a9;
+ height: 50px;
+ list-style: none;
+ margin: 0px;
+ overflow: hidden;
+ padding: 0px;
+}
+
+.app_buttons li
+{
+ border: 2px solid transparent;
+ color: #000;
+ display: block;
+ float: left;
+ hide-focus: true;/* M$IE Only :( */
+ margin: 2px;
+ padding: 0px 10px;
+ text-align: center;
+ -moz-user-select: none;
+}
+
+.app_buttons li a, .app_buttons li a:hover, .app_buttons li a:active
+{
+
+ color: #000;
+ text-decoration: none;
+}
+
+.app_buttons li:hover
+{
+ border: 2px outset #c0b5a9;
+ background-color: #eee;
+}
+
+.app_buttons li:active
+{
+ border: 2px inset #ccc;
+ background-color: #ccc;
+}
+
+.app_buttons li.inactive
+{
+ background-color: #ddd;
+ color: #999;
+}
+
+.app_buttons li.inactive:hover
+{
+ border: 2px solid transparent;
+}
+
+.app_buttons li.inactive img
+{
+ /* CSS 3 */
+ opacity: 0.7;
+
+ /* Non standard */
+ -moz-opacity: 0.7;
+ filter:alpha(opacity=70);
+}
+
+.app_buttons img
+{
+ border: 0px;
+ height: 24px;
+ width: 24px;
}
Index: desktop/images/cal.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/cal.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvs70yc3w and /tmp/cvsMrQmBQ differ
Index: desktop/images/first.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/first.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsYJOmjA and /tmp/cvseT4PTT differ
Index: desktop/images/home.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/home.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvshNOIQy and /tmp/cvskJ0qtS differ
Index: desktop/images/last.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/last.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsqz7rvz and /tmp/cvswSLI9S differ
Index: desktop/images/left.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/left.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsDDrNsC and /tmp/cvs6p8B8V differ
Index: desktop/images/logout.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/logout.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsEPLp0A and /tmp/cvsehZtIU differ
Index: desktop/images/right.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/right.png,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsbmKeKB and /tmp/cvsWgywuV differ
Index: desktop/images/title-bg.png
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/images/title-bg.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvs6eK1XE and /tmp/cvsIoRAKY differ
Index: probusiness/head.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/probusiness/head.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- probusiness/head.inc.php 24 Apr 2006 09:49:25 -0000 1.5
+++ probusiness/head.inc.php 15 Oct 2006 11:09:45 -0000 1.6
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/gpl.html GNU General Public License
* @package phpgwapi
* @subpackage gui
- * @version $Id: head.inc.php,v 1.5 2006/04/24 09:49:25 sigurdne Exp $
+ * @version $Id: head.inc.php,v 1.6 2006/10/15 11:09:45 skwashd Exp $
*/
$app_css = $java_script = '';
@@ -32,7 +32,8 @@
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ?
$GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
- $var = Array (
+ $var = array
+ (
'img_icon' => PHPGW_IMAGES_DIR .
'/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR .
'/favicon.ico',
'font_family' =>
$GLOBALS['phpgw_info']['theme']['font'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates base/config.tpl base/css/bas...,
Dave Hall <=