From 863a80298dc685f7a2f86e105d15f5b2fb8babd0 Mon Sep 17 00:00:00 2001 From: skeeter Date: Tue, 28 Aug 2001 03:39:34 +0000 Subject: [PATCH] This will now allow apps to include CSS values into the portion of the HTML page by having a function in their ui class called css(). --- phpgwapi/templates/default/head.inc.php | 30 ++++++++++---- phpgwapi/templates/default/head.tpl | 1 + phpgwapi/templates/idsociety/head.inc.php | 41 ++++++++++++------- phpgwapi/templates/idsociety/head.tpl | 1 + phpgwapi/templates/idsociety/navbar.inc.php | 8 ++-- phpgwapi/templates/justweb/head.inc.php | 44 +++++++++++++-------- phpgwapi/templates/justweb/head.tpl | 1 + phpgwapi/templates/verdilak/head.inc.php | 29 ++++++++++---- phpgwapi/templates/verdilak/head.tpl | 1 + 9 files changed, 106 insertions(+), 50 deletions(-) diff --git a/phpgwapi/templates/default/head.inc.php b/phpgwapi/templates/default/head.inc.php index 42fde55c39..1ecb75301f 100644 --- a/phpgwapi/templates/default/head.inc.php +++ b/phpgwapi/templates/default/head.inc.php @@ -11,18 +11,32 @@ /* $Id$ */ - $bodyheader = 'BGCOLOR="'.$phpgw_info['theme']['bg_color'].'"'; - if ($phpgw_info['server']['htmlcompliant']) { - $bodyheader .= ' ALINK="'.$phpgw_info['theme']['alink'].'" LINK="'.$phpgw_info['theme']['link'].'" VLINK="'.$phpgw_info['theme']['vlink'].'"'; + if($GLOBALS['menuaction'] && is_array($GLOBALS['obj']->public_functions) && $GLOBALS['obj']->public_functions['css']) + { + eval("\$app_css = \$GLOBALS['obj']->css();"); + } + else + { + $app_css = ''; + } + + $bodyheader = 'BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"'; + if ($GLOBALS['phpgw_info']['server']['htmlcompliant']) { + $bodyheader .= ' ALINK="'.$GLOBALS['phpgw_info']['theme']['alink'].'" LINK="'.$GLOBALS['phpgw_info']['theme']['link'].'" VLINK="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"'; } $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $tpl->set_unknowns('remove'); $tpl->set_file(array('head' => 'head.tpl')); - $tpl->set_var('font_family',$phpgw_info['theme']['font']); - $tpl->set_var('charset',lang('charset')); - $tpl->set_var('website_title',$phpgw_info['server']['site_title']); - $tpl->set_var('body_tags',$bodyheader); - echo $tpl->finish($tpl->parse('out','head')); + + $var = Array ( + 'charset' => lang('charset'), + 'font_family' => $GLOBALS['phpgw_info']['theme']['font'], + 'website_title' => $GLOBALS['phpgw_info']['server']['site_title'], + 'body_tags' => $bodyheader, + 'app_css' => $app_css + ); + $tpl->set_var($var); + $tpl->pfp('out','head'); unset($tpl); ?> diff --git a/phpgwapi/templates/default/head.tpl b/phpgwapi/templates/default/head.tpl index 2ce787c3bd..03165bd91f 100644 --- a/phpgwapi/templates/default/head.tpl +++ b/phpgwapi/templates/default/head.tpl @@ -14,6 +14,7 @@ A:active{ text-decoration:none } body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: {font_family} } .tablink { color: #000000; } + {app_css} --> {website_title} diff --git a/phpgwapi/templates/idsociety/head.inc.php b/phpgwapi/templates/idsociety/head.inc.php index 615f91d798..8714abdddf 100644 --- a/phpgwapi/templates/idsociety/head.inc.php +++ b/phpgwapi/templates/idsociety/head.inc.php @@ -12,18 +12,27 @@ /* $Id$ */ // needed until hovlink is specified in all theme files - if (isset($phpgw_info['theme']['hovlink']) - && ($phpgw_info['theme']['hovlink'] != '')) + if (isset($GLOBALS['phpgw_info']['theme']['hovlink']) + && ($GLOBALS['phpgw_info']['theme']['hovlink'] != '')) { - $csshover = 'A:hover{ text-decoration:none; color: ' .$phpgw_info['theme']['hovlink'] .'; }'; + $csshover = 'A:hover{ text-decoration:none; color: ' .$GLOBALS['phpgw_info']['theme']['hovlink'] .'; }'; } else { $csshover = ''; - }; + } - $bodyheader = 'bgcolor="'.$phpgw_info['theme']['bg_color'].'" alink="'.$phpgw_info['theme']['alink'].'" link="'.$phpgw_info['theme']['link'].'" vlink="'.$phpgw_info['theme']['vlink'].'"'; - if (!$phpgw_info['server']['htmlcompliant']) + if($GLOBALS['menuaction'] && is_array($GLOBALS['obj']->public_functions) && $GLOBALS['obj']->public_functions['css']) + { + eval("\$app_css = \$GLOBALS['obj']->css();"); + } + else + { + $app_css = ''; + } + + $bodyheader = 'bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'" alink="'.$GLOBALS['phpgw_info']['theme']['alink'].'" link="'.$GLOBALS['phpgw_info']['theme']['link'].'" vlink="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"'; + if (!$GLOBALS['phpgw_info']['server']['htmlcompliant']) { $bodyheader .= ' topmargin="0" marginheight="0" marginwidth="0" leftmargin="0"'; } @@ -31,14 +40,18 @@ $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $tpl->set_unknowns('remove'); $tpl->set_file(array('head' => 'head.tpl')); - $tpl->set_var('charset',lang('charset')); - $tpl->set_var('font_family',$phpgw_info['theme']['font']); - $tpl->set_var('website_title',$phpgw_info['server']['site_title']); - $tpl->set_var('body_tags',$bodyheader); - $tpl->set_var('css_link',$phpgw_info['theme']['link']); - $tpl->set_var('css_alink',$phpgw_info['theme']['alink']); - $tpl->set_var('css_vlink',$phpgw_info['theme']['vlink']); - $tpl->set_var('css_hovlink',$csshover); + $var = Array ( + 'charset' => lang('charset'), + 'font_family' => $GLOBALS['phpgw_info']['theme']['font'], + 'website_title' => $GLOBALS['phpgw_info']['server']['site_title'], + 'body_tags' => $bodyheader, + 'css_link' => $GLOBALS['phpgw_info']['theme']['link'], + 'css_alink' => $GLOBALS['phpgw_info']['theme']['alink'], + 'css_vlink' => $GLOBALS['phpgw_info']['theme']['vlink'], + 'css_hovlink' => $csshover, + 'app_css' => $app_css + ); + $tpl->set_var($var); $tpl->pfp('out','head'); unset($tpl); ?> diff --git a/phpgwapi/templates/idsociety/head.tpl b/phpgwapi/templates/idsociety/head.tpl index 53026725de..2976b38bff 100644 --- a/phpgwapi/templates/idsociety/head.tpl +++ b/phpgwapi/templates/idsociety/head.tpl @@ -15,6 +15,7 @@ {css_hovlink} body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: "{font_family}" } .tablink { color: #000000; } + {app_css} -->