forked from extern/egroupware
SF #413712 - Fixed text only layout not working
This commit is contained in:
parent
68b25fceba
commit
1844bdcd26
@ -15,95 +15,113 @@
|
|||||||
{
|
{
|
||||||
global $phpgw_info, $phpgw, $PHP_SELF;
|
global $phpgw_info, $phpgw, $PHP_SELF;
|
||||||
|
|
||||||
$tpl = new Template($phpgw_info["server"]["template_dir"]);
|
$tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']);
|
||||||
$tpl->set_unknowns("remove");
|
|
||||||
|
|
||||||
$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('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('table_bg_color',$phpgw_info['theme']['navbar_bg']);
|
||||||
|
|
||||||
if ($phpgw_info["flags"]["navbar_target"]) {
|
if ($phpgw_info['flags']['navbar_target'])
|
||||||
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"';
|
{
|
||||||
|
$target = ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
|
||||||
}
|
}
|
||||||
|
|
||||||
while ($app = each($phpgw_info["navbar"])) {
|
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 = '<img src="' . $app[1]["icon"] . '" alt="' . lang($app[1]["title"]) . '" title="'
|
if ($app[1]['title'] != 'Home' && $app[1]['title'] != 'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout')
|
||||||
. lang($app[1]["title"]) . '" border="0">';
|
{
|
||||||
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
|
if ($phpgw_info['user']['preferences']['common']['navbar_format'] != 'text')
|
||||||
$title .= "<br>" . lang($app[1]["title"]);
|
{
|
||||||
}
|
$title = '<img src="' . $app[1]['icon'] . '" alt="' . lang($app[1]['title']) . '" title="'
|
||||||
$applications .= '<br><a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>';
|
. lang($app[1]['title']) . '" border="0">';
|
||||||
}
|
|
||||||
}
|
|
||||||
$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"]);
|
|
||||||
|
|
||||||
$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["flags"]["currentapp"] == "preferences") {
|
if ($phpgw_info['user']['preferences']['common']['navbar_format'] != 'icons')
|
||||||
$tpl->set_var("preferences_img",$ir . "/preferences-red.gif");
|
{
|
||||||
} else {
|
$title .= '<br>' . lang($app[1]['title']);
|
||||||
$tpl->set_var("preferences_img",$ir . "/preferences-grey.gif");
|
|
||||||
}
|
}
|
||||||
$tpl->set_var("logout_img",$ir . "/logout-grey.gif");
|
$applications .= '<br><a href="' . $app[1]['url'] . '"' . $target . '>' . $title . '</a>';
|
||||||
|
unset($title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$tpl->set_var('applications',$applications);
|
||||||
|
|
||||||
$tpl->set_var("powered_by",lang("Powered by phpGroupWare version x",$phpgw_info["server"]["versions"]["phpgwapi"]));
|
$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']);
|
||||||
|
|
||||||
if (isset($phpgw_info["navbar"]["admin"]) && isset($phpgw_info["user"]["preferences"]["common"]["show_currentusers"])) {
|
$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['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('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 = $phpgw->db;
|
||||||
$db->query("select count(*) from phpgw_sessions where session_flags != 'A'");
|
$db->query("select count(*) from phpgw_sessions where session_flags != 'A'");
|
||||||
$db->next_record();
|
$db->next_record();
|
||||||
$tpl->set_var("current_users",'<a href="' . $phpgw->link("/admin/currentusers.php") . '"> '
|
$tpl->set_var('current_users','<a href="' . $phpgw->link('/admin/currentusers.php') . '"> '
|
||||||
. lang("Current users") . ': ' . $db->f(0) . '</a>');
|
. lang('Current users') . ': ' . $db->f(0) . '</a>');
|
||||||
}
|
}
|
||||||
$tpl->set_var("user_info",$phpgw->common->display_fullname() . " - "
|
$tpl->set_var('user_info',$phpgw->common->display_fullname() . ' - '
|
||||||
. lang($phpgw->common->show_date(time(),"l")) . " "
|
. lang($phpgw->common->show_date(time(),'l')) . ' '
|
||||||
. lang($phpgw->common->show_date(time(),"F")) . " "
|
. lang($phpgw->common->show_date(time(),'F')) . ' '
|
||||||
. $phpgw->common->show_date(time(),"d, Y"));
|
. $phpgw->common->show_date(time(),'d, Y'));
|
||||||
|
|
||||||
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
|
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
|
||||||
// to get rid of duplicate code.
|
// to get rid of duplicate code.
|
||||||
/* if ($phpgw_info["user"]["lastpasswd_change"] == 0) {
|
if ($phpgw_info['user']['lastpasswd_change'] == 0)
|
||||||
$api_messages = lang("You are required to change your password during your first login")
|
{
|
||||||
|
$api_messages = lang('You are required to change your password during your first login')
|
||||||
. '<br> Click this image on the navbar: <img src="'
|
. '<br> Click this image on the navbar: <img src="'
|
||||||
. $phpgw_info["server"]["webserver_url"] . '/preferences/templates/'
|
. $phpgw_info['server']['webserver_url'] . '/preferences/templates/'
|
||||||
. $phpgw_info["server"]["template_set"] . '/images/navbar.gif">';
|
. $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);
|
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
|
// This is gonna change
|
||||||
if (isset($cd)) {
|
if (isset($cd))
|
||||||
$tpl->set_var("messages",$api_messages . "<br>" . checkcode($cd));
|
{
|
||||||
} */
|
$tpl->set_var('messages',$api_messages . '<br>' . checkcode($cd));
|
||||||
|
|
||||||
// If the application has a header include, we now include it
|
|
||||||
if ($phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"]) {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
return $tpl->finish($tpl->parse("out","navbar"));
|
|
||||||
|
return $tpl->pfp('out','navbar');
|
||||||
}
|
}
|
||||||
|
|
||||||
function parse_navbar_end()
|
function parse_navbar_end()
|
||||||
{
|
{
|
||||||
global $phpgw_info, $phpgw;
|
global $phpgw_info, $phpgw;
|
||||||
$tpl = new Template($phpgw_info["server"]["template_dir"]);
|
$tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']);
|
||||||
$tpl->set_unknowns("remove");
|
|
||||||
|
|
||||||
$tpl->set_file(array("footer" => "footer.tpl"));
|
$tpl->set_file(array(
|
||||||
$tpl->set_var("img_root",$phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/verdilak/images");
|
'footer' => 'footer.tpl'
|
||||||
$tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
|
));
|
||||||
$tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
|
$tpl->set_var('img_root',$phpgw_info['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images');
|
||||||
echo $tpl->finish($tpl->parse("out","footer"));
|
$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');
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user