svn commit: r781870 - in /ofbiz/trunk: framework/images/webapp/images/ecommain.css framework/images/webapp/images/forms.css framework/images/webapp/images/reset.css specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r781870 - in /ofbiz/trunk: framework/images/webapp/images/ecommain.css framework/images/webapp/images/forms.css framework/images/webapp/images/reset.css specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl

apatel-2
Author: apatel
Date: Thu Jun  4 23:29:13 2009
New Revision: 781870

URL: http://svn.apache.org/viewvc?rev=781870&view=rev
Log:
cleaned up html of newcustomer form and did changes to css to style the form. Will soon do similar thing to rest of forms.

Added:
    ofbiz/trunk/framework/images/webapp/images/reset.css   (with props)
Modified:
    ofbiz/trunk/framework/images/webapp/images/ecommain.css
    ofbiz/trunk/framework/images/webapp/images/forms.css
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl

Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=781870&r1=781869&r2=781870&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Thu Jun  4 23:29:13 2009
@@ -17,11 +17,8 @@
  * under the License.
  */
 
-blockquote,body,div,dl,dt,dd,fieldset,form,h1,h2,h3,h4,h5,h6,img,input,li,ol,p,select,span,td,textarea,th,ul {
-border-style:none;
-margin:0;
-padding:0;
-}
+@import url("reset.css");
+@import url("forms.css");
 
 a,address,body,caption,cite,code,dfn,em,strong,th,var {
 font-style:normal;
@@ -37,6 +34,8 @@
 font-size:100%;
 }
 
+h1 span,h2 span,h3 span ,h4 span ,h5 span,h6 span {font-size:75%}
+
 ol,ul {
 list-style:none;
 }
@@ -55,13 +54,10 @@
 text-decoration:none;
 }
 
-body,textarea,input,select {
-font-family:Verdana, Arial, Helvetica, sans-serif;
-}
-
 body {
 background-color:#FFF;
 color:#000;
+font-family:Verdana, Arial, Helvetica, sans-serif;
 font-size:10px;
 margin:10px;
 }
@@ -77,13 +73,6 @@
 font-size:8pt;
 }
 
-input[type=text],input[type=password] {
-background:#FFF;
-border:#999 solid 1px;
-font-size:8pt;
-margin:2px;
-}
-
 input[type=submit],input[type=button],input[type=reset] {
 background:#FFF;
 border:#999 solid 1px;
@@ -103,13 +92,6 @@
 font-size:11px;
 }
 
-select {
-background:#FFF;
-border:#999 solid 1px;
-font-size:8pt;
-margin:2px;
-}
-
 h1,.h1 {
 color:#1C334D;
 font-size:12pt;
@@ -380,11 +362,6 @@
 text-decoration:none;
 }
 
-#ecom-mainarea .form-row {
-clear:both;
-padding-top:2px;
-}
-
 #ecom-mainarea .form-label {
 float:left;
 padding-top:5px;

Modified: ofbiz/trunk/framework/images/webapp/images/forms.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/forms.css?rev=781870&r1=781869&r2=781870&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/forms.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/forms.css Thu Jun  4 23:29:13 2009
@@ -17,24 +17,42 @@
  * under the License.
  */
 
-fieldset {clear: both;}
+/***********************************************
+Forms
+***********************************************/
+form {clear:both; margin:0; padding:0}
+
+form p.desc {margin:.5em 0; padding:.75em 0;}
+
+fieldset {clear: both; margin: 0 0 2em 0;}
+fieldset.col {clear:none; float:left; display:inline; margin:0 2em 2em 0}
+
 legend {padding: 0 0 1.286em; font-size: 1.167em; font-weight: 700;}
 fieldset fieldset legend {padding: 0 0 1.5em; font-size: 1em;}
 * html legend {margin-left: -7px;}
 *+html legend {margin-left: -7px;}
 
-form .form-row, form .buttons {clear: both; margin: 0 0 0.8em;}
-form .form-row label {display: block;}
-form ul.fields li {list-style-type: none; margin: 0;}
-form ul.inline li, form ul.inline label {display: inline;}
-form ul.inline li {padding: 0 .75em 0 0;}
-
-form .form-row input, select, textarea, button { font:12px Arial, Helvetica, sans-serif; vertical-align:middle; }
-form .form-row input, select, textarea { border-style:solid; border-width:1px; background-color:#fff; border-color: #7a7a7a #B4B4B4 #DADADA #B4B4B4;}
-form .form-row input, textarea {padding:4px;}
+form .form-row, .buttons {clear: both; margin: 0 0 0.8em;}
+form .form-row label {display: block; padding-bottom:.34em}
+form ul li {list-style-type: none; margin: 0;}
+form .inline li, form .inline label {display: inline;}
+form .inline li {padding: 0 .75em 0 0;}
+
+form .form-row input, form .form-row select, form .form-row textarea, form table input, form table select {
+border-style:solid;
+border-width:1px;
+background-color:#fbfbfb;
+border-color: #7a7a7a #B4B4B4 #DADADA #B4B4B4;
+font:12px Arial, Helvetica, sans-serif;
+padding:4px;
+}
+
+form table thead th {padding:0 .5em;}
+form td {padding:.5em;}
 
+input[type=text],input[type=password]{vertical-align:middle}
 input.radio {vertical-align: top;}
-input.checkbox {vertical-align: bottom;}
+input.checkbox {vertical-align: middle;}
 label, button, input.submit, input.image {cursor: pointer;}
 * html input.radio, * html input.checkbox {vertical-align: middle;}
 *+html input.radio, *+html input.checkbox {vertical-align: middle;}
@@ -46,72 +64,87 @@
 
 form.horizontal .form-row label {display: inline; float: left; text-align:right; padding-right:.34em}
 
+form .form-row span {
+display:block;
+float:left;
+line-height:20px;
+margin:0;
+padding:0 0.4em 0 0;
+}
+form .form-row span label {
+color:#404040;
+display:block;
+font-size:85%;
+font-weight:normal;
+margin:0.3em 0 0;
+}
+
 /***********************************************
 Buttons
 ***********************************************/
-.buttons { font-size:100%; padding:5px 0px 5px 0px; text-align:center;}
+.buttons { font-size:110%; padding:5px 0px 5px 0px; text-align:center;}
 .buttons a, .buttons button, .buttons input[type=submit], .buttons input[type=reset]{
-    display:block;
-    float:left;
-    margin:0 7px 0 0;
-    background-color:#f5f5f5;
-    border:1px solid #dedede;
-    border-top:1px solid #eee;
-    border-left:1px solid #eee;
-    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
-    font-size:100%;
-    line-height:130%;
-    text-decoration:none;
-    font-weight:bold;
-    color:#565656;
-    cursor:pointer;
-    padding:5px 10px 6px 7px; /* Links */
+display:block;
+float:left;
+margin:0 7px 0 0;
+background-color:#f5f5f5;
+border:1px solid #dedede;
+border-top:1px solid #eee;
+border-left:1px solid #eee;
+font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+font-size:110%;
+line-height:140%;
+text-decoration:none;
+font-weight:bold;
+color:#565656;
+cursor:pointer;
+padding:5px 10px 6px 7px; /* Links */
 }
 .buttons button{
-    width:auto;
-    overflow:visible;
-    padding:4px 10px 3px 7px; /* IE6 */
+width:auto;
+overflow:visible;
+padding:4px 10px 3px 7px; /* IE6 */
 }
 .buttons button[type]{
-    padding:5px 10px 5px 7px; /* Firefox */
-    line-height:17px; /* Safari */
+padding:5px 10px 5px 7px; /* Firefox */
+line-height:17px; /* Safari */
 }
 *:first-child+html button[type]{
-    padding:4px 10px 3px 7px; /* IE7 */
+padding:4px 10px 3px 7px; /* IE7 */
 }
 button:hover, .buttons a:hover{
-    background-color:#dff4ff;
-    border:1px solid #c2e1ef;
-    color:#336699;
+background-color:#dff4ff;
+border:1px solid #c2e1ef;
+color:#336699;
 }
 .buttons a:active{
-    background-color:#6299c5;
-    border:1px solid #6299c5;
-    color:#fff;
+background-color:#6299c5;
+border:1px solid #6299c5;
+color:#fff;
 }
 .buttons input[type=submit]:hover {
-    background-color:#dff4ff;
-    border:1px solid #c2e1ef;
-    color:#336699;
-}
-.buttons a.positive:active{
-    background-color:#529214;
-    border:1px solid #529214;
-    color:#fff;
-}
-.buttons a.negative, button.negative{color:#d12f19;}
-.buttons a.negative:hover, button.negative:hover{
-    background:#fbe3e4;
-    border:1px solid #fbc2c4;
-    color:#d12f19;
+background-color:#dff4ff;
+border:1px solid #c2e1ef;
+color:#336699;
+}
+.buttons a.submit:active{
+background-color:#529214;
+border:1px solid #529214;
+color:#fff;
+}
+.buttons a.reset, button.reset{color:#d12f19;}
+.buttons a.reset:hover, button.reset:hover{
+background:#fbe3e4;
+border:1px solid #fbc2c4;
+color:#d12f19;
 }
 .buttons input[type=reset]:hover, .buttons button[type=reset]:hover {
-    background:#fbe3e4;
-    border:1px solid #fbc2c4;
-    color:#d12f19;
-}
-.buttons a.negative:active{
-    background-color:#d12f19;
-    border:1px solid #d12f19;
-    color:#fff;
+background:#fbe3e4;
+border:1px solid #fbc2c4;
+color:#d12f19;
+}
+.buttons a.reset:active{
+background-color:#d12f19;
+border:1px solid #d12f19;
+color:#fff;
 }
\ No newline at end of file

Added: ofbiz/trunk/framework/images/webapp/images/reset.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/reset.css?rev=781870&view=auto
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/reset.css (added)
+++ ofbiz/trunk/framework/images/webapp/images/reset.css Thu Jun  4 23:29:13 2009
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
+/***********************************************
+Reset
+***********************************************/
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+border:0;
+margin:0;
+outline:0;
+padding:0;
+font-size: 100%;
+background:transparent;
+vertical-align: baseline;
+}
+
+blockquote, q {quotes: none;}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+content:'';
+content: none;
+}
+
+a, address, body, caption, cite, code, dfn, em, strong, th, var {
+font-style: normal;
+font-weight: normal;
+text-decoration: none;
+}
+
+a img {border: none;}
+
+:focus {
+-moz-outline:0;
+outline:0;
+outline-offset:0;
+}
+
+ol, ul {list-style: none;}
+
+table {border-collapse: collapse; border-spacing: 0;}
+
+caption, th, td {text-align: left; font-weight: normal;}
+
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+body {line-height: 1; color: black; background: white;}
+
+/***********************************************
+Clear Fix
+***********************************************/
+.clearfix:after {
+content: ".";
+display: block;
+height: 0;
+clear: both;
+visibility: hidden;
+}
+
+.clearfix {display: inline-block;}
+html[xmlns] .clearfix { display: block; }
+* html .clearfix { height: 1%;}
+.clearfix {display: block;}
\ No newline at end of file

Propchange: ofbiz/trunk/framework/images/webapp/images/reset.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/images/webapp/images/reset.css
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/images/webapp/images/reset.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=781870&r1=781869&r2=781870&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Thu Jun  4 23:29:13 2009
@@ -58,8 +58,22 @@
 </script>
 </#if>
 
-<h1>${uiLabelMap.PartyRequestNewAccount}</h1>
-<p class='tabletext'>${uiLabelMap.PartyAlreadyHaveAccount}, <a href='<@ofbizUrl>checkLogin/main</@ofbizUrl>' class='buttontext'>${uiLabelMap.CommonLoginHere}</a>.</p>
+<!-------------------------------------------------------------------------------------------
+Anil,
+The notes in this file are for developmental purposes only.  Please delete them before
+committing this file to the OFBiz trunk.
+-------------------------------------------------------------------------------------------->
+
+<!--------------------------------------------------------------------------------------------
+NOTE: all page headings should start with an <h2></h2> tag,
+(not an H1 tag, as there should generally always only be one <h1></h1> tag on the page and
+that will generally always be reserved for the logo at the top of the page.
+---------------------------------------------------------------------------------------------->
+<h2>${uiLabelMap.PartyRequestNewAccount}
+ <span>
+ ${uiLabelMap.PartyAlreadyHaveAccount}, <a href='<@ofbizUrl>checkLogin/main</@ofbizUrl>'>${uiLabelMap.CommonLoginHere}</a>
+ </span>
+</h2>
 
 <#macro fieldErrors fieldName>
   <#if errorMessageList?has_content>
@@ -82,300 +96,324 @@
   </#if>
 </#macro>
 
-<form method="post" action="<@ofbizUrl>createcustomer${previousParams}</@ofbizUrl>" name="newuserform" style="margin: 0;">
-<input type="hidden" name="emailProductStoreId" value="${productStoreId}"/>
-
-<div class="screenlet">
-    <div class="screenlet-header" id="toggleNameAndShippingAddressPanel">
-        <div class='boxhead'>&nbsp;${uiLabelMap.PartyNameAndShippingAddress}</div>
-    </div>
-    <div class="screenlet-body" id="nameAndShippingAddressPanel">
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.CommonTitle}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="USER_TITLE"/>
-                <select name="USER_TITLE" class="selectBox">
-                  <#if requestParameters.USER_TITLE?has_content >
-                      <option>${requestParameters.USER_TITLE}</option>
-                      <option value="${requestParameters.USER_TITLE}"> -- </option>
-                  <#else>
-                      <option value="">${uiLabelMap.CommonSelectOne}</option>
-                  </#if>
-                      <option>${uiLabelMap.CommonTitleMr}</option>
-                      <option>${uiLabelMap.CommonTitleMrs}</option>
-                      <option>${uiLabelMap.CommonTitleMs}</option>
-                      <option>${uiLabelMap.CommonTitleDr}</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyFirstName}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="USER_FIRST_NAME"/>
-                <input type="text" class='inputBox' name="USER_FIRST_NAME" value="${requestParameters.USER_FIRST_NAME?if_exists}" size="30" maxlength="30"> *
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyMiddleInitial}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="USER_MIDDLE_NAME"/>
-                <input type="text" class='inputBox' name="USER_MIDDLE_NAME" value="${requestParameters.USER_MIDDLE_NAME?if_exists}" size="4" maxlength="4">
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyLastName}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="USER_LAST_NAME"/>
-                <input type="text" class='inputBox' name="USER_LAST_NAME" value="${requestParameters.USER_LAST_NAME?if_exists}" size="30" maxlength="30"> *
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartySuffix}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="USER_SUFFIX"/>
-                <input type="text" class='inputBox' name="USER_SUFFIX" value="${requestParameters.USER_SUFFIX?if_exists}" size="10" maxlength="30">
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyAddressLine1}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="CUSTOMER_ADDRESS1"/>
-                <input type="text" class='inputBox' name="CUSTOMER_ADDRESS1" value="${requestParameters.CUSTOMER_ADDRESS1?if_exists}" size="30" maxlength="30"> *
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyAddressLine2}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="CUSTOMER_ADDRESS2"/>
-                <input type="text" class='inputBox' name="CUSTOMER_ADDRESS2" value="${requestParameters.CUSTOMER_ADDRESS2?if_exists}" size="30" maxlength="30">
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyCity}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="CUSTOMER_CITY"/>
-                <input type="text" class='inputBox' name="CUSTOMER_CITY" value="${requestParameters.CUSTOMER_CITY?if_exists}" size="30" maxlength="30"> *
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyZipCode}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="CUSTOMER_POSTAL_CODE"/>
-                <input type="text" class='inputBox' name="CUSTOMER_POSTAL_CODE" value="${requestParameters.CUSTOMER_POSTAL_CODE?if_exists}" size="12" maxlength="10"> *
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyCountry}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="CUSTOMER_COUNTRY"/>
-                <select name="CUSTOMER_COUNTRY" class='selectBox' onClick="hideShowUsaStates();" id="customerCountry">
-                    <#if requestParameters.CUSTOMER_COUNTRY?exists><option value='${requestParameters.CUSTOMER_COUNTRY}'>${selectedCountryName?default(requestParameters.CUSTOMER_COUNTRY)}</option></#if>
-                    ${screens.render("component://common/widget/CommonScreens.xml#countries")}
-                </select> *
-            </div>
-        </div>
-        <div class="form-row" id="customerState">
-            <div class="form-label">${uiLabelMap.PartyState}</div>
-            <div class="form-field">
-                <@fieldErrors fieldName="CUSTOMER_STATE"/>
-                <select name="CUSTOMER_STATE" class='selectBox'>
-                    <#if requestParameters.CUSTOMER_STATE?exists><option value='${requestParameters.CUSTOMER_STATE}'>${selectedStateName?default(requestParameters.CUSTOMER_STATE)}</option></#if>
-                    <option value="">${uiLabelMap.PartyNoState}</option>
-                    ${screens.render("component://common/widget/CommonScreens.xml#states")}
-                </select> *
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyAllowAddressSolicitation}</div>
-            <div class="form-field">
-                <select name="CUSTOMER_ADDRESS_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
-                    <option></option>
-                    <option value="Y">${uiLabelMap.CommonY}</option>
-                    <option value="N">${uiLabelMap.CommonN}</option>
-                </select>
-            </div>
-        </div>
-        <div class="endcolumns"><span></span></div>
+<form method="post" action="<@ofbizUrl>createcustomer${previousParams}</@ofbizUrl>" name="newuserform">
+  <input type="hidden" name="emailProductStoreId" value="${productStoreId}"/>
+  
+  <!----------------------------------------------------------------------
+  If you need to include a brief explanation of the form, or certain
+  elements in the form (such as explaining asterisks denote REQUIRED),
+  then you should use a <p></p> tag with a class name of "desc"
+  ----------------------------------------------------------------------->
+  
+  <p class="desc">${uiLabelMap.CommonFieldsMarkedAreRequired}</p>
+  
+  <!----------------------------------------------------------------------
+  There are two types of fieldsets, regular (full width) fielsets, and
+  column (half width) fieldsets. If you want to group two sets of inputs
+  side by side in two columns, give each fieldset a class name of "col"
+  ----------------------------------------------------------------------->
+  
+  <fieldset class="col">
+  
+    <legend>${uiLabelMap.PartyFullName}</legend>
+    
+    <!----------------------------------------------------------------------
+   Each input row should be enclosed in a <div></div> with a class name
+   of "form-row". This will ensure than each input field clears the one
+   above it. Alternately, if you want several inputs to float next to
+   each other, you can enclose them in a table as illustrated below for
+   the phone numbers, or you can enclose each label/input pair in a span
+  
+   Example:
+   <div class="form-row">
+      <span>
+          <input type="text" name="expMonth" value=""/>
+          <label for="expMonth">Exp. Month</label>
+      </span>
+      <span>
+          <input type="text" name="expYear" value=""/>
+          <label for="expYear">Exp. Year</label>
+      </span>
+   </div>
+   ----------------------------------------------------------------------->
+    <div class="form-row">
+     <label for="USER_TITLE">${uiLabelMap.CommonTitle}</label>
+    <@fieldErrors fieldName="USER_TITLE"/>
+    <select name="USER_TITLE">
+      <#if requestParameters.USER_TITLE?has_content >
+        <option>${requestParameters.USER_TITLE}</option>
+        <option value="${requestParameters.USER_TITLE}"> -- </option>
+      <#else>
+        <option value="">${uiLabelMap.CommonSelectOne}</option>
+      </#if>
+      <option>${uiLabelMap.CommonTitleMr}</option>
+      <option>${uiLabelMap.CommonTitleMrs}</option>
+      <option>${uiLabelMap.CommonTitleMs}</option>
+      <option>${uiLabelMap.CommonTitleDr}</option>
+    </select>
     </div>
-</div>
-
-<div class="screenlet">
-    <div class="screenlet-header" id="togglePhoneNumberPanel">
-        <div class='boxhead'>&nbsp;${uiLabelMap.PartyPhoneNumbers}</div>
-    </div>
-    <div class="screenlet-body" id="phoneNumberPanel">
-        <div class="form-row">
-            <div class="form-label">${uiLabelMap.PartyAllPhoneNumbers}</div>
-            <div class="form-field">
-                [${uiLabelMap.PartyCountry}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label"><div>${uiLabelMap.PartyHomePhone}</div><div>(${uiLabelMap.PartyAllowSolicitation}?)</div></div>
-            <div class="form-field">
-                <@fieldErrorsMulti fieldName1="CUSTOMER_HOME_COUNTRY" fieldName2="CUSTOMER_HOME_AREA" fieldName3="CUSTOMER_HOME_CONTACT" fieldName4="CUSTOMER_HOME_EXT"/>
-                <input type="text" class='inputBox' name="CUSTOMER_HOME_COUNTRY" value="${requestParameters.CUSTOMER_HOME_COUNTRY?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_HOME_AREA" value="${requestParameters.CUSTOMER_HOME_AREA?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_HOME_CONTACT" value="${requestParameters.CUSTOMER_HOME_CONTACT?if_exists}" size="15" maxlength="15">
-                &nbsp;${uiLabelMap.PartyExtension}&nbsp;<input type="text" class='inputBox' name="CUSTOMER_HOME_EXT" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}" size="6" maxlength="10">
-                <br/>
-                <select name="CUSTOMER_HOME_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
-                    <option></option>
-                    <option value="Y">${uiLabelMap.CommonY}</option>
-                    <option value="N">${uiLabelMap.CommonN}</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label"><div>${uiLabelMap.PartyBusinessPhone}</div><div>(${uiLabelMap.PartyAllowSolicitation}?)</div></div>
-            <div class="form-field">
-                <@fieldErrorsMulti fieldName1="CUSTOMER_WORK_COUNTRY" fieldName2="CUSTOMER_WORK_AREA" fieldName3="CUSTOMER_WORK_CONTACT" fieldName4="CUSTOMER_WORK_EXT"/>
-                <input type="text" class='inputBox' name="CUSTOMER_WORK_COUNTRY" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_WORK_AREA" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_WORK_CONTACT" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" size="15" maxlength="15">
-                &nbsp;${uiLabelMap.PartyExtension}&nbsp;<input type="text" class='inputBox' name="CUSTOMER_WORK_EXT" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10">
-                <br/>
-                <select name="CUSTOMER_WORK_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
-                    <option></option>
-                    <option value="Y">${uiLabelMap.CommonY}</option>
-                    <option value="N">${uiLabelMap.CommonN}</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label"><div>${uiLabelMap.PartyFaxNumber}</div><div>(${uiLabelMap.PartyAllowSolicitation}?)</div></div>
-            <div class="form-field">
-                <@fieldErrorsMulti fieldName1="CUSTOMER_FAX_COUNTRY" fieldName2="CUSTOMER_FAX_AREA" fieldName3="CUSTOMER_FAX_CONTACT" fieldName4=""/>
-                <input type="text" class='inputBox' name="CUSTOMER_FAX_COUNTRY" value="${requestParameters.CUSTOMER_FAX_COUNTRY?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_FAX_AREA" value="${requestParameters.CUSTOMER_FAX_AREA?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}" size="15" maxlength="15">
-                <br/>
-                <select name="CUSTOMER_FAX_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
-                    <option></option>
-                    <option value="Y">${uiLabelMap.CommonY}</option>
-                    <option value="N">${uiLabelMap.CommonN}</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="form-label"><div>${uiLabelMap.PartyMobilePhone}</div><div>(${uiLabelMap.PartyAllowSolicitation}?)</div></div>
-            <div class="form-field">
-                <@fieldErrorsMulti fieldName1="CUSTOMER_MOBILE_COUNTRY" fieldName2="CUSTOMER_MOBILE_AREA" fieldName3="CUSTOMER_MOBILE_CONTACT" fieldName4=""/>
-                <input type="text" class='inputBox' name="CUSTOMER_MOBILE_COUNTRY" value="${requestParameters.CUSTOMER_MOBILE_COUNTRY?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_MOBILE_AREA" value="${requestParameters.CUSTOMER_MOBILE_AREA?if_exists}" size="4" maxlength="10">
-                -&nbsp;<input type="text" class='inputBox' name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}" size="15" maxlength="15">
-                <br/>
-                <select name="CUSTOMER_MOBILE_ALLOW_SOL" class='selectBox'>
-                    <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                    <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
-                    <option></option>
-                    <option value="Y">${uiLabelMap.CommonY}</option>
-                    <option value="N">${uiLabelMap.CommonN}</option>
-                </select>
-            </div>
-        </div>
-        <div class="endcolumns"><span></span></div>
+    
+    <div class="form-row">
+     <label for="USER_FIRST_NAME">${uiLabelMap.PartyFirstName}*</label>
+    <@fieldErrors fieldName="USER_FIRST_NAME"/>
+    <input type="text" name="USER_FIRST_NAME" value="${requestParameters.USER_FIRST_NAME?if_exists}">
     </div>
-</div>
-
-<div class="screenlet">
-    <div class="screenlet-header" id="toggleEmailAddressPanel">
-        <div class='boxhead'>&nbsp;${uiLabelMap.PartyEmailAddress}</div>
-    </div>
-    <div class="screenlet-body" id="emailAddressPanel">
-        <div class="form-row">
-            <div class="form-label"><div>${uiLabelMap.PartyEmailAddress}</div><div>(${uiLabelMap.PartyAllowSolicitation}?)</div></div>
-            <div class="form-field">
-                <@fieldErrors fieldName="CUSTOMER_EMAIL"/>
-                <div><input type="text" class='inputBox' name="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL?if_exists}" size="40" maxlength="255" onchange="changeEmail()" onkeyup="changeEmail()"> *</div>
-                <div>
-                    <select name="CUSTOMER_EMAIL_ALLOW_SOL" class='selectBox'>
-                            <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                            <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
-                            <option></option>
-                            <option value="Y">${uiLabelMap.CommonY}</option>
-                            <option value="N">${uiLabelMap.CommonN}</option>
-                    </select>
-                </div>
-            </div>
-        </div>
-<#--
-        <div>Order Email addresses (comma separated)</div>
-        <input type="text" name="CUSTOMER_ORDER_EMAIL" value="${requestParameters.CUSTOMER_ORDER_EMAIL?if_exists}" size="40" maxlength="80">
--->
-        <div class="endcolumns"><span></span></div>
+    
+    <div class="form-row">
+     <label for="USER_MIDDLE_NAME">${uiLabelMap.PartyMiddleInitial}</label>
+    <@fieldErrors fieldName="USER_MIDDLE_NAME"/>
+    <input type="text" name="USER_MIDDLE_NAME" value="${requestParameters.USER_MIDDLE_NAME?if_exists}">
     </div>
-</div>
-
-<div class="screenlet">
-    <div class="screenlet-header" id="toggleUsernameAndPasswordPanel">
-        <div class='boxhead'>&nbsp;<#if getUsername>${uiLabelMap.CommonUsername} & </#if>${uiLabelMap.CommonPassword}</div>
-    </div>
-    <div class="screenlet-body" id="usernameAndPasswordPanel">
-        <#if getUsername>
-            <div class="form-row">
-                <div class="form-label"><span class="tabletext">${uiLabelMap.CommonUsername}</span></div>
-                <div class="form-field">
-                    <@fieldErrors fieldName="USERNAME"/>
-                    <div>${uiLabelMap.EcommerceUseEmailAddress}: <input type="checkbox" name="UNUSEEMAIL" value="on" onClick="setEmailUsername();" onFocus="setLastFocused(this);"/></div>
-                    <div><input type="text" class='inputBox' name="USERNAME" value="${requestParameters.USERNAME?if_exists}" size="20" maxlength="50" onFocus="clickUsername();" onchange="changeEmail();"/> *</div>
-                </div>
-            </div>
-        </#if>
-        <#if createAllowPassword>
-            <div class="form-row">
-                <div class="form-label">${uiLabelMap.CommonPassword}</div>
-                <div class="form-field">
-                    <@fieldErrors fieldName="PASSWORD"/>
-                    <input type="password" class='inputBox' name="PASSWORD" value="" size="20" maxlength="50" onFocus="setLastFocused(this);"/> *
-                </div>
-            </div>
-            <div class="form-row">
-                <div class="form-label">${uiLabelMap.PartyRepeatPassword}</div>
-                <div class="form-field">
-                    <@fieldErrors fieldName="CONFIRM_PASSWORD"/>
-                    <input type="password" class='inputBox' name="CONFIRM_PASSWORD" value="" size="20" maxlength="50"/> *
-                </div>
-            </div>
-            <div class="form-row">
-                <div class="form-label"><span class="tabletext">${uiLabelMap.PartyPasswordHint}</span></div>
-                <div class="form-field">
-                    <@fieldErrors fieldName="PASSWORD_HINT"/>
-                    <input type="text" class='inputBox' name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" size="30" maxlength="100"/>
-                </div>
-            </div>
-        <#else/>
-            <div class="form-row">
-                <div class="form-label">${uiLabelMap.CommonPassword}</div>
-                <div class="form-field">
-                    ${uiLabelMap.PartyReceivePasswordByEmail}.
-                </div>
-            </div>
-        </#if>
-        <div class="endcolumns"><span></span></div>
+    
+    <div class="form-row">
+     <label for="USER_LAST_NAME">${uiLabelMap.PartyLastName}*</label>
+    <@fieldErrors fieldName="USER_LAST_NAME"/>
+    <input type="text" name="USER_LAST_NAME" value="${requestParameters.USER_LAST_NAME?if_exists}">
+    </div>
+    
+    <div class="form-row">
+     <label for="USER_SUFFIX">${uiLabelMap.PartySuffix}</label>
+    <@fieldErrors fieldName="USER_SUFFIX"/>
+    <input type="text" class='inputBox' name="USER_SUFFIX" value="${requestParameters.USER_SUFFIX?if_exists}">
+    </div>
+    
+  </fieldset>
+  
+  <fieldset class="col">
+  
+    <legend>${uiLabelMap.PartyShippingAddress}</legend>
+    
+    <div class="form-row">
+    <label for="CUSTOMER_ADDRESS1">${uiLabelMap.PartyAddressLine1}*</label>
+    <@fieldErrors fieldName="CUSTOMER_ADDRESS1"/>
+    <input type="text" name="CUSTOMER_ADDRESS1" value="${requestParameters.CUSTOMER_ADDRESS1?if_exists}">
+    </div>
+    
+    <div class="form-row">
+    <label for="CUSTOMER_ADDRESS2">${uiLabelMap.PartyAddressLine2}</label>
+    <@fieldErrors fieldName="CUSTOMER_ADDRESS2"/>
+    <input type="text" name="CUSTOMER_ADDRESS2" value="${requestParameters.CUSTOMER_ADDRESS2?if_exists}">
+    </div>
+    
+    <div class="form-row">
+    <label for="CUSTOMER_CITY">${uiLabelMap.PartyCity}*</label>
+    <@fieldErrors fieldName="CUSTOMER_CITY"/>
+    <input type="text" name="CUSTOMER_CITY" value="${requestParameters.CUSTOMER_CITY?if_exists}">
+    </div>
+    
+    <div class="form-row">
+    <label for="CUSTOMER_POSTAL_CODE">${uiLabelMap.PartyZipCode}*</label>
+    <@fieldErrors fieldName="CUSTOMER_POSTAL_CODE"/>
+    <input type="text" name="CUSTOMER_POSTAL_CODE" value="${requestParameters.CUSTOMER_POSTAL_CODE?if_exists}">
     </div>
-</div>
 
-<input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.newuserform.submit();">
+    <div class="form-row">
+    <label for="CUSTOMER_COUNTRY">${uiLabelMap.PartyCountry}*</label>
+    <@fieldErrors fieldName="CUSTOMER_COUNTRY"/>
+    <select name="CUSTOMER_COUNTRY" onClick="hideShowUsaStates();" id="customerCountry">
+      <#if requestParameters.CUSTOMER_COUNTRY?exists>
+        <option value='${requestParameters.CUSTOMER_COUNTRY}'>${selectedCountryName?default(requestParameters.CUSTOMER_COUNTRY)}</option>
+      </#if>
+      ${screens.render("component://common/widget/CommonScreens.xml#countries")}
+    </select>
+    </div>
+    
+    <div class="form-row">
+    <label for="CUSTOMER_STATE">${uiLabelMap.PartyState}*</label>
+    <@fieldErrors fieldName="CUSTOMER_STATE"/>
+    <select name="CUSTOMER_STATE">
+      <#if requestParameters.CUSTOMER_STATE?exists>
+        <option value='${requestParameters.CUSTOMER_STATE}'>${selectedStateName?default(requestParameters.CUSTOMER_STATE)}</option>
+      </#if>
+      <option value="">${uiLabelMap.PartyNoState}</option>
+      ${screens.render("component://common/widget/CommonScreens.xml#states")}
+    </select>
+    </div>
+    
+    <div class="form-row">
+    <label for="CUSTOMER_ADDRESS_ALLOW_SOL">${uiLabelMap.PartyAllowAddressSolicitation}</label>
+    <select name="CUSTOMER_ADDRESS_ALLOW_SOL">
+      <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+      <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+      <option>--</option>
+      <option value="Y">${uiLabelMap.CommonY}</option>
+      <option value="N">${uiLabelMap.CommonN}</option>
+    </select>
+    </div>
+    
+  </fieldset>
+  
+  <fieldset>
+  
+    <legend>${uiLabelMap.PartyPhoneNumbers}</legend>
+    
+ <table summary="Tabular form for entering multiple telecom numbers for different purposes. Each row allows user to enter telecom number for a purpose">
+  <thead>
+  <tr>
+    <th></th>
+    <th scope="col">${uiLabelMap.PartyCountry}</th>
+    <th scope="col">${uiLabelMap.PartyAreaCode}</th>
+    <th scope="col">${uiLabelMap.PartyContactNumber}</th>
+    <th scope="col">${uiLabelMap.PartyExtension}</th>
+    <th scope="col">${uiLabelMap.PartyAllowSolicitation}</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <th scope="row">${uiLabelMap.PartyHomePhone}</th>
+    <td><input type="text" name="CUSTOMER_HOME_COUNTRY" size=5 value="${requestParameters.CUSTOMER_HOME_COUNTRY?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_HOME_AREA" size=5 value="${requestParameters.CUSTOMER_HOME_AREA?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_HOME_CONTACT" value="${requestParameters.CUSTOMER_HOME_CONTACT?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_HOME_EXT" size=6 value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}"></td>
+    <td>
+      <select name="CUSTOMER_HOME_ALLOW_SOL">
+        <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+        <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+        <option></option>
+        <option value="Y">${uiLabelMap.CommonY}</option>
+        <option value="N">${uiLabelMap.CommonN}</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <th scope="row">${uiLabelMap.PartyBusinessPhone}</th>
+    <td><input type="text" name="CUSTOMER_WORK_COUNTRY" size=5 value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_WORK_AREA" size=5 value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_WORK_CONTACT" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_WORK_EXT" size=6 value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}"></td>
+    <td>
+      <select name="CUSTOMER_WORK_ALLOW_SOL">
+        <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+        <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+        <option></option>
+        <option value="Y">${uiLabelMap.CommonY}</option>
+        <option value="N">${uiLabelMap.CommonN}</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <th scope="row">${uiLabelMap.PartyFaxNumber}</th>
+    <td><input type="text" name="CUSTOMER_FAX_COUNTRY" size=5 value="${requestParameters.CUSTOMER_FAX_COUNTRY?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_FAX_AREA" size=5 value="${requestParameters.CUSTOMER_FAX_AREA?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}"></td>
+    <td></td>
+    <td>
+      <select name="CUSTOMER_FAX_ALLOW_SOL">
+        <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+        <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+        <option></option>
+        <option value="Y">${uiLabelMap.CommonY}</option>
+        <option value="N">${uiLabelMap.CommonN}</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <th scope="row">${uiLabelMap.PartyMobilePhone}</th>
+    <td><input type="text" name="CUSTOMER_MOBILE_COUNTRY" size=5 value="${requestParameters.CUSTOMER_MOBILE_COUNTRY?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_MOBILE_AREA" size=5 value="${requestParameters.CUSTOMER_MOBILE_AREA?if_exists}"></td>
+    <td><input type="text" name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}"></td>
+    <td></td>
+    <td>
+      <select name="CUSTOMER_MOBILE_ALLOW_SOL">
+        <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+        <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+        <option></option>
+        <option value="Y">${uiLabelMap.CommonY}</option>
+        <option value="N">${uiLabelMap.CommonN}</option>
+      </select>
+    </td>
+  </tr>
+  </tbody>
+ </table>
+
+  </fieldset>
+  
+  <fieldset class="col">
+   <legend>${uiLabelMap.PartyEmailAddress}</legend>
+  <div class="form-row">
+    <label for= "CUSTOMER_EMAIL">${uiLabelMap.PartyEmailAddress}*</label>
+    <@fieldErrors fieldName="CUSTOMER_EMAIL"/>
+    <input type="text" name="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL?if_exists}" onchange="changeEmail()" onkeyup="changeEmail()">
+  </div>
+  <div class="form-row">
+    <label for="CUSTOMER_EMAIL_ALLOW_SOL">${uiLabelMap.PartyAllowSolicitation}</label>
+    <select name="CUSTOMER_EMAIL_ALLOW_SOL">
+      <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
+      <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+      <option></option>
+      <option value="Y">${uiLabelMap.CommonY}</option>
+      <option value="N">${uiLabelMap.CommonN}</option>
+    </select>
+  </div>
+  </fieldset>
+
+  <fieldset class="col">
+  
+   <legend><#if getUsername>${uiLabelMap.CommonUsername}</#if></legend>
+  
+  <#if getUsername>
+    <@fieldErrors fieldName="USERNAME"/>
+    
+    <div class="form-row inline">
+      <label for="UNUSEEMAIL">
+      <input type="checkbox" class="checkbox" name="UNUSEEMAIL" value="on" onClick="setEmailUsername();" onFocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress}
+      </label>
+    </div>
+      
+    <div class="form-row">
+      <label for="USERNAME">${uiLabelMap.CommonUsername}*</label>
+      <input type="text" name="USERNAME" value="${requestParameters.USERNAME?if_exists}" onFocus="clickUsername();" onchange="changeEmail();"/>
+    </div>
+    
+  </#if>
+  
+ </fieldset>
+    
+ <fieldset class="col">
+
+  <legend>${uiLabelMap.CommonPassword}</legend>
+    
+  <#if createAllowPassword>
+  
+    <div class="form-row">
+      <label for="PASSWORD">${uiLabelMap.CommonPassword}*</label>
+      <@fieldErrors fieldName="PASSWORD"/>
+      <input type="password" name="PASSWORD" onFocus="setLastFocused(this);"/>
+    </div>
+    
+    <div class="form-row">
+      <label for="CONFIRM_PASSWORD">${uiLabelMap.PartyRepeatPassword}*</label>
+      <@fieldErrors fieldName="CONFIRM_PASSWORD"/>
+      <input type="password" class='inputBox' name="CONFIRM_PASSWORD" value="" maxlength="50"/>
+    </div>
+    
+    <div class="form-row">
+      <label for="PASSWORD_HINT">${uiLabelMap.PartyPasswordHint}</label>
+      <@fieldErrors fieldName="PASSWORD_HINT"/>
+      <input type="text" class='inputBox' name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" maxlength="100"/>
+    </div>
+    
+  <#else/>
+  
+    <div class="form-row">
+      <label>${uiLabelMap.PartyReceivePasswordByEmail}.</div>
+    </div>
+    
+  </#if>
+  
+  </fieldset>
+  
 </form>
 
-<div class="tabletext">${uiLabelMap.CommonFieldsMarkedAreRequired}</div>
-
-<div>
-&nbsp;&nbsp;<a href="<@ofbizUrl>checkLogin/main</@ofbizUrl>" class="buttontextbig">${uiLabelMap.CommonBack}</a>
-&nbsp;&nbsp;<a href="javascript:document.newuserform.submit()" class="buttontextbig">${uiLabelMap.CommonSave}</a>
+<!--------------------------------------------------------------------------------------------
+To create a consistent look and feel for all buttons, input[type=submit], and a tags acting as
+submit buttons, all button actions should be enclosed in a div with a class name of "buttons"
+--------------------------------------------------------------------------------------------->
+<div class="buttons">
+    <a href="javascript:document.newuserform.submit()">${uiLabelMap.CommonSave}</a>
+    <a href="<@ofbizUrl>checkLogin/main</@ofbizUrl>" class="reset">${uiLabelMap.CommonBack}</a>
 </div>
 
-<br/>
-
 <script language="JavaScript" type="text/javascript">
     hideShowUsaStates();
 </script>