Index: footer.tpl =================================================================== RCS file: footer.tpl diff -N footer.tpl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ footer.tpl 25 Nov 2003 08:26:53 -0000 @@ -0,0 +1,16 @@ +<!-- BEGIN footer --> + </td> + </tr> +</table> +<table class="footer"> + <tr> + <td align="center"> + <span id="powered_by">{powered_by}</span> - <span id="user_info">&nbsp;{user_info}</span> + +<!-- not yet supported <div id="current_users">{current_users}</div> --> + + </td> + </tr> +</table> +<!-- END footer --> + Index: head.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/Attic/head.inc.php,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 head.inc.php --- head.inc.php 23 Oct 2003 14:11:40 -0000 1.1.2.2 +++ head.inc.php 25 Nov 2003 08:26:53 -0000 @@ -1,17 +1,14 @@ <?php - /**************************************************************************\ - * phpGroupWare * - * http://www.phpgroupware.org * - * Copyright (C) 2003 probusiness AG * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id: head.inc.php,v 1.1.2.2 2003/10/23 14:11:40 cw Exp $ */ - +/** + * probusiness template set + * @author Philipp Kamps <pkamps@probusiness.de>, Daniel Briegert <dbriegert@probusiness.de> + * @copyright Copyright (C) 2003 Free Software Foundation http://www.fsf.org/ + * @license http://www.fsf.org/licenses/gpl.html GNU General Public License + * @package template + * @subpackage probusiness + * @version $Id: head.inc.php,v 1.1.4.9 2003/11/25 07:56:02 dbriegert Exp $ + */ + $app_css = $java_script = ''; if(@isset($_GET['menuaction'])) { @@ -26,13 +23,17 @@ $java_script .= $GLOBALS['phpgw_info']['flags']['java_script']; } - if (file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/probusiness/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css')) + /* + * css file handling + */ + $css_file = PHPGW_SERVER_ROOT . '/phpgwapi/templates/probusiness/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css'; + if (file_exists($css_file)) { - $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/probusiness/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css'; + $css_ref = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/probusiness/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css'; } else { - $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/probusiness/css/styles.css'; + $css_ref = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/probusiness/css/styles.css'; } $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); @@ -50,7 +51,7 @@ 'charset' => lang('charset'), 'font_family' => $GLOBALS['phpgw_info']['theme']['font'], 'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app, - 'theme_css' => $theme_css, + 'theme_css' => $css_ref, 'css' => $GLOBALS['phpgw']->common->get_css(), 'java_script' => $java_script, 'api_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/probusiness/' Index: head.tpl =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/Attic/head.tpl,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 head.tpl --- head.tpl 23 Oct 2003 02:08:39 -0000 1.1.2.1 +++ head.tpl 25 Nov 2003 08:26:53 -0000 @@ -1,19 +1,23 @@ <!-- BEGIN head --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML> -<HEAD> -<META http-equiv="Content-Type" content="text/html; charset={charset}"> -<META name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org"> -<META NAME="description" CONTENT="phpGroupWare"> -<META NAME="keywords" CONTENT="phpGroupWare"> -<meta name="robots" content="none"> -<LINK REL="ICON" href="{img_icon}" type="image/x-ico"> -<LINK REL="SHORTCUT ICON" href="{img_shortcut}"> -<script src="{closePopup}" type="text/javascript"></script> -<script src="{api_root}js/tabs.js" type="text/javascript"></script> -<LINK href="{theme_css}" type="text/css" rel="StyleSheet"> -<TITLE>{website_title}</TITLE> -{java_script} -</HEAD> -<BODY> +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html lang="en" xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset={charset}" /> + <meta name="AUTHOR" content="phpGroupWare http://www.phpgroupware.org" /> + <meta name="description" content="phpGroupWare" /> + <meta name="keywords" content="phpGroupWare" /> + <meta name="robots" content="none" /> + <link rel="ICON" href="{img_icon}" type="image/x-ico" /> + <link rel="SHORTCUT ICON" href="{img_shortcut}" /> + + <script src="{api_root}js/tabs.js" language="JavaScript1.1" type="text/javascript"></script> + + <link href="{theme_css}" type="text/css" rel="StyleSheet" /> + + <title>{website_title}</title> + {java_script} + </head> + <body> <!-- END Head --> + Index: navbar.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/Attic/navbar.inc.php,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 navbar.inc.php --- navbar.inc.php 28 Oct 2003 23:04:05 -0000 1.1.2.3 +++ navbar.inc.php 25 Nov 2003 08:26:53 -0000 @@ -1,196 +1,213 @@ <?php - /**************************************************************************\ - * phpGroupWare * - * http://www.phpgroupware.org * - * Copyright (C) 2003 probusiness AG * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id: navbar.inc.php,v 1.1.2.3 2003/10/28 23:04:05 cw Exp $ */ - - function parse_navbar($force = False) - { - if( !$_REQUEST['popup'] ) - { - $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); - $tpl->set_unknowns('remove'); - - $tpl->set_file(array( 'navbar' => 'navbar.tpl', - 'navbar_app' => 'navbar_app.tpl', - 'navbar_app_table' => 'navbar_app_tablecontent.tpl' - )); - - $var['api_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/probusiness/'; - - if($_GET['mode'] == "folders" ) - { - $GLOBALS['HTTP_SESSION_VARS']['navbar']['mode'] = "folders"; - } - - if($_GET['mode'] == "applications" ) - { - $GLOBALS['HTTP_SESSION_VARS']['navbar']['mode'] = "applications"; - } - - if ($GLOBALS['phpgw_info']['user']['apps']['folders']['enabled'] == true) - { - $mtree = createobject('folders.menutree', ''); - $var['switchlink'] = $mtree->get_switchlink($GLOBALS['HTTP_SESSION_VARS']['navbar']['mode']); - } - - if ( $GLOBALS['HTTP_SESSION_VARS']['navbar']['mode'] == "folders") - { - if ($GLOBALS['phpgw_info']['user']['apps']['folders']['enabled'] == true) +/** + * probusiness template set + * @author Philipp Kamps <pkamps@probusiness.de>, Daniel Briegert <dbriegert@probusiness.de> + * @copyright Copyright (C) 2003 Free Software Foundation http://www.fsf.org/ + * @license http://www.fsf.org/licenses/gpl.html GNU General Public License + * @package template + * @subpackage probusiness + * @version $Id: navbar.inc.php,v 1.1.4.22 2003/11/25 07:56:02 dbriegert Exp $ + */ + + + /** + * Parse navigation bar + * + * @var boolean $force + */ + function parse_navbar($force = false) { - $var['navbarview'] = $mtree->get_iframe(); + $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); + $tpl->set_unknowns('remove'); + + $tpl->set_file(array( 'navbar' => 'navbar.tpl', + 'navbar_app' => 'navbar_app.tpl', + 'navbar_app_table' => 'navbar_app_tablecontent.tpl' + )); + + $var['api_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/probusiness/'; + + /* + * folder handling + */ + if ( $GLOBALS['phpgw_info']['user']['apps']['folders']['enabled'] == true ) + { + $mtree = createobject('folders.uifolders', ''); + $var['switchlink'] = $mtree->get_switchlink(); + $folderMode = $mtree->get_folderMode(); + } + + if ( $folderMode == 'enabled' ) + { + if ($GLOBALS['phpgw_info']['user']['apps']['folders']['enabled'] == true) + { + $var['navbarview'] = $mtree->get_iframe(); + } + } + else + { + + /* + * application list + */ + + $navBarMode = $GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']; + $tpl->set_block('navbar_app_table','app_row','app_rows'); + foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data) + { + if ( $navBarMode == 'text' OR $navBarMode == 'icons_and_text' ) + { + $label = $app_data['title']; + } + + if ( $navBarMode == 'icons' OR $navBarMode == 'icons_and_text' ) + { + $image = '<img src="' . $app_data['icon'] . + '" alt="' . $app_data['title'] . + '" title="' . $app_data['title'] . + '" />'; + } + + $var['appllink'] = $app_data['url']; + $var['image'] = $image; + $var['label'] = $label; + + $tpl->set_var($var); + $tpl->fp('appdiv','navbar_app'); + $tpl->fp('app_rows','app_row',true); + } + $tpl->parse('navbarview','app_rows',false); + } + + /* + * get sidebox content and parse it as a menu + */ + + /* not yet ready + if ( $GLOBALS['phpgw_info']['user']['apps']['folders']['enabled'] == true ) + { + $GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']); + $var['sideboxcontent'] = parseMenu(); + } + */ + + if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']) + { + $var['current_users'] = '<a href="' . + $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . + '">&nbsp;' . + lang('Current users') . + ': ' . + $GLOBALS['phpgw']->session->total() . + '</a>'; + } + + if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0) + { + $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').'">'; + } + elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30)) + { + $api_messages = lang('it has been more then %1 days since you changed your password',30); + } + + // This gonna change + if (isset($cd)) + { + $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']; + } + + $tpl->set_var($var); + $tpl->pfp('out','navbar'); + + // If the application has a header include, we now include it + if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction'])) + { + list($app,$class,$method) = explode('.',$_GET['menuaction']); + if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header']) + { + $GLOBALS[$class]->header(); + } + } + $GLOBALS['phpgw']->hooks->process('after_navbar'); } - } - else - { - /* some stuff to parse the application bar */ - if ($GLOBALS['phpgw_info']['flags']['navbar_target']) + + /** + * Parse navigation bar end + */ + function parse_navbar_end() { - $target = ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"'; + $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); + $tpl->set_unknowns('remove'); + $tpl->set_file(array('footer' => 'footer.tpl')); + + $var['powered_by'] = '[ layout powered by <a target="_blank" href="http://www.probusiness.de">pro|business AG</a> ]'; + + if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']) + { + $var['current_users'] = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') + . '">&nbsp;' + . lang('Current users') + . ': ' + . $GLOBALS['phpgw']->session->total() + . '</a>'; + } + + $now = time(); + $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - ' + . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' ' + . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); + + $tpl->set_var($var); + $GLOBALS['phpgw']->hooks->process('navbar_end'); + $tpl->pfp('out','footer'); } - $tpl->set_block('navbar_app_table','app_row','app_rows'); - foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data) + function display_sidebox($appname,$menu_title,$file) { - $title = ''; - //fallback in case of no default - if (!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']) || $GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == "") - { - $GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] = 'icons_and_text'; - } - if (strpos($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'], 'icons') !== false) - { - $title = '<img src="' . $app_data['icon'] . - '" alt="' . $app_data['title'] . - '" title="' . $app_data['title'] . - '" border="0" />'; - } - if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'icons_and_text') - { - $title .= "<br />"; - } - if (strpos($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'], 'text') !== false) - { - $title .= $app_data['title']; - $var['width'] = '7%'; - } - else - { - $var['width'] = '3%'; - } - - $var['value'] = '<a href="' . $app_data['url'] . '"' . $target . '>' . $title . '</a>'; - $var['align'] = 'center'; - $tpl->set_var($var); - $tpl->fp('appdiv','navbar_app'); - $tpl->fp('app_rows','app_row',true); - } - - $tpl->parse('navbarview','app_rows',false); - } - - if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top') - { - $var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']); - } - if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']) - { - $var['current_users'] = '<a href="' . - $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . - '">&nbsp;' . - lang('Current users') . - ': ' . - $GLOBALS['phpgw']->session->total() . - '</a>'; - } - $now = time(); - $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - ' - . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' ' - . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); -// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' ' -// . $GLOBALS['phpgw']->common->show_date($now,'d, Y'); - // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file - // to get rid of duplicate code. - if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0) - { - $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').'">'; - } - elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30)) - { - $api_messages = lang('it has been more then %1 days since you changed your password',30); - } - - // This is gonna change - if (isset($cd)) - { - $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 - if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction'])) - { - list($app,$class,$method) = explode('.',$_GET['menuaction']); - if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header']) - { - $GLOBALS[$class]->header(); + + /* + * workaround for old hook technique + */ + $GLOBALS['phpgw_info']['user']['apps']['phpgw']['sidebox'][$menu_title] = $file; } - } - $GLOBALS['phpgw']->hooks->process('after_navbar'); - } - return; - } - - function parse_navbar_end() - { - if( !$_REQUEST['popup'] ) - { - if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom') + + function parseMenu() { - $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); - $tpl->set_unknowns('remove'); - $tpl->set_file(array('footer' => 'footer.tpl')); - $var = Array('table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg']); - $var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']); - if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']) - { - $var['current_users'] = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') - . '">&nbsp;' - . lang('Current users') - . ': ' - . $GLOBALS['phpgw']->session->total() - . '</a>'; - } - $now = time(); - $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - ' - . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' ' - . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); - $tpl->set_var($var); - $GLOBALS['phpgw']->hooks->process('navbar_end'); - $tpl->pfp('out','footer'); - } - } + $content = $GLOBALS['phpgw_info']['user']['apps']['phpgw']['sidebox']; + + if (is_array($content) && $GLOBALS['phpgw_info']['flags']['currentapp'] != 'admin') + { + include_once (PHPGW_SERVER_ROOT.'/folders/phplayersmenu/lib/PHPLIB.php'); + include_once (PHPGW_SERVER_ROOT.'/folders/phplayersmenu/lib/layersmenu-common.inc.php'); + include_once (PHPGW_SERVER_ROOT.'/folders/phplayersmenu/lib/layersmenu.inc.php'); + include_once (PHPGW_SERVER_ROOT.'/folders/phplayersmenu/lib/phpgw-layersmenu.inc.php'); + + $mid = new phpgwLayersMenu(); + + $mid->setLibjsdir(PHPGW_SERVER_ROOT.'/folders/phplayersmenu/libjs'); + + $mid->setImgwww($GLOBALS['phpgw_info']['server']['webserver_url'].'/folders/phplayersmenu/images/'); + $mid->setImgdir(PHPGW_SERVER_ROOT.'/folders/phplayersmenu/images/'); + + $mid->setHorizontalMenuTpl(PHPGW_SERVER_ROOT.'/folders/phplayersmenu/templates/layersmenu-horizontal_menu.ihtml'); + $mid->setSubMenuTpl(PHPGW_SERVER_ROOT.'/folders/phplayersmenu/templates/layersmenu-sub_menu.ihtml'); + + $mid->parseStructureForMenu($content, 'sidebox'); + $mid->newHorizontalMenu('sidebox'); + + $mid->printHeader(); + $return = $mid->getMenu('sidebox'); + $mid->printFooter(); + + return $return; + } } Index: navbar.tpl =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/Attic/navbar.tpl,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 navbar.tpl --- navbar.tpl 23 Oct 2003 02:08:39 -0000 1.1.2.1 +++ navbar.tpl 25 Nov 2003 08:26:53 -0000 @@ -3,35 +3,16 @@ <tr> <td class="APINavBar" align="center"> <table class="APINavBar"> - <tr> - <td id="logo"> - <IMG src="{api_root}/images/logo.gif" title="www.phpgroupware.org"> - </td> - </tr> - <tr> - <td> - {switchlink} - </td> - </tr> - {navbarview} + <tr><td id="logo"><img src="{api_root}/images/logo.gif" title="www.phpgroupware.org" alt="phpgroupware" /></td></tr> + <tr><td>{switchlink}</td></tr> + {navbarview} </table> </td> <td valign="top"> - {applications} - -<!-- - <tr> - <td align="left" colspan="2"> - {user_info} - </td> - <td align="right"> - {current_users} - </td> - </tr> ---> - -<!-- BEGIN app_header --> -<b>{current_app_header}</b><hr> -<!-- END app_header --> -{messages}<br> + <div align="center"> + <p class="current_app_header">{current_app_header}</p> + {messages}<br /> + {sideboxcontent} + </div> <!-- END navbar --> + Index: navbar_app.tpl =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/Attic/navbar_app.tpl,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 navbar_app.tpl --- navbar_app.tpl 23 Oct 2003 02:08:39 -0000 1.1.2.1 +++ navbar_app.tpl 25 Nov 2003 08:26:53 -0000 @@ -1 +1 @@ -{value} +<a href="{appllink}">{image}<br />{label}</a> Index: navbar_app_tablecontent.tpl =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/Attic/navbar_app_tablecontent.tpl,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 navbar_app_tablecontent.tpl --- navbar_app_tablecontent.tpl 23 Oct 2003 02:08:39 -0000 1.1.2.1 +++ navbar_app_tablecontent.tpl 25 Nov 2003 08:26:53 -0000 @@ -1,7 +1,4 @@ <!-- BEGIN app_row --> - <tr> - <td class="modBg"> - {appdiv} - </td> - </tr> + <tr><td class="modBg">{appdiv}</td></tr> <!-- END app_row --> + Index: nextmatchs.tpl =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/Attic/nextmatchs.tpl,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 nextmatchs.tpl --- nextmatchs.tpl 23 Oct 2003 02:08:39 -0000 1.1.2.1 +++ nextmatchs.tpl 25 Nov 2003 08:26:53 -0000 @@ -1,107 +1,100 @@ <!-- BEGIN nextmatchs --> - <table cellspacing="1" cellpadding="1" cols="5"> - <tr> - {left} - <td align="center"" valign="top" width="92%">{cats_search_filter_data}</td> - {right} - </tr> - </table> -<br> +<table cellspacing="1" cellpadding="1" cols="5"> + <tr> + {left} + <td align="center"" valign="top" width="92%">{cats_search_filter_data}</td> + {right} + </tr> +</table> +<br /> <!-- END nextmatchs --> - <!-- BEGIN filter --> - <td> - {select} - <noscript> - <input type="submit" value="{lang_filter}"> - </noscript> - </td> + <td> + {select} + <noscript> + <input type="submit" value="{lang_filter}" /> + </noscript> + </td> <!-- END filter --> - <!-- BEGIN form --> -<form method="POST" action="{action}" name="{form_name}"> +<form method="post" action="{action}" name="{form_name}"> <td width="2%" align="{align}" valign="top"> - {hidden} + {hidden} <table border="0" cellspacing="0" cellpadding="0"> - <tr> - <td align="{align}"> - <input type="image" src="{img}" border="{border}" alt="{label}" width="12" height="12" name="start" value="{start}"> - </td> - </tr> + <tr><td align="{align}"><input type="image" src="{img}" border="{border}" alt="{label}" width="12" height="12" name="start" value="{start}" /></td></tr> </table> </td> </form> <!-- END form --> - <!-- BEGIN icon --> -<td width="2%" align="{align}">&nbsp;{_link}</td> + <td width="2%" align="{align}">&nbsp;{_link}</td> <!-- END icon --> - <!-- BEGIN link --> -<td width="2%" align="{align}" valign="top"> - <table border="0" cellspacing="0" cellpadding="0"> - <tr> - <td align="{align}"> - <img src="{img}" border="{border}" alt="{label}"> - </td> - </tr> - </table> -</td> + <td align="{align}" valign="top"> + <table border="0" cellspacing="0" cellpadding="0"> + <tr> + <td align="{align}"><img src="{img}" border="{border}" alt="{label}" /></td> + </tr> + </table> + </td> <!-- END link --> - <!-- BEGIN search --> - <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}"> + <input type="text" name="query" value="{query_value}" />&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}" /> <!-- END search --> <!-- BEGIN cats --> - <td> - {lang_category}&nbsp;&nbsp;<select name="{cat_field}" onChange="this.form.submit();"> - <option value="0">{lang_all}</option> - {categories} + <td> + {lang_category}&nbsp;&nbsp; + <select name="{cat_field}" onChange="this.form.submit();"> + <option value="0">{lang_all}</option> + {categories} </select> - <noscript><input type="submit" name="cats" value="{lang_select}"></noscript> - </td> + <noscript> + <input type="submit" name="cats" value="{lang_select}" /> + </noscript> + </td> <!-- END cats --> <!-- BEGIN search_filter --> - <table border="0" cellspacing="0" cellpadding="0"> - <form method="POST" action="{form_action}" name="filter"> - <input type="hidden" name="filter" value="{filter_value}"> - <input type="hidden" name="qfield" value="{qfield_value}"> - <input type="hidden" name="start" value="{start_value}"> - <input type="hidden" name="order" value="{order_value}"> - <input type="hidden" name="sort" value="{sort_value}"> - <input type="hidden" name="query" value="{query_value}"> - <tr> - <td>{search}</td> - <td>&nbsp;</td> - {filter} - </tr> - </form> - </table> +<form method="post" action="{form_action}" name="filter"> + <input type="hidden" name="filter" value="{filter_value}" /> + <input type="hidden" name="qfield" value="{qfield_value}" /> + <input type="hidden" name="start" value="{start_value}" /> + <input type="hidden" name="order" value="{order_value}" /> + <input type="hidden" name="sort" value="{sort_value}" /> + <input type="hidden" name="query" value="{query_value}" /> + <table border="0" cellspacing="0" cellpadding="0"> + <tr> + <td>{search}</td> + <td>&nbsp;</td> + {filter} + </tr> + </table> +</form> <!-- END search_filter --> <!-- BEGIN cats_search_filter --> - <table border="0" cellspacing="0" cellpadding="0"> - <form method="POST" action="{form_action}" name="filter"> - <input type="hidden" name="filter" value="{filter_value}"> - <input type="hidden" name="qfield" value="{qfield_value}"> - <input type="hidden" name="start" value="0"> - <input type="hidden" name="order" value="{order_value}"> - <input type="hidden" name="sort" value="{sort_value}"> - <input type="hidden" name="query" value="{query_value}"> - <tr> - {cats} - <td>&nbsp;</td> - <td>{search}</td> - <td>&nbsp;&nbsp;</td> - {filter} - </tr> - </form> - </table> +<form method="post" action="{form_action}" name="filter"> + <input type="hidden" name="filter" value="{filter_value}" /> + <input type="hidden" name="qfield" value="{qfield_value}" /> + <input type="hidden" name="start" value="0" /> + <input type="hidden" name="order" value="{order_value}" /> + <input type="hidden" name="sort" value="{sort_value}" /> + <input type="hidden" name="query" value="{query_value}" /> + <table border="0" cellspacing="0" cellpadding="0"> + <tr> + {cats} + <td>&nbsp;</td> + <td>{search}</td> + <td>&nbsp;&nbsp;</td> + {filter} + </tr> + </table> +</form> <!-- END cats_search_filter --> + Index: css/styles.css =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/css/Attic/styles.css,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 styles.css --- css/styles.css 23 Oct 2003 02:08:40 -0000 1.1.2.1 +++ css/styles.css 25 Nov 2003 08:26:53 -0000 @@ -5,72 +5,102 @@ /* - *General + * set global hyperlink */ A { text-decoration:none; color: #000570; } -A:active{ text-decoration:none; color: '#000ACE'; } +A:active{ text-decoration:none; color: #000ACE; } A:hover { text-decoration: none; color: #000ACE; } + + +/* + * set global body + */ body { background-color: #ECE9D8; margin: 0px; color: #303030 } + + + /* + *set global button color + */ + BUTTON { background-color:#DFDFDF; color:#000000; border: 2px solid #808080; } + BUTTON#switchlink { width: 100%; border: 1px solid #808080; } + +/* + * set global colors + */ + +.cellcolor { background-color: #ECE9D8; padding:6px; margin: 6px; } +.workaround input + { + background-color:#DFDFDF; + color:#000000; + border: 2px solid #808080; + } + .bg_color1 { background-color:#eeeeee; padding:3px } + .bg_color1#nowrap { white-space:nowrap } + .bg_color2 { background-color:#dfdfdf; padding:3px } + .bg_color2#nowrap { white-space:nowrap } + .bg_view { background-color:#ffffff; padding:3px } + .bg_view#nowrap { white-space:nowrap } + .bg_view2 { background-color:#ece9d8; padding:3px } + .bg_view2#nowrap { white-space:nowrap } + .head_background { background-color: #cccccc } + .head_background#nowrap { white-space:nowrap } + + + +/* + * set global font + */ font { font-size: 14px; color: #212020; margin: 3px; font-family: Arial, Helvetica, san-serif; } font#title { color: #000099 } font#header { font-weight: bolder; font-size: 14; color: #212020; font-family: Arial, Helvetica, san-serif; } -font#calendar { font-weight: bolder; font-size: 10; font-family: Arial, Helvetica, san-serif; } +font#calendar { font-size: 10px; font-family: Arial, Helvetica, san-serif; } font#cal_day { font-size:12px; font-family: Arial, Helvetica, san-serif } + + +/* + * set global text-align + */ .right {text-align: right } .center { text-align: center } .left { text-align: left } .top { vertical-align: top } .bottom { vertical-align: bottom } .middle { vertical-align: middle } -.cellcolor { background-color: #ECE9D8; padding:6px; margin: 6px; } -.workaround input - { - background-color:#DFDFDF; - color:#000000; - border: 2px solid #808080; - } - - +.no_wrap { white-space:nowrap } /* - *set global button color + * set global table */ -BUTTON { background-color:#DFDFDF; color:#000000; border: 2px solid #808080; } + TABLE.tableCenter { margin-left: auto; margin-right: auto } /* *set global table colors */ - table.defaulttable { background-color:#ECE9D8; padding:0px; margin:2px; border:0px solid; white-space:nowrap } + table.defaulttable { background-color:#ECE9D8; padding:0px; margin:2px; border:0px solid; white-space:nowrap; margin-left: auto; margin-right: auto } + table.defaulttable #3 { width: 3% } + table.defaulttable #5 { width: 5% } + table.defaulttable #50 { width: 50%; margin-left: auto; margin-right: auto; border: 0px; } + table.defaulttable #100 { width: 100%; margin-left: auto; margin-right: auto } table.defaulttable thead td { background-color:#dfdfdf } table.defaulttable #head { border-bottom-color:#FFFFFF; border-bottom-width:3px; border-bottom-style:solid; text-align: center} table.defaulttable td { background-color: #FFFFFF; white-space:nowrap } table.defaulttable #transparent { background-color:#ece9d8; margin:5px; white-space:nowrap } + table.defaulttable #head_background { background-color: #cccccc } table.defaulttable #bg_color1 { background-color:#eeeeee } - table.defaulttable #bg_color2 { background-color:#cccccc } + table.defaulttable #bg_color2 { background-color:#dfdfdf } + table.defaulttable #addressbookIndex { width: 95%; border: 0px; border-spacing: 1px; padding: 2px } DIV.workaround1 td { background-color:#eeeeee } - - .bg_color1 { background-color:#eeeeee; padding:3px } - .bg_color1#nowrap { white-space:nowrap } - .bg_color2 { background-color:#dfdfdf; padding:3px } - .bg_color2#nowrap { white-space:nowrap } - .bg_view { background-color:#ffffff; padding:3px } - .bg_view#nowrap { white-space:nowrap } - .bg_view2 { background-color:#ece9d8; padding:3px } - .bg_view2#nowrap { white-space:nowrap } - .head_background { background-color: #cccccc } - .head_background#nowrap { white-space:nowrap } - - /* * Admin */ TABLE.admin { width: 100% } TABLE.admin TD #25 { width: 25% } - TABLE.adminApplication_form { width: 55 % } + TABLE.adminApplication_form { width: 65 %; border: 0px; margin-left: auto; margin-right: auto } TABLE.adminApplication { width: 50% } TABLE.adminApplication TD { padding:3px } .adminApplication2 TD { width: 5% } @@ -86,6 +116,7 @@ TABLE.adminGroupmanager { width: 70% } TABLE.adminGroupmanager2 { width: 100%; border-spacing: 3px } TABLE.adminIndex { width: 75%; border-spacing: 0px; border-collapse: collapse } + TABLE.adminMainscreen_message { width: 60%; border: 0px; margin-left: auto; margin-right: auto } .05 { width: 5% } TABLE.admin45 { width: 45% } TABLE.admin50 { width: 50% } @@ -104,34 +135,102 @@ */ TABLE.workframe { width: 100%; border-collapse: collapse; margin: 0px; border: 1px solid #DACACA} TD.APINavBar { padding: 0px; width: 70px; vertical-align: top; height: 100% } -TABLE.APINavBar { margin: 0px; border-collapse: collapse; text-align: center; border: 1px solid #FFFFFF} +TABLE.APINavBar { margin: 0px; border-collapse: collapse; text-align: center; border: 1px solid #FFFFFF } TABLE.APINavBar A { color: #DACACA } TABLE.APINavBar A:hover { color: #FFFFFF } TABLE.APINavBar TD#logo { border-bottom: 2px solid #FFFFFF } -TABLE.APINavBar TD.modBg {background-color: #808080} -TABLE.APINavBar TD.modBg IMG { border: 1px solid #808080; margin-top: 7px } +TABLE.APINavBar TD.modBg {background-color: #808080; padding-top: 2px; padding-bottom: 9px} +TABLE.APINavBar TD.modBg IMG { border: 1px solid #808080 } TABLE.APINavBar TD.modBg IMG:hover { border: 1px solid #DACACA } TABLE.APINavBar IFRAME { height: 650px; width: 250px; } +P.current_app_header { font-variant: small-caps; font-weight: bold } + +TABLE.footer { width: 100%; font-size: 12px } +TABLE.footer TD#user_info { text-align: right } +TABLE.footer TD#powered_by { text-align: center } + +/* + * email + */ + + .EmailNowrap { white-space: nowrap } + TABLE.emailClass_prefs_ui { width: 75%; border-spacing:2px } + TABLE.emailClass_prefs_ex_accounts { width: 100%; border-spacing: 2 } + TABLE.emailClass_prefs_ex_accounts #60 { width: 60% } + TABLE.emailClass_prefs_ex_accounts #10 { width: 10% } + TABLE.emailFilters { width: 90%; border-spacing: 3px } + TABLE.emailFilters #20 { width: 20% } + TABLE.emailFilters #30 { width: 30% } + .email50 { width: 50% } + TABLE.emailFilters_list { width: 100%; border-spacing: 2px } + TABLE.emailFilters_list #60 { width: 60% } + TABLE.emailFilters_list #10 { width: 10% } + TABLE.emailFilters_list2 { width: 90%; border-spacing: 3px } + TABLE.emailFilters_list2 #50 { width: 50% } + TABLE.emailFolders { width: 100%; border-spacing: 1px } + TABLE.emailFolders #7 { width: 7% } + TABLE.emailIndex_main_b0 { width: 100%; border-spacing: 2px; padding: 4px; border: 2px } + TABLE.emailIndex_main_b0 #2 { width: 2% } + TABLE.emailIndex_main_b0 #3 { width: 3% } + TABLE.emailIndex_main_b0 #4 { width: 4% } + TABLE.emailIndex_main_b0 #10 { width: 10% } + TABLE.emailIndex_main_b0 #20 { width: 20% } + TABLE.emailIndex_main_b0 #39 { width: 39% } + TABLE.emailSearch_form + { + width: 75%; + text-align: left; + margin-left: auto; + margin-right: auto; + border-spacing: 4px; + padding: 4px; + } + TABLE.emailSearch_form #5 { width: 5% } + TABLE.emailSearch_form #70 { width: 70% } + TABLE.emailSearch_form2 + { + width: 100%; + border-spacing: 2px; + padding: 2px; + } + TABLE.emailSearch_form3 { width: 100% } + TABLE.emailSearch_form2 #60 { width: 60% } + TABLE.emailSearch_results { width: 100%; border-spacing: 0px; padding: 4px } + TABLE.emailSearch_results2 { width: 95%; border-spacing: 1px; padding: 4px } + TABLE.emailSearch_results2 #2 { width: 2% } + TABLE.emailSearch_results2 #3 { width: 3% } + TABLE.emailSearch_results2 #4 { width: 4% } + TABLE.emailSearch_results2 #10 { width: 10% } + TABLE.emailSearch_results2 #20 { width: 20% } + TABLE.emailSearch_results2 #39 { width: 39% } + TABLE.emailWidget_toolbar { width: 100%; border-spacing: 2px } + TABLE.emailWidget_toolbar #17 { width: 17% } + TABLE.emailWidget_toolbar #20 { width: 20% } + TABLE.emailWidget_toolbar #50 { width: 50% } + + /* *ToDo */ - TABLE.todoView { width: 90%; text-align: center; border-spacing: 3px } - TABLE.todoView #center { text-align: center; border-spacing: 10px } - TABLE.todoView TD #left { text-align: left } - TABLE.todoView TD #right { text-align: right } - TABLE.todoPref { width: 70%; text-align: center; border-spacing: 2px } - TABLE.todoList { width: 80%; text-align: center; border-spacing: 2px } TABLE.defaulttable #todoList { text-align: center; border-spacing: 2px } + TABLE.defaulttable #todoForm { text-align: center; border-spacing: 2px } + TABLE.defaulttable #todoList { text-align: center; border-spacing: 2px } + TABLE.todoDelete { width: 55%; margin-left: auto; margin-right: auto } + TABLE.todoDelete TD #center { text-align: center } TABLE.todoForm { text-align: center } TABLE.todoForm #head { white-space: nowrap } TABLE.todoForm2 { width: 90%; text-align: center; border-spacing: 2px } TABLE.todoForm2 DIV { text-align: center; vertical-align: top } - TABLE.defaulttable #todoForm { text-align: center; border-spacing: 2px } - TABLE.defaulttable #todoList { text-align: center; border-spacing: 2px } - TABLE.todoDelete { width: 55% } - TABLE.todoDelete TD #center { text-align: center } + TABLE.todoList { width: 80%; text-align: center; border-spacing: 2px; margin-left: auto; margin-right: auto } + TABLE.todoPref { width: 70%; text-align: center; border-spacing: 2px; margin-left: auto; margin-right: auto } + TABLE.todoView { width: 90%; text-align: center; border-spacing: 3px } + TABLE.todoView #center { text-align: center; border-spacing: 10px } + TABLE.todoView TD #left { text-align: left } + TABLE.todoView TD #right { text-align: right } + + /* *set textarea @@ -154,15 +253,15 @@ */ .noteshead { background-color: #dfdfdf; text-align:center } TABLE.defaulttable thead.notes td { background-color: #ECE9D8 } - TABLE.noteDelete TD { text-align: center } + TABLE.noteDelete { margin-left: auto; margin-right: auto } TABLE.noteForm { width: 60%; border-spacing: 10px } TABLE.noteForm TD { text-align: center } - TABLE.noteEdit { width: 40%; text-align: center } + TABLE.noteEdit { width: 40%; text-align: center; margin-left: auto; margin-right: auto } TABLE.noteEdit TD { text-align: center } TABLE.noteEdit #bottom { vertical-align: text-bottom } - TABLE.notePref { width: 70%; border-spacing: 2px } + TABLE.notePref { width: 70%; border-spacing: 2px; margin-left: auto; margin-right: auto } TABLE.notePref TD { text-align: center } - TABLE.noteView { width: 80%; border-spacing: 2px; text-align: center } + TABLE.noteView { width: 80%; border-spacing: 2px; text-align: center; margin-left: auto; margin-right: auto } TABLE.noteView TD { text-align: center } TABLE.noteView #left { text-align: left } TABLE.noteView #right { text-align: right } @@ -179,14 +278,76 @@ TABLE.noteList { width: 70%; border-spacing: 2px } TABLE.noteList #Tableheader { width: 100% } TABLE.noteList #center { text-align: center } - TABLE.noteHeader { width: 30%; border-space: 10px } - TABLE.noteHeader #center { text-align: center } + TABLE.noteHeader { width: 30%; border-spacing: 2px; margin-left: auto; margin-right: auto } /* *addressbook */ + + .tableAddressbook10 { width: 10 % } + .tableAddressbook15 { width: 15 % } + .tableAddressbook35 { width: 35 % } + .tableAddressbook40 { width: 40% } + .tableAddressbook45 { width: 45% } + TABLE.addressbook50 { width: 50%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.addressbook65 { width: 65%; margin-left: auto; margin-right: auto } + TABLE.addressbook70 { width: 70%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.addressbook85 { width: 85% } + TABLE.addressbook85 #8 { width: 8% } + TABLE.addressbook85 #32 { width: 32% } + TABLE.addressbook85 #64 { width: 64% } + TABLE.addressbook90 { width: 90%; margin-left: auto; margin-right: auto } + TABLE.addressbook95 { width: 95%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.addressbook100 { width: 100%; border: 0px } + TABLE.addressbook100 #25 { width: 25% } + TABLE.addressbookAdd { width: 77%; padding: 0px; border-spacing: 0px; margin-left: auto; margin-right: auto } + TABLE.addressbookAdd #10 { width: 10% } + TABLE.addressbookAdd #60 { width: 60% } + TABLE.addressbookAdmin { border: 0px; margin-left: auto; margin-right: auto; border-spacing: 1px; padding: 1px } + TABLE.addressbookBody_detail_org { width: 100%; border: 0px; border-spacing: 0px; padding: 0px; border-padding: padding } + TABLE.addressbookCurrent_tab_body { width: 80%; border: 0px; border-spacing: 0px; padding: 0px; } + TABLE.addressbookCurrent_tab_body #15 { width: 15% } + TABLE.addressbookCurrent_tab_body #35 { width: 35% } + TABLE.addressbookCurrent_tab_body #40 { width: 40% } + TABLE.addressbookCurrent_tab_body2 { width: 100%; border: 0px; border-spacing: 2px; padding: 2px } + TABLE.addressbookEdit { width:77%; border: 0px; padding: 1px; border-spacing: 1px } + TABLE.addressbookEdit #10 { width: 10% } + TABLE.addressbookField_form { width: 80%; border: 0px; border-spacing: 2px; padding: 2px; margin-left: auto; margin-right: auto } + TABLE.addressbookField_form2 {width: 50%; border: 0px; border-spacing: 2px; padding: 2px; margin-left: auto; margin-right: auto } + TABLE.addressbookField_form2 #h50 { height: 50px } + TABLE.addressbookForm { width: 80%; border: 0px; border-spacing: 2px; padding: 2px; margin-left: auto; margin-right: auto } + TABLE.addressbookFormat { border: 0px; border-spacing: 2px; padding: 2px } + TABLE.addressbookFull_format { border: 0px; border-spacing: 1px; padding: 1px } + TABLE.addressbookImport { width: 90%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.addressbookIndex { width: 95%; border: 0px; border-spacing: 1px; padding: 2px; margin-left: auto; margin-right: auto } + TABLE.addressbookIndex2 { width: 95%; border: 0px; border-spacing: 0px; padding: 4px; margin-left: auto; margin-right:auto } + TABLE.addressbookIndex2 #16 { width: 16% } + TABLE.addressbookLine_format { border: 0px; border-spacing: 2px; padding: 2px } + TABLE.addressbookListfields { border: 0px; border-spacing: 2px; padding: 2px; margin-left: auto; margin-right: auto } + TABLE.addressbookListfields #16 { width: 16% } + TABLE.addressbookListfields #8 { width: 8% } + TABLE.addressbookMany_actions { width: 80%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.addressbookMany_actions2 { width: 100%; border: 0px } + TABLE.addressbookOrg_data { width: 80%; border: 0px; border-spacing; 0px; padding: 0px; margin-left: auto; margin-right: auto } + .addressbookOrg_data2 { vertical-align: top; width: 40% } + TABLE.addressbookOrg_data3 { width: 100%; border: 0px; border-spacing: 2px; padding: 2px } + TABLE.addressbookPerson_data1 { width: 80%; border: 0px; border-spacing: 0px; padding: 0px; border-collapse: collapse } + .addressbookPerson_data1-2 { width: 40%; vertical-align: top } + .addressbookPreferencesHR { width: 100%; height: 2px; } + TABLE.addressbookPreferences { padding: 2px; border-spacing: 2px; border: 0px } + TABLE.addressbookPrincipal_tabs { border: 0px; border-spacing: 0px; padding: 0px; border-collapse: collapse } + TABLE.addressbookTab { border: 0px; border-spacing: 0px; padding: 0px; border-collapse: collapse } + TABLE.addressbookTabbodycontents { width: 80%; border: 0px; border-spacing: 2px; padding: 2px } + .addressbookTabbodycontents2 { vertical-align: top; width: 40% } + TABLE.addressbookView { width: 70%; border: 0px; border-spacing: 2px; padding: 2px; margin-left: auto; margin-right: auto } + TABLE.addressbookView2 { border: 0px; padding: 1px; border-spacing: 1px; margin-left: auto; margin-right: auto } + +/* + * begin addressbook tab style + */ + .tablink { color:#000000 } input.button_style, input.button_style { @@ -223,31 +384,76 @@ background-color: #eeeeee; color: #9ac9ac; } + /* + *end addressbook tab style + */ /* *calendar */ - .calendar { color:#cccccc; border:1px solid; margin:0px; padding:0px; } + .calendar { width: 50%; color:#cccccc; border:1px solid; margin:0px; padding:0px; border-spacing: 0px } .calendar #transparent { color: #ece9d8 } .calendar #bg_head { background-color:#dfdfdf } .event-on { width: 100%; background-color:#eeeeee } .event-off { width: 100%; background-color:#cccccc } .event-holiday { width: 100%; background-color:#dfdfdf } .time { background-color:#ece9d8 } + .calendar4 { width: 4% } + .calendar6 { width: 6% } + .calendar30 { width: 30% } + .calendar33 { width: 33% } + .calendar35 { width: 35% } + .calendar54 { width: 54% } + .calendar65 { width: 65% } + .calendar90 { width: 90% } + .calendar98 { width: 98% } + .calendarMonth_column { vertical-align: top; height: 75;} + .calendarMonth_header { height: 75px; vertical-align: top } + TABLE.calendar45 { width: 45%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.calendar65 { width: 65%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.calendar70 { width: 70%; border: 0px; margin-left: auto; margin-right: auto } + TABLE.calendar70 #40 { width: 40% } + TABLE.calendar70_2 { width: 70%; border: 0px; margin-left: auto; margin-right: auto; border-spacing: 5px } + TABLE.calendar70_2 #80 { width: 80% } + TABLE.calendar90 { width: 90%; margin-left: auto; margin-right: auto } + TABLE.calendar90 #25 { width: 25% } + TABLE.calendar90 #65 { width: 65% } + TABLE.calendar100 { width: 100%; border: 0px } + TABLE.calendar100 #70 { width: 70% } + TABLE.calendar100-2 { width: 100%; border-spacing: 0px; border-collapse: collapse; padding: 0px; border: 0px } + TABLE.calendarCenter { margin-left: auto; margin-right: auto } + TABLE.calendarDay_cal { width: 100%; border: 0px; border-spacing: 0px; padding: 0px } + TABLE.calendarFooter { width: 100%; border: 0px; padding: 8px; border-spacing: 0px; border-collapse: collapse } + TABLE.calendarFooter #high2 { height: 2px } + TABLE.calendarHoliday { width: 80%; border: 0px; border-spacing: 2px; padding: 2px; margin-left: auto; margin-right: auto } + TABLE.calendarHoliday2 { width: 100%; border-spacing: 5px; border: 0px } + TABLE.calendarHoliday2 #80 { width: 80% } + TABLE.calendarMini_cal { width: 100%; border: 0px; border-spacing: 0px; padding: 0px } + TABLE.month_day { width: 100%; border: 0px; border-spacing: 2px; padding: 2px; border-color: #FFFFFF } + TABLE.month { width: 100%; border: 0px; border-color: #FFFFFF; border-spacing: 2px; padding: 2px } + TABLE.view { border-spacing: 5px } + TABLE.year { border: 0px; border-spacing: 2px; padding: 4px } + TABLE.week { border: 0px; width: 100% } + TABLE.week #20 { width: 20% } + /* *tts */ .tts_td { padding:10px; margin:5px; } .tts_height { height:1 } - TABLE.ttsPref { width: 70%; text-align: center; border-space: 3px } + TABLE.ttsAdmin { border-spacing: 1px; padding: 1px; margin-right: auto; margin } + TABLE.ttsPref { width: 70%; text-align: center; padding: 2px } + TABLE.ttsPref #id40 { width: 40% } + TABLE.ttsPrefACL { width: 80% } TABLE.ttsView { width: 90% } TABLE.ttsView2 { width: 100%; border-space: 3px } - TABLE.ttsIndex { width: 100%; border-space: 2px } - TABLE:ttsHook { width: 100%; border-space: 3px } - TABLE.ttsIndexTable { width: 100%; background-color:#ECE9D8; padding:0px; margin:2px; border:0px solid; white-space:nowrap } + TABLE.ttsIndex { width: 100%; border-space: 0px; border-collapse: collapse; padding: 0px } + TABLE:ttsHook { width: 100%; border-spacing: 1; padding: 1 } + TABLE.ttsIndexTable { width: 98%; border-spacing: 1px; background-color:#ECE9D8; padding:1px; margin:2px; border:0px solid; white-space:nowrap; margin-left: auto; margin-right:auto } + TABLE.ttsIndexTable #22 { width: 22px } TABLE.ttsIndexTable thead td { background-color:#dfdfdf } TABLE.ttsIndexTable #head { border-bottom-color:#FFFFFF; border-bottom-width:3px; border-bottom-style:solid; text-align: center} TABLE.ttsIndexTable td { background-color: #FFFFFF; white-space:nowrap } Index: doc/TODO =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/doc/Attic/TODO,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 TODO --- doc/TODO 23 Oct 2003 02:08:41 -0000 1.1.2.1 +++ doc/TODO 25 Nov 2003 08:26:53 -0000 @@ -1 +1,8 @@ - +- email list +* differentiation terms of color of even and uneven lines + +- adapt stylesheet for folders modul +* dark background +* adapt pictures with no contrast + +- stylesheet for j-script menu \ No newline at end of file Index: images/about.png =================================================================== RCS file: images/about.png diff -N images/about.png Binary files /dev/null and about.png differ Index: images/application150x18_de.gif =================================================================== RCS file: images/application150x18_de.gif diff -N images/application150x18_de.gif Binary files /tmp/cvszzA6c8 and /dev/null differ Index: images/application150x18_en.gif =================================================================== RCS file: images/application150x18_en.gif diff -N images/application150x18_en.gif Binary files /tmp/cvsgQXoDZ and /dev/null differ Index: images/folder150x18_de.gif =================================================================== RCS file: images/folder150x18_de.gif diff -N images/folder150x18_de.gif Binary files /tmp/cvsTIXwD2 and /dev/null differ Index: images/folder150x18_en.gif =================================================================== RCS file: images/folder150x18_en.gif diff -N images/folder150x18_en.gif Binary files /tmp/cvs4gSdSb and /dev/null differ Index: images/home.png =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/images/Attic/home.png,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 home.png Binary files /tmp/cvsklSh8c and home.png differ Index: images/logout.png =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/templates/probusiness/images/Attic/logout.png,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 logout.png Binary files /tmp/cvss9TxKD and logout.png differ