svn commit: r815207 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile: EditBillToAddress.ftl EditPostalAddress.ftl EditShipToAddress.ftl ManageAddress.ftl ViewProfile.ftl

[mor-2]

Author: mor
Date: Tue Sep 15 08:19:27 2009
New Revision: 815207

URL: http://svn.apache.org/viewvc?rev=815207&view=rev
Log:
Markup cleanup.

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=815207&r1=815206&r2=815207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Tue Sep 15 08:19:27 2009
@@ -20,10 +20,10 @@
 <div id="billToServerError" class="errorMessage"></div>
 <form id="editBillToPostalAddress" method="post" action="<@ofbizUrl></@ofbizUrl>">
   <fieldset>
-    <input type="hidden" name="setBillingPurpose" value="Y"/>
-    <input type="hidden" name="contactMechId" value="${billToContactMechId?if_exists}"/>
-    <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
-    <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
+    <input type="hidden" name="setBillingPurpose" value="Y" />
+    <input type="hidden" name="contactMechId" value="${billToContactMechId?if_exists}" />
+    <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
+    <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
     <div>
       <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
       <input type="text" class="left required" name="address1" id="billToAddress1" value="${billToAddress1?if_exists}" size="30" maxlength="30" />
@@ -86,4 +86,4 @@
       <a class="popup_closebox button" href="javascript:void(0);">${uiLabelMap.CommonClose}</a>
     </div>
   </fieldset>
-</form>
+</form>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=815207&r1=815206&r2=815207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Tue Sep 15 08:19:27 2009
@@ -25,7 +25,6 @@
     <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}" />
     <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
     <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
-    <div class="screenlet-body">
       <div>
         <label for="address1_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine1}*</label>
         <input type="text" class="left required" name="address1" id="address1_${contactMech.contactMechId}" value="${postalAddress.address1?if_exists}" style="width: 50%" size="30" maxlength="30" />
@@ -80,6 +79,5 @@
         <a name="submitEditPostalAddress_${contactMech.contactMechId}" id="submitEditPostalAddress_${contactMech.contactMechId}" class="button" onclick="updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}')">${uiLabelMap.CommonSubmit}</a>
         <a href="javascript:void(0);" class="popup_closebox button">${uiLabelMap.CommonClose}</a>
       </div>
-    </div>
   </fieldset>
 </form>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=815207&r1=815206&r2=815207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Tue Sep 15 08:19:27 2009
@@ -20,10 +20,10 @@
 <div id="shipToServerError" class="errorMessage"></div>
 <form id="editShipToPostalAddress" method="post" action="<@ofbizUrl></@ofbizUrl>">
   <fieldset>
-    <input type="hidden" name="setShippingPurpose" value="Y"/>
-    <input type="hidden" name="contactMechId" value="${shipToContactMechId?if_exists}"/>
-    <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
-    <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
+    <input type="hidden" name="setShippingPurpose" value="Y" />
+    <input type="hidden" name="contactMechId" value="${shipToContactMechId?if_exists}" />
+    <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
+    <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
     <div>
       <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
       <input type="text" class="left required" name="address1" id="shipToAddress1" value="${shipToAddress1?if_exists}" size="30" maxlength="30" />
@@ -79,11 +79,11 @@
     </#if>
     <div>
       <label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
-      <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if>/>
+      <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> />
     </div>
     <div>
       <a name="submitEditShipToPostalAddress" id="submitEditShipToPostalAddress" class="button" onclick="updatePartyShipToPostalAddress('submitEditShipToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
       <a class="popup_closebox button">${uiLabelMap.CommonClose}</a>
     </div>
   </fieldset>
-</form>
+</form>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=815207&r1=815206&r2=815207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Tue Sep 15 08:19:27 2009
@@ -131,7 +131,7 @@
       </#if>
       </ul>
       <div id="displayEditBillToPostalAddress" class="popup" style="display: none;">
-        <#include "EditBillToAddress.ftl"/>
+        <#include "EditBillToAddress.ftl" />
       </div>
       <script type="text/javascript">
         //<![CDATA[
@@ -167,7 +167,7 @@
       </#if>
       </ul>
       <div id="displayEditShipToPostalAddress" class="popup" style="display: none;">
-        <#include "EditShipToAddress.ftl"/>
+        <#include "EditShipToAddress.ftl" />
       </div>
       <script type="text/javascript">
          //<![CDATA[
@@ -191,12 +191,10 @@
             <#assign postalAddressFlag = "Y" />
             <#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists />
             <div id="displayEditAddressForm_${contactMech.contactMechId}" class="popup" style="display: none;">
-              <#include "EditPostalAddress.ftl"/>
+              <#include "EditPostalAddress.ftl" />
             </div>
             <#if postalAddress?exists>
-              <div>
                 <div class="form-field">
-                  <div>
                     <ul>
                       <li>${postalAddress.address1}</li>
                       <#if postalAddress.address2?has_content><li>${postalAddress.address2}</li></#if>
@@ -217,9 +215,7 @@
                         <a target="_blank" href="#" class="linktext">(${uiLabelMap.CommonLookupWhitepages})</a>
                       </#if>
                     </#if>
-                  </div>
                 </div>
-              </div>
               <div>
                 <span>
                   <a id="update_${contactMech.contactMechId}" href="javascript:void(0)" class="button popup_link" onclick="showState('${contactMech.contactMechId}')">${uiLabelMap.CommonEdit}</a></span>

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=815207&r1=815206&r2=815207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Tue Sep 15 08:19:27 2009
@@ -35,8 +35,7 @@
     <div>
       <a class="button" href="<@ofbizUrl>manageAddress</@ofbizUrl>">${uiLabelMap.EcommerceManageAddresses}</a>
       <div class="left center">
-        <div class='boxhead'><h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3></div>
-        <div>
+        <h3>${uiLabelMap.EcommercePrimaryShippingAddress}</h3>
           <ul>
           <#if shipToContactMechId?exists>
             <li>${shipToAddress1?if_exists}</li>
@@ -65,11 +64,9 @@
             <li>${uiLabelMap.PartyPostalInformationNotFound}</li>
           </#if>
           </ul>
-        </div>
       </div>
       <div class="right center">
-        <div class='boxhead'><h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3></div>
-        <div>
+        <h3>${uiLabelMap.EcommercePrimaryBillingAddress}</h3>
           <ul>
           <#if billToContactMechId?exists>
             <li>${billToAddress1?if_exists}</li>
@@ -98,7 +95,6 @@
             <li>${uiLabelMap.PartyPostalInformationNotFound}</li>
           </#if>
           </ul>
-        </div>
       </div>
     </div>
   </div>