holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text version of navbar is working again

Browse Source
This commit is contained in:
jengo 2001-01-07 09:34:45 +00:00
parent 6e63f1172f
commit 24945c4b3b
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/accounts_sql.inc.php
View File

@ -121,7 +121,7 @@
. "account_lastpwd_change='" . time() . "' where account_lid='"
. $account_info["loginid"] . "'");
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"])
// . "' where session_lid='" . $account_info["loginid"] . "'");

33
phpgwapi/templates/default/navbar.inc.php
View File

@ -28,17 +28,34 @@
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"';
}
$i = 1;
while ($app = each($phpgw_info["navbar"])) {
$title = '<img src="' . $app[1]["icon"] . '" alt="' . $app[1]["title"] . '" title="'
. $app[1]["title"] . '" border="0">';
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
$title .= "<br>" . $app[1]["title"];
$tpl->set_var("width","7%");
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 {
$tpl->set_var("width","3%");
$title = '<img src="' . $app[1]["icon"] . '" alt="' . $app[1]["title"] . '" title="'
. $app[1]["title"] . '" border="0">';
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
$title .= "<br>" . $app[1]["title"];
$tpl->set_var("width","7%");
} else {
$tpl->set_var("width","3%");
}
$tpl->set_var("value",'<a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>');
$tpl->set_var("align","center");
$tpl->parse("applications","navbar_app",True);
}
$tpl->set_var("value",'<a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>');
}
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);
}

2
phpgwapi/templates/default/navbar_app.tpl
View File

@ -1 +1 @@
<td align="center" width="{width}">{value}</td>
<td align="{align}" width="{width}">{value}</td>