Improvement of standard themes. 2 small gif files added. Shown upper right.

diff --git a/themes/aqua/images/lock.gif b/themes/aqua/images/lock.gif
new file mode 100644 (file)
index 0000000..92a51e2
Binary files /dev/null and b/themes/aqua/images/lock.gif differ

diff --git a/themes/aqua/images/preferences.gif b/themes/aqua/images/preferences.gif
new file mode 100644 (file)
index 0000000..56c12bc
Binary files /dev/null and b/themes/aqua/images/preferences.gif differ

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 96eed076e726a15e432c7bdb4ebfc9877bbdcd65..ac299b50d909f2dc2132d219590ac18bc076197c 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'>&nbsp;&nbsp;";
+                       return "<img src='$path_to_root/themes/".user_theme()."/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 
                function wa_header()
@@ -67,20 +67,22 @@
                                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;";
+                               $pimg = "<img src='$local_path_to_root/themes/".user_theme()."/images/preferences.gif' width='14' height='14' border='0' alt='"._('Preferences')."'>&nbsp;&nbsp;";
+                               $limg = "<img src='$local_path_to_root/themes/".user_theme()."/images/lock.gif' width='14' height='14' border='0' alt='"._('Change Password')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$local_path_to_root/themes/".user_theme()."/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/".user_theme()."/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
 
                                echo "<table class='logoutBar'>";
                                echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</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";
+                               echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>$pimg" . _("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 . "'>$limg" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
                                if ($SysPrefs->help_base_url != null)
                                {
-                                       echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
+                                       echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>$himg" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
-                               echo "$img<a class='shortcut' href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+                               echo "<a class='shortcut' href='$local_path_to_root/access/logout.php?'>$img" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";

diff --git a/themes/cool/images/lock.gif b/themes/cool/images/lock.gif
new file mode 100644 (file)
index 0000000..92a51e2
Binary files /dev/null and b/themes/cool/images/lock.gif differ

diff --git a/themes/cool/images/preferences.gif b/themes/cool/images/preferences.gif
new file mode 100644 (file)
index 0000000..56c12bc
Binary files /dev/null and b/themes/cool/images/preferences.gif differ

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index d053d1b1d0c5a1f1a2216d8275972af771c44418..a14e26c5281a8a5e5f5f1b14d9795d4a89dbd5c9 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -19,7 +19,7 @@
                                $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/".user_theme()."/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 
                function wa_header()
@@ -67,20 +67,22 @@
                                echo "</div>";
                                echo "</td></tr></table>";
                                // top status bar
-                               $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;";
+                               $pimg = "<img src='$local_path_to_root/themes/".user_theme()."/images/preferences.gif' width='14' height='14' border='0' alt='"._('Preferences')."'>&nbsp;&nbsp;";
+                               $limg = "<img src='$local_path_to_root/themes/".user_theme()."/images/lock.gif' width='14' height='14' border='0' alt='"._('Change Password')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$local_path_to_root/themes/".user_theme()."/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/".user_theme()."/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
 
                                echo "<table class='logoutBar'>";
                                echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</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";
+                               echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>$pimg" . _("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 . "'>$limg" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
                                if ($SysPrefs->help_base_url != null)
                                {
-                                       echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
+                                       echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>$himg" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
-                               echo "$img<a class='shortcut' href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+                               echo "<a class='shortcut' href='$local_path_to_root/access/logout.php?'>$img" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";

diff --git a/themes/default/images/lock.gif b/themes/default/images/lock.gif
new file mode 100644 (file)
index 0000000..92a51e2
Binary files /dev/null and b/themes/default/images/lock.gif differ

diff --git a/themes/default/images/preferences.gif b/themes/default/images/preferences.gif
new file mode 100644 (file)
index 0000000..56c12bc
Binary files /dev/null and b/themes/default/images/preferences.gif differ

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index d9138468dd6195c9a48c1a33bf946b3d74f5016e..09e2df6e608f0da6e17e3056fe87a6fc7dff4494 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -19,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'>&nbsp;&nbsp;";
+                       return "<img src='$path_to_root/themes/".user_theme()."/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 
                function wa_header()
@@ -67,19 +67,21 @@
                                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;";
+                               $pimg = "<img src='$local_path_to_root/themes/".user_theme()."/images/preferences.gif' width='14' height='14' border='0' alt='"._('Preferences')."'>&nbsp;&nbsp;";
+                               $limg = "<img src='$local_path_to_root/themes/".user_theme()."/images/lock.gif' width='14' height='14' border='0' alt='"._('Change Password')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$local_path_to_root/themes/".user_theme()."/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/".user_theme()."/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
                                echo "<table class='logoutBar'>";
                                echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</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";
+                               echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>$pimg" . _("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 . "'>$limg" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
                                if ($SysPrefs->help_base_url != null)
                                {
-                                       echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
+                                       echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>$himg" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
-                               echo "$img<a class='shortcut' href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+                               echo "<a class='shortcut' href='$local_path_to_root/access/logout.php?'>$img" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
                                echo "</td></tr><tr><td colspan=3>";
                                echo "</td></tr></table>";
                        }