Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl 
Sat Sep 17 07:17:15 2016
@@ -19,48 +19,72 @@ under the License.
 
 <#assign delegator = requestAttributes.delegator>
 <#if communicationEvent.partyIdFrom??>
-    <#assign fromName = 
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdFrom, true)>
+  <#assign fromName =
+      
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdFrom, true)>
 </#if>
 <#if communicationEvent.partyIdTo??>
-    <#assign toName = 
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdTo, true)>
+  <#assign toName =
+      
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdTo, true)>
 </#if>
 
 <div class="screenlet">
-    <div class="screenlet-title-bar">
-        <div class="boxlink">
-            <#if (communicationEvent.partyIdFrom! != (userLogin.partyId)!)>
-              <a 
href="<@ofbizUrl>newmessage?communicationEventId=${communicationEvent.communicationEventId}</@ofbizUrl>"
 class="submenutext">${uiLabelMap.PartyReply}</a>
-            </#if>
-            <a href="<@ofbizUrl>messagelist</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
-        </div>
-        <div class="h3">${uiLabelMap.EcommerceReadMessage}</div>
-    </div>
-    <div class="screenlet-body">
-        <table width="100%" border="0" cellpadding="1">
-          <tr><td>&nbsp;</td></tr>
-          <tr>
-              <td align="right"><div 
class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td>
-              <td><div>${fromName!}</div></td>
-          </tr>
-          <tr>
-              <td align="right"><div 
class="tableheadtext">${uiLabelMap.CommonTo}:</div></td>
-              <td><div>${toName!}</div></td>
-          </tr>
-          <tr>
-              <td align="right"><div 
class="tableheadtext">${uiLabelMap.CommonDate}:</div></td>
-              <td><div>${communicationEvent.entryDate}</div></td>
-          </tr>
-          <tr>
-              <td align="right"><div 
class="tableheadtext">${uiLabelMap.EcommerceSubject}:</div></td>
-              
<td><div>&nbsp;${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}</div></td>
-          </tr>
-          <tr><td>&nbsp;</td></tr>
-          <tr>
-            <td>&nbsp;</td>
-            <td>
-              
<div>${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}</div>
-            </td>
-          </tr>
-        </table>
+  <div class="screenlet-title-bar">
+    <div class="boxlink">
+    <#if (communicationEvent.partyIdFrom! != (userLogin.partyId)!)>
+      <a 
href="<@ofbizUrl>newmessage?communicationEventId=${communicationEvent.communicationEventId}</@ofbizUrl>"
+          class="submenutext">${uiLabelMap.PartyReply}
+      </a>
+    </#if>
+      <a href="<@ofbizUrl>messagelist</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
     </div>
+    <div class="h3">${uiLabelMap.EcommerceReadMessage}</div>
+  </div>
+  <div class="screenlet-body">
+    <table width="100%" border="0" cellpadding="1">
+      <tr>
+        <td>&nbsp;</td>
+      </tr>
+      <tr>
+        <td align="right">
+          <div class="tableheadtext">${uiLabelMap.CommonFrom}:</div>
+        </td>
+        <td>
+          <div>${fromName!}</div>
+        </td>
+      </tr>
+      <tr>
+        <td align="right">
+          <div class="tableheadtext">${uiLabelMap.CommonTo}:</div>
+        </td>
+        <td>
+          <div>${toName!}</div>
+        </td>
+      </tr>
+      <tr>
+        <td align="right">
+          <div class="tableheadtext">${uiLabelMap.CommonDate}:</div>
+        </td>
+        <td>
+          <div>${communicationEvent.entryDate}</div>
+        </td>
+      </tr>
+      <tr>
+        <td align="right">
+          <div class="tableheadtext">${uiLabelMap.EcommerceSubject}:</div>
+        </td>
+        <td>
+          
<div>&nbsp;${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}</div>
+        </td>
+      </tr>
+      <tr>
+        <td>&nbsp;</td>
+      </tr>
+      <tr>
+        <td>&nbsp;</td>
+        <td>
+          
<div>${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}</div>
+        </td>
+      </tr>
+    </table>
+  </div>
 </div>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl Sat 
Sep 17 07:17:15 2016
@@ -19,67 +19,97 @@ under the License.
 
 <#macro showMessage communicationEvent isSentMessage index>
   <#if communicationEvent.partyIdFrom?has_content>
-    <#assign partyNameFrom = 
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdFrom, true)>
+    <#assign partyNameFrom =
+        
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdFrom, true)>
   <#else>
     <#assign partyNameFrom = "${uiLabelMap.CommonNA}">
   </#if>
   <#if communicationEvent.partyIdTo?has_content>
-    <#assign partyNameTo = 
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdTo, true)>
+    <#assign partyNameTo =
+        
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
communicationEvent.partyIdTo, true)>
   <#else>
     <#assign partyNameTo = "${uiLabelMap.CommonNA}">
   </#if>
-              <tr>
-                <td><div>${partyNameFrom}</div></td>
-                <td><div>${partyNameTo}</div></td>
-                <td><div>${communicationEvent.subject?default("")}</div></td>
-                <td><div>${communicationEvent.entryDate}</div></td>
-                <td align="right">
-                  <form method="post" 
action="<@ofbizUrl>readmessage</@ofbizUrl>" name="ecomm_read_mess${index}">
-                    <input name="communicationEventId" 
value="${communicationEvent.communicationEventId}" type="hidden"/>
-                  </form>
-                  <a 
href="javascript:document.ecomm_read_mess${index}.submit()">${uiLabelMap.EcommerceRead}</a>
-                  
-                  <#if isSentMessage>
-                  <form method="post" 
action="<@ofbizUrl>newmessage</@ofbizUrl>" name="ecomm_sent_mess${index}">
-                    <input name="communicationEventId" 
value="${communicationEvent.communicationEventId}" type="hidden"/>
-                  </form>
-                  <a 
href="javascript:document.ecomm_sent_mess${index}.submit()">${uiLabelMap.PartyReply}</a>
-                  </#if>
-                </td>
-              </tr>
+  <tr>
+    <td>
+      <div>${partyNameFrom}</div>
+    </td>
+    <td>
+      <div>${partyNameTo}</div>
+    </td>
+    <td>
+      <div>${communicationEvent.subject?default("")}</div>
+    </td>
+    <td>
+      <div>${communicationEvent.entryDate}</div>
+    </td>
+    <td align="right">
+      <form method="post" action="<@ofbizUrl>readmessage</@ofbizUrl>" 
name="ecomm_read_mess${index}">
+        <input name="communicationEventId" 
value="${communicationEvent.communicationEventId}" type="hidden"/>
+      </form>
+      <a 
href="javascript:document.ecomm_read_mess${index}.submit()">${uiLabelMap.EcommerceRead}</a>
+      <#if isSentMessage>
+        <form method="post" action="<@ofbizUrl>newmessage</@ofbizUrl>" 
name="ecomm_sent_mess${index}">
+          <input name="communicationEventId" 
value="${communicationEvent.communicationEventId}" type="hidden"/>
+        </form>
+        <a 
href="javascript:document.ecomm_sent_mess${index}.submit()">${uiLabelMap.PartyReply}</a>
+      </#if>
+    </td>
+  </tr>
 </#macro>
 
 <div class="screenlet">
-    <div class="screenlet-title-bar">
-        <div class="boxlink">
-            <#if parameters.showSent! == "true">
-              <a href="<@ofbizUrl>messagelist</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.EcommerceViewReceivedOnly}</a>
-            <#else>
-              <a href="<@ofbizUrl>messagelist?showSent=true</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.EcommerceViewSent}</a>
-            </#if>
-        </div>
-        <div class="h3">${uiLabelMap.CommonMessages}</div>
-    </div>
-    <div class="screenlet-body">
-        <table width="100%" border="0" cellpadding="1">
-          <#if (!receivedCommunicationEvents?has_content && 
!sentCommunicationEvents?has_content)>
-            <tr><td><div>${uiLabelMap.EcommerceNoMessages}.</div></td></tr>
-          <#else>
-            <tr>
-              <td><div 
class="tableheadtext">${uiLabelMap.CommonFrom}</div></td>
-              <td><div class="tableheadtext">${uiLabelMap.CommonTo}</div></td>
-              <td><div 
class="tableheadtext">${uiLabelMap.EcommerceSubject}</div></td>
-              <td><div 
class="tableheadtext">${uiLabelMap.EcommerceSentDate}</div></td>
-              <td>&nbsp;</td>
-            </tr>
-            <tr><td colspan="5"><hr /></td></tr>
-            <#list receivedCommunicationEvents! as receivedCommunicationEvent>
-              <@showMessage communicationEvent=receivedCommunicationEvent 
isSentMessage=false index=receivedCommunicationEvent_index/>
-            </#list>
-            <#list sentCommunicationEvents! as sentCommunicationEvent>
-              <@showMessage communicationEvent=sentCommunicationEvent 
isSentMessage=true index=sentCommunicationEvent_index/>
-            </#list>
-          </#if>
-        </table>
+  <div class="screenlet-title-bar">
+    <div class="boxlink">
+      <#if parameters.showSent! == "true">
+        <a href="<@ofbizUrl>messagelist</@ofbizUrl>" class="submenutextright">
+          ${uiLabelMap.EcommerceViewReceivedOnly}
+        </a>
+      <#else>
+        <a href="<@ofbizUrl>messagelist?showSent=true</@ofbizUrl>" 
class="submenutextright">
+          ${uiLabelMap.EcommerceViewSent}
+        </a>
+      </#if>
     </div>
+    <div class="h3">${uiLabelMap.CommonMessages}</div>
+  </div>
+  <div class="screenlet-body">
+    <table width="100%" border="0" cellpadding="1">
+    <#if (!receivedCommunicationEvents?has_content && 
!sentCommunicationEvents?has_content)>
+      <tr>
+        <td>
+          <div>${uiLabelMap.EcommerceNoMessages}.</div>
+        </td>
+      </tr>
+    <#else>
+      <tr>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.CommonFrom}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.CommonTo}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.EcommerceSubject}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.EcommerceSentDate}</div>
+        </td>
+        <td>&nbsp;</td>
+      </tr>
+      <tr>
+        <td colspan="5">
+          <hr/>
+        </td>
+      </tr>
+      <#list receivedCommunicationEvents! as receivedCommunicationEvent>
+        <@showMessage communicationEvent=receivedCommunicationEvent
+            isSentMessage=false index=receivedCommunicationEvent_index/>
+      </#list>
+      <#list sentCommunicationEvents! as sentCommunicationEvent>
+        <@showMessage communicationEvent=sentCommunicationEvent 
isSentMessage=true index=sentCommunicationEvent_index/>
+      </#list>
+    </#if>
+    </table>
+  </div>
 </div>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/MiniSignUpForContactList.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/MiniSignUpForContactList.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/MiniSignUpForContactList.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/MiniSignUpForContactList.ftl
 Sat Sep 17 07:17:15 2016
@@ -22,24 +22,26 @@ under the License.
   <select name="contactListId" class="selectBox" style="width:134px">
     <#list publicEmailContactLists as publicEmailContactList>
       <#assign publicContactMechType = 
publicEmailContactList.contactList.getRelatedOne("ContactMechType", true)!>
-        <option 
value="${publicEmailContactList.contactList.contactListId}">${publicEmailContactList.contactListType.description!}
 - ${publicEmailContactList.contactList.contactListName!}</option>
+      <option value="${publicEmailContactList.contactList.contactListId}">
+        ${publicEmailContactList.contactListType.description!}- 
${publicEmailContactList.contactList.contactListName!}
+      </option>
     </#list>
   </select>
 </#macro>
 
 <script type="text/javascript" language="JavaScript">
-    function unsubscribe() {
-        var form = document.getElementById("signUpForContactListForm");
-        form.action = "<@ofbizUrl>unsubscribeContactListParty</@ofbizUrl>"
-        document.getElementById("statusId").value = "CLPT_UNSUBS_PENDING";
-        form.submit();
-    }
-    function unsubscribeByContactMech() {
-        var form = document.getElementById("signUpForContactListForm");
-        form.action = 
"<@ofbizUrl>unsubscribeContactListPartyContachMech</@ofbizUrl>"
-        document.getElementById("statusId").value = "CLPT_UNSUBS_PENDING";
-        form.submit();
-    }
+  function unsubscribe() {
+    var form = document.getElementById("signUpForContactListForm");
+    form.action = "<@ofbizUrl>unsubscribeContactListParty</@ofbizUrl>"
+    document.getElementById("statusId").value = "CLPT_UNSUBS_PENDING";
+    form.submit();
+  }
+  function unsubscribeByContactMech() {
+    var form = document.getElementById("signUpForContactListForm");
+    form.action = 
"<@ofbizUrl>unsubscribeContactListPartyContachMech</@ofbizUrl>"
+    document.getElementById("statusId").value = "CLPT_UNSUBS_PENDING";
+    form.submit();
+  }
 </script>
 
 <div id="miniSignUpForContactList" class="screenlet">
@@ -54,7 +56,8 @@ under the License.
   <#-- The visitor potentially has an account and party id -->
     <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
     <#-- They are logged in so lets present the form to sign up with their 
email address -->
-      <form method="post" 
action="<@ofbizUrl>createContactListParty</@ofbizUrl>" 
name="signUpForContactListForm" id="signUpForContactListForm">
+      <form method="post" 
action="<@ofbizUrl>createContactListParty</@ofbizUrl>" 
name="signUpForContactListForm"
+          id="signUpForContactListForm">
         <fieldset>
           <#assign contextPath = request.getContextPath()>
           <input type="hidden" name="baseLocation" value="${contextPath}"/>
@@ -68,25 +71,40 @@ under the License.
             <label for="preferredContactMechId">${uiLabelMap.CommonEmail} 
*</label>
             <select id="preferredContactMechId" name="preferredContactMechId" 
class="selectBox">
               <#list partyAndContactMechList as partyAndContactMech>
-                <option value="${partyAndContactMech.contactMechId}"><#if 
partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif
 
partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode!}-${partyAndContactMech.tnAreaCode!}-${partyAndContactMech.tnContactNumber}<#elseif
 partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, 
${partyAndContactMech.paAddress2!}, ${partyAndContactMech.paCity!}, 
${partyAndContactMech.paStateProvinceGeoId!}, 
${partyAndContactMech.paPostalCode!}, ${partyAndContactMech.paPostalCodeExt!} 
${partyAndContactMech.paCountryGeoId!}</#if></option>
+                <option value="${partyAndContactMech.contactMechId}">
+                  <#if partyAndContactMech.infoString?has_content>
+                    ${partyAndContactMech.infoString}
+                  <#elseif partyAndContactMech.tnContactNumber?has_content>
+                    
${partyAndContactMech.tnCountryCode!}-${partyAndContactMech.tnAreaCode!}
+                    -${partyAndContactMech.tnContactNumber}
+                  <#elseif partyAndContactMech.paAddress1?has_content>
+                  ${partyAndContactMech.paAddress1}, 
${partyAndContactMech.paAddress2!}, ${partyAndContactMech.paCity!}
+                  , ${partyAndContactMech.paStateProvinceGeoId!}, 
${partyAndContactMech.paPostalCode!}
+                  , ${partyAndContactMech.paPostalCodeExt!} 
${partyAndContactMech.paCountryGeoId!}
+                  </#if>
+                </option>
               </#list>
             </select>
           </div>
           <div>
             <input type="submit" value="${uiLabelMap.EcommerceSubscribe}"/>
-            <input type="button" value="${uiLabelMap.EcommerceUnsubscribe}" 
onclick="javascript:unsubscribeByContactMech();"/>
+            <input type="button" value="${uiLabelMap.EcommerceUnsubscribe}"
+                onclick="javascript:unsubscribeByContactMech();"/>
           </div>
         </fieldset>
       </form>
     <#else>
     <#-- Not logged in so ask them to log in and then sign up or clear the 
user association -->
       <p>${uiLabelMap.EcommerceSignUpForContactListLogIn}</p>
-      <p><a 
href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a> 
${sessionAttributes.autoName}</p>
+      <p>
+        <a 
href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a> 
${sessionAttributes.autoName}
+      </p>
       <p>(${uiLabelMap.CommonNotYou}? <a 
href="<@ofbizUrl>autoLogout</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a>)</p>
     </#if>
   <#else>
   <#-- There is no party info so just offer an anonymous (non-partyId) related 
newsletter sign up -->
-    <form method="post" action="<@ofbizUrl>signUpForContactList</@ofbizUrl>" 
name="signUpForContactListForm" id="signUpForContactListForm">
+    <form method="post" action="<@ofbizUrl>signUpForContactList</@ofbizUrl>" 
name="signUpForContactListForm"
+        id="signUpForContactListForm">
       <fieldset>
         <#assign contextPath = request.getContextPath()>
         <input type="hidden" name="baseLocation" value="${contextPath}"/>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl Sat 
Sep 17 07:17:15 2016
@@ -20,46 +20,46 @@ under the License.
 <#if getUsername>
 <script type="text/javascript">
   //<![CDATA[
-     lastFocusedName = null;
-     function setLastFocused(formElement) {
-         lastFocusedName = formElement.name;
-         document.write.lastFocusedName;
-     }
-     function clickUsername() {
-         if (document.getElementById('UNUSEEMAIL').checked) {
-             if (lastFocusedName == "UNUSEEMAIL") {
-                 jQuery('#PASSWORD').focus();
-             } else if (lastFocusedName == "PASSWORD") {
-                 jQuery('#UNUSEEMAIL').focus();
-             } else {
-                 jQuery('#PASSWORD').focus();
-             }
-         }
-     }
-     function changeEmail() {
-         if (document.getElementById('UNUSEEMAIL').checked) {
-             document.getElementById('USERNAME').value = 
jQuery('#CUSTOMER_EMAIL').val();
-         }
-     }
-     function setEmailUsername() {
-         if (document.getElementById('UNUSEEMAIL').checked) {
-             document.getElementById('USERNAME').value = 
jQuery('#CUSTOMER_EMAIL').val();
-             // don't disable, make the browser not submit the field: 
document.getElementById('USERNAME').disabled=true;
-         } else {
-             document.getElementById('USERNAME').value='';
-             // document.getElementById('USERNAME').disabled=false;
-         }
-     }
-     function hideShowUsaStates() {
-         var customerStateElement = 
document.getElementById('newuserform_stateProvinceGeoId');
-          var customerCountryElement = 
document.getElementById('newuserform_countryGeoId');
-         if (customerCountryElement.value == "USA" || 
customerCountryElement.value == "UMI") {
-             customerStateElement.style.display = "block";
-         } else {
-             customerStateElement.style.display = "none";
-         }
-     }
-   //]]>
+  lastFocusedName = null;
+  function setLastFocused(formElement) {
+    lastFocusedName = formElement.name;
+    document.write.lastFocusedName;
+  }
+  function clickUsername() {
+    if (document.getElementById('UNUSEEMAIL').checked) {
+      if (lastFocusedName == "UNUSEEMAIL") {
+        jQuery('#PASSWORD').focus();
+      } else if (lastFocusedName == "PASSWORD") {
+        jQuery('#UNUSEEMAIL').focus();
+      } else {
+        jQuery('#PASSWORD').focus();
+      }
+    }
+  }
+  function changeEmail() {
+    if (document.getElementById('UNUSEEMAIL').checked) {
+      document.getElementById('USERNAME').value = 
jQuery('#CUSTOMER_EMAIL').val();
+    }
+  }
+  function setEmailUsername() {
+    if (document.getElementById('UNUSEEMAIL').checked) {
+      document.getElementById('USERNAME').value = 
jQuery('#CUSTOMER_EMAIL').val();
+      // don't disable, make the browser not submit the field: 
document.getElementById('USERNAME').disabled=true;
+    } else {
+      document.getElementById('USERNAME').value = '';
+      // document.getElementById('USERNAME').disabled=false;
+    }
+  }
+  function hideShowUsaStates() {
+    var customerStateElement = 
document.getElementById('newuserform_stateProvinceGeoId');
+    var customerCountryElement = 
document.getElementById('newuserform_countryGeoId');
+    if (customerCountryElement.value == "USA" || customerCountryElement.value 
== "UMI") {
+      customerStateElement.style.display = "block";
+    } else {
+      customerStateElement.style.display = "none";
+    }
+  }
+  //]]>
 </script>
 </#if>
 
@@ -71,83 +71,87 @@ will generally always be reserved for th
 
 <h2>${uiLabelMap.PartyRequestNewAccount}
   <span>
-    ${uiLabelMap.PartyAlreadyHaveAccount}, <a 
href='<@ofbizUrl>checkLogin/main</@ofbizUrl>'>${uiLabelMap.CommonLoginHere}</a>
+    ${uiLabelMap.PartyAlreadyHaveAccount}, <a
+        
href='<@ofbizUrl>checkLogin/main</@ofbizUrl>'>${uiLabelMap.CommonLoginHere}</a>
   </span>
 </h2>
 
 <#macro fieldErrors fieldName>
   <#if errorMessageList?has_content>
-    <#assign fieldMessages = 
Static["org.apache.ofbiz.base.util.MessageString"].getMessagesForField(fieldName,
 true, errorMessageList)>
-    <ul>
-      <#list fieldMessages as errorMsg>
-        <li class="errorMessage">${errorMsg}</li>
-      </#list>
-    </ul>
+    <#assign fieldMessages =
+        
Static["org.apache.ofbiz.base.util.MessageString"].getMessagesForField(fieldName,
 true, errorMessageList)>
+  <ul>
+    <#list fieldMessages as errorMsg>
+      <li class="errorMessage">${errorMsg}</li>
+    </#list>
+  </ul>
   </#if>
 </#macro>
 <#macro fieldErrorsMulti fieldName1 fieldName2 fieldName3 fieldName4>
   <#if errorMessageList?has_content>
-    <#assign fieldMessages = 
Static["org.apache.ofbiz.base.util.MessageString"].getMessagesForField(fieldName1,
 fieldName2, fieldName3, fieldName4, true, errorMessageList)>
-    <ul>
-      <#list fieldMessages as errorMsg>
-        <li class="errorMessage">${errorMsg}</li>
-      </#list>
-    </ul>
+    <#assign fieldMessages =
+        
Static["org.apache.ofbiz.base.util.MessageString"].getMessagesForField(fieldName1,
 fieldName2,
+        fieldName3, fieldName4, true, errorMessageList)>
+  <ul>
+    <#list fieldMessages as errorMsg>
+      <li class="errorMessage">${errorMsg}</li>
+    </#list>
+  </ul>
   </#if>
 </#macro>
 
-  &nbsp;<a href="<@ofbizUrl>${donePage}</@ofbizUrl>" 
class="button">${uiLabelMap.CommonCancel}</a>
-  &nbsp;<a href="javascript:document.getElementById('newuserform').submit()" 
class="button">${uiLabelMap.CommonSave}</a>
+&nbsp;<a href="<@ofbizUrl>${donePage}</@ofbizUrl>" 
class="button">${uiLabelMap.CommonCancel}</a>
+&nbsp;<a href="javascript:document.getElementById('newuserform').submit()" 
class="button">${uiLabelMap.CommonSave}</a>
 
 <form method="post" 
action="<@ofbizUrl>createcustomer${previousParams}</@ofbizUrl>" 
id="newuserform" name="newuserform">
-  
-  
-  <#----------------------------------------------------------------------
-  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"
-  ----------------------------------------------------------------------->
+
+
+<#----------------------------------------------------------------------
+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"
-  ----------------------------------------------------------------------->
+<#----------------------------------------------------------------------
+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>
     <input type="hidden" name="emailProductStoreId" value="${productStoreId}"/>
-    <#----------------------------------------------------------------------
-    Each input row should be enclosed in a <div></div>. 
-    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>
-      <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>
-    ----------------------------------------------------------------------->
+  <#----------------------------------------------------------------------
+  Each input row should be enclosed in a <div></div>.
+  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>
+    <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>
       <label for="USER_TITLE">${uiLabelMap.CommonTitle}</label>
-      <@fieldErrors fieldName="USER_TITLE"/>
+    <@fieldErrors fieldName="USER_TITLE"/>
       <select name="USER_TITLE" id="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>
+      <#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>
@@ -157,26 +161,27 @@ will generally always be reserved for th
 
     <div>
       <label for="USER_FIRST_NAME">${uiLabelMap.PartyFirstName}*</label>
-      <@fieldErrors fieldName="USER_FIRST_NAME"/>
-      <input type="text" name="USER_FIRST_NAME" id="USER_FIRST_NAME" 
value="${requestParameters.USER_FIRST_NAME!}" />
+    <@fieldErrors fieldName="USER_FIRST_NAME"/>
+      <input type="text" name="USER_FIRST_NAME" id="USER_FIRST_NAME" 
value="${requestParameters.USER_FIRST_NAME!}"/>
     </div>
 
     <div>
       <label for="USER_MIDDLE_NAME">${uiLabelMap.PartyMiddleInitial}</label>
-      <@fieldErrors fieldName="USER_MIDDLE_NAME"/>
-      <input type="text" name="USER_MIDDLE_NAME" id="USER_MIDDLE_NAME" 
value="${requestParameters.USER_MIDDLE_NAME!}" />
+    <@fieldErrors fieldName="USER_MIDDLE_NAME"/>
+      <input type="text" name="USER_MIDDLE_NAME" id="USER_MIDDLE_NAME" 
value="${requestParameters.USER_MIDDLE_NAME!}"/>
     </div>
 
     <div>
       <label for="USER_LAST_NAME">${uiLabelMap.PartyLastName}*</label>
-      <@fieldErrors fieldName="USER_LAST_NAME"/>
-      <input type="text" name="USER_LAST_NAME" id="USER_LAST_NAME" 
value="${requestParameters.USER_LAST_NAME!}" />
+    <@fieldErrors fieldName="USER_LAST_NAME"/>
+      <input type="text" name="USER_LAST_NAME" id="USER_LAST_NAME" 
value="${requestParameters.USER_LAST_NAME!}"/>
     </div>
 
     <div>
       <label for="USER_SUFFIX">${uiLabelMap.PartySuffix}</label>
-      <@fieldErrors fieldName="USER_SUFFIX"/>
-      <input type="text" class='inputBox' name="USER_SUFFIX" id="USER_SUFFIX" 
value="${requestParameters.USER_SUFFIX!}" />
+    <@fieldErrors fieldName="USER_SUFFIX"/>
+      <input type="text" class='inputBox' name="USER_SUFFIX" id="USER_SUFFIX"
+             value="${requestParameters.USER_SUFFIX!}"/>
     </div>
 
   </fieldset>
@@ -185,64 +190,69 @@ will generally always be reserved for th
     <legend>${uiLabelMap.PartyShippingAddress}</legend>
     <div>
       <label for="CUSTOMER_ADDRESS1">${uiLabelMap.PartyAddressLine1}*</label>
-      <@fieldErrors fieldName="CUSTOMER_ADDRESS1"/>
-      <input type="text" name="CUSTOMER_ADDRESS1" id="CUSTOMER_ADDRESS1" 
value="${requestParameters.CUSTOMER_ADDRESS1!}" />
+    <@fieldErrors fieldName="CUSTOMER_ADDRESS1"/>
+      <input type="text" name="CUSTOMER_ADDRESS1" id="CUSTOMER_ADDRESS1"
+          value="${requestParameters.CUSTOMER_ADDRESS1!}"/>
     </div>
-
     <div>
       <label for="CUSTOMER_ADDRESS2">${uiLabelMap.PartyAddressLine2}</label>
-      <@fieldErrors fieldName="CUSTOMER_ADDRESS2"/>
-      <input type="text" name="CUSTOMER_ADDRESS2" id="CUSTOMER_ADDRESS2" 
value="${requestParameters.CUSTOMER_ADDRESS2!}" />
+    <@fieldErrors fieldName="CUSTOMER_ADDRESS2"/>
+      <input type="text" name="CUSTOMER_ADDRESS2" id="CUSTOMER_ADDRESS2"
+          value="${requestParameters.CUSTOMER_ADDRESS2!}"/>
     </div>
-
     <div>
       <label for="CUSTOMER_CITY">${uiLabelMap.PartyCity}*</label>
-      <@fieldErrors fieldName="CUSTOMER_CITY"/>
-      <input type="text" name="CUSTOMER_CITY" id="CUSTOMER_CITY" 
value="${requestParameters.CUSTOMER_CITY!}" />
+    <@fieldErrors fieldName="CUSTOMER_CITY"/>
+      <input type="text" name="CUSTOMER_CITY" id="CUSTOMER_CITY" 
value="${requestParameters.CUSTOMER_CITY!}"/>
     </div>
-
     <div>
       <label for="CUSTOMER_POSTAL_CODE">${uiLabelMap.PartyZipCode}*</label>
-      <@fieldErrors fieldName="CUSTOMER_POSTAL_CODE"/>
-      <input type="text" name="CUSTOMER_POSTAL_CODE" id="CUSTOMER_POSTAL_CODE" 
value="${requestParameters.CUSTOMER_POSTAL_CODE!}" />
+     <@fieldErrors fieldName="CUSTOMER_POSTAL_CODE"/>
+      <input type="text" name="CUSTOMER_POSTAL_CODE" id="CUSTOMER_POSTAL_CODE"
+          value="${requestParameters.CUSTOMER_POSTAL_CODE!}"/>
+    </div>
+    <div>
+      <label for="customerCountry">${uiLabelMap.CommonCountry}*</label>
+      <@fieldErrors fieldName="CUSTOMER_COUNTRY"/>
+      <select name="CUSTOMER_COUNTRY" id="newuserform_countryGeoId">
+        
${screens.render("component://common/widget/CommonScreens.xml#countries")}
+        <#assign defaultCountryGeoId =
+            
Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general",
+            "country.geo.id.default", delegator)>
+        <option selected="selected" value="${defaultCountryGeoId}">
+          <#assign countryGeo = 
delegator.findOne("Geo",Static["org.apache.ofbiz.base.util.UtilMisc"]
+              .toMap("geoId",defaultCountryGeoId), false)>
+          ${countryGeo.get("geoName",locale)}
+        </option>
+      </select>
     </div>
-  
-    <div>
-        <label for="customerCountry">${uiLabelMap.CommonCountry}*</label>
-        <@fieldErrors fieldName="CUSTOMER_COUNTRY"/>
-        <select name="CUSTOMER_COUNTRY" id="newuserform_countryGeoId">
-            
${screens.render("component://common/widget/CommonScreens.xml#countries")}
-            <#assign defaultCountryGeoId = 
Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general",
 "country.geo.id.default", delegator)>
-            <option selected="selected" value="${defaultCountryGeoId}">
-                <#assign countryGeo = 
delegator.findOne("Geo",Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId),
 false)>
-                ${countryGeo.get("geoName",locale)}
-            </option>
-        </select>
-    <div/>
-    
     <div>
-        <label for="customerState">${uiLabelMap.PartyState}*</label>
-        <@fieldErrors fieldName="CUSTOMER_STATE"/>
-        <select name="CUSTOMER_STATE" 
id="newuserform_stateProvinceGeoId"></select>
+      <label for="customerState">${uiLabelMap.PartyState}*</label>
+      <@fieldErrors fieldName="CUSTOMER_STATE"/>
+      <select name="CUSTOMER_STATE" 
id="newuserform_stateProvinceGeoId"></select>
     <div/>
-
     <div>
       <label 
for="CUSTOMER_ADDRESS_ALLOW_SOL">${uiLabelMap.PartyAllowAddressSolicitation}</label>
       <@fieldErrors fieldName="CUSTOMER_ADDRESS_ALLOW_SOL"/>
       <select name="CUSTOMER_ADDRESS_ALLOW_SOL" 
id="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>
+        <#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">
+    <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>
@@ -256,14 +266,24 @@ will generally always be reserved for th
       <tbody>
         <tr>
           <th scope="row">${uiLabelMap.PartyHomePhone}</th>
-          <td><input type="text" name="CUSTOMER_HOME_COUNTRY" size="5" 
value="${requestParameters.CUSTOMER_HOME_COUNTRY!}" /></td>
-          <td><input type="text" name="CUSTOMER_HOME_AREA" size="5" 
value="${requestParameters.CUSTOMER_HOME_AREA!}" /></td>
-          <td><input type="text" name="CUSTOMER_HOME_CONTACT" 
value="${requestParameters.CUSTOMER_HOME_CONTACT!}" /></td>
-          <td><input type="text" name="CUSTOMER_HOME_EXT" size="6" 
value="${requestParameters.CUSTOMER_HOME_EXT!}"/></td>
+          <td>
+            <input type="text" name="CUSTOMER_HOME_COUNTRY" size="5" 
value="${requestParameters.CUSTOMER_HOME_COUNTRY!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_HOME_AREA" size="5" 
value="${requestParameters.CUSTOMER_HOME_AREA!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_HOME_CONTACT" 
value="${requestParameters.CUSTOMER_HOME_CONTACT!}"/></td>
+          <td>
+            <input type="text" name="CUSTOMER_HOME_EXT" size="6" 
value="${requestParameters.CUSTOMER_HOME_EXT!}"/>
+          </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>
+              <#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>
@@ -272,14 +292,24 @@ will generally always be reserved for th
         </tr>
         <tr>
           <th scope="row">${uiLabelMap.PartyBusinessPhone}</th>
-          <td><input type="text" name="CUSTOMER_WORK_COUNTRY" size="5" 
value="${requestParameters.CUSTOMER_WORK_COUNTRY!}" /></td>
-          <td><input type="text" name="CUSTOMER_WORK_AREA" size="5" 
value="${requestParameters.CUSTOMER_WORK_AREA!}" /></td>
-          <td><input type="text" name="CUSTOMER_WORK_CONTACT" 
value="${requestParameters.CUSTOMER_WORK_CONTACT!}" /></td>
-          <td><input type="text" name="CUSTOMER_WORK_EXT" size="6" 
value="${requestParameters.CUSTOMER_WORK_EXT!}" /></td>
+          <td>
+            <input type="text" name="CUSTOMER_WORK_COUNTRY" size="5" 
value="${requestParameters.CUSTOMER_WORK_COUNTRY!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_WORK_AREA" size="5" 
value="${requestParameters.CUSTOMER_WORK_AREA!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_WORK_CONTACT" 
value="${requestParameters.CUSTOMER_WORK_CONTACT!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_WORK_EXT" size="6" 
value="${requestParameters.CUSTOMER_WORK_EXT!}"/>
+          </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>
+              <#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>
@@ -288,14 +318,22 @@ will generally always be reserved for th
         </tr>
         <tr>
           <th scope="row">${uiLabelMap.PartyFaxNumber}</th>
-          <td><input type="text" name="CUSTOMER_FAX_COUNTRY" size="5" 
value="${requestParameters.CUSTOMER_FAX_COUNTRY!}" /></td>
-          <td><input type="text" name="CUSTOMER_FAX_AREA" size="5" 
value="${requestParameters.CUSTOMER_FAX_AREA!}" /></td>
-          <td><input type="text" name="CUSTOMER_FAX_CONTACT" 
value="${requestParameters.CUSTOMER_FAX_CONTACT!}" /></td>
+          <td>
+            <input type="text" name="CUSTOMER_FAX_COUNTRY" size="5" 
value="${requestParameters.CUSTOMER_FAX_COUNTRY!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_FAX_AREA" size="5" 
value="${requestParameters.CUSTOMER_FAX_AREA!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_FAX_CONTACT" 
value="${requestParameters.CUSTOMER_FAX_CONTACT!}"/>
+          </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>
+              <#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>
@@ -304,14 +342,23 @@ will generally always be reserved for th
         </tr>
         <tr>
           <th scope="row">${uiLabelMap.PartyMobilePhone}</th>
-          <td><input type="text" name="CUSTOMER_MOBILE_COUNTRY" size="5" 
value="${requestParameters.CUSTOMER_MOBILE_COUNTRY!}" /></td>
-          <td><input type="text" name="CUSTOMER_MOBILE_AREA" size="5" 
value="${requestParameters.CUSTOMER_MOBILE_AREA!}" /></td>
-          <td><input type="text" name="CUSTOMER_MOBILE_CONTACT" 
value="${requestParameters.CUSTOMER_MOBILE_CONTACT!}" /></td>
+          <td>
+            <input type="text" name="CUSTOMER_MOBILE_COUNTRY" size="5"
+                value="${requestParameters.CUSTOMER_MOBILE_COUNTRY!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_MOBILE_AREA" size="5" 
value="${requestParameters.CUSTOMER_MOBILE_AREA!}"/>
+          </td>
+          <td>
+            <input type="text" name="CUSTOMER_MOBILE_CONTACT" 
value="${requestParameters.CUSTOMER_MOBILE_CONTACT!}"/>
+          </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>
+              <#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>
@@ -325,15 +372,18 @@ will generally always be reserved for th
   <fieldset class="col">
     <legend>${uiLabelMap.PartyEmailAddress}</legend>
     <div>
-      <label for= "CUSTOMER_EMAIL">${uiLabelMap.PartyEmailAddress}*</label>
+      <label for="CUSTOMER_EMAIL">${uiLabelMap.PartyEmailAddress}*</label>
       <@fieldErrors fieldName="CUSTOMER_EMAIL"/>
-      <input type="text" name="CUSTOMER_EMAIL" id="CUSTOMER_EMAIL" 
value="${requestParameters.CUSTOMER_EMAIL!}" onchange="changeEmail()" 
onkeyup="changeEmail()" />
+      <input type="text" name="CUSTOMER_EMAIL" id="CUSTOMER_EMAIL" 
value="${requestParameters.CUSTOMER_EMAIL!}"
+          onchange="changeEmail()" onkeyup="changeEmail()"/>
     </div>
     <div>
       <label 
for="CUSTOMER_EMAIL_ALLOW_SOL">${uiLabelMap.PartyAllowSolicitation}</label>
       <select name="CUSTOMER_EMAIL_ALLOW_SOL" id="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>
+        <#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>
@@ -348,7 +398,8 @@ will generally always be reserved for th
       <#if !requestParameters.preferredUsername?has_content>
         <div class="form-row inline">
           <label for="UNUSEEMAIL">
-            <input type="checkbox" class="checkbox" name="UNUSEEMAIL" 
id="UNUSEEMAIL" value="on" onclick="setEmailUsername();" 
onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress}
+            <input type="checkbox" class="checkbox" name="UNUSEEMAIL" 
id="UNUSEEMAIL" value="on"
+                onclick="setEmailUsername();" 
onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress}
           </label>
         </div>
       </#if>
@@ -356,10 +407,12 @@ will generally always be reserved for th
       <div>
         <label for="USERNAME">${uiLabelMap.CommonUsername}*</label>
         <#if requestParameters.preferredUsername?has_content>
-            <input type="text" name="showUserName" id="showUserName" 
value="${requestParameters.USERNAME!}" disabled="disabled"/>
-            <input type="hidden" name="USERNAME" id="USERNAME" 
value="${requestParameters.USERNAME!}"/>
+          <input type="text" name="showUserName" id="showUserName" 
value="${requestParameters.USERNAME!}"
+              disabled="disabled"/>
+          <input type="hidden" name="USERNAME" id="USERNAME" 
value="${requestParameters.USERNAME!}"/>
         <#else>
-            <input type="text" name="USERNAME" id="USERNAME" 
value="${requestParameters.USERNAME!}" onfocus="clickUsername();" 
onchange="changeEmail();"/>
+          <input type="text" name="USERNAME" id="USERNAME" 
value="${requestParameters.USERNAME!}"
+              onfocus="clickUsername();" onchange="changeEmail();"/>
         </#if>
       </div>
     </#if>
@@ -383,7 +436,8 @@ will generally always be reserved for th
       <div>
         <label for="PASSWORD_HINT">${uiLabelMap.PartyPasswordHint}</label>
         <@fieldErrors fieldName="PASSWORD_HINT"/>
-        <input type="text" class='inputBox' name="PASSWORD_HINT" 
id="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT!}" maxlength="100"/>
+        <input type="text" class='inputBox' name="PASSWORD_HINT" 
id="PASSWORD_HINT"
+            value="${requestParameters.PASSWORD_HINT!}" maxlength="100"/>
       </div>
     <#else>
       <div>
@@ -399,13 +453,13 @@ and a tags acting as submit buttons, all
 class name of "button". No other class names should be used to style 
 button actions.
 
------------------------------------------------------------------------------->
-<div class="buttons">  
-  &nbsp;<a href="<@ofbizUrl>${donePage}</@ofbizUrl>" 
class="button">${uiLabelMap.CommonCancel}</a>
-  &nbsp;<a href="javascript:document.getElementById('newuserform').submit()" 
class="button">${uiLabelMap.CommonSave}</a>   
+<div class="buttons">&nbsp;
+  <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" 
class="button">${uiLabelMap.CommonCancel}</a>&nbsp;
+  <a href="javascript:document.getElementById('newuserform').submit()" 
class="button">${uiLabelMap.CommonSave}</a>
 </div>
 
 <script type="text/javascript">
   //<![CDATA[
-      hideShowUsaStates();
+  hideShowUsaStates();
   //]]>
 </script>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewMsg.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewMsg.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewMsg.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewMsg.ftl Sat Sep 
17 07:17:15 2016
@@ -18,93 +18,109 @@ under the License.
 -->
 
 <div class="screenlet">
-    <div class="screenlet-title-bar">
-        <div class="boxlink">
-            <#if showMessageLinks?default("false")?upper_case == "TRUE">
-                <a href="<@ofbizUrl>messagelist</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
-            </#if>
-        </div>
-        <div class="h3">${pageHeader}</div>
+  <div class="screenlet-title-bar">
+    <div class="boxlink">
+      <#if showMessageLinks?default("false")?upper_case == "TRUE">
+        <a href="<@ofbizUrl>messagelist</@ofbizUrl>" 
class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
+      </#if>
     </div>
-    <div class="screenlet-body">
-      <form name="contactus" method="post" 
action="<@ofbizUrl>${submitRequest}</@ofbizUrl>" style="margin: 0;">
-        <input type="hidden" name="partyIdFrom" value="${userLogin.partyId}"/>
-        <input type="hidden" name="contactMechTypeId" value="WEB_ADDRESS"/>
-        <input type="hidden" name="communicationEventTypeId" 
value="WEB_SITE_COMMUNICATI"/>
-        <#if productStore?has_content>
-          <input type="hidden" name="partyIdTo" 
value="${productStore.payToPartyId!}"/>
-        </#if>
-        <input type="hidden" name="note" 
value="${Static["org.apache.ofbiz.base.util.UtilHttp"].getFullRequestUrl(request)}"/>
-        <#if message?has_content>
-          <input type="hidden" name="parentCommEventId" 
value="${communicationEvent.communicationEventId}"/>
-          <#if (communicationEvent.origCommEventId?? && 
communicationEvent.origCommEventId?length > 0)>
-            <#assign orgComm = communicationEvent.origCommEventId>
-          <#else>
-            <#assign orgComm = communicationEvent.communicationEventId>
-          </#if>
-          <input type="hidden" name="origCommEventId" value="${orgComm}"/>
+    <div class="h3">${pageHeader}</div>
+  </div>
+  <div class="screenlet-body">
+    <form name="contactus" method="post" 
action="<@ofbizUrl>${submitRequest}</@ofbizUrl>" style="margin: 0;">
+      <input type="hidden" name="partyIdFrom" value="${userLogin.partyId}"/>
+      <input type="hidden" name="contactMechTypeId" value="WEB_ADDRESS"/>
+      <input type="hidden" name="communicationEventTypeId" 
value="WEB_SITE_COMMUNICATI"/>
+      <#if productStore?has_content>
+        <input type="hidden" name="partyIdTo" 
value="${productStore.payToPartyId!}"/>
+      </#if>
+        <input type="hidden" name="note"
+               
value="${Static["org.apache.ofbiz.base.util.UtilHttp"].getFullRequestUrl(request)}"/>
+      <#if message?has_content>
+        <input type="hidden" name="parentCommEventId" 
value="${communicationEvent.communicationEventId}"/>
+        <#if (communicationEvent.origCommEventId?? && 
communicationEvent.origCommEventId?length > 0)>
+          <#assign orgComm = communicationEvent.origCommEventId>
+        <#else>
+          <#assign orgComm = communicationEvent.communicationEventId>
         </#if>
-        <table width="100%" border='0' cellspacing='0' cellpadding='0' 
class='boxbottom'>
+        <input type="hidden" name="origCommEventId" value="${orgComm}"/>
+      </#if>
+      <table width="100%" border='0' cellspacing='0' cellpadding='0' 
class='boxbottom'>
+        <tr>
+          <td colspan="3">&nbsp;</td>
+        </tr>
+        <tr>
+          <td width="5">&nbsp;</td>
+          <td align="right">
+            <div class="tableheadtext">${uiLabelMap.CommonFrom}:</div>
+          </td>
+          <td>
+            <div>&nbsp;${sessionAttributes.autoName!} [${userLogin.partyId}] 
(${uiLabelMap.CommonNotYou}?&nbsp;<a
+                href="<@ofbizUrl>autoLogout</@ofbizUrl>" 
class="buttontext">${uiLabelMap.CommonClickHere}</a>)
+            </div>
+          </td>
+        </tr>
+        <#if partyIdTo?has_content>
+          <#assign partyToName =
+              
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
partyIdTo, true)>
+          <input type="hidden" name="partyIdTo" value="${partyIdTo}"/>
           <tr>
             <td colspan="3">&nbsp;</td>
           </tr>
           <tr>
             <td width="5">&nbsp;</td>
-            <td align="right"><div 
class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td>
-            <td><div>&nbsp;${sessionAttributes.autoName!} 
[${userLogin.partyId}] (${uiLabelMap.CommonNotYou}?&nbsp;<a 
href="<@ofbizUrl>autoLogout</@ofbizUrl>" 
class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div></td>
-          </tr>
-          <#if partyIdTo?has_content>
-            <#assign partyToName = 
Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, 
partyIdTo, true)>
-            <input type="hidden" name="partyIdTo" value="${partyIdTo}"/>
-            <tr>
-              <td colspan="3">&nbsp;</td>
-            </tr>
-            <tr>
-              <td width="5">&nbsp;</td>
-              <td align="right"><div 
class="tableheadtext">${uiLabelMap.CommonTo}:</div></td>
-              <td><div>&nbsp;${partyToName}</div></td>
-            </tr>
-          </#if>
-          <tr>
-            <td colspan="3">&nbsp;</td>
+            <td align="right">
+              <div class="tableheadtext">${uiLabelMap.CommonTo}:</div>
+            </td>
+            <td>
+              <div>&nbsp;${partyToName}</div>
+            </td>
           </tr>
-          <#assign defaultSubject = (communicationEvent.subject)?default("")>
-          <#if (defaultSubject?length == 0)>
-            <#assign replyPrefix = "RE: ">
-            <#if parentEvent?has_content>
-              <#if 
!parentEvent.subject?default("")?upper_case?starts_with(replyPrefix)>
-                <#assign defaultSubject = replyPrefix>
-              </#if>
-              <#assign defaultSubject = defaultSubject + 
parentEvent.subject?default("")>
+        </#if>
+        <tr>
+          <td colspan="3">&nbsp;</td>
+        </tr>
+        <#assign defaultSubject = (communicationEvent.subject)?default("")>
+        <#if (defaultSubject?length == 0)>
+          <#assign replyPrefix = "RE: ">
+          <#if parentEvent?has_content>
+            <#if 
!parentEvent.subject?default("")?upper_case?starts_with(replyPrefix)>
+              <#assign defaultSubject = replyPrefix>
             </#if>
+            <#assign defaultSubject = defaultSubject + 
parentEvent.subject?default("")>
           </#if>
-          <tr>
-            <td width="5">&nbsp;</td>
-            <td align="right"><div 
class="tableheadtext">${uiLabelMap.EcommerceSubject}:</div></td>
-            <td><input type="input" class="inputBox" name="subject" size="20" 
value="${defaultSubject}"/>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;</td>
-          </tr>
-          <tr>
-            <td width="5">&nbsp;</td>
-            <td align="right"><div 
class="tableheadtext">${uiLabelMap.CommonMessage}:</div></td>
-            <td>&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
-            <td colspan="2">
-              <textarea name="content" class="textAreaBox" cols="40" 
rows="5"></textarea>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
-            <td><input type="submit" class="smallSubmit" 
value="${uiLabelMap.CommonSend}"/></td>
-          </tr>
-        </table>
-      </form>
-    </div>
+        </#if>
+        <tr>
+          <td width="5">&nbsp;</td>
+          <td align="right">
+            <div class="tableheadtext">${uiLabelMap.EcommerceSubject}:</div>
+          </td>
+          <td><input type="input" class="inputBox" name="subject" size="20" 
value="${defaultSubject}"/>
+        </tr>
+        <tr>
+          <td colspan="3">&nbsp;</td>
+        </tr>
+        <tr>
+          <td width="5">&nbsp;</td>
+          <td align="right">
+            <div class="tableheadtext">${uiLabelMap.CommonMessage}:</div>
+          </td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2">&nbsp;</td>
+          <td colspan="2">
+            <textarea name="content" class="textAreaBox" cols="40" 
rows="5"></textarea>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="3">&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2">&nbsp;</td>
+          <td><input type="submit" class="smallSubmit" 
value="${uiLabelMap.CommonSend}"/></td>
+        </tr>
+      </table>
+    </form>
+  </div>
 </div>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/SerializedInventorySummary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/SerializedInventorySummary.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/SerializedInventorySummary.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/SerializedInventorySummary.ftl
 Sat Sep 17 07:17:15 2016
@@ -18,45 +18,61 @@ under the License.
 -->
 
 <div id="serialized-inventory-summary" class="screenlet">
-    <div class="screenlet-title-bar">
-        <span class="h3">${uiLabelMap.ProductSerializedInventorySummary}</span>
-    </div>
-    <div class="screenlet-body">
-        <table width="100%" cellspacing="0" cellpadding="2">
-            <thead>
-                <tr class="header-row">
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductInventoryItemId}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductProductName}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductSerialNumber}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductSoftIdentifier}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductActivationNumber}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductActivationNumber} 
${uiLabelMap.CommonValidThruDate}</div></td>
-                </tr>
-            </thead>
-            <tbody>
-                <#list inventoryItemList as inventoryItem>
-                    <#assign product = inventoryItem.getRelatedOne('Product', 
false)!>
-                    <tr>
-                        <td>${inventoryItem.inventoryItemId}</td>
-                        <td>
-                            <#if product?has_content>
-                                <#if product.isVariant?default('N') == 'Y'>
-                                    <#assign product = 
Static['org.apache.ofbiz.product.product.ProductWorker'].getParentProduct(product.productId,
 delegator)!>
-                                </#if>
-                                <#if product?has_content>
-                                    <#assign productName = 
Static['org.apache.ofbiz.product.product.ProductContentWrapper'].getProductContentAsText(product,
 'PRODUCT_NAME', request, "html")!>
-                                    <a 
href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" 
class="linktext">${productName?default(product.productId)}</a>
-                                </#if>
-                            </#if>
-                        </td>
-                        <td>${inventoryItem.serialNumber!}</td>
-                        <td>${inventoryItem.softIdentifier!}</td>
-                        <td>${inventoryItem.activationNumber!}</td>
-                        <td>${inventoryItem.activationValidThru!}</td>
-                    </tr>
-                </#list>
-            </tbody>
-        </table>
-    </div>
+  <div class="screenlet-title-bar">
+    <span class="h3">${uiLabelMap.ProductSerializedInventorySummary}</span>
+  </div>
+  <div class="screenlet-body">
+    <table width="100%" cellspacing="0" cellpadding="2">
+      <thead>
+        <tr class="header-row">
+          <td>
+            <div 
class="tableheadtext">${uiLabelMap.ProductInventoryItemId}</div>
+          </td>
+          <td>
+            <div class="tableheadtext">${uiLabelMap.ProductProductName}</div>
+          </td>
+          <td>
+            <div class="tableheadtext">${uiLabelMap.ProductSerialNumber}</div>
+          </td>
+          <td>
+            <div 
class="tableheadtext">${uiLabelMap.ProductSoftIdentifier}</div>
+          </td>
+          <td>
+            <div 
class="tableheadtext">${uiLabelMap.ProductActivationNumber}</div>
+          </td>
+          <td>
+            <div class="tableheadtext">${uiLabelMap.ProductActivationNumber} 
${uiLabelMap.CommonValidThruDate}</div>
+          </td>
+        </tr>
+      </thead>
+      <tbody>
+        <#list inventoryItemList as inventoryItem>
+          <#assign product = inventoryItem.getRelatedOne('Product', false)!>
+          <tr>
+            <td>${inventoryItem.inventoryItemId}</td>
+            <td>
+              <#if product?has_content>
+                <#if product.isVariant?default('N') == 'Y'>
+                  <#assign product = 
Static['org.apache.ofbiz.product.product.ProductWorker']
+                      .getParentProduct(product.productId, delegator)!>
+                </#if>
+                <#if product?has_content>
+                  <#assign productName = 
Static['org.apache.ofbiz.product.product.ProductContentWrapper']
+                      .getProductContentAsText(product, 'PRODUCT_NAME', 
request, "html")!>
+                  <a 
href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" 
class="linktext">
+                    ${productName?default(product.productId)}
+                  </a>
+                </#if>
+              </#if>
+            </td>
+            <td>${inventoryItem.serialNumber!}</td>
+            <td>${inventoryItem.softIdentifier!}</td>
+            <td>${inventoryItem.activationNumber!}</td>
+            <td>${inventoryItem.activationValidThru!}</td>
+          </tr>
+        </#list>
+      </tbody>
+    </table>
+  </div>
 </div>
 

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/SubscriptionSummary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/SubscriptionSummary.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/SubscriptionSummary.ftl 
(original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/SubscriptionSummary.ftl 
Sat Sep 17 07:17:15 2016
@@ -18,44 +18,63 @@ under the License.
 -->
 
 <div id="subscription-summary" class="screenlet">
-    <div class="screenlet-title-bar">
-        <span class="h3">${uiLabelMap.ProductSubscriptions}</span>
-    </div>
-    <div class="screenlet-body">
-        <table width="100%" cellspacing="0" cellpadding="2">
-            <thead>
-                <tr class="header-row">
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductSubscription} 
${uiLabelMap.CommonId}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductSubscription} 
${uiLabelMap.CommonType}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.ProductProductName}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.CommonFromDate}</div></td>
-                    <td><div 
class="tableheadtext">${uiLabelMap.CommonThruDate}</div></td>
-                </tr>
-                <tr><td colspan="6"><hr /></td></tr>
-            </thead>
-            <tbody>
-                <#list subscriptionList as subscription>
-                    <tr>
-                        <td>${subscription.subscriptionId}</td>
-                        <td>
-                            <#assign subscriptionType = 
subscription.getRelatedOne('SubscriptionType', false)!>
+  <div class="screenlet-title-bar">
+    <span class="h3">${uiLabelMap.ProductSubscriptions}</span>
+  </div>
+  <div class="screenlet-body">
+    <table width="100%" cellspacing="0" cellpadding="2">
+      <thead>
+      <tr class="header-row">
+        <td>
+          <div class="tableheadtext">${uiLabelMap.ProductSubscription} 
${uiLabelMap.CommonId}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.ProductSubscription} 
${uiLabelMap.CommonType}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.CommonDescription}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.ProductProductName}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.CommonFromDate}</div>
+        </td>
+        <td>
+          <div class="tableheadtext">${uiLabelMap.CommonThruDate}</div>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="6">
+          <hr/>
+        </td>
+      </tr>
+      </thead>
+      <tbody>
+      <#list subscriptionList as subscription>
+      <tr>
+        <td>${subscription.subscriptionId}</td>
+        <td>
+          <#assign subscriptionType = 
subscription.getRelatedOne('SubscriptionType', false)!>
                             
${(subscriptionType.description)?default(subscription.subscriptionTypeId?default('N/A'))}
-                        </td>
-                        <td>${subscription.description!}</td>
-                        <td>
-                            <#assign product = 
subscription.getRelatedOne('Product', false)!>
-                            <#if product?has_content>
-                                <#assign productName = 
Static['org.apache.ofbiz.product.product.ProductContentWrapper'].getProductContentAsText(product,
 'PRODUCT_NAME', request, "html")!>
-                                <a 
href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" 
class="linktext">${productName?default(product.productId)}</a>
-                            </#if>
-                        </td>
-                        <td>${subscription.fromDate!}</td>
-                        <td>${subscription.thruDate!}</td>
-                    </tr>
-                </#list>
-            </tbody>
-        </table>
-    </div>
+        </td>
+        <td>${subscription.description!}</td>
+        <td>
+          <#assign product = subscription.getRelatedOne('Product', false)!>
+          <#if product?has_content>
+            <#assign productName = 
Static['org.apache.ofbiz.product.product.ProductContentWrapper']
+                .getProductContentAsText(product, 'PRODUCT_NAME', request, 
"html")!>
+            <a 
href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" 
class="linktext">
+              ${productName?default(product.productId)}
+            </a>
+          </#if>
+        </td>
+        <td>${subscription.fromDate!}</td>
+        <td>${subscription.thruDate!}</td>
+      </tr>
+      </#list>
+      </tbody>
+    </table>
+  </div>
 </div>
 

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditBillToAddress.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditBillToAddress.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditBillToAddress.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditBillToAddress.ftl
 Sat Sep 17 07:17:15 2016
@@ -20,28 +20,36 @@ under the License.
 <div id="billToServerError" class="errorMessage"></div>
 <form id="editBillToPostalAddress" method="post" action="">
   <fieldset>
-    <input type="hidden" name="setBillingPurpose" value="Y" />
-    <input type="hidden" name="contactMechId" value="${billToContactMechId!}" 
/>
+    <input type="hidden" name="setBillingPurpose" value="Y"/>
+    <input type="hidden" name="contactMechId" value="${billToContactMechId!}"/>
     <#assign productStoreId = 
Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)
 />
-    <input type="hidden" name="productStoreId" value="${productStoreId!}" />
+    <input type="hidden" name="productStoreId" value="${productStoreId!}"/>
     <div>
       <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*</label>
-      <input type="text" class="required" name="address1" id="billToAddress1" 
value="${billToAddress1!}" maxlength="30" />
-      <span id="advice-required-billToAddress1" style="display: none" 
class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+      <input type="text" class="required" name="address1" id="billToAddress1" 
value="${billToAddress1!}"
+          maxlength="30"/>
+      <span id="advice-required-billToAddress1" style="display: none" 
class="errorMessage">
+        (${uiLabelMap.CommonRequired})
+      </span>
     </div>
     <div>
       <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label>
-      <input type="text" name="address2" id="billToAddress2" 
value="${billToAddress2!}" maxlength="30" />
+      <input type="text" name="address2" id="billToAddress2" 
value="${billToAddress2!}" maxlength="30"/>
     </div>
     <div>
       <label for="billToCity">${uiLabelMap.PartyCity}*</label>
-      <input type="text" class="required" name="city" id="billToCity" 
value="${billToCity!}" maxlength="30" />
-      <span id="advice-required-billToCity" style="display: none" 
class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+      <input type="text" class="required" name="city" id="billToCity" 
value="${billToCity!}" maxlength="30"/>
+      <span id="advice-required-billToCity" style="display: none" 
class="errorMessage">
+        (${uiLabelMap.CommonRequired})
+      </span>
     </div>
     <div>
       <label for="billToPostalCode">${uiLabelMap.PartyZipCode}*</label>
-      <input type="text" class="required" name="postalCode" 
id="billToPostalCode" value="${billToPostalCode!}" maxlength="10" />
-      <span id="advice-required-billToPostalCode" style="display: none" 
class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+      <input type="text" class="required" name="postalCode" 
id="billToPostalCode" value="${billToPostalCode!}"
+          maxlength="10"/>
+      <span id="advice-required-billToPostalCode" style="display: none" 
class="errorMessage">
+        (${uiLabelMap.CommonRequired})
+      </span>
     </div>
     <div>
       <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}*</label>
@@ -51,13 +59,22 @@ under the License.
         </#if>
         
${screens.render("component://common/widget/CommonScreens.xml#countries")}
       </select>
-      <span id="advice-required-billToCountryGeoId" style="display: none" 
class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+      <span id="advice-required-billToCountryGeoId" style="display: none" 
class="errorMessage">
+        (${uiLabelMap.CommonRequired})
+      </span>
     </div>
     <div id="billToStates">
-      <label for="billToStateProvinceGeoId">${uiLabelMap.PartyState}*<span 
id="advice-required-billToStateProvinceGeoId" style="display: none" 
class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
+      <label for="billToStateProvinceGeoId">
+        ${uiLabelMap.PartyState}*
+        <span id="advice-required-billToStateProvinceGeoId" style="display: 
none" class="errorMessage">
+          (${uiLabelMap.CommonRequired})
+        </span>
+      </label>
       <select name="stateProvinceGeoId" id="billToStateProvinceGeoId">
         <#if billToStateProvinceGeoId?has_content>
-          <option 
value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo!(billToStateProvinceGeoId!)}</option>
+          <option value='${billToStateProvinceGeoId!}'>
+            ${billToStateProvinceGeo!(billToStateProvinceGeoId!)}
+          </option>
         <#else>
           <option value="_NA_">${uiLabelMap.PartyNoState}</option>
         </#if>
@@ -69,23 +86,33 @@ under the License.
         <span id="advice-required-billToCountryCode" style="display:none" 
class="errorMessage"></span>
         <span id="advice-required-billToAreaCode" style="display:none" 
class="errorMessage"></span>
         <span id="advice-required-billToContactNumber" style="display:none" 
class="errorMessage"></span>
-        <span id="billToPhoneRequired" style="display: none;" 
class="errorMessage">(${uiLabelMap.CommonRequired})</span>
-        <input type="hidden" name="phoneContactMechId" 
value="${billToTelecomNumber.contactMechId!}" />
-        <input type="text" name="countryCode" id="billToCountryCode" 
class="required" value="${billToTelecomNumber.countryCode!}" size="3" 
maxlength="3" />
-        - <input type="text" name="areaCode" id="billToAreaCode" 
class="required" value="${billToTelecomNumber.areaCode!}" size="3" 
maxlength="3" />
-        - <input type="text" name="contactNumber" id="billToContactNumber" 
class="required" 
value="${contactNumber?default("${billToTelecomNumber.contactNumber!}")}" 
size="6" maxlength="7" />
-        - <input type="text" name="extension" 
value="${extension?default("${billToExtension!}")}" size="3" maxlength="3" />
+        <span id="billToPhoneRequired" style="display: none;" 
class="errorMessage">
+          (${uiLabelMap.CommonRequired})
+        </span>
+        <input type="hidden" name="phoneContactMechId" 
value="${billToTelecomNumber.contactMechId!}"/>
+        <input type="text" name="countryCode" id="billToCountryCode" 
class="required"
+            value="${billToTelecomNumber.countryCode!}" size="3" 
maxlength="3"/>
+        - <input type="text" name="areaCode" id="billToAreaCode" 
class="required"
+              value="${billToTelecomNumber.areaCode!}" size="3" maxlength="3"/>
+        - <input type="text" name="contactNumber" id="billToContactNumber" 
class="required"
+              
value="${contactNumber?default("${billToTelecomNumber.contactNumber!}")}" 
size="6" maxlength="7"/>
+        - <input type="text" name="extension"
+              value="${extension?default("${billToExtension!}")}" size="3" 
maxlength="3"/>
       </div>
     </#if>
     <div class="inline">
       <label 
for="setShippingPurposeForBilling">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
-      <input type="checkbox" name="setShippingPurpose" 
id="setShippingPurposeForBilling" value="Y" <#if 
setShippingPurpose??>checked="checked"</#if> />
+      <input type="checkbox" name="setShippingPurpose" 
id="setShippingPurposeForBilling" value="Y"
+          <#if setShippingPurpose??>checked="checked"</#if>/>
     </div>
-      <#--
-    <div>
-      <a name="submitEditBillToPostalAddress" 
id="submitEditBillToPostalAddress" class="button" 
onclick="updatePartyBillToPostalAddress('submitEditBillToPostalAddress')">${uiLabelMap.CommonSubmit}</a>
-      <a class="popup_closebox button" 
href="javascript:void(0);">${uiLabelMap.CommonClose}</a>
-    </div>
-      -->
+    <#--
+      <div>
+        <a name="submitEditBillToPostalAddress" 
id="submitEditBillToPostalAddress" class="button"
+            
onclick="updatePartyBillToPostalAddress('submitEditBillToPostalAddress')">
+          ${uiLabelMap.CommonSubmit}
+        </a>
+        <a class="popup_closebox button" 
href="javascript:void(0);">${uiLabelMap.CommonClose}</a>
+      </div>
+    -->
   </fieldset>
 </form>
\ No newline at end of file

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditPostalAddress.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditPostalAddress.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditPostalAddress.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditPostalAddress.ftl
 Sat Sep 17 07:17:15 2016
@@ -18,68 +18,88 @@ under the License.
 -->
 
 <div id="serverError_${contactMech.contactMechId}" class="errorMessage"></div>
-<#assign postalAddress = delegator.findOne("PostalAddress", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("contactMechId", 
contactMech.contactMechId), true) />
+<#assign postalAddress = delegator.findOne("PostalAddress",
+    Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("contactMechId", 
contactMech.contactMechId), true) />
 
 <form id="editPostalAddress_${contactMech.contactMechId}" method="post" 
action="">
   <fieldset>
-    <input type="hidden" name="contactMechId" 
value="${postalAddress.contactMechId!}" />
+    <input type="hidden" name="contactMechId" 
value="${postalAddress.contactMechId!}"/>
     <#assign productStoreId = 
Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)
 />
-    <input type="hidden" name="productStoreId" value="${productStoreId!}" />
-      <div>
-        <label 
for="address1_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine1}*</label>
-        <input type="text" class="required" name="address1" 
id="address1_${contactMech.contactMechId}" value="${postalAddress.address1!}" 
maxlength="30" />
-        <span id="advice-required-address1_${contactMech.contactMechId}" 
style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
-      </div>
-      <div>
-        <label 
for="additionalAddress2_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine2}</label>
-        <input type="text" name="address2" 
id="additionalAddress2_${contactMech.contactMechId}" 
value="${postalAddress.address2!}" maxlength="30" />
-      </div>
-      <div>
-        <label 
for="city_${contactMech.contactMechId}">${uiLabelMap.PartyCity}*</label>
-        <input type="text" class="required" name="city" 
id="city_${contactMech.contactMechId}" value="${postalAddress.city!}" 
maxlength="30" />
-        <span id="advice-required-city_${contactMech.contactMechId}" 
style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
-      </div>
-      <div>
-        <label 
for="postalCode_${contactMech.contactMechId}">${uiLabelMap.PartyZipCode}*</label>
-        <input type="text" class="required" name="postalCode" 
id="postalCode_${contactMech.contactMechId}" 
value="${postalAddress.postalCode!}" maxlength="10" />
-        <span id="advice-required-postalCode_${contactMech.contactMechId}" 
style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
-      </div>
-      <div>
-        <label 
for="countryGeoId_${contactMech.contactMechId}">${uiLabelMap.CommonCountry}*</label>
-        <select name="countryGeoId" 
id="countryGeoId_${contactMech.contactMechId}" class="required">
-          <#if postalAddress.countryGeoId??>
-            <#assign geo = delegator.findOne("Geo", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("geoId", 
postalAddress.countryGeoId), true) />
-            <option 
value="${postalAddress.countryGeoId}">${geo.geoName!(postalAddress.countryGeoId)}</option>
-          </#if>
-          
${screens.render("component://common/widget/CommonScreens.xml#countries")}
-        </select>
-        <span id="advice-required-countryGeoId_${contactMech.contactMechId}" 
style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
-      </div>
-      <div id="states_${contactMech.contactMechId}">
-        <label 
for="stateProvinceGeoId_${contactMech.contactMechId}">${uiLabelMap.PartyState}*</label>
-        <select name="stateProvinceGeoId" 
id="stateProvinceGeoId_${contactMech.contactMechId}">
-          <#if postalAddress.stateProvinceGeoId??>
-            <#assign geo = delegator.findOne("Geo", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("geoId", 
postalAddress.stateProvinceGeoId), true) />
-            <option 
value="${postalAddress.stateProvinceGeoId}">${geo.geoName!(postalAddress.stateProvinceGeoId)}</option>
-          <#else>
-            <option value="_NA_">${uiLabelMap.PartyNoState}</option>
-          </#if>
-        </select>
-        <span 
id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" 
style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
-      </div>
-      <div class="inline">
-        <label 
for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
-        <input type="checkbox" name="setBillingPurpose" 
id="setBillingPurposeForPostalAddress" value="Y" <#if 
setBillingPurpose??>checked="checked"</#if> />
-      </div>
-      <div class="inline">
-        <label 
for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
-        <input type="checkbox" name="setShippingPurpose" 
id="setShippingPurposeForPostalAddress" value="Y" <#if 
setShippingPurpose??>checked="checked"</#if> />
-      </div>
-        <#--
-      <div>
-        <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>
-        -->
+    <input type="hidden" name="productStoreId" value="${productStoreId!}"/>
+    <div>
+      <label 
for="address1_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine1}*</label>
+      <input type="text" class="required" name="address1" 
id="address1_${contactMech.contactMechId}"
+          value="${postalAddress.address1!}" maxlength="30"/>
+      <span id="advice-required-address1_${contactMech.contactMechId}" 
style="display: none"
+          class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+    </div>
+    <div>
+      <label 
for="additionalAddress2_${contactMech.contactMechId}">${uiLabelMap.PartyAddressLine2}</label>
+      <input type="text" name="address2" 
id="additionalAddress2_${contactMech.contactMechId}"
+          value="${postalAddress.address2!}" maxlength="30"/>
+    </div>
+    <div>
+      <label 
for="city_${contactMech.contactMechId}">${uiLabelMap.PartyCity}*</label>
+      <input type="text" class="required" name="city" 
id="city_${contactMech.contactMechId}"
+          value="${postalAddress.city!}" maxlength="30"/>
+      <span id="advice-required-city_${contactMech.contactMechId}" 
style="display: none"
+          class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+    </div>
+    <div>
+      <label 
for="postalCode_${contactMech.contactMechId}">${uiLabelMap.PartyZipCode}*</label>
+      <input type="text" class="required" name="postalCode" 
id="postalCode_${contactMech.contactMechId}"
+          value="${postalAddress.postalCode!}" maxlength="10"/>
+      <span id="advice-required-postalCode_${contactMech.contactMechId}" 
style="display: none"
+          class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+    </div>
+    <div>
+      <label 
for="countryGeoId_${contactMech.contactMechId}">${uiLabelMap.CommonCountry}*</label>
+      <select name="countryGeoId" 
id="countryGeoId_${contactMech.contactMechId}" class="required">
+        <#if postalAddress.countryGeoId??>
+          <#assign geo = delegator.findOne("Geo", 
Static["org.apache.ofbiz.base.util.UtilMisc"]
+              .toMap("geoId", postalAddress.countryGeoId), true) />
+          <option 
value="${postalAddress.countryGeoId}">${geo.geoName!(postalAddress.countryGeoId)}</option>
+        </#if>
+        
${screens.render("component://common/widget/CommonScreens.xml#countries")}
+      </select>
+      <span id="advice-required-countryGeoId_${contactMech.contactMechId}" 
style="display: none"
+          class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+    </div>
+    <div id="states_${contactMech.contactMechId}">
+      <label 
for="stateProvinceGeoId_${contactMech.contactMechId}">${uiLabelMap.PartyState}*</label>
+      <select name="stateProvinceGeoId" 
id="stateProvinceGeoId_${contactMech.contactMechId}">
+        <#if postalAddress.stateProvinceGeoId??>
+          <#assign geo = delegator.findOne("Geo", 
Static["org.apache.ofbiz.base.util.UtilMisc"]
+              .toMap("geoId", postalAddress.stateProvinceGeoId), true) />
+          <option value="${postalAddress.stateProvinceGeoId}">
+            ${geo.geoName!(postalAddress.stateProvinceGeoId)}
+          </option>
+        <#else>
+          <option value="_NA_">${uiLabelMap.PartyNoState}</option>
+        </#if>
+      </select>
+      <span 
id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" 
style="display: none"
+          class="errorMessage">(${uiLabelMap.CommonRequired})</span>
+    </div>
+    <div class="inline">
+      <label 
for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label>
+      <input type="checkbox" name="setBillingPurpose" 
id="setBillingPurposeForPostalAddress" value="Y"
+          <#if setBillingPurpose??>checked="checked"</#if>/>
+    </div>
+    <div class="inline">
+      <label 
for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label>
+      <input type="checkbox" name="setShippingPurpose" 
id="setShippingPurposeForPostalAddress" value="Y"
+          <#if setShippingPurpose??>checked="checked"</#if>/>
+    </div>
+      <#--
+    <div>
+      <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>
+      -->
   </fieldset>
 </form>
\ No newline at end of file


Reply via email to