diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index 284c17dfe1..b058c42a41 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -715,6 +715,14 @@ $GLOBALS['phpgw_info']['server']['template_set'] = 'default'; } +/******** start temporarily code **************************************/ +/* this just makes sure the template set is updated to the new format */ +if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'].'/parts.inc.php')) +{ + $GLOBALS['phpgw_info']['server']['template_set'] = 'default'; +} +/******** end temporarily code **************************************/ + $tpldir = PHPGW_SERVER_ROOT . '/' . $appname . '/templates/' . $GLOBALS['phpgw_info']['server']['template_set']; $tpldir_default = PHPGW_SERVER_ROOT . '/' . $appname . '/templates/default'; @@ -1275,7 +1283,7 @@ function load_preload_images_data() { - $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw_info']['navbar']['logout']['icon']; + //$GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw_info']['navbar']['logout']['icon']; if(@is_array($GLOBALS['phpgw_info']['flags']['preload_images'])) { @@ -1300,6 +1308,11 @@ function load_phpgw_body_tags() { + $GLOBALS['phpgw_info']['flags']['body_tags']['bgcolor'] = $GLOBALS['phpgw_info']['theme']['bg_color']; + $GLOBALS['phpgw_info']['flags']['body_tags']['alink'] = $GLOBALS['phpgw_info']['theme']['alink']; + $GLOBALS['phpgw_info']['flags']['body_tags']['link'] = $GLOBALS['phpgw_info']['theme']['link']; + $GLOBALS['phpgw_info']['flags']['body_tags']['vlink'] = $GLOBALS['phpgw_info']['theme']['vlink']; + $GLOBALS['phpgw_info']['flags']['body_tags']['marginwidth']='0'; $GLOBALS['phpgw_info']['flags']['body_tags']['marginheight']='0'; $GLOBALS['phpgw_info']['flags']['body_tags']['topmargin']='0'; @@ -1318,7 +1331,10 @@ reset($GLOBALS['phpgw_info']['flags']['body_tags']); while(list($key,$value) = each($GLOBALS['phpgw_info']['flags']['body_tags'])) { - $body_tags_string .= " $key=\"$value\""; + if($value != '') + { + $body_tags_string .= " $key=\"$value\""; + } } $GLOBALS['phpgw']->template->set_var('phpgw_body_tags',$body_tags_string); } diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php index 742165484e..47737218ae 100644 --- a/phpgwapi/inc/functions.inc.php +++ b/phpgwapi/inc/functions.inc.php @@ -325,9 +325,6 @@ $GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False; } - -/*DELETE ME SOON!!!!*/ $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = 'default'; - /*************************************************************************\ * A few hacker resistant constants that will be used throught the program * \*************************************************************************/ @@ -352,16 +349,16 @@ /* These default values will be overridden and appended to as needed by template sets */ $GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','0'); $GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','0'); - $GLOBALS['phpgw']->template->set_var('phpgw_top_scrolling','NO'); + $GLOBALS['phpgw']->template->set_var('phpgw_top_scrolling','AUTO'); $GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','0'); $GLOBALS['phpgw']->template->set_var('phpgw_left_frame_width','0'); - $GLOBALS['phpgw']->template->set_var('phpgw_left_scrolling','NO'); + $GLOBALS['phpgw']->template->set_var('phpgw_left_scrolling','AUTO'); $GLOBALS['phpgw']->template->set_var('phpgw_right_table_width','0'); $GLOBALS['phpgw']->template->set_var('phpgw_right_frame_width','0'); - $GLOBALS['phpgw']->template->set_var('phpgw_right_scrolling','NO'); + $GLOBALS['phpgw']->template->set_var('phpgw_right_scrolling','AUTO'); $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','0'); $GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','0'); - $GLOBALS['phpgw']->template->set_var('phpgw_bottom_scrolling','NO'); + $GLOBALS['phpgw']->template->set_var('phpgw_bottom_scrolling','AUTO'); $GLOBALS['phpgw']->template->set_var('phpgw_head_charset',lang('charset')); $GLOBALS['phpgw']->template->set_var('phpgw_head_description','phpGroupWare'); @@ -562,6 +559,11 @@ \*************************************************************************/ if(!PHPGW_USE_FRAMES || PHPGW_FRAME_PART == 'body') { + /* parse_bodypart() should not output anything. This is here for them to set body tags and such */ + if(function_exists('parse_bodypart')) + { + parse_bodypart(); + } /* Verify that user has rights to the currentapp */ $continue_app_data = True; if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' && diff --git a/phpgwapi/templates/default/parts.inc.php b/phpgwapi/templates/default/parts.inc.php index 319ecba7d9..2551f1ea43 100644 --- a/phpgwapi/templates/default/parts.inc.php +++ b/phpgwapi/templates/default/parts.inc.php @@ -105,7 +105,7 @@ $GLOBALS['phpgw']->template->set_file('parts','parts.tpl'); $GLOBALS['phpgw']->template->set_block('parts','bottom_part'); $var = Array( - 'msg' => "

\n".lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']), + 'msg' => "

\n".lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']).'

', 'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] ); $GLOBALS['phpgw']->template->set_var($var); diff --git a/phpgwapi/templates/default/parts.tpl b/phpgwapi/templates/default/parts.tpl index 24507e1b57..820513cb52 100644 --- a/phpgwapi/templates/default/parts.tpl +++ b/phpgwapi/templates/default/parts.tpl @@ -17,7 +17,7 @@ - +
{msg}
{msg}
diff --git a/phpgwapi/templates/idsociety/footer.tpl b/phpgwapi/templates/idsociety/footer.tpl deleted file mode 100644 index e5d85eb54d..0000000000 --- a/phpgwapi/templates/idsociety/footer.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -
- - - - - - - - -
- {powered} -
- - - - diff --git a/phpgwapi/templates/idsociety/head.inc.php b/phpgwapi/templates/idsociety/head.inc.php deleted file mode 100644 index 8be751d884..0000000000 --- a/phpgwapi/templates/idsociety/head.inc.php +++ /dev/null @@ -1,45 +0,0 @@ -public_functions) && $GLOBALS[$class]->public_functions['css']) - { - $app_css = $GLOBALS[$class]->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"'; - } - - $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); - $tpl->set_unknowns('remove'); - $tpl->set_file(array('head' => 'head.tpl')); - $var = Array ( - 'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico', - 'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico', - '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/idsociety/head.tpl b/phpgwapi/templates/idsociety/head.tpl deleted file mode 100644 index 76d572ed49..0000000000 --- a/phpgwapi/templates/idsociety/head.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - -{website_title} - - - - - - - - - - -{website_title} - Login - - - - -phpGroupWare -

 

-
{lang_message}
-

 

- - - - - -
- - - - - - - -
 phpGroupWare
-
- - - - - - - - - - - - - - - - - - - -
{cd}
{lang_username}: 
{lang_password}: 
{version}
-
-
-
- - - diff --git a/phpgwapi/templates/idsociety/login_denylogin.tpl b/phpgwapi/templates/idsociety/login_denylogin.tpl deleted file mode 100644 index d678da7e46..0000000000 --- a/phpgwapi/templates/idsociety/login_denylogin.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - - -phpGroupWare - - - - - -
- Opps! You caught us in the middle of a system upgrade.
Please, check back with us shortly. -
- - diff --git a/phpgwapi/templates/idsociety/login_selectdomain.tpl b/phpgwapi/templates/idsociety/login_selectdomain.tpl deleted file mode 100644 index bff863a816..0000000000 --- a/phpgwapi/templates/idsociety/login_selectdomain.tpl +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - -{website_title} - Login - - - - -phpGroupWare -

 

-
{lang_message}
-

 

- - - - - -
- - - - - - - -
 phpGroupWare
-
- - - - - - - - - - - - - - - - - - - - -
- {cd} -
{lang_username}:  
{lang_password}: 
- -
- {version} -
-
-
-
- - - diff --git a/phpgwapi/templates/idsociety/navbar_app.tpl b/phpgwapi/templates/idsociety/navbar_app.tpl deleted file mode 100644 index 6f639d7274..0000000000 --- a/phpgwapi/templates/idsociety/navbar_app.tpl +++ /dev/null @@ -1 +0,0 @@ -{value} diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/parts.inc.php similarity index 73% rename from phpgwapi/templates/idsociety/navbar.inc.php rename to phpgwapi/templates/idsociety/parts.inc.php index 6706412f63..d7eb60d3a5 100644 --- a/phpgwapi/templates/idsociety/navbar.inc.php +++ b/phpgwapi/templates/idsociety/parts.inc.php @@ -9,22 +9,20 @@ * option) any later version. * \**************************************************************************/ - /* $Id$ */ - - function parse_navbar($force = False) - { - $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); - $tpl->set_unknowns('remove'); - - $tpl->set_file( - array( - 'navbar' => 'navbar.tpl' - ) - ); - - //$tpl->set_block('navbar','B_powered_top','V_powered_top'); - //$tpl->set_block('navbar','B_num_users','V_num_users'); + /* $Id$ */ + $GLOBALS['phpgw']->template->set_var('phpgw_top_table_height','10%'); + $GLOBALS['phpgw']->template->set_var('phpgw_top_frame_height','85'); + $GLOBALS['phpgw']->template->set_var('phpgw_left_table_width','5%'); + $GLOBALS['phpgw']->template->set_var('phpgw_left_frame_width','155'); + $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','5%'); + $GLOBALS['phpgw']->template->set_var('phpgw_bottom_frame_height','30'); + $GLOBALS['phpgw_info']['flags']['body_tags']['background']=$GLOBALS['phpgw']->common->image('phpgwapi','content_spacer_middle'); + + function parse_toppart($output) + { + $GLOBALS['phpgw']->template->set_file('parts','parts.tpl'); + $GLOBALS['phpgw']->template->set_block('parts','top_part'); $var['img_root'] = PHPGW_IMAGES_DIR; $var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg']; @@ -50,7 +48,98 @@ $strip_portion = $GLOBALS['phpgw_info']['server']['webserver_url'].'/'; } - # echo '
'; print_r($GLOBALS['phpgw_info']['navbar']); echo '
'; + $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url']; + $var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url']; + $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url']; + $var['help_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url']; + + if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home') + { + $var['welcome_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2'); + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over'); + } + else + { + $var['welcome_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over'); + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2'); + } + + if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'preferences') + { + $var['preferences_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2'); + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over'); + } + else + { + $var['preferences_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over'); + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2'); + } + + $var['logout_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','log_out2'); + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over'); + + + if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'about') + { + $var['about_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2'); + $var['about_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over'); + } + else + { + $var['about_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over'); + $var['about_img_hover'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2'); + } + + $var['em_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','em'); + $var['logo_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','logo2'); + $var['top_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle'); + + // "powered_by_color" and "_size" are is also used by number of current users thing + $var['powered_by_size'] = '2'; + $var['powered_by_color'] = '#ffffff'; + if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top') + { + $var['powered_by'] = lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']); + $GLOBALS['phpgw']->template->set_var($var); + } + else + { + $var['powered_by'] = ''; + $GLOBALS['phpgw']->template->set_var($var); + } + + if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])) + { + $db = $GLOBALS['phpgw']->db; + $db->query('select count(session_id) from phpgw_sessions'); + $db->next_record(); + $var['current_users'] = ' ' . lang('Current users') . ': ' . $db->f(0) . ''; + $GLOBALS['phpgw']->template->set_var($var); + } + else + { + $var['current_users'] = ''; + $GLOBALS['phpgw']->template->set_var($var); + } + + $var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname(); + $now = time(); + $var['user_info_date'] = + lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' ' + . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); + $var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date']; + $var['user_info_size'] = '2'; + $var['user_info_color'] = '#000000'; + + $GLOBALS['phpgw']->template->set_var($var); + $GLOBALS['phpgw']->template->fp($output,'top_part'); + } + + function parse_leftpart($output) + { + $GLOBALS['phpgw']->template->set_file('parts','parts.tpl'); + $GLOBALS['phpgw']->template->set_block('parts','left_part'); $applications = ''; while ($app = each($GLOBALS['phpgw_info']['navbar'])) { @@ -87,137 +176,27 @@ { $img_src_over = str_replace($strip_portion,'',$img_src_over); } - - $pre_load[] = $img_src_over; + $GLOBALS['phpgw_info']['flags']['preload_images'][] = $img_src_over; } } - $var['app_images'] = implode("',\r\n'",$pre_load); - $var['applications'] = $applications; - - $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url']; - $var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url']; - $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url']; - $var['help_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url']; - - if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home') - { - $var['welcome_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2'); - $var['welcome_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over'); - } - else - { - $var['welcome_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over'); - $var['welcome_img_hover'] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2'); - } - - if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'preferences') - { - $var['preferences_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2'); - $var['preferences_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over'); - } - else - { - $var['preferences_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over'); - $var['preferences_img_hover'] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2'); - } - - $var['logout_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','log_out2'); - $var['logout_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over'); - - if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'about') - { - $var['about_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2'); - $var['about_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over'); - } - else - { - $var['about_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over'); - $var['about_img_hover'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2'); - } - - $var['content_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','content_spacer_middle'); - $var['em_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','em'); - $var['logo_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','logo2'); - $var['top_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle'); $var['nav_bar_left_spacer_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_spacer'); $var['nav_bar_left_top_bg_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_top_bg'); - // "powered_by_color" and "_size" are is also used by number of current users thing - $var['powered_by_size'] = '2'; - $var['powered_by_color'] = '#ffffff'; - if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top') - { - $var['powered_by'] = lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']); - $tpl->set_var($var); - } - else - { - $var['powered_by'] = ''; - $tpl->set_var($var); - } - - if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])) - { - $db = $GLOBALS['phpgw']->db; - $db->query('select count(session_id) from phpgw_sessions'); - $db->next_record(); - $var['current_users'] = ' ' . lang('Current users') . ': ' . $db->f(0) . ''; - $tpl->set_var($var); - } - else - { - $var['current_users'] = ''; - $tpl->set_var($var); - } - - $var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname(); - $now = time(); - $var['user_info_date'] = - lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' ' - . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); - $var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date']; - $var['user_info_size'] = '2'; - $var['user_info_color'] = '#000000'; - - // 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') - . '
Click this image on the navbar: '; - } - elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30)) - { - $api_messages = lang('it has been more then x days since you changed your password',30); - } - - // This is gonna change - if (isset($cd)) - { - $var['messages'] = $api_messages . '
' . checkcode($cd); - } -*/ - $tpl->set_var($var); - $tpl->pfp('out','navbar'); - return; + $GLOBALS['phpgw']->template->set_var($var); + $GLOBALS['phpgw']->template->fp($output,'left_part'); } - function parse_nonavbar() - { - echo '>'; + function parse_bodypart() + { + $GLOBALS['phpgw_info']['flags']['body_tags']['background']=$GLOBALS['phpgw']->common->image('phpgwapi','content_spacer_middle'); } - function parse_navbar_end() + function parse_bottompart($output) { - $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); - $tpl->set_unknowns('remove'); - - $tpl->set_file(array('footer' => 'footer.tpl')); - $tpl->set_block('footer','B_powered_bottom','V_powered_bottom'); + $GLOBALS['phpgw']->template->set_file('parts','parts.tpl'); + $GLOBALS['phpgw']->template->set_block('parts','bottom_part'); if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom') { @@ -230,14 +209,11 @@ ); $var['top_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle'); $var['em_bottom_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','em_bottom'); - $tpl->set_var($var); - $tpl->parse('V_powered_bottom','B_powered_bottom'); + $GLOBALS['phpgw']->template->set_var($var); + $GLOBALS['phpgw']->template->fp($output,'bottom_part'); } else { - $tpl->set_var('V_powered_bottom',''); + $GLOBALS['phpgw']->template->set_var($output,''); } - - $GLOBALS['phpgw']->hooks->process('navbar_end'); - $tpl->pfp('out','footer'); } diff --git a/phpgwapi/templates/idsociety/navbar.tpl b/phpgwapi/templates/idsociety/parts.tpl old mode 100755 new mode 100644 similarity index 79% rename from phpgwapi/templates/idsociety/navbar.tpl rename to phpgwapi/templates/idsociety/parts.tpl index 6009a1139b..304056c93f --- a/phpgwapi/templates/idsociety/navbar.tpl +++ b/phpgwapi/templates/idsociety/parts.tpl @@ -1,15 +1,5 @@ - marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" rightmargin="0" leftmargin="0" border="0" - onLoad="MM_preloadImages('{app_images}', -'{logout_img_hover}', -'{preferences_img_hover}', -'{about_img_hover}', -'{welcome_img_hover}');" - background="{content_spacer_middle_img}"> - - - + +
@@ -55,6 +45,11 @@
+ + + + +
@@ -66,7 +61,17 @@
- - -
- + + + + + + + + + + +
+ {powered} +
+