From 1844bdcd2619284adcf238ad6569779866ebf5e6 Mon Sep 17 00:00:00 2001 From: jengo Date: Sat, 7 Apr 2001 11:53:03 +0000 Subject: [PATCH] SF #413712 - Fixed text only layout not working --- phpgwapi/templates/verdilak/navbar.inc.php | 200 +++++++++++---------- 1 file changed, 109 insertions(+), 91 deletions(-) diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php index ee159df0be..55fa81fa84 100644 --- a/phpgwapi/templates/verdilak/navbar.inc.php +++ b/phpgwapi/templates/verdilak/navbar.inc.php @@ -1,109 +1,127 @@ set_unknowns("remove"); + $tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']); - $tpl->set_file(array("navbar" => "navbar.tpl")); + $tpl->set_file(array( + 'navbar' => 'navbar.tpl' + )); - $tpl->set_var("img_root",$phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/verdilak/images"); - $tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]); + $tpl->set_var('img_root',$phpgw_info['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images'); + $tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']); - if ($phpgw_info["flags"]["navbar_target"]) { - $target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"'; - } + if ($phpgw_info['flags']['navbar_target']) + { + $target = ' target="' . $phpgw_info['flags']['navbar_target'] . '"'; + } - while ($app = each($phpgw_info["navbar"])) { - if ($app[1]["title"] != "Home" && $app[1]["title"] != "preferences" && ! ereg("About",$app[1]["title"]) && $app[1]["title"] != "Logout") { - $title = '' . lang($app[1]['; - if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") { - $title .= "
" . lang($app[1]["title"]); - } - $applications .= '
' . $title . ''; - } - } - $tpl->set_var("applications",$applications); - - $tpl->set_var("home_link",$phpgw_info["navbar"]["home"]["url"]); - $tpl->set_var("preferences_link",$phpgw_info["navbar"]["preferences"]["url"]); - $tpl->set_var("logout_link",$phpgw_info["navbar"]["logout"]["url"]); - $tpl->set_var("help_link",$phpgw_info["navbar"]["about"]["url"]); + while ($app = each($phpgw_info['navbar'])) + { + if ($app[1]['title'] != 'Home' && $app[1]['title'] != 'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout') + { + if ($phpgw_info['user']['preferences']['common']['navbar_format'] != 'text') + { + $title = '' . lang($app[1]['title']) . ''; + } - $ir = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/verdilak/images"; - if ($phpgw_info["flags"]["currentapp"] == "home") { - $tpl->set_var("welcome_img",$ir . "/welcome-red.gif"); - } else { - $tpl->set_var("welcome_img",$ir . "/welcome-grey.gif"); - } + if ($phpgw_info['user']['preferences']['common']['navbar_format'] != 'icons') + { + $title .= '
' . lang($app[1]['title']); + } + $applications .= '
' . $title . ''; + unset($title); + } + } + $tpl->set_var('applications',$applications); - if ($phpgw_info["flags"]["currentapp"] == "preferences") { - $tpl->set_var("preferences_img",$ir . "/preferences-red.gif"); - } else { - $tpl->set_var("preferences_img",$ir . "/preferences-grey.gif"); - } - $tpl->set_var("logout_img",$ir . "/logout-grey.gif"); + $tpl->set_var('home_link',$phpgw_info['navbar']['home']['url']); + $tpl->set_var('preferences_link',$phpgw_info['navbar']['preferences']['url']); + $tpl->set_var('logout_link',$phpgw_info['navbar']['logout']['url']); + $tpl->set_var('help_link',$phpgw_info['navbar']['about']['url']); - $tpl->set_var("powered_by",lang("Powered by phpGroupWare version x",$phpgw_info["server"]["versions"]["phpgwapi"])); + $ir = $phpgw_info['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images'; + if ($phpgw_info['flags']['currentapp'] == 'home') + { + $tpl->set_var('welcome_img',$ir . '/welcome-red.gif'); + } + else + { + $tpl->set_var('welcome_img',$ir . '/welcome-grey.gif'); + } - if (isset($phpgw_info["navbar"]["admin"]) && isset($phpgw_info["user"]["preferences"]["common"]["show_currentusers"])) { - $db = $phpgw->db; - $db->query("select count(*) from phpgw_sessions where session_flags != 'A'"); - $db->next_record(); - $tpl->set_var("current_users",' ' - . lang("Current users") . ': ' . $db->f(0) . ''); - } - $tpl->set_var("user_info",$phpgw->common->display_fullname() . " - " - . lang($phpgw->common->show_date(time(),"l")) . " " - . lang($phpgw->common->show_date(time(),"F")) . " " - . $phpgw->common->show_date(time(),"d, Y")); + if ($phpgw_info['flags']['currentapp'] == 'preferences') + { + $tpl->set_var('preferences_img',$ir . '/preferences-red.gif'); + } + else + { + $tpl->set_var('preferences_img',$ir . '/preferences-grey.gif'); + } + $tpl->set_var('logout_img',$ir . '/logout-grey.gif'); - // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file - // to get rid of duplicate code. -/* if ($phpgw_info["user"]["lastpasswd_change"] == 0) { - $api_messages = lang("You are required to change your password during your first login") + $tpl->set_var('powered_by',lang('Powered by phpGroupWare version x',$phpgw_info['server']['versions']['phpgwapi'])); + + if (isset($phpgw_info['navbar']['admin']) && isset($phpgw_info['user']['preferences']['common']['show_currentusers'])) + { + $db = $phpgw->db; + $db->query("select count(*) from phpgw_sessions where session_flags != 'A'"); + $db->next_record(); + $tpl->set_var('current_users',' ' + . lang('Current users') . ': ' . $db->f(0) . ''); + } + $tpl->set_var('user_info',$phpgw->common->display_fullname() . ' - ' + . lang($phpgw->common->show_date(time(),'l')) . ' ' + . lang($phpgw->common->show_date(time(),'F')) . ' ' + . $phpgw->common->show_date(time(),'d, Y')); + + // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file + // to get rid of duplicate code. + if ($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: '; - } else if ($phpgw_info["user"]["lastpasswd_change"] < time() - (86400*30)) { - $api_messages = lang("it has been more then x days since you changed your password",30); - } + . $phpgw_info['server']['webserver_url'] . '/preferences/templates/' + . $phpgw_info['server']['template_set'] . '/images/navbar.gif">'; + } + else if ($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)) { - $tpl->set_var("messages",$api_messages . "
" . checkcode($cd)); - } */ + // This is gonna change + if (isset($cd)) + { + $tpl->set_var('messages',$api_messages . '
' . checkcode($cd)); + } - // If the application has a header include, we now include it - if ($phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"]) { + return $tpl->pfp('out','navbar'); + } - } - return $tpl->finish($tpl->parse("out","navbar")); - } - - function parse_navbar_end() - { - global $phpgw_info, $phpgw; - $tpl = new Template($phpgw_info["server"]["template_dir"]); - $tpl->set_unknowns("remove"); + function parse_navbar_end() + { + global $phpgw_info, $phpgw; + $tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']); - $tpl->set_file(array("footer" => "footer.tpl")); - $tpl->set_var("img_root",$phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/verdilak/images"); - $tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]); - $tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]); - echo $tpl->finish($tpl->parse("out","footer")); - } + $tpl->set_file(array( + 'footer' => 'footer.tpl' + )); + $tpl->set_var('img_root',$phpgw_info['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images'); + $tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']); + $tpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']); + echo $tpl->pfp('out','footer'); + }