From: Joe Hunt Date: Sat, 28 Feb 2009 00:45:33 +0000 (+0000) Subject: Improved layout in standard themes (graphics) X-Git-Tag: v2.4.2~19^2~1499 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=6b338e9f3a82343490bb346b747a2ae341dc4882;p=fa-stable.git Improved layout in standard themes (graphics) --- 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 00000000..58c0ffef Binary files /dev/null and b/themes/aqua/images/help.gif differ diff --git a/themes/aqua/images/login.gif b/themes/aqua/images/login.gif new file mode 100644 index 00000000..bd3f47c5 Binary files /dev/null and b/themes/aqua/images/login.gif differ diff --git a/themes/aqua/images/right.gif b/themes/aqua/images/right.gif new file mode 100644 index 00000000..eed11946 Binary files /dev/null and b/themes/aqua/images/right.gif differ 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 00000000..58c0ffef Binary files /dev/null and b/themes/cool/images/help.gif differ diff --git a/themes/cool/images/login.gif b/themes/cool/images/login.gif new file mode 100644 index 00000000..bd3f47c5 Binary files /dev/null and b/themes/cool/images/login.gif differ diff --git a/themes/cool/images/right.gif b/themes/cool/images/right.gif new file mode 100644 index 00000000..eed11946 Binary files /dev/null and b/themes/cool/images/right.gif differ 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 00000000..58c0ffef Binary files /dev/null and b/themes/default/images/help.gif differ diff --git a/themes/default/images/login.gif b/themes/default/images/login.gif new file mode 100644 index 00000000..bd3f47c5 Binary files /dev/null and b/themes/default/images/login.gif differ diff --git a/themes/default/images/right.gif b/themes/default/images/right.gif new file mode 100644 index 00000000..eed11946 Binary files /dev/null and b/themes/default/images/right.gif differ 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 "";