From 6b338e9f3a82343490bb346b747a2ae341dc4882 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 28 Feb 2009 00:45:33 +0000 Subject: [PATCH] Improved layout in standard themes (graphics) --- CHANGELOG.txt | 16 ++++++++++++++++ themes/aqua/images/help.gif | Bin 0 -> 591 bytes themes/aqua/images/login.gif | Bin 0 -> 341 bytes themes/aqua/images/right.gif | Bin 0 -> 895 bytes themes/aqua/renderer.php | 30 ++++++++++++++++++++++-------- themes/cool/images/help.gif | Bin 0 -> 591 bytes themes/cool/images/login.gif | Bin 0 -> 341 bytes themes/cool/images/right.gif | Bin 0 -> 895 bytes themes/cool/renderer.php | 27 ++++++++++++++++++++------- themes/default/images/help.gif | Bin 0 -> 591 bytes themes/default/images/login.gif | Bin 0 -> 341 bytes themes/default/images/right.gif | Bin 0 -> 895 bytes themes/default/login.css | 11 ++++++----- themes/default/renderer.php | 26 ++++++++++++++++++++------ 14 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 themes/aqua/images/help.gif create mode 100644 themes/aqua/images/login.gif create mode 100644 themes/aqua/images/right.gif create mode 100644 themes/cool/images/help.gif create mode 100644 themes/cool/images/login.gif create mode 100644 themes/cool/images/right.gif create mode 100644 themes/default/images/help.gif create mode 100644 themes/default/images/login.gif create mode 100644 themes/default/images/right.gif diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 81911f1f..0e16b30d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,22 @@ Legend: ! -> Note $ -> Affected files +28-Feb-2009 Joe Hunt +! Improved layout in standard themes (graphics) +$ /themes/aqua/renderer.php + /themes/aqua/help.gif (new file) + /themes/aqua/login.gif (new file) + /themes/aqua/right.gif (new file) + /themes/cool/renderer.php + /themes/cool/help.gif (new file) + /themes/cool/login.gif (new file) + /themes/cool/right.gif (new file) + /themes/default/renderer.php + /themes/default/help.gif (new file) + /themes/default/login.gif (new file) + /themes/default/right.gif (new file) + /themes/themes/login.css + 27-Feb-2009 Janusz Dobrowolski # Security fix to my last commit. $ /frontaccounting.php diff --git a/themes/aqua/images/help.gif b/themes/aqua/images/help.gif new file mode 100644 index 0000000000000000000000000000000000000000..58c0ffef53c069afad5fe2ffcb28bdb9008ea8c7 GIT binary patch literal 591 zcmZ?wbhEHb6krfwc;?Q);Btl`?acrG{~3&DvaR^P=K6nzst1D0|1+eYHDB?YA?6xG z$sLB&Gm*RgNA3Jyd+a|$$t{-h+mp}yXGl81(Dg-l`gex@ueC@2GnC(DsJQ39h^-mcZo-q{NV3_=iq4T}WivJ9GR~X`MiZA@n zkafX#$A5<0%M48~#S0!X#9n8Z@|U6Q4d<-Cn(O{c6h3S^0aSdIA@#o8w9gEwrx~KJ z$}IcO(EHhZ!+(a3cMOr2{eap_Z}T@kVrY5Akb4E>ogo4gf3h$#Ft{`5fZPj;69)D* z4em`%jIC|W9qz5HJ-w}+jOJ2OGBP3}RzgCI&5YvO_67`#8MI_&`R8K}IK6bvv=WT#~9fx~-gS`o<3H zH?s-o@yI`5V^dZ!TIz{A5ihgnWSLUOOBfWitxhYJmIf=UlwY;{)XYGUJ;nXw`9 aN*kw;BA=8&L&NcY8R6U~9!7x*4AuZe@Tdm> literal 0 HcmV?d00001 diff --git a/themes/aqua/images/login.gif b/themes/aqua/images/login.gif new file mode 100644 index 0000000000000000000000000000000000000000..bd3f47c59a12469d8f6c707d88b0ae7d02e1441d GIT binary patch literal 341 zcmZ?wbhEHb6krfwxT??a{|v*KnGFB`|DT;D`Tsw|%ru6HF$}3r4F69v%*he?e~sb) zC5HJ$vS}_1=`IXuK=J>tPb_Ene}m!wJ%)qx9R9yx*xn`Z{|UpE4(b0d878OjWw!BuF$lFf9XaS@dXi~@N^6T4L&zN_2L-4t72Pfdva27&#@)=14dkaO@OOk5aKvNN(&AU{5OXXn5q- zC@Cwoz+*#V<8)TGx||zEOB-gIxTbB%n3Q~Ms)+L|pOu#$c=U3LXNk<(urj!rk&(d~ E0JMlPf&c&j literal 0 HcmV?d00001 diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php index 48fd487a..c671e8e6 100644 --- a/themes/aqua/renderer.php +++ b/themes/aqua/renderer.php @@ -42,6 +42,8 @@ { $applications = $_SESSION['App']->applications; $local_path_to_root = $path_to_root; + $img = ""._(  "; + $himg = ""._(  "; $sel_app = $_SESSION['sel_app']; echo "
"; echo "
"; @@ -65,9 +67,9 @@ if ($help_base_url != null) { - echo "" . _("Help") . "   "; + echo "$himg" . _("Help") . "   "; } - echo "" . _("Logout") . "   "; + echo "$img" . _("Logout") . "   "; echo "
"; } echo ""; @@ -125,9 +127,11 @@ function display_applications(&$waapp) { - + global $path_to_root; + $selected_app = $waapp->get_selected_application(); + $img = "  "; foreach ($selected_app->modules as $module) { // image @@ -144,8 +148,13 @@ { if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) { - $lnk = access_string($appfunction->label); - echo "$lnk[0]
"; + if ($appfunction->label == "") + echo " 
"; + else + { + $lnk = access_string($appfunction->label); + echo "$img$lnk[0]
"; + } } } echo ""; @@ -156,9 +165,14 @@ { if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) { - $lnk = access_string($appfunction->label); - echo "$lnk[0]
"; - } + if ($appfunction->label == "") + echo " 
"; + else + { + $lnk = access_string($appfunction->label); + echo "$img$lnk[0]
"; + } + } } echo ""; } diff --git a/themes/cool/images/help.gif b/themes/cool/images/help.gif new file mode 100644 index 0000000000000000000000000000000000000000..58c0ffef53c069afad5fe2ffcb28bdb9008ea8c7 GIT binary patch literal 591 zcmZ?wbhEHb6krfwc;?Q);Btl`?acrG{~3&DvaR^P=K6nzst1D0|1+eYHDB?YA?6xG z$sLB&Gm*RgNA3Jyd+a|$$t{-h+mp}yXGl81(Dg-l`gex@ueC@2GnC(DsJQ39h^-mcZo-q{NV3_=iq4T}WivJ9GR~X`MiZA@n zkafX#$A5<0%M48~#S0!X#9n8Z@|U6Q4d<-Cn(O{c6h3S^0aSdIA@#o8w9gEwrx~KJ z$}IcO(EHhZ!+(a3cMOr2{eap_Z}T@kVrY5Akb4E>ogo4gf3h$#Ft{`5fZPj;69)D* z4em`%jIC|W9qz5HJ-w}+jOJ2OGBP3}RzgCI&5YvO_67`#8MI_&`R8K}IK6bvv=WT#~9fx~-gS`o<3H zH?s-o@yI`5V^dZ!TIz{A5ihgnWSLUOOBfWitxhYJmIf=UlwY;{)XYGUJ;nXw`9 aN*kw;BA=8&L&NcY8R6U~9!7x*4AuZe@Tdm> literal 0 HcmV?d00001 diff --git a/themes/cool/images/login.gif b/themes/cool/images/login.gif new file mode 100644 index 0000000000000000000000000000000000000000..bd3f47c59a12469d8f6c707d88b0ae7d02e1441d GIT binary patch literal 341 zcmZ?wbhEHb6krfwxT??a{|v*KnGFB`|DT;D`Tsw|%ru6HF$}3r4F69v%*he?e~sb) zC5HJ$vS}_1=`IXuK=J>tPb_Ene}m!wJ%)qx9R9yx*xn`Z{|UpE4(b0d878OjWw!BuF$lFf9XaS@dXi~@N^6T4L&zN_2L-4t72Pfdva27&#@)=14dkaO@OOk5aKvNN(&AU{5OXXn5q- zC@Cwoz+*#V<8)TGx||zEOB-gIxTbB%n3Q~Ms)+L|pOu#$c=U3LXNk<(urj!rk&(d~ E0JMlPf&c&j literal 0 HcmV?d00001 diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php index 48fd487a..34f1f355 100644 --- a/themes/cool/renderer.php +++ b/themes/cool/renderer.php @@ -42,6 +42,8 @@ { $applications = $_SESSION['App']->applications; $local_path_to_root = $path_to_root; + $img = ""._(  "; + $himg = ""._(  "; $sel_app = $_SESSION['sel_app']; echo "
"; echo "
"; @@ -65,9 +67,9 @@ if ($help_base_url != null) { - echo "" . _("Help") . "   "; + echo "$himg" . _("Help") . "   "; } - echo "" . _("Logout") . "   "; + echo "$img" . _("Logout") . "   "; echo "
"; } echo ""; @@ -125,9 +127,10 @@ function display_applications(&$waapp) { - + global $path_to_root; $selected_app = $waapp->get_selected_application(); + $img = "  "; foreach ($selected_app->modules as $module) { // image @@ -144,8 +147,13 @@ { if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) { - $lnk = access_string($appfunction->label); - echo "$lnk[0]
"; + if ($appfunction->label == "") + echo " 
"; + else + { + $lnk = access_string($appfunction->label); + echo "$img$lnk[0]
"; + } } } echo ""; @@ -156,8 +164,13 @@ { if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) { - $lnk = access_string($appfunction->label); - echo "$lnk[0]
"; + if ($appfunction->label == "") + echo " 
"; + else + { + $lnk = access_string($appfunction->label); + echo "$img$lnk[0]
"; + } } } echo ""; diff --git a/themes/default/images/help.gif b/themes/default/images/help.gif new file mode 100644 index 0000000000000000000000000000000000000000..58c0ffef53c069afad5fe2ffcb28bdb9008ea8c7 GIT binary patch literal 591 zcmZ?wbhEHb6krfwc;?Q);Btl`?acrG{~3&DvaR^P=K6nzst1D0|1+eYHDB?YA?6xG z$sLB&Gm*RgNA3Jyd+a|$$t{-h+mp}yXGl81(Dg-l`gex@ueC@2GnC(DsJQ39h^-mcZo-q{NV3_=iq4T}WivJ9GR~X`MiZA@n zkafX#$A5<0%M48~#S0!X#9n8Z@|U6Q4d<-Cn(O{c6h3S^0aSdIA@#o8w9gEwrx~KJ z$}IcO(EHhZ!+(a3cMOr2{eap_Z}T@kVrY5Akb4E>ogo4gf3h$#Ft{`5fZPj;69)D* z4em`%jIC|W9qz5HJ-w}+jOJ2OGBP3}RzgCI&5YvO_67`#8MI_&`R8K}IK6bvv=WT#~9fx~-gS`o<3H zH?s-o@yI`5V^dZ!TIz{A5ihgnWSLUOOBfWitxhYJmIf=UlwY;{)XYGUJ;nXw`9 aN*kw;BA=8&L&NcY8R6U~9!7x*4AuZe@Tdm> literal 0 HcmV?d00001 diff --git a/themes/default/images/login.gif b/themes/default/images/login.gif new file mode 100644 index 0000000000000000000000000000000000000000..bd3f47c59a12469d8f6c707d88b0ae7d02e1441d GIT binary patch literal 341 zcmZ?wbhEHb6krfwxT??a{|v*KnGFB`|DT;D`Tsw|%ru6HF$}3r4F69v%*he?e~sb) zC5HJ$vS}_1=`IXuK=J>tPb_Ene}m!wJ%)qx9R9yx*xn`Z{|UpE4(b0d878OjWw!BuF$lFf9XaS@dXi~@N^6T4L&zN_2L-4t72Pfdva27&#@)=14dkaO@OOk5aKvNN(&AU{5OXXn5q- zC@Cwoz+*#V<8)TGx||zEOB-gIxTbB%n3Q~Ms)+L|pOu#$c=U3LXNk<(urj!rk&(d~ E0JMlPf&c&j literal 0 HcmV?d00001 diff --git a/themes/default/login.css b/themes/default/login.css index 1864b5dc..f4cd1e94 100644 --- a/themes/default/login.css +++ b/themes/default/login.css @@ -2,12 +2,12 @@ | | | login.css | |---------------------------------------------------| | For use with: | -| OpenAccounting | -| http://open-accounting.sourceforge.net/ | -| by KylieTech Consulting | +| FrontAccounting | +| http://frontaccounting.net/ | +| by FrontAccount, LLC | |---------------------------------------------------| | Developer: | -| Shane Barnaby | +| Joe Hunt | | | |---------------------------------------------------| | Note: | @@ -41,5 +41,6 @@ input.small { } td.login { - background: #dddddd; + border: 1px solid #ccc; + background-color: #eee; } \ No newline at end of file diff --git a/themes/default/renderer.php b/themes/default/renderer.php index e3e58605..473cf82f 100644 --- a/themes/default/renderer.php +++ b/themes/default/renderer.php @@ -43,6 +43,8 @@ { $applications = $_SESSION['App']->applications; $local_path_to_root = $path_to_root; + $img = ""._(  "; + $himg = ""._(  "; $sel_app = $_SESSION['sel_app']; echo "
"; echo "
"; @@ -65,9 +67,9 @@ if ($help_base_url != null) { - echo "" . _("Help") . "   "; + echo "$himg" . _("Help") . "   "; } - echo "" . _("Logout") . "   "; + echo "$img" . _("Logout") . "   "; echo "
"; } echo ""; @@ -125,9 +127,11 @@ function display_applications(&$waapp) { + global $path_to_root; $selected_app = $waapp->get_selected_application(); + $img = "  "; foreach ($selected_app->modules as $module) { // image @@ -144,8 +148,13 @@ { if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) { - $lnk = access_string($appfunction->label); - echo "$lnk[0]
"; + if ($appfunction->label == "") + echo " 
"; + else + { + $lnk = access_string($appfunction->label); + echo "$img$lnk[0]
"; + } } } echo ""; @@ -156,8 +165,13 @@ { if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) { - $lnk = access_string($appfunction->label); - echo "$lnk[0]
"; + if ($appfunction->label == "") + echo " 
"; + else + { + $lnk = access_string($appfunction->label); + echo "$img$lnk[0]
"; + } } } echo ""; -- 2.30.2