merges from trunk

timschofield · May 6, 2012 · eba6206 · eba6206
2 parents 6ed5d93 + 7fd6e4e
commit eba6206
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/AccountGroups.php b/AccountGroups.php
@@ -9,6 +9,8 @@
 include('includes/header.inc');
 include('includes/SQL_CommonFunctions.inc');
 
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
+
 function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
 
 /* returns true ie 1 if the group contains the parent group as a child group
@@ -222,9 +224,8 @@ function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
 	$DbgMsg = _('The sql that was used to retrieve the account group information was ');
 	$ErrMsg = _('Could not get account groups because');
 	$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
 
-	echo '<table class="selection">
+	echo '<br /><table class="selection">
 			<tr>
 				<th>' . _('Group Name') . '</th>
 				<th>' . _('Section') . '</th>
@@ -269,13 +270,9 @@ function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
 } //end of ifs and buts!
 
 
-if (isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
-	echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
-}
-
 if (!isset($_GET['delete'])) {
 
-	echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+	echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 	if (isset($_GET['SelectedAccountGroup'])) {
@@ -412,6 +409,10 @@ function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
 
 	echo '</table><br />';
 
+	if (isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
+		echo '<div style="text-align: right"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
+	}
+
 	echo '<script  type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
 
 	echo '</form>';

diff --git a/StockAdjustments.php b/StockAdjustments.php
@@ -77,7 +77,7 @@
 	exit;
 }
 
-if (isset($_POST['EnterAdjustment']) and $_POST['EnterAdjustment']!= ''){
+if (isset($_POST['EnterAdjustment'])){
 
 	$InputError = false; /*Start by hoping for the best */
 	$result = DB_query("SELECT stockid FROM stockmaster WHERE stockid='" . $_SESSION['Adjustment']->StockID . "'",$db);

diff --git a/css/silverwolf/default.css b/css/silverwolf/default.css
@@ -290,7 +290,12 @@ button {
 button:hover {
    border-top-color: #638094;
    background: #638094;
-   color: #ccc;
+  background: -webkit-gradient(linear, left top, left bottom, from(#0DA4AE), to(#FFE7E7));
+   background: -webkit-linear-gradient(top, #0DA4AE, #FFE7E7);
+   background: -moz-linear-gradient(top, #0DA4AE, #FFE7E7);
+   background: -ms-linear-gradient(top, #0DA4AE, #FFE7E7);
+   background: -o-linear-gradient(top, #0DA4AE, #FFE7E7);
+   color: #484848;
    cursor: pointer;
    }
 button:active {