X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=themes%2Fdefault%2Frenderer.php;h=aaee7125ccff889b85c497fae961ef5b99e534f3;hb=20c9b5846824f0489c6791d74a6c78e2bfb0b2fc;hp=6c4db65cde8062540e34a318497e06275f4bb00e;hpb=061f4eff6493a6cca071338156225401ae849d72;p=fa-stable.git diff --git a/themes/default/renderer.php b/themes/default/renderer.php index 6c4db65c..aaee7125 100644 --- a/themes/default/renderer.php +++ b/themes/default/renderer.php @@ -14,7 +14,7 @@ function wa_header() { // add_js_ufile("themes/default/renderer.js"); - page(_("Main Menu"), false, true); + page(_($help_context = "Main Menu"), false, true); } function wa_footer() @@ -25,10 +25,6 @@ function menu_header($title, $no_menu, $is_index) { global $path_to_root, $help_base_url, $db_connections; - // you can owerride the table styles from config.php here, if you want. - //global $table_style, $table_style2; - //$table_style = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'"; - //$table_style2 = "cellpadding=3 border=1 bordercolor='#cccccc' style='border-collapse: collapse'"; echo "\n"; echo "\n"; echo "
\n"; @@ -68,30 +64,30 @@ if ($help_base_url != null) { - echo "$himg" . _("Help") . "   "; + echo "$himg" . _("Help") . "   "; } echo "$img" . _("Logout") . "   "; + echo "
"; echo "
"; } echo ""; - if ($title && !$no_menu && !$is_index) + if ($no_menu) + echo "
"; + elseif ($title && !$is_index) { - echo "
" + echo "
$title
" ."" ."
$title" .(user_hints() ? "" : '') ."
"; } - - if (!$is_index) - echo "
"; - } function menu_footer($no_menu, $is_index) { - global $version, $allow_demo_mode, $app_title, $power_url, $power_by, $path_to_root; + global $version, $allow_demo_mode, $app_title, $power_url, + $power_by, $path_to_root, $Pagehelp, $Ajax; include_once($path_to_root . "/includes/date_functions.inc"); if ($no_menu == false) @@ -101,8 +97,12 @@ else echo "\n"; echo ""; - if (isset($_SESSION['wa_current_user'])) + if (isset($_SESSION['wa_current_user'])) { + $phelp = implode('; ', $Pagehelp); echo "\n"; + $Ajax->addUpdate(true, 'hotkeyshelp', $phelp); + echo ""; + } echo "
" . Today() . " | " . Now() . "".$phelp."
\n"; } echo "\n"; @@ -111,7 +111,7 @@ { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -147,13 +147,18 @@ foreach ($module->lappfunctions as $appfunction) { - if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) + if ($appfunction->label == "") + echo " 
"; + elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) { - if ($appfunction->label == "") - echo " 
"; - else echo $img.menu_link($appfunction->link, $appfunction->label)."
\n"; } + else + { + echo $img.'' + .access_string($appfunction->label, true) + ."
\n"; + } } echo ""; if (sizeof($module->rappfunctions) > 0) @@ -161,13 +166,18 @@ echo ""; }