diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index ecb190cee4..524feaa7e1 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -1168,17 +1168,23 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $var['about_img'] = $GLOBALS['phpgw_info']['navbar']['about']['icon']; break; } - $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url']; - $var['prefs_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url']; - $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url']; - $var['about_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url']; - $var['home_title'] = $GLOBALS['phpgw_info']['navbar']['home']['title']; - $var['prefs_title'] = $GLOBALS['phpgw_info']['navbar']['preferences']['title']; - $var['logout_title'] = $GLOBALS['phpgw_info']['navbar']['logout']['title']; - $var['about_title'] = $GLOBALS['phpgw_info']['navbar']['about']['title']; + $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url']; + $var['prefs_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url']; + $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url']; + $var['about_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url']; - if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])) + $var['home_title'] = $GLOBALS['phpgw_info']['navbar']['home']['title']; + $var['prefs_title'] = $GLOBALS['phpgw_info']['navbar']['preferences']['title']; + $var['logout_title'] = $GLOBALS['phpgw_info']['navbar']['logout']['title']; + $var['about_title'] = $GLOBALS['phpgw_info']['navbar']['about']['title']; + + $var['home_statustext'] = $GLOBALS['phpgw_info']['navbar']['home']['title']; + $var['prefs_statustext'] = $GLOBALS['phpgw_info']['navbar']['preferences']['title']; + $var['logout_statustext'] = $GLOBALS['phpgw_info']['navbar']['logout']['title']; + $var['about_statustext'] = $GLOBALS['phpgw_info']['navbar']['about']['title']; + + if (isset($GLOBALS['phpgw_ifo']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])) { $GLOBALS['phpgw']->db->query('select count(session_id) from phpgw_sessions'); $GLOBALS['phpgw']->db->next_record(); @@ -1202,7 +1208,8 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' 'title' => $data['title'], 'img_src_over' => $data['icon_hover'], 'url' => $data['url'], - 'name' => str_replace('-','_',$app) + 'name' => str_replace('-','_',$app), + 'statustext' => $data['title'] ); if($data['icon_hover'] != '') @@ -1276,7 +1283,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $var['phpgw_version'] = $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']; $var['lang_phpgw_statustext'] = lang('phpGroupWare --> homepage'); $var['top_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle'); - $var['navbar_format'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']; + $var['navbar_format'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']; $GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var); } @@ -1364,7 +1371,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' /* We handle this here becuase its special */ - $GLOBALS['phpgw_info']['navbar']['about']['title'] = lang('about x',lang($app)); + $GLOBALS['phpgw_info']['navbar']['about']['title'] = lang('about'); $GLOBALS['phpgw_info']['navbar']['about']['url'] = $GLOBALS['phpgw']->link('/about.php','app='.$app); $GLOBALS['phpgw_info']['navbar']['about']['icon'] = $this->image('phpgwapi',Array('about','nonav')); $GLOBALS['phpgw_info']['navbar']['about']['icon_hover'] = $this->image_on('phpgwapi',Array('about','nonav'),'-over'); @@ -1414,9 +1421,11 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $css_file = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP . 'css' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'; } - elseif(@file_exists(PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP . 'css' . SEP . 'submarine.css')) + elseif(@file_exists(PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP + . 'css' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . '.css')) { - $css_file = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP . 'css' . SEP . 'submarine.css'; + $css_file = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 'templates' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] + . SEP . 'css' . SEP . $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . '.css'; } else { diff --git a/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php index 4d7758701e..f1ac5cd826 100644 --- a/phpgwapi/inc/class.hooks.inc.php +++ b/phpgwapi/inc/class.hooks.inc.php @@ -1,27 +1,26 @@ * - * Allows applications to "hook" into each other * - * Copyright (C) 2000, 2001 Dan Kuykendall * - * -------------------------------------------------------------------------* - * This library is part of the phpGroupWare API * - * http://www.phpgroupware.org/api * - * ------------------------------------------------------------------------ * - * This library is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as published by * - * the Free Software Foundation; either version 2.1 of the License, * - * or any later version. * - * This library is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * See the GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License * - * along with this library; if not, write to the Free Software Foundation, * - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - \**************************************************************************/ - - /* $Id$ */ + /**************************************************************************\ + * phpGroupWare API - Hooks * + * This file written by Dan Kuykendall * + * Allows applications to "hook" into each other * + * Copyright (C) 2000 - 2002 Dan Kuykendall * + * ------------------------------------------------------------------------ * + * This library is part of the phpGroupWare API * + * http://www.phpgroupware.org/api * + * ------------------------------------------------------------------------ * + * This library is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as published by * + * the Free Software Foundation; either version 2.1 of the License, * + * or any later version. * + * This library is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * + * See the GNU Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public License * + * along with this library; if not, write to the Free Software Foundation, * + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + \**************************************************************************/ + /* $Id$ */ /*! @class hooks @@ -56,7 +55,6 @@ // Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo) function process($location, $order = '', $no_permission_check = False) { - $SEP = filesystem_separator(); if ($order == '') { settype($order,'array'); @@ -69,7 +67,7 @@ { if (isset($this->found_hooks[$appname][$location])) { - $f = PHPGW_SERVER_ROOT . $SEP . $appname . $SEP . 'inc' . $SEP . $this->found_hooks[$appname][$location]; + $f = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'inc' . SEP . $this->found_hooks[$appname][$location]; if (file_exists($f) && ( $GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check || $appname == 'preferences') && $appname)) ) { @@ -91,7 +89,7 @@ { if (isset($this->found_hooks[$appname][$location])) { - $f = PHPGW_SERVER_ROOT . $SEP . $appname . $SEP . 'inc' . $SEP . $this->found_hooks[$appname][$location]; + $f = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'inc' . SEP . $this->found_hooks[$appname][$location]; if (file_exists($f)) { include($f); @@ -110,7 +108,7 @@ { if (isset($this->found_hooks[$appname][$location])) { - $f = PHPGW_SERVER_ROOT . $SEP . $appname . $SEP . 'inc' . $SEP . $this->found_hooks[$appname][$location]; + $f = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'inc' . SEP . $this->found_hooks[$appname][$location]; if (file_exists($f)) { include($f); @@ -134,12 +132,11 @@ { $appname = $GLOBALS['phpgw_info']['flags']['currentapp']; } - $SEP = filesystem_separator(); /* First include the ordered apps hook file */ if (isset($this->found_hooks[$appname][$location])) { - $f = PHPGW_SERVER_ROOT . $SEP . $appname . $SEP . 'inc' . $SEP . $this->found_hooks[$appname][$location]; + $f = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'inc' . SEP . $this->found_hooks[$appname][$location]; if (file_exists($f) && ( $GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check || $location == 'config' || $appname == 'phpgwapi') && $appname)) ) { @@ -170,11 +167,10 @@ { $appname = $GLOBALS['phpgw_info']['flags']['currentapp']; } - $SEP = filesystem_separator(); if(@isset($this->found_hooks[$appname][$location])) { - $f = PHPGW_SERVER_ROOT . $SEP . $appname . $SEP . 'inc' . $SEP . $this->found_hooks[$appname][$location]; + $f = PHPGW_SERVER_ROOT . SEP . $appname . SEP . 'inc' . SEP . $this->found_hooks[$appname][$location]; if(@file_exists($f) && ( $GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check || $location == 'config' || $appname == 'phpgwapi') && $appname)) ) { @@ -200,7 +196,6 @@ { $count = 0; reset($GLOBALS['phpgw_info']['user']['apps']); - $SEP = filesystem_separator(); while ($permission = each($GLOBALS['phpgw_info']['user']['apps'])) { if (isset($this->found_hooks[$permission[0]][$location])) diff --git a/phpgwapi/setup/phpgw_en.lang b/phpgwapi/setup/phpgw_en.lang index 6328366236..066cb410ad 100644 --- a/phpgwapi/setup/phpgw_en.lang +++ b/phpgwapi/setup/phpgw_en.lang @@ -1,3 +1,4 @@ +about common en about access common en Access access not permitted common en Access not permitted acl common en ACL diff --git a/phpgwapi/templates/default/app_header.xsl b/phpgwapi/templates/default/app_header.xsl index e2dea833e2..d48e25a4f0 100644 --- a/phpgwapi/templates/default/app_header.xsl +++ b/phpgwapi/templates/default/app_header.xsl @@ -1,13 +1,13 @@ - +
-
+
diff --git a/phpgwapi/templates/default/css/default.css b/phpgwapi/templates/default/css/default.css new file mode 100644 index 0000000000..a5494d6f99 --- /dev/null +++ b/phpgwapi/templates/default/css/default.css @@ -0,0 +1,66 @@ +body,p,td,th,table,input,form,option +{ + color: #000000; +} + +body +{ + background-color: #FFFFFF; +} + +a:link,a:visited,a:active +{ + color: mediumblue; +} + +a:hover +{ + color: #cc0000; +} + +.navbar,.th +{ + background-color: #80BBFF; +} + +.login,.portal,.about +{ + background-color: #80BBFF; + border-color: #000000; +} + +.portal_text +{ + color: #FFFFFF; +} + +.row_on,.th_bright,.app_header +{ + background-color: #CCEEFF; +} + +.msgbox +{ + background-color: #FFFFFF; +} + +.row_off +{ + background-color: #DDF0FF; +} + +.cal_today +{ + background-color: #FFFFCC; +} + +.cal_dayview +{ + background-color: #C0C0C0; +} + +.email_folder +{ + background-color: #7090FF; + color: #FFFFFF; +} diff --git a/phpgwapi/templates/funkwerk/css/funkwerk.css b/phpgwapi/templates/funkwerk/css/funkwerk.css new file mode 100644 index 0000000000..18b2f567b6 --- /dev/null +++ b/phpgwapi/templates/funkwerk/css/funkwerk.css @@ -0,0 +1,129 @@ +body,p,td,th,table,input,form,option +{ + color: #0000A0; +} + +body +{ + background-color: #CCCCCC; +} + +.top_top +{ + background-color: #FF3300 +} + +.top_bottom +{ + background-color: #FFE000; +} + +td.left +{ + background-color: #FF3300; +} + +.left_app +{ + background-color: #660000; +} + +.top_link +{ + background-color: #0000A0; +} + +.user_info +{ + background-color: #FF3300; + color: #FFFFFF; +} + +.admin_info +{ + background-color: #0000A0; + color: #FFFFFF; +} + +.bottom +{ + background-color: #FF3300; +} + +a:link,a:active,a:visited,a:hover +{ + color: #0000A0; +} + +a:link.top_link,a:active.top_link,a:visited.top_link +{ + color: #FFFFFF; + font-weight: bold; +} + +a:hover.top_link +{ + font-weight: bold; + color: #660000; + background-color: #FFE000; +} + +a:link.left,a:active.left,a:visited.left +{ + color: #FFFFFF; + font-weight: bold; +} + +a:hover.left +{ + font-weight: bold; + color: #660000; + background-color: #FFE000; +} + +.login,.portal,.about +{ + background-color: #ADADAD; + border-color: #000000; +} + +.portal_text +{ + color: #FFFFFF; +} + +.row_on,.th_bright,.app_header +{ + background-color: #999999; +} + +.msgbox +{ + background-color: #FFFFFF; +} + +.row_off +{ + background-color: #FFFFFF; +} + +.th +{ + background-color: #FFE000; +} + +.cal_today +{ + background-color: #ffffcc; +} + +.cal_dayview +{ + background-color: #C0C0C0; +} + +.email_folder +{ + background-color: #adadad; + color: #ffffff; +} diff --git a/phpgwapi/templates/funkwerk/css/phpgw.css b/phpgwapi/templates/funkwerk/css/phpgw.css new file mode 100644 index 0000000000..2a46f6204f --- /dev/null +++ b/phpgwapi/templates/funkwerk/css/phpgw.css @@ -0,0 +1,127 @@ +body,p,td,th,table,input,form,option +{ + font-family: Tahoma,Verdana,Arial,Helvetica,sans-serif; + font-size: 10pt; + font-style: normal; + font-weight: normal; + line-height: normal; + text-decoration: none; + letter-spacing: 0em; + word-spacing: 0em; +} + +body +{ + margin-right: 0em; + margin-left: 0em; + margin-top: 0em; + margin-bottom: 0em; +} + +table +{ + border-width: 0; +} + +a:link,a:visited,a:active +{ + text-decoration: none; +} + +a:hover +{ + text-decoration: underline; +} + +a:hover.left,a:hover.top_link +{ + text-decoration: none; +} + +a.th,a.th_text +{ + font-weight: bold; +} + +.top_top +{ + height: 30; +} + +.top_bottom +{ + height: 30; +} + +.info +{ + font-size: 85%; +} + +td.left +{ + height: 30; +} + +.bottom +{ + width: 100%; + height: 5%; +} + +table.portal +{ + width: 100%; +} + +table.about +{ + width: 70%; +} + +table.login +{ + margin-top: 130px; + width: 40%; + text-align: center; +} + +.login,.portal,.about,.msgbox +{ + border-width: 1px; + border-style: ridge; +} + +.portal_text +{ + font-weight: bold; + background: url(../../default/images/bg_filler.png); +} + + +.user_info,.admin_info +{ + font-size: 80%; + font-weight: bold; +} + +.small_text +{ + font-size: 80%; +} + +.header_text +{ + font-size: 110%; + font-weight: bold; +} + +.th_text,.app_header_text +{ + font-weight: bold; +} + +.app_header,.th +{ + font-weight: bold; +} diff --git a/phpgwapi/templates/funkwerk/phpgw.xsl b/phpgwapi/templates/funkwerk/phpgw.xsl new file mode 100644 index 0000000000..0539b149fd --- /dev/null +++ b/phpgwapi/templates/funkwerk/phpgw.xsl @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + <xsl:value-of select="website_title"/> + + + + + + + + + + + + + + + + + + + + +
[phpGroupWare][] + + +
+ + + + + + + +
[][][][]
+
+ + + + + + + + + +
+ + + + + +
+
+ + 		+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + window.status=' + + '; return true; + + phpGroupWare + + + +
+ + + + + + + + + + + + + +
+ [] +
+ + + diff --git a/phpgwapi/templates/justweb/css/justweb.css b/phpgwapi/templates/justweb/css/justweb.css new file mode 100644 index 0000000000..a5494d6f99 --- /dev/null +++ b/phpgwapi/templates/justweb/css/justweb.css @@ -0,0 +1,66 @@ +body,p,td,th,table,input,form,option +{ + color: #000000; +} + +body +{ + background-color: #FFFFFF; +} + +a:link,a:visited,a:active +{ + color: mediumblue; +} + +a:hover +{ + color: #cc0000; +} + +.navbar,.th +{ + background-color: #80BBFF; +} + +.login,.portal,.about +{ + background-color: #80BBFF; + border-color: #000000; +} + +.portal_text +{ + color: #FFFFFF; +} + +.row_on,.th_bright,.app_header +{ + background-color: #CCEEFF; +} + +.msgbox +{ + background-color: #FFFFFF; +} + +.row_off +{ + background-color: #DDF0FF; +} + +.cal_today +{ + background-color: #FFFFCC; +} + +.cal_dayview +{ + background-color: #C0C0C0; +} + +.email_folder +{ + background-color: #7090FF; + color: #FFFFFF; +} diff --git a/phpgwapi/templates/verdilak/css/verdilak.css b/phpgwapi/templates/verdilak/css/verdilak.css new file mode 100644 index 0000000000..5d01bf6d30 --- /dev/null +++ b/phpgwapi/templates/verdilak/css/verdilak.css @@ -0,0 +1,66 @@ +body,p,td,th,table,input,form,option +{ + color: #000000; +} + +body +{ + background-color: #FFFFFF; +} + +a:link,a:visited,a:active +{ + color: mediumblue; +} + +a:hover +{ + color: #cc0000; +} + +.navbar,.th +{ + background-color: #80BBFF; +} + +.login,.portal,.about +{ + background-color: #80BBFF; + border-color: #000000; +} + +.portal_text,.info +{ + color: #FFFFFF; +} + +.row_on,.th_bright,.app_header +{ + background-color: #CCEEFF; +} + +.msgbox +{ + background-color: #FFFFFF; +} + +.row_off +{ + background-color: #DDF0FF; +} + +.cal_today +{ + background-color: #FFFFCC; +} + +.cal_dayview +{ + background-color: #C0C0C0; +} + +.email_folder +{ + background-color: #7090FF; + color: #FFFFFF; +}