From 8d8bf3bc560ab929ae30f1ebf5e17c79df178f1d Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 8 Dec 2015 08:36:21 +0100
Subject: [PATCH] Improvement of standard themes. 2 small gif files added.
 Shown upper right.

---
 themes/aqua/images/lock.gif           | Bin 0 -> 594 bytes
 themes/aqua/images/preferences.gif    | Bin 0 -> 632 bytes
 themes/aqua/renderer.php              |  16 +++++++++-------
 themes/cool/images/lock.gif           | Bin 0 -> 594 bytes
 themes/cool/images/preferences.gif    | Bin 0 -> 632 bytes
 themes/cool/renderer.php              |  16 +++++++++-------
 themes/default/images/lock.gif        | Bin 0 -> 594 bytes
 themes/default/images/preferences.gif | Bin 0 -> 632 bytes
 themes/default/renderer.php           |  16 +++++++++-------
 9 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 themes/aqua/images/lock.gif
 create mode 100644 themes/aqua/images/preferences.gif
 create mode 100644 themes/cool/images/lock.gif
 create mode 100644 themes/cool/images/preferences.gif
 create mode 100644 themes/default/images/lock.gif
 create mode 100644 themes/default/images/preferences.gif

diff --git a/themes/aqua/images/lock.gif b/themes/aqua/images/lock.gif
new file mode 100644
index 0000000000000000000000000000000000000000..92a51e2920ac2dc37850d0542701ebf51e426c7a
GIT binary patch
literal 594
zcma)&?K9H>0LOo;J+WdB5q4cjv+__b6(-d6^N^4%)@k9;5Vh2$u6Fj|CY!siH9eg+
zMaosDdeK@}lp0dx;#$LD*ei9(i=1BcjsKv}i|^g%`|^{Nk{A_Tz$VzlF@gwKq*90_
zLYHUxYhBXniyCwn1Mhn?X~xUfU2-p2WizD=bW1xk7yyh0ldFW*-2Aw+>m6!2z&FR}
z7@X!DaV`vg6*BqL6!!szux%d?*97RUa#ivx%1-0wGc3M_CGD$(?kXZMdHc^_)Ye>a
z$*6Fe&>_K?VxV4xdkGVAZ@kUIeGv>HfE`!E@G-ymgaY%H@=`e(g3uHXTa`Fdf*vWX
zMHn%D85+iTC0r_~+)&ROvX5X~i?$fp&MYkaMtkz7&x5e0qvrxFq~m-bKIEan|4o+-
zb1yN~G%-1Yj%>8VeV_ettD&hzrGq&R)pVF5T3a4L%RyfOwA_SP67w&fr!pUqZqBLc
zQ7QdZIujV3l@T^w{IF7p-lMRc#hvheF&&LUheFVJvl%)z+EbSc{|AhAC81W+XgL&$
zMyJV6EadLWsMD)A9y&<#_V)B#V<d7}a?SQ+lhK2<O0$j|ZT1LysNS|G&%D{E^yL0f
zW}wVi!a1-hEVX>c5wF#HpOw6*kV;{i+X}j#I!KC>vdZiZ9d&EuhU1K#5ed8db?%(}
zU_L{#<?tzie(m~Lk>91>xnG6MTGE%kH}kHIG=#@I35cAg)bNAZ{^#11O2Z9SL7&in
MP(bx1RRkgW2O;bdlK=n!

literal 0
HcmV?d00001

diff --git a/themes/aqua/images/preferences.gif b/themes/aqua/images/preferences.gif
new file mode 100644
index 0000000000000000000000000000000000000000..56c12bc8340212e569809d1171f45115718c67c6
GIT binary patch
literal 632
zcmZ?wbhEHb6krfwNMm47{K>+|00cT90wlH!$dyZ+ec|VS<-D~S>tBX0dLZbQpSb$j
zq4)n6-T3c0^NvRC5t-P@T8*ctU;HH<-W9*%$@!oESKa$>*?V>Ega0z|)10Q?4qo)|
z*ysO&^X_kX^51*TJ(K>M+ASA)PkraLO%M;LOJDb*?dVsH&hy^0@2z?8f5xRhtMC0^
ze(%3d%f)q%{wox&j#~C;&XvEC2@{R_ZpcPYP_H^*-g|Z9lm7?a|8F|{SuSQm$nt0N
zuKz3D`EJ+C|0)HWI*xr)E!q;k_@R9AT<58`x=wym%v!EhcPxG5D>3hKx#Zbdn_enp
zEM0Qzf6L*|@@b32JWJ<Z|0f$eRk!t`%hX$i+uo{{ZdcA(t(dtiW$km*o-4u2pRIrN
zKVaVd^o=jwrr(x{of5R*fkOI{#W(*~@B6sr+5efB{}{Ail24uo3OA|(_NxsHO-)fO
zO)M_WT}|Okg5u(WOy=DTGRpc)OcD~a^p$0r#iVpqBaEE6!?aX&rNo-JIGE(DL%dV$
zogA4sxSH8DWVyK+8G~#MHQ1Z9MZE%zJeZr98F}56M74#DwG?H8yO<5xMT~_t)jboE
z4Z7m|E#uWS^%Qi}LK&|xTvJSnuqjYn!Pv(V*(0f~py=4_$S-4&A=Jjs!Xa0pV({=m
zqk;g78N*7&Mm8ocr3Did4kS!yoX*OnapTeA)9w7a;)N$SEaVUtk}L{iN_Zm6Anhl{
I%EVv|06diK0RR91

literal 0
HcmV?d00001

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 96eed076..ac299b50 100644
--- 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
index 0000000000000000000000000000000000000000..92a51e2920ac2dc37850d0542701ebf51e426c7a
GIT binary patch
literal 594
zcma)&?K9H>0LOo;J+WdB5q4cjv+__b6(-d6^N^4%)@k9;5Vh2$u6Fj|CY!siH9eg+
zMaosDdeK@}lp0dx;#$LD*ei9(i=1BcjsKv}i|^g%`|^{Nk{A_Tz$VzlF@gwKq*90_
zLYHUxYhBXniyCwn1Mhn?X~xUfU2-p2WizD=bW1xk7yyh0ldFW*-2Aw+>m6!2z&FR}
z7@X!DaV`vg6*BqL6!!szux%d?*97RUa#ivx%1-0wGc3M_CGD$(?kXZMdHc^_)Ye>a
z$*6Fe&>_K?VxV4xdkGVAZ@kUIeGv>HfE`!E@G-ymgaY%H@=`e(g3uHXTa`Fdf*vWX
zMHn%D85+iTC0r_~+)&ROvX5X~i?$fp&MYkaMtkz7&x5e0qvrxFq~m-bKIEan|4o+-
zb1yN~G%-1Yj%>8VeV_ettD&hzrGq&R)pVF5T3a4L%RyfOwA_SP67w&fr!pUqZqBLc
zQ7QdZIujV3l@T^w{IF7p-lMRc#hvheF&&LUheFVJvl%)z+EbSc{|AhAC81W+XgL&$
zMyJV6EadLWsMD)A9y&<#_V)B#V<d7}a?SQ+lhK2<O0$j|ZT1LysNS|G&%D{E^yL0f
zW}wVi!a1-hEVX>c5wF#HpOw6*kV;{i+X}j#I!KC>vdZiZ9d&EuhU1K#5ed8db?%(}
zU_L{#<?tzie(m~Lk>91>xnG6MTGE%kH}kHIG=#@I35cAg)bNAZ{^#11O2Z9SL7&in
MP(bx1RRkgW2O;bdlK=n!

literal 0
HcmV?d00001

diff --git a/themes/cool/images/preferences.gif b/themes/cool/images/preferences.gif
new file mode 100644
index 0000000000000000000000000000000000000000..56c12bc8340212e569809d1171f45115718c67c6
GIT binary patch
literal 632
zcmZ?wbhEHb6krfwNMm47{K>+|00cT90wlH!$dyZ+ec|VS<-D~S>tBX0dLZbQpSb$j
zq4)n6-T3c0^NvRC5t-P@T8*ctU;HH<-W9*%$@!oESKa$>*?V>Ega0z|)10Q?4qo)|
z*ysO&^X_kX^51*TJ(K>M+ASA)PkraLO%M;LOJDb*?dVsH&hy^0@2z?8f5xRhtMC0^
ze(%3d%f)q%{wox&j#~C;&XvEC2@{R_ZpcPYP_H^*-g|Z9lm7?a|8F|{SuSQm$nt0N
zuKz3D`EJ+C|0)HWI*xr)E!q;k_@R9AT<58`x=wym%v!EhcPxG5D>3hKx#Zbdn_enp
zEM0Qzf6L*|@@b32JWJ<Z|0f$eRk!t`%hX$i+uo{{ZdcA(t(dtiW$km*o-4u2pRIrN
zKVaVd^o=jwrr(x{of5R*fkOI{#W(*~@B6sr+5efB{}{Ail24uo3OA|(_NxsHO-)fO
zO)M_WT}|Okg5u(WOy=DTGRpc)OcD~a^p$0r#iVpqBaEE6!?aX&rNo-JIGE(DL%dV$
zogA4sxSH8DWVyK+8G~#MHQ1Z9MZE%zJeZr98F}56M74#DwG?H8yO<5xMT~_t)jboE
z4Z7m|E#uWS^%Qi}LK&|xTvJSnuqjYn!Pv(V*(0f~py=4_$S-4&A=Jjs!Xa0pV({=m
zqk;g78N*7&Mm8ocr3Did4kS!yoX*OnapTeA)9w7a;)N$SEaVUtk}L{iN_Zm6Anhl{
I%EVv|06diK0RR91

literal 0
HcmV?d00001

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index d053d1b1..a14e26c5 100644
--- 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
index 0000000000000000000000000000000000000000..92a51e2920ac2dc37850d0542701ebf51e426c7a
GIT binary patch
literal 594
zcma)&?K9H>0LOo;J+WdB5q4cjv+__b6(-d6^N^4%)@k9;5Vh2$u6Fj|CY!siH9eg+
zMaosDdeK@}lp0dx;#$LD*ei9(i=1BcjsKv}i|^g%`|^{Nk{A_Tz$VzlF@gwKq*90_
zLYHUxYhBXniyCwn1Mhn?X~xUfU2-p2WizD=bW1xk7yyh0ldFW*-2Aw+>m6!2z&FR}
z7@X!DaV`vg6*BqL6!!szux%d?*97RUa#ivx%1-0wGc3M_CGD$(?kXZMdHc^_)Ye>a
z$*6Fe&>_K?VxV4xdkGVAZ@kUIeGv>HfE`!E@G-ymgaY%H@=`e(g3uHXTa`Fdf*vWX
zMHn%D85+iTC0r_~+)&ROvX5X~i?$fp&MYkaMtkz7&x5e0qvrxFq~m-bKIEan|4o+-
zb1yN~G%-1Yj%>8VeV_ettD&hzrGq&R)pVF5T3a4L%RyfOwA_SP67w&fr!pUqZqBLc
zQ7QdZIujV3l@T^w{IF7p-lMRc#hvheF&&LUheFVJvl%)z+EbSc{|AhAC81W+XgL&$
zMyJV6EadLWsMD)A9y&<#_V)B#V<d7}a?SQ+lhK2<O0$j|ZT1LysNS|G&%D{E^yL0f
zW}wVi!a1-hEVX>c5wF#HpOw6*kV;{i+X}j#I!KC>vdZiZ9d&EuhU1K#5ed8db?%(}
zU_L{#<?tzie(m~Lk>91>xnG6MTGE%kH}kHIG=#@I35cAg)bNAZ{^#11O2Z9SL7&in
MP(bx1RRkgW2O;bdlK=n!

literal 0
HcmV?d00001

diff --git a/themes/default/images/preferences.gif b/themes/default/images/preferences.gif
new file mode 100644
index 0000000000000000000000000000000000000000..56c12bc8340212e569809d1171f45115718c67c6
GIT binary patch
literal 632
zcmZ?wbhEHb6krfwNMm47{K>+|00cT90wlH!$dyZ+ec|VS<-D~S>tBX0dLZbQpSb$j
zq4)n6-T3c0^NvRC5t-P@T8*ctU;HH<-W9*%$@!oESKa$>*?V>Ega0z|)10Q?4qo)|
z*ysO&^X_kX^51*TJ(K>M+ASA)PkraLO%M;LOJDb*?dVsH&hy^0@2z?8f5xRhtMC0^
ze(%3d%f)q%{wox&j#~C;&XvEC2@{R_ZpcPYP_H^*-g|Z9lm7?a|8F|{SuSQm$nt0N
zuKz3D`EJ+C|0)HWI*xr)E!q;k_@R9AT<58`x=wym%v!EhcPxG5D>3hKx#Zbdn_enp
zEM0Qzf6L*|@@b32JWJ<Z|0f$eRk!t`%hX$i+uo{{ZdcA(t(dtiW$km*o-4u2pRIrN
zKVaVd^o=jwrr(x{of5R*fkOI{#W(*~@B6sr+5efB{}{Ail24uo3OA|(_NxsHO-)fO
zO)M_WT}|Okg5u(WOy=DTGRpc)OcD~a^p$0r#iVpqBaEE6!?aX&rNo-JIGE(DL%dV$
zogA4sxSH8DWVyK+8G~#MHQ1Z9MZE%zJeZr98F}56M74#DwG?H8yO<5xMT~_t)jboE
z4Z7m|E#uWS^%Qi}LK&|xTvJSnuqjYn!Pv(V*(0f~py=4_$S-4&A=Jjs!Xa0pV({=m
zqk;g78N*7&Mm8ocr3Did4kS!yoX*OnapTeA)9w7a;)N$SEaVUtk}L{iN_Zm6Anhl{
I%EVv|06diK0RR91

literal 0
HcmV?d00001

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index d9138468..09e2df6e 100644
--- 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>";
 			}
-- 
2.30.2