Fine tuning of Standard themes and dashboard.
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Tue, 22 Dec 2015 22:34:55 +0000 (23:34 +0100)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Tue, 22 Dec 2015 22:34:55 +0000 (23:34 +0100)
includes/dashboard.inc
themes/canvas/renderer.php
themes/default/renderer.php
themes/dropdown/renderer.php

index 69654c88e39f9ba6e4624c6e55e1c663dead245d..3beaf98eafc2662642024f51ca486581e561fe39 100644 (file)
@@ -160,7 +160,7 @@ function display_all()
        $title = supplier_top($today, 3, 66, $pg);
        source_graphic($today, $title, _("Supplier"), $pg, _("Purchases"));
        $title = stock_top($today, 3, 66, 0, $pg);
-       source_graphic($today, $title, _("Stock"), $pg, _("Sales"));
+       source_graphic($today, $title, _("Items"), $pg, _("Sales"), _("Costs"));
        table_two();
        dimension_top($today, 3, 66);
        $title = gl_top($today, 66, $pg);
index 16cb570e2d34d1e0380a2e79ac543fa3a9fab9e0..de8b58a99d99f54f8ce91eaa5e91be2c223479cb 100644 (file)
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
-                               $img = "<img src='$path_to_root/themes/".user_theme()."/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&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;";
-                               $himg = "<img src='$path_to_root/themes/".user_theme()."/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$path_to_root/themes/".user_theme()."/images/login.gif' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $pimg = "<img src='$local_path_to_root/themes/".user_theme()."/images/preferences.gif' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Preferences')."'>&nbsp;&nbsp;";
+                               $limg = "<img src='$local_path_to_root/themes/".user_theme()."/images/lock.gif' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Change Password')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$path_to_root/themes/".user_theme()."/images/help.gif' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Help')."'>&nbsp;&nbsp;";
                                echo "<div id='header'>\n";
                                echo "<ul>\n";
                                echo "  <li><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>$pimg" . _("Preferences") . "</a></li>\n";
                                echo $module->name;
                                echo "</td></tr><tr>";
                                echo "<td width='50%' class='menu_group_items'>";
-                               $img = "<img src='$path_to_root/themes/".user_theme()."/images/".$imgs2[$i]."' width='14' height='14' border='0'>&nbsp;&nbsp;";
+                               $img = "<img src='$path_to_root/themes/".user_theme()."/images/".$imgs2[$i]."' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;'>&nbsp;&nbsp;";
                                if ($_SESSION["language"]->dir == "rtl")
                                        $class = "right";
                                else
index 32e1590c1a9b2be5eddb6f0e26e1b7b9b4ee0483..ee5b26fda8e5bd0784a6a5299f6a61302000f3d6 100644 (file)
                                echo "</div>";
                                echo "</td></tr></table>";
                                // top status bar
-                               $rimg = "<img src='$path_to_root/themes/".user_theme()."/images/report.png' width='14' height='14' border='0' alt='"._('Dashboard')."'>&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;";
+                               $rimg = "<img src='$path_to_root/themes/".user_theme()."/images/report.png' style='width:14px;height:14px;border:0;vertical-align:middle;' alt='"._('Dashboard')."'>&nbsp;&nbsp;";
+                               $pimg = "<img src='$local_path_to_root/themes/".user_theme()."/images/preferences.gif' style='width:14px;height:14px; border:0;vertical-align:middle;' alt='"._('Preferences')."'>&nbsp;&nbsp;";
+                               $limg = "<img src='$local_path_to_root/themes/".user_theme()."/images/lock.gif' style='width:14px;height:14px;border:0;vertical-align:middle;' alt='"._('Change Password')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$local_path_to_root/themes/".user_theme()."/images/login.gif' style='width:14px;height:14px;border:0;vertical-align:middle;' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/".user_theme()."/images/help.gif' style='width:14px;height:14px;border:0;vertical-align:middle;'' 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>";
index 8cc0ba9b3a73b108af4ee89ad77937fb50a4d64c..c59c56c7ec44d51e6b8846c05a6c6b3d1fc35d9e 100644 (file)
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
-                               $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/on_off.png' 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;";
+                               $pimg = "<img src='$local_path_to_root/themes/".user_theme()."/images/preferences.gif' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Preferences')."'>&nbsp;&nbsp;";
+                               $limg = "<img src='$local_path_to_root/themes/".user_theme()."/images/lock.gif' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Change Password')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$local_path_to_root/themes/".user_theme()."/images/on_off.png' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/".user_theme()."/images/help.gif' style='width:14px;height:14px;border:0;vertical-align:middle;padding-bottom:3px;' alt='"._('Help')."'>&nbsp;&nbsp;";
                                echo "<div id='header'>\n";
                                echo "<ul>\n";
                                echo "  <li><a href='$local_path_to_root/admin/display_prefs.php?'>$pimg" . _("Preferences") . "</a></li>\n";