[Web-erp-svn] SF.net SVN: web-erp:[6148] trunk

[<dai...@us...>]

Revision: 6148
          http://sourceforge.net/p/web-erp/reponame/6148
Author:   daintree
Date:     2013-07-26 11:43:16 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
html5

Modified Paths:
--------------
    trunk/NoSalesItems.php
    trunk/WWW_Users.php
    trunk/css/default/default.css
    trunk/includes/DefineCartClass.php

Modified: trunk/NoSalesItems.php
===================================================================
--- trunk/NoSalesItems.php	2013-07-26 03:08:39 UTC (rev 6147)
+++ trunk/NoSalesItems.php	2013-07-26 11:43:16 UTC (rev 6148)
@@ -16,10 +16,10 @@
 
 	//select location
 	echo '<tr>
-		         <td>'._('Select Location') . '</td>
-				 <td>:</td>
-		         <td><select name="Location[]" multiple="multiple">
-				 <option value="All" selected="selected">' . _('All') . '</option>';;
+			 <td>'._('Select Location') . '</td>
+			 <td>:</td>
+			 <td><select name="Location[]" multiple="multiple">
+				<option value="All" selected="selected">' . _('All') . '</option>';;
 	$sql = "SELECT 	loccode,locationname
 			FROM 	locations ORDER BY locationname";
 	$locationresult = DB_query($sql, $db);
@@ -81,7 +81,7 @@
 	echo '<tr>
 			<td>' . _('Number Of Days') . ' </td>
 			<td>:</td>
-			<td><input class="number" tabindex="3" type="text" name="NumberOfDays" size="8"	maxlength="8" value="30" /></td>
+			<td><input class="integer" tabindex="3" type="text" required="required" title="' . _('Enter the number of days to examine the sales for') . '" name="NumberOfDays" size="8" maxlength="8" value="30" /></td>
 		 </tr>
 	</table>
 	<br />

Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php	2013-07-26 03:08:39 UTC (rev 6147)
+++ trunk/WWW_Users.php	2013-07-26 11:43:16 UTC (rev 6148)
@@ -420,7 +420,7 @@
 	echo '<table class="selection">
 			<tr>
 				<td>' . _('User Login') . ':</td>
-				<td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('Not less than 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains illegal characters').'"  /></td>
+				<td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('At least 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains illegal characters').'"  /></td>
 			</tr>';
 
 	/*set the default modules to show to all
@@ -452,19 +452,19 @@
 }
 echo '<tr>
 		<td>' . _('Password') . ':</td>
-		<td><input type="password" pattern=".{5,}" reuired="required" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" placeholder="'._('not less than 5 characters').'" title="'._('Please enter not less than 5 characters and cannot same as the users id').'" /></td>
+		<td><input type="password" pattern=".{5,}" name="Password" ' . (!isset($SelectedUser) ? 'required="required"' : '') . ' size="22" maxlength="20" value="' . $_POST['Password'] . '" placeholder="'._('At least 5 characters').'" title="'._('Passwords must be 5 characters or more and cannot same as the users id. A mix of upper and lower case and some non-alphanumeric characters are recommended.').'" /></td>
 	</tr>';
 echo '<tr>
 		<td>' . _('Full Name') . ':</td>
-		<td><input type="text" name="RealName" required="required" value="' . $_POST['RealName'] . '" size="36" maxlength="35" /></td>
+		<td><input type="text" name="RealName" ' . (isset($SelectedUser) ? 'autofocus="autofocus"' : '') . ' required="required" value="' . $_POST['RealName'] . '" size="36" maxlength="35" /></td>
 	</tr>';
 echo '<tr>
 		<td>' . _('Telephone No') . ':</td>
-		<td><input type="tel" name="Phone" pattern="[0-9+\s]*" value="' . $_POST['Phone'] . '"  size="32" maxlength="30" /></td>
+		<td><input type="tel" name="Phone" pattern="[0-9+()\s]*" value="' . $_POST['Phone'] . '"  size="32" maxlength="30" /></td>
 	</tr>';
 echo '<tr>
 		<td>' . _('Email Address') .':</td>
-		<td><input type="email" name="Email" required="required" value="' . $_POST['Email'] .'" size="32" maxlength="55" title="'._('A valid email address is required').'" /></td>
+		<td><input type="email" name="Email" placeholder="' . _('e.g. us...@do...') . '" required="required" value="' . $_POST['Email'] .'" size="32" maxlength="55" title="'._('A valid email address is required').'" /></td>
 	</tr>';
 echo '<tr>
 		<td>' . _('Security Role') . ':</td>
@@ -737,10 +737,5 @@
     </div>
 	</form>';
 
-if (isset($_GET['SelectedUser'])) {
-	echo '<script  type="text/javascript">defaultControl(document.forms[0].Password);</script>';
-} else {
-	echo '<script  type="text/javascript">defaultControl(document.forms[0].UserID);</script>';
-}
 include('includes/footer.inc');
 ?>

Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css	2013-07-26 03:08:39 UTC (rev 6147)
+++ trunk/css/default/default.css	2013-07-26 11:43:16 UTC (rev 6148)
@@ -9,7 +9,7 @@
 	font-family:Arial, Verdana, Helvetica, sans-serif;
 	font-size:10pt;
 	margin:0;
-	padding:0
+	padding:0;
 }
 
 a{

Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php	2013-07-26 03:08:39 UTC (rev 6147)
+++ trunk/includes/DefineCartClass.php	2013-07-26 11:43:16 UTC (rev 6148)
@@ -166,7 +166,7 @@
 														" . $Qty . ",
 														" . $Price . ",
 														" . $Disc . ",'
-														" . $ItemDue . "',
+														" . FormatDateForSQL($ItemDue) . "',
 														" . $POLine . ")";
 				$result = DB_query($sql,
 							$db ,