Changed Header_3 function to increase the y-value in the logo.

[fa-stable.git] / themes / aqua / renderer.php

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 2734ad08f644bbb5efa908346c47f95f91648042..a5036185273ef75e67cbf5b425208b82c331a89f 100644 (file)
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -14,12 +14,12 @@
                function get_icon($category)
                {
                        global  $path_to_root, $show_menu_category_icons;
-;
+
                        if ($show_menu_category_icons)
                                $img = $category == '' ? 'right.gif' : $category.'.png';
                        else    
                                $img = 'right.gif';
-                       return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
+                       return "<img src='$path_to_root/themes/aqua/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 
                function wa_header()
@@ -56,10 +56,13 @@
                                echo "<div class=tabs>";
                                foreach($applications as $app)
                                {
-                                       $acc = access_string($app->name);
-                                       echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
-                                               ."' href='$local_path_to_root/index.php?application=".$app->id
-                                               ."'$acc[1]>" .$acc[0] . "</a>";
+                    if ($_SESSION["wa_current_user"]->check_application_access($app))
+                    {
+                                               $acc = access_string($app->name);
+                                               echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
+                                                       ."' href='$local_path_to_root/index.php?application=".$app->id
+                                                       ."'$acc[1]>" .$acc[0] . "</a>";
+                                       }               
                                }
                                echo "</div>";
 
@@ -141,9 +144,13 @@
                        global $path_to_root;
                        
                        $selected_app = $waapp->get_selected_application();
+                       if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
+                               return;
 
                        foreach ($selected_app->modules as $module)
                        {
+                       if (!$_SESSION["wa_current_user"]->check_module_access($module))
+                               continue;
                                // image
                                echo "<tr>";
                                // values
@@ -163,7 +170,7 @@
                                        {
                                                        echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
                                        }
-                                       else 
+                                       elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
                                        {
                                                        echo $img.'<span class="inactive">'
                                                                .access_string($appfunction->label, true)
@@ -183,7 +190,7 @@
                                                {
                                                                echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
                                                }
-                                               else 
+                                               elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
                                                {
                                                                echo $img.'<span class="inactive">'
                                                                        .access_string($appfunction->label, true)