projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fixes to upgrade scripts.
[fa-stable.git]
/
themes
/
aqua
/
renderer.php
diff --git
a/themes/aqua/renderer.php
b/themes/aqua/renderer.php
index bf51fb558380ddd40698e45c2a50eafb96b9d5ae..415a500972a67a52462c109bf25834bb3aa21599 100644
(file)
--- a/
themes/aqua/renderer.php
+++ b/
themes/aqua/renderer.php
@@
-23,7
+23,7
@@
function menu_header($title, $no_menu, $is_index)
{
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'";
// 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 "<td class='quick_menu'>\n";
if (!$no_menu)
{
echo "<td class='quick_menu'>\n";
if (!$no_menu)
{
+ $applications = $_SESSION['App']->applications;
$local_path_to_root = $path_to_root;
$local_path_to_root = $path_to_root;
+ $img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'> ";
+ $himg = "<img src='$local_path_to_root/themes/aqua/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'> ";
$sel_app = $_SESSION['sel_app'];
echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
echo "<div class=tabs>";
$sel_app = $_SESSION['sel_app'];
echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
echo "<div class=tabs>";
- foreach($applications as $app
=> $name
)
+ foreach($applications as $app)
{
{
- $acc = access_string($name);
- echo "<a ".($sel_app == $app ? "class='selected' " : "").
- "href='$local_path_to_root/index.php?application=".$app
.
-
SID
."'$acc[1]>" .$acc[0] . "</a>";
+ $acc = access_string($
app->
name);
+ echo "<a ".($sel_app == $app
->id
? "class='selected' " : "").
+ "href='$local_path_to_root/index.php?application=".$app
->id
+ ."'$acc[1]>" .$acc[0] . "</a>";
}
echo "</div>";
}
echo "</div>";
@@
-64,30
+67,30
@@
if ($help_base_url != null)
{
if ($help_base_url != null)
{
- echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a> ";
+ echo "
$himg
<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a> ";
}
}
- echo "<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a> ";
+ echo "
$img
<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a> ";
echo "</td></tr></table>";
}
echo "</td></tr></table>";
echo "</td></tr></table>";
}
echo "</td></tr></table>";
-
- if ($title && !$no_menu && !$is_index)
+ if ($no_menu)
+ echo "<br>";
+ elseif ($title && !$is_index)
{
{
-
echo "<center><table width='100%
'><tr><td width='100%' class='titletext'>$title</td>"
+
echo "<center><table id='title
'><tr><td width='100%' class='titletext'>$title</td>"
."<td align=right>"
.(user_hints() ? "<span id='hints'></span>" : '')
."</td>"
."</tr></table></center>";
}
."<td align=right>"
.(user_hints() ? "<span id='hints'></span>" : '')
."</td>"
."</tr></table></center>";
}
- if (!$is_index)
- echo "<br>";
}
function menu_footer($no_menu, $is_index)
{
}
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)
include_once($path_to_root . "/includes/date_functions.inc");
if ($no_menu == false)
@@
-97,8
+100,12
@@
else
echo "<table class=bottomBar2>\n";
echo "<tr>";
else
echo "<table class=bottomBar2>\n";
echo "<tr>";
- if (isset($_SESSION['wa_current_user']))
+ if (isset($_SESSION['wa_current_user'])) {
+ $phelp = implode('; ', $Pagehelp);
echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+ $Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
+ echo "<td id='hotkeyshelp'>".$phelp."</td>";
+ }
echo "</tr></table>\n";
}
echo "</td></tr></table></td>\n";
echo "</tr></table>\n";
}
echo "</td></tr></table></td>\n";
@@
-107,7
+114,7
@@
{
echo "<table align='center' id='footer'>\n";
echo "<tr>\n";
{
echo "<table align='center' id='footer'>\n";
echo "<tr>\n";
- echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . "</font></a></td>\n";
+ echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . "
- ".show_users_online()."
</font></a></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
@@
-124,9
+131,11
@@
function display_applications(&$waapp)
{
function display_applications(&$waapp)
{
-
+ global $path_to_root;
+
$selected_app = $waapp->get_selected_application();
$selected_app = $waapp->get_selected_application();
+ $img = "<img src='$path_to_root/themes/aqua/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'> ";
foreach ($selected_app->modules as $module)
{
// image
foreach ($selected_app->modules as $module)
{
// image
@@
-141,10
+150,17
@@
foreach ($module->lappfunctions as $appfunction)
{
foreach ($module->lappfunctions as $appfunction)
{
- if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ if ($appfunction->label == "")
+ echo " <br>";
+ elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
{
{
- $lnk = access_string($appfunction->label);
- echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+ echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
+ }
+ else
+ {
+ echo $img.'<span class="inactive">'
+ .access_string($appfunction->label, true)
+ ."</span><br>\n";
}
}
echo "</td>";
}
}
echo "</td>";
@@
-153,10
+169,17
@@
echo "<td width='50%' class='menu_group_items'>";
foreach ($module->rappfunctions as $appfunction)
{
echo "<td width='50%' class='menu_group_items'>";
foreach ($module->rappfunctions as $appfunction)
{
- if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ if ($appfunction->label == "")
+ echo " <br>";
+ elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ {
+ echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
+ }
+ else
{
{
- $lnk = access_string($appfunction->label);
- echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+ echo $img.'<span class="inactive">'
+ .access_string($appfunction->label, true)
+ ."</span><br>\n";
}
}
echo "</td>";
}
}
echo "</td>";