Additional cleanups in standard themes.

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 40b7f7ea658c2014d6775b21222184a6aa2bf0bf..5f3843b253f665ccd068eacabc1997983e7039a9 100644 (file)
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -19,7 +19,7 @@
                                $img = $category == '' ? 'right.gif' : $category.'.png';
                        else    
                                $img = 'right.gif';
-                       return "<img src='$path_to_root/themes/aqua/images/$img' style='vertical-align:middle;' border='0' ".basename($img).">&nbsp;&nbsp;";
+                       return "<img src='$path_to_root/themes/aqua/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 
                function wa_header()
@@ -36,7 +36,7 @@
                {
                        global $path_to_root, $help_base_url, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-                       echo "<tr>";
+                       echo "<tr>\n";
                        echo "<td colspan='2' rowspan='2'>\n";
 
                        echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
@@ -49,7 +49,6 @@
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
-
                                $sel_app = $_SESSION['sel_app'];
                                echo "<table cellpadding='0' cellspacing='0' width='100%'><tr><td>";
                                echo "<div class='tabs'>";
@@ -57,14 +56,13 @@
                                {
                     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>";
-                                       }               
+                        $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>";
-
                                echo "</td></tr></table>";
                                // top status bar
                                $img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
@@ -89,17 +87,14 @@
                                echo "<br>";
                        elseif ($title && !$is_index)
                        {
-                                       echo "<center><table id='title'><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>";
                        }
-
-
                }
 
-
                function menu_footer($no_menu, $is_index)
                {
                        global $version, $allow_demo_mode, $app_title, $power_url,
@@ -107,7 +102,7 @@
                        include_once($path_to_root . "/includes/date_functions.inc");
 
                        echo "</td></tr></table>\n"; // 'main_page'
-                       if ($no_menu == false)  // bottom status line
+                       if ($no_menu == false) // bottom status line
                        {
                                if ($is_index)
                                        echo "<table class='bottomBar'>\n";
@@ -118,7 +113,7 @@
                                        $phelp = implode('; ', $Pagehelp);
                                        echo "<td class='bottomBarCell'>" . Today() . " | " . Now() . "</td>\n";
                                        $Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
-                                       echo "<td id='hotkeyshelp'>".$phelp.'</td>';
+                                       echo "<td id='hotkeyshelp'>".$phelp."</td>";
                                }
                                echo "</tr></table>\n";
                        }
@@ -127,15 +122,15 @@
                        {
                                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() . " - ".show_users_online()."</font></a></td>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><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 "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
                                echo "</tr>\n";
                                if ($allow_demo_mode==true)
                                {
                                        echo "<tr>\n";
-                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='middle' /></a></div></td>\n";
+                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
                                        echo "</tr>\n";
                                }
                                echo "</table><br><br>\n";
@@ -147,7 +142,6 @@
                        global $path_to_root;
 
                        $selected_app = $waapp->get_selected_application();
-
                        if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
                                return;
 
@@ -214,6 +208,6 @@
                                echo "</tr></table></td></tr>";
                        }
                        echo "</table>";
-       }
+               }
        }
 ?>
\ No newline at end of file

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index fcf9a8dc60edb41a818dfa58b75d8cb382dae059..ddb7dcdd1b0cc9330e046a05980c8eaeaa832535 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -36,7 +36,7 @@
                {
                        global $path_to_root, $help_base_url, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-                       echo "<tr>";
+                       echo "<tr>\n";
                        echo "<td colspan='2' rowspan='2'>\n";
 
                        echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
@@ -49,7 +49,6 @@
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
-
                                $sel_app = $_SESSION['sel_app'];
                                echo "<table cellpadding='0' cellspacing='0' width='100%'><tr><td>";
                                echo "<div class='tabs'>";
@@ -57,23 +56,22 @@
                                {
                     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>";
-                                       }
+                        $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>";
-
                                echo "</td></tr></table>";
                                // top status bar
-                               $img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
-                               $himg = "<img src='$local_path_to_root/themes/aqua/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$local_path_to_root/themes/cool/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/cool/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
 
                                echo "<table class='logoutBar'>";
                                echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='middle' style='visibility:hidden;'></td>";
+                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
                                echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
                                echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
@@ -85,7 +83,6 @@
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
-
                        if ($no_menu)
                                echo "<br>";
                        elseif ($title && !$is_index)
@@ -96,17 +93,16 @@
                                ."</td>"
                                ."</tr></table></center>";
                        }
-
                }
 
                function menu_footer($no_menu, $is_index)
                {
-                       global $version, $allow_demo_mode, $app_title, $power_url, 
+                       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");
 
                        echo "</td></tr></table>\n"; // 'main_page'
-                       if ($no_menu == false)  // bottom status line
+                       if ($no_menu == false) // bottom status line
                        {
                                if ($is_index)
                                        echo "<table class='bottomBar'>\n";
@@ -126,10 +122,10 @@
                        {
                                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() ." - ".show_users_online(). "</font></a></td>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><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 "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
                                echo "</tr>\n";
                                if ($allow_demo_mode==true)
                                {
@@ -212,7 +208,6 @@
                                echo "</tr></table></td></tr>";
                        }
                        echo "</table>";
-       }
+               }
        }
-
 ?>
\ No newline at end of file

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 252dbfb840712807305573dbdbe53e53ab14fa77..438d87debd814313d47325cc6726937db237c720 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -9,7 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-
        class renderer
        {
                function get_icon($category)
@@ -20,7 +19,7 @@
                                $img = $category == '' ? 'right.gif' : $category.'.png';
                        else    
                                $img = 'right.gif';
-                       return "<img src='$path_to_root/themes/default/images/$img' style='vertical-align:middle;' border='0' ".basename($img).">&nbsp;&nbsp;";
+                       return "<img src='$path_to_root/themes/default/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 
                function wa_header()
@@ -65,14 +64,14 @@
                                }
                                echo "</div>";
                                echo "</td></tr></table>";
-
                                // top status bar
                                $img = "<img src='$local_path_to_root/themes/default/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
                                $himg = "<img src='$local_path_to_root/themes/default/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
+
                                echo "<table class='logoutBar'>";
                                echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='middle' style='visibility:hidden;' alt='ajaxmark'></td>";
+                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
                                echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
                                echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
@@ -85,7 +84,6 @@
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
-
                        if ($no_menu)
                                echo "<br>";
                        elseif ($title && !$is_index)
@@ -100,7 +98,7 @@
 
                function menu_footer($no_menu, $is_index)
                {
-                       global $version, $allow_demo_mode, $app_title, $power_url, 
+                       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");
 
@@ -125,7 +123,7 @@
                        {
                                echo "<table align='center' id='footer'>\n";
                                echo "<tr>\n";
-                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><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' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
@@ -133,7 +131,7 @@
                                if ($allow_demo_mode==true)
                                {
                                        echo "<tr>\n";
-                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='middle' /></a></div></td>\n";
+                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
                                        echo "</tr>\n";
                                }
                                echo "</table><br><br>\n";
@@ -211,6 +209,6 @@
                                echo "</tr></table></td></tr>";
                        }
                        echo "</table>";
-       }
-}
+               }
+       }
 ?>
\ No newline at end of file