X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=themes%2Faqua%2Frenderer.php;h=cb7c4b5d729b139e2db6b78e949b36233bc3728c;hb=9451db1760036985de791ba24c442801e37f37de;hp=1d03c5d9c6b8f453690868f43a449869a318a188;hpb=e6af7f9f8087bc668eb55f3bf5acead018d38ad8;p=fa-stable.git
diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 1d03c5d9..cb7c4b5d 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -13,9 +13,9 @@
{
function get_icon($category)
{
- global $path_to_root, $show_menu_category_icons;
+ global $path_to_root, $SysPrefs;
- if ($show_menu_category_icons)
+ if ($SysPrefs->show_menu_category_icons)
$img = $category == '' ? 'right.gif' : $category.'.png';
else
$img = 'right.gif';
@@ -34,9 +34,9 @@
function menu_header($title, $no_menu, $is_index)
{
- global $path_to_root, $help_base_url, $db_connections;
+ global $path_to_root, $SysPrefs, $db_connections;
echo "
\n";
- echo "";
+ echo "
\n";
echo "\n";
echo "\n";
@@ -49,35 +49,33 @@
{
$applications = $_SESSION['App']->applications;
$local_path_to_root = $path_to_root;
-
$sel_app = $_SESSION['sel_app'];
- echo "";
- echo "";
+ echo " ";
+ echo "";
foreach($applications as $app)
{
if ($_SESSION["wa_current_user"]->check_application_access($app))
{
- $acc = access_string($app->name);
- echo " " .$acc[0] . "";
- }
+ $acc = access_string($app->name);
+ echo " " .$acc[0] . "";
+ }
}
echo " ";
-
echo " |
";
// top status bar
$img = " !["._(]($local_path_to_root/themes/aqua/images/login.gif) ";
$himg = " !["._(]($local_path_to_root/themes/aqua/images/help.gif) ";
- echo " ";
- echo "" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . " | ";
+ echo "";
+ echo "" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . " | ";
$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
- echo "![]($indicator) | ";
+ echo "![ajaxmark]($indicator) | ";
echo " " . _("Preferences") . " \n";
echo " " . _("Change password") . " \n";
- if ($help_base_url != null)
+ if ($SysPrefs->help_base_url != null)
{
echo "$himg" . _("Help") . " ";
}
@@ -89,53 +87,52 @@
echo " ";
elseif ($title && !$is_index)
{
- echo "$title | "
+ echo "$title | "
.""
.(user_hints() ? "" : '')
." | "
." ";
}
-
-
}
-
function menu_footer($no_menu, $is_index)
{
- global $version, $allow_demo_mode, $app_title, $power_url,
- $power_by, $path_to_root, $Pagehelp, $Ajax;
+ global $version, $path_to_root, $Pagehelp, $Ajax, $SysPrefs;
+
include_once($path_to_root . "/includes/date_functions.inc");
echo " \n"; // 'main_page'
- if ($no_menu == false) // bottom status line
+ if ($no_menu == false) // bottom status line
{
if ($is_index)
- echo "\n";
+ echo "\n";
else
- echo "\n";
+ echo "\n";
echo "";
if (isset($_SESSION['wa_current_user'])) {
$phelp = implode('; ', $Pagehelp);
- echo "" . Today() . " | " . Now() . " | \n";
+ echo "" . Today() . " | " . Now() . " | \n";
$Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
echo "".$phelp." | ";
}
- echo " \n";
+ echo " \n";
}
echo " \n"; // 'callout_main'
if ($no_menu == false)
{
echo "
\n";
@@ -147,7 +144,6 @@
global $path_to_root;
$selected_app = $waapp->get_selected_application();
-
if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
return;
@@ -157,7 +153,7 @@
return;
}
- echo "";
+ echo "";
foreach ($selected_app->modules as $module)
{
if (!$_SESSION["wa_current_user"]->check_module_access($module))
@@ -214,6 +210,5 @@
echo " ";
}
echo " ";
- }
+ }
}
-?>
\ No newline at end of file
| |
|