X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=themes%2Faqua%2Frenderer.php;h=415a500972a67a52462c109bf25834bb3aa21599;hb=36ec54507b7841b2352734b81e45b95e371ecdab;hp=bf51fb558380ddd40698e45c2a50eafb96b9d5ae;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php index bf51fb55..415a5009 100644 --- a/themes/aqua/renderer.php +++ b/themes/aqua/renderer.php @@ -23,7 +23,7 @@ function menu_header($title, $no_menu, $is_index) { - global $path_to_root, $applications, $help_base_url, $db_connections; + 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'"; @@ -40,16 +40,19 @@ echo "
";
echo " ";
- foreach($applications as $app => $name)
+ foreach($applications as $app)
{
- $acc = access_string($name);
- echo "" .$acc[0] . "";
+ $acc = access_string($app->name);
+ echo "id ? "class='selected' " : "").
+ "href='$local_path_to_root/index.php?application=".$app->id
+ ."'$acc[1]>" .$acc[0] . "";
}
echo " ";
@@ -64,30 +67,30 @@
if ($help_base_url != null)
{
- echo "" . _("Help") . " ";
+ echo "$himg" . _("Help") . " ";
}
- echo "" . _("Logout") . " ";
+ echo "$img" . _("Logout") . " ";
echo " |
$title | " + echo "
$title | " ."" .(user_hints() ? "" : '') ." | " ."
" . Today() . " | " . Now() . " | \n"; + $Ajax->addUpdate(true, 'hotkeyshelp', $phelp); + echo "".$phelp." | "; + } echo "
$app_title $version - " . _("Theme:") . " " . user_theme() . " | \n"; + echo "$app_title $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()." | \n"; echo "
$power_by | \n"; @@ -124,9 +131,11 @@ function display_applications(&$waapp) { - + global $path_to_root; + $selected_app = $waapp->get_selected_application(); + $img = " "; foreach ($selected_app->modules as $module) { // image @@ -141,10 +150,17 @@ foreach ($module->lappfunctions as $appfunction) { - if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) + if ($appfunction->label == "") + echo "";
foreach ($module->rappfunctions 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)) + { + echo $img.menu_link($appfunction->link, $appfunction->label)." \n"; + } + else { - $lnk = access_string($appfunction->label); - echo "$lnk[0] "; + echo $img.'' + .access_string($appfunction->label, true) + ." \n"; } } echo " | ";