Commit 9e029107 authored by cvs2svn's avatar cvs2svn

This commit was manufactured by cvs2svn to create tag 'v5-0-2-0-0'.

Sprout from master 2016-11-11 13:00:13 UTC Frank Bergmann  <frank.bergmann@project-open.com> '- Updated version information to 5.0.2.0.0'
Cherrypick from master 2016-10-25 09:08:58 UTC Frank Bergmann  <frank.bergmann@project-open.com> '-- moved close button into sidebar':
    www/style/style.saltnpepper.css
Cherrypick from master 2016-11-03 22:11:51 UTC Frank Bergmann  <frank.bergmann@project-open.com> '- Fixed issue that visible_tcl expressions were not evaluated':
    tcl/intranet-design-procs.tcl
parent c86ce638
......@@ -656,7 +656,7 @@ ad_proc -public im_sub_navbar {
# Replaced the db_foreach by this construct to save
# the relatively high amount of SQLs to get the menus
set menu_list_list [util_memoize [list im_sub_navbar_menu_helper -locale $locale -bind_vars $bind_vars $user_id $parent_menu_id]]
set menu_list_list [util_memoize [list im_sub_navbar_menu_helper -locale $locale $user_id $parent_menu_id]]
foreach menu_list $menu_list_list {
......@@ -791,7 +791,6 @@ ad_proc -public im_sub_navbar {
ad_proc -private im_sub_navbar_menu_helper {
{-locale "" }
{-bind_vars "" }
user_id
parent_menu_id
} {
......@@ -823,7 +822,7 @@ ad_proc -private im_sub_navbar_menu_helper {
set errmsg ""
set visible $admin_p; # Visible for admins, but not for normal users
if [catch {
set visible [expr $visible_tcl]
set visible [expr $visible_tcl]
} errmsg] {
ns_log Error "im_sub_navbar_menu_helper: Error evalualuating menu visible_tcl=$visible_tcl: $errmsg"
append name ": Error in $visible_tcl"
......
......@@ -98,7 +98,7 @@
}
.fullwidth-list {
margin-left: 253px;
margin-left: 290px;
margin-right: 20px;
margin-top: 15px;
min-height: 400px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment