svn commit: r806664 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile: EditProfile.ftl ViewProfile.ftl

[apatel-2]

Author: apatel
Date: Fri Aug 21 18:19:25 2009
New Revision: 806664

URL: http://svn.apache.org/viewvc?rev=806664&view=rev
Log:
Clean up html markup.

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=806664&r1=806663&r2=806664&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl Fri Aug 21 18:19:25 2009
@@ -17,61 +17,53 @@
 under the License.
 -->
 
-<div id="form-container" class="screenlet">
-  <div class="screenlet-header">
-    <div class='boxhead'>&nbsp;${uiLabelMap.EcommerceMyAccount}</div>
-  </div>
-  <div class="screenlet-body">
-    <form id="editUserForm" name="editUserForm" method="post" action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>">
+<div class="screenlet">
+  <h3>${uiLabelMap.EcommerceMyAccount}</h3>
+  <form id="editUserForm" name="editUserForm" method="post" action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>">
+    <fieldset>
       <input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
       <input type="hidden" name="emailContactMechId" value="${emailContactMechId?if_exists}"/>
-
       <div class="left center">
-        <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.PartyContactInformation}</div></div>
-        <div class="screenlet-body">
-          <div class="form-row">
-            <div class="field-label"><label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label></div>
-            <div class="form-field"><input type="text" name="firstName" id="firstName" class="required" value="${firstName?if_exists}" size="30" maxlength="30"></div>
-          </div>
-          <div class="form-row">
-            <div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div>
-            <div class="form-field"><input type="text" name="lastName" id="lastName" class="required" value="${lastName?if_exists}" size="30" maxlength="30"></div>
-          </div>
-          <div class="form-row">
-            <div class="field-label">
-              <label for="emailAddress">
-                ${uiLabelMap.CommonEmail}*
-                <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span>
-                <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span>
-              </label>
-            </div>
-            <div class="form-field"><input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress?if_exists}" size="30" maxlength="255"/></div>
-          </div>
+        <h3>${uiLabelMap.PartyContactInformation}</h3>
+        <div>
+          <label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label>
+          <input type="text" name="firstName" id="firstName" class="required" value="${firstName?if_exists}" size="30" maxlength="30" />
+        </div>
+        <div>
+          <label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label>
+          <input type="text" name="lastName" id="lastName" class="required" value="${lastName?if_exists}" size="30" maxlength="30" />
+        </div>
+        <div>
+          <label for="emailAddress">${uiLabelMap.CommonEmail}*
+            <span id="advice-required-emailAddress" style="display: none" class="errorMessage">(required)</span>
+            <span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span>
+          </label>
+          <input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress?if_exists}" size="30" maxlength="255"/>
         </div>
       </div>
+    </fieldset>
 
+    <fieldset>
       <div class="center right">
-        <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.EcommerceAccountInformation}</div></div>
-        <div class="screenlet-body">
-          <div class="form-row">
-            <div class="field-label"><label for="userName">${uiLabelMap.CommonUsername}*</label></div>
-            <div class="form-field"><input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId?if_exists}" size="30" maxlength="255" <#if userLogin.userLoginId?exists>disabled</#if>></div>
-          </div>
-          <div class="form-row">
-            <div class="field-label"><label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label></div>
-            <div class="form-field"><input type="password" name="currentPassword" id="currentPassword" value="" size="30" maxlength="16"></div>
-          </div>
-          <div class="form-row">
-            <div class="field-label"><label for="newPassword">${uiLabelMap.CommonNewPassword}*</label></div>
-            <div class="form-field"><input type="password" name="newPassword" id="newPassword" value="" size="30" maxlength="16"></div>
-          </div>
-          <div class="form-row">
-            <div class="field-label"><label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label></div>
-            <div class="form-field"><input type="password" name="newPasswordVerify" id="newPasswordVerify" value="" size="30" maxlength="16"></div>
-          </div>
+        <h3>${uiLabelMap.EcommerceAccountInformation}</h3>
+        <div>
+          <label for="userLoginId">${uiLabelMap.CommonUsername}*</label>
+          <input type="text" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId?if_exists}" size="30" maxlength="255" <#if userLogin.userLoginId?exists>disabled="disabled"</#if> />
+        </div>
+        <div>
+          <label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label>
+          <input type="password" name="currentPassword" id="currentPassword" value="" size="30" maxlength="16" />
+        </div>
+        <div>
+          <label for="newPassword">${uiLabelMap.CommonNewPassword}*</label>
+          <input type="password" name="newPassword" id="newPassword" value="" size="30" maxlength="16" />
+        </div>
+        <div>
+          <label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label>
+          <input type="password" name="newPasswordVerify" id="newPasswordVerify" value="" size="30" maxlength="16" />
         </div>
       </div>
-      <div class="form-row">&nbsp;<a id="submitEditUserForm" href="javascript:void(0);" class="buttontext">${uiLabelMap.CommonSubmit}</a></div>
-    </form>
-  </div>
+    </fieldset>
+    <div><a id="submitEditUserForm" href="javascript:void(0);" class="button">${uiLabelMap.CommonSubmit}</a></div>
+  </form>
 </div>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=806664&r1=806663&r2=806664&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Fri Aug 21 18:19:25 2009
@@ -18,78 +18,88 @@
 -->
 
 <div class="screenlet">
-  <div class="screenlet-header">
-    <div class="boxhead">&nbsp;${uiLabelMap.EcommerceMyAccount}</div>
-  </div>
+  <h3>${uiLabelMap.EcommerceMyAccount}</h3>
   <div class="screenlet-body">
-    <div align="right"><a class="buttontext" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.EcommerceEditProfile}</a>&nbsp;</div><br/>
-    <div class="screenlet-header"><div class="boxhead">&nbsp;${uiLabelMap.PartyContactInformation}</div></div>
-    <div class="screenlet-body">
-      <div class="form-row">
-        <div class="form-field">${firstName?if_exists} ${lastName?if_exists}</div>
-      </div>
-
-      <div class="form-row">
-        <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId}">
-        <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress}">
-        <div class="form-field" id="emailAddress">${emailAddress}</div>
-        <a href="mailto:${emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a>&nbsp;
-      </div>
-      <div class="form-row"><div id="serverError_${emailContactMechId}" class="errorMessage"></div></div>
+    <div>
+      <a class="button" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.EcommerceEditProfile}</a>
+      <h3>${uiLabelMap.PartyContactInformation}</h3>
+      <label>${firstName?if_exists} ${lastName?if_exists}</label>
+      <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId}" />
+      <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress}" />
+      <label>${emailAddress}</label>
+      <a href="mailto:${emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a>
+      <div id="serverError_${emailContactMechId}" class="errorMessage"></div>
     </div>
-
     <#-- Manage Addresses -->
-    <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.EcommerceAddressBook}</div></div>
-    <div class="screenlet-body">
-      <div align="right"><a class="buttontext" href="<@ofbizUrl>manageAddress</@ofbizUrl>">${uiLabelMap.EcommerceManageAddresses}</a>&nbsp;</div>
+    <h3>${uiLabelMap.EcommerceAddressBook}</h3>
+    <div>
+      <a class="button" href="<@ofbizUrl>manageAddress</@ofbizUrl>">${uiLabelMap.EcommerceManageAddresses}</a>
       <div class="left center">
-        <div class="screenlet-header"><div class='boxhead'>${uiLabelMap.EcommercePrimaryShippingAddress}</div></div>
-        <div class="screenlet-body">
+        <div class='boxhead'><h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3></div>
+        <div>
+          <ul>
           <#if shipToContactMechId?exists>
-            ${shipToAddress1?if_exists}<br/>
-            <#if shipToAddress2?has_content>${shipToAddress2?if_exists}<br/></#if>
-            <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_">
-              ${shipToStateProvinceGeoId}
-            </#if>
-              ${shipToCity?if_exists},
-              ${shipToPostalCode?if_exists}<br/>
-              ${shipToCountryGeoId?if_exists}<br/>
+            <li>${shipToAddress1?if_exists}</li>
+            <#if shipToAddress2?has_content><li>${shipToAddress2?if_exists}</li></#if>
+            <li>
+              <ul>
+                <li>
+                  <#if shipToStateProvinceGeoId?has_content && shipToStateProvinceGeoId != "_NA_">
+                    ${shipToStateProvinceGeoId}
+                  </#if>
+                  ${shipToCity?if_exists},
+                  ${shipToPostalCode?if_exists}
+                </li>
+                <li>${shipToCountryGeoId?if_exists}</li>
+              </ul>
+            </li>
             <#if shipToTelecomNumber?has_content>
+            <li>
               ${shipToTelecomNumber.countryCode?if_exists}-
               ${shipToTelecomNumber.areaCode?if_exists}-
               ${shipToTelecomNumber.contactNumber?if_exists}
-              <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if><br/>
+              <#if shipToExtension?exists>-${shipToExtension?if_exists}</#if>
+            </li>
             </#if>
           <#else>
-            ${uiLabelMap.PartyPostalInformationNotFound}
+            <li>${uiLabelMap.PartyPostalInformationNotFound}</li>
           </#if>
+          </ul>
         </div>
       </div>
-
-      <div class="center right">
-        <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.EcommercePrimaryBillingAddress}</div></div>
-        <div class="screenlet-body">
+      <div class="right center">
+        <div class='boxhead'><h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3></div>
+        <div>
+          <ul>
           <#if billToContactMechId?exists>
-            ${billToAddress1?if_exists}<br/>
-            <#if billToAddress2?has_content>${billToAddress2?if_exists}<br/></#if>
-            <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_">
-              ${billToStateProvinceGeoId}
-            </#if>
-              ${billToCity?if_exists},
-              ${billToPostalCode?if_exists}<br/>
-              ${billToCountryGeoId?if_exists}<br/>
+            <li>${billToAddress1?if_exists}</li>
+            <#if billToAddress2?has_content><li>${billToAddress2?if_exists}</li></#if>
+            <li>
+              <ul>
+                <li>
+                  <#if billToStateProvinceGeoId?has_content && billToStateProvinceGeoId != "_NA_">
+                    ${billToStateProvinceGeoId}
+                  </#if>
+                  ${billToCity?if_exists},
+                  ${billToPostalCode?if_exists}
+                </li>
+                <li>${billToCountryGeoId?if_exists}</li>
+              </ul>
+            </li>
             <#if billToTelecomNumber?has_content>
+            <li>
               ${billToTelecomNumber.countryCode?if_exists}-
               ${billToTelecomNumber.areaCode?if_exists}-
               ${billToTelecomNumber.contactNumber?if_exists}
-              <#if billToExtension?exists>-${billToExtension?if_exists}</#if><br/>
+              <#if billToExtension?exists>-${billToExtension?if_exists}</#if>
+            </li>
             </#if>
           <#else>
-            ${uiLabelMap.PartyPostalInformationNotFound}
+            <li>${uiLabelMap.PartyPostalInformationNotFound}</li>
           </#if>
+          </ul>
         </div>
       </div>
     </div>
-    <div class="form-row"></div>
   </div>
 </div>
\ No newline at end of file