mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-29 19:33:54 +01:00
text version of navbar is working again
This commit is contained in:
parent
6e63f1172f
commit
24945c4b3b
@ -121,7 +121,7 @@
|
|||||||
. "account_lastpwd_change='" . time() . "' where account_lid='"
|
. "account_lastpwd_change='" . time() . "' where account_lid='"
|
||||||
. $account_info["loginid"] . "'");
|
. $account_info["loginid"] . "'");
|
||||||
if ($account_info["account_id"] == $phpgw_info["user"]["account_id"]) {
|
if ($account_info["account_id"] == $phpgw_info["user"]["account_id"]) {
|
||||||
$phpgw_info["user"]["passwd"] = $phpgw->common->encrypt($account_info["passwd"];
|
$phpgw_info["user"]["passwd"] = $phpgw->common->encrypt($account_info["passwd"]);
|
||||||
}
|
}
|
||||||
// $phpgw->db->query("update phpgw_sessions set session_pwd='" . addslashes($account_info["passwd"])
|
// $phpgw->db->query("update phpgw_sessions set session_pwd='" . addslashes($account_info["passwd"])
|
||||||
// . "' where session_lid='" . $account_info["loginid"] . "'");
|
// . "' where session_lid='" . $account_info["loginid"] . "'");
|
||||||
|
@ -28,7 +28,16 @@
|
|||||||
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"';
|
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$i = 1;
|
||||||
while ($app = each($phpgw_info["navbar"])) {
|
while ($app = each($phpgw_info["navbar"])) {
|
||||||
|
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "text") {
|
||||||
|
$tabs[$i]["label"] = $app[1]["title"];
|
||||||
|
$tabs[$i]["link"] = $app[1]["url"];
|
||||||
|
if (ereg($phpgw_info["navbar"][$app[0]],$PHP_SELF)) {
|
||||||
|
$selected = $i;
|
||||||
|
}
|
||||||
|
$i++;
|
||||||
|
} else {
|
||||||
$title = '<img src="' . $app[1]["icon"] . '" alt="' . $app[1]["title"] . '" title="'
|
$title = '<img src="' . $app[1]["icon"] . '" alt="' . $app[1]["title"] . '" title="'
|
||||||
. $app[1]["title"] . '" border="0">';
|
. $app[1]["title"] . '" border="0">';
|
||||||
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
|
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
|
||||||
@ -39,6 +48,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$tpl->set_var("value",'<a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>');
|
$tpl->set_var("value",'<a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>');
|
||||||
|
$tpl->set_var("align","center");
|
||||||
|
$tpl->parse("applications","navbar_app",True);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "text") {
|
||||||
|
$tpl->set_var("navbar_color",$phpgw_info["theme"]["bg_color"]);
|
||||||
|
$tpl->set_var("align","right");
|
||||||
|
$tpl->set_var("value",$phpgw->common->create_tabs($tabs,$selected,-1));
|
||||||
$tpl->parse("applications","navbar_app",True);
|
$tpl->parse("applications","navbar_app",True);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
<td align="center" width="{width}">{value}</td>
|
<td align="{align}" width="{width}">{value}</td>
|
||||||
|
Loading…
Reference in New Issue
Block a user