svn commit: r514106 [2/6] - in /ofbiz/trunk/applications/party: config/ webapp/partymgr/WEB-INF/ webapp/partymgr/communication/ webapp/partymgr/contactlist/ webapp/partymgr/includes/ webapp/partymgr/lookup/ webapp/partymgr/party/ webapp/partymgr/securi...

[jacopoc]

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl Sat Mar  3 01:41:15 2007
@@ -17,155 +17,175 @@
 under the License.
 -->
 
+<!-- begin EditPartyRelationships.ftl -->
+<br />
 <div class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxhead">${uiLabelMap.PartyRelationships}</div>
-    </div>
-    <div class="screenlet-body">
-        <#if partyRelationships?has_content>
-        <table width="100%" border="1" cellpadding="1" cellspacing="0">
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.PartyRelationships}</h3>
+  </div>
+  <div class="screenlet-body">
+    <#if partyRelationships?has_content>
+      <table class="basic-table" cellspacing="0">
+        <tr>
+          <th>${uiLabelMap.CommonDescription}</th>
+          <th>${uiLabelMap.CommonFromDate}</th>
+          <#if security.hasEntityPermission("PARTYMGR", "_REL_DELETE", session) ||
+               security.hasEntityPermission("PARTYMGR", "_REL_UPDATE", session)>
+            <th>&nbsp;</th>
+          </#if>
+        </tr>
+        <#list partyRelationships as partyRelationship>
+          <#assign partyRelationshipType = partyRelationship.getRelatedOneCache("PartyRelationshipType")?if_exists>
+          <#assign roleTypeTo = partyRelationship.getRelatedOneCache("ToRoleType")>
+          <#assign roleTypeFrom = partyRelationship.getRelatedOneCache("FromRoleType")>
+          <tr><td colspan="3"><hr/></td></tr>
           <tr>
-            <td><div class="tabletext"><b>&nbsp;${uiLabelMap.CommonDescription}</b></div></td>
-            <td><div class="tabletext"><b>&nbsp;${uiLabelMap.CommonFromDate}</b></div></td>
+            <td>
+              ${uiLabelMap.PartyParty} <b>${partyRelationship.partyIdTo}</b>
+              <#if "_NA_" != partyRelationship.roleTypeIdTo>
+                ${uiLabelMap.PartyRole} <b>${roleTypeTo.get("description",locale)}</b>
+              </#if>
+              ${uiLabelMap.CommonIsA} <b>${(partyRelationshipType.get("partyRelationshipName",locale))?default("${uiLabelMap.CommonNA}")}</b>
+              ${uiLabelMap.CommonOf} ${uiLabelMap.PartyParty} <b>${partyRelationship.partyIdFrom}</b>
+              <#if "_NA_" != partyRelationship.roleTypeIdFrom>
+                ${uiLabelMap.PartyRole} <b>${roleTypeFrom.get("description",locale)}</b>
+              </#if>
+              <#if partyRelationship.securityGroupId?exists>
+                ${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity} <b>${partyRelationship.getRelatedOne("SecurityGroup").get("description",locale)}</b>
+              </#if>
+            </td>
+            <td>${partyRelationship.fromDate}</td>
             <#if security.hasEntityPermission("PARTYMGR", "_REL_DELETE", session)>
-            <td>&nbsp;</td>
+              <td class="button-col">                    
+                <a href="<@ofbizUrl>deletePartyRelationship?partyIdTo=${partyRelationship.partyIdTo}&amp;roleTypeIdTo=${partyRelationship.roleTypeIdTo}&amp;roleTypeIdFrom=${partyRelationship.roleTypeIdFrom}&amp;partyIdFrom=${partyRelationship.partyIdFrom}&amp;fromDate=${partyRelationship.fromDate}&amp;partyId=${partyId?if_exists}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonRemove}</a>
+              </td>
             </#if>
           </tr>
-          <#list partyRelationships as partyRelationship>
-              <#assign partyRelationshipType = partyRelationship.getRelatedOneCache("PartyRelationshipType")?if_exists>
-              <#assign roleTypeTo = partyRelationship.getRelatedOneCache("ToRoleType")>
-              <#assign roleTypeFrom = partyRelationship.getRelatedOneCache("FromRoleType")>
-              <tr>
-                <td><div class="tabletext">
-                    ${uiLabelMap.PartyParty} <b>${partyRelationship.partyIdTo}</b>
-                    <#if "_NA_" != partyRelationship.roleTypeIdTo>
-                        ${uiLabelMap.PartyRole} <b>${roleTypeTo.get("description",locale)}</b>
-                    </#if>
-                    ${uiLabelMap.CommonIsA} <b>${(partyRelationshipType.get("partyRelationshipName",locale))?default("${uiLabelMap.CommonNA}")}</b>
-                    ${uiLabelMap.CommonOf} ${uiLabelMap.PartyParty} <b>${partyRelationship.partyIdFrom}</b>
-                    <#if "_NA_" != partyRelationship.roleTypeIdFrom>
-                        ${uiLabelMap.PartyRole} <b>${roleTypeFrom.get("description",locale)}</b>
-                    </#if>
-                    <#if partyRelationship.securityGroupId?exists>
-                    ${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity} <b>${partyRelationship.getRelatedOne("SecurityGroup").get("description",locale)}</b>
-                    </#if>
-                </div></td>
-                <td><div class="tabletext">&nbsp;${partyRelationship.fromDate}</div></td>
-                <#if security.hasEntityPermission("PARTYMGR", "_REL_DELETE", session)>
-                <td align="right">                    
-                    <a href="<@ofbizUrl>deletePartyRelationship?partyIdTo=${partyRelationship.partyIdTo}&amp;roleTypeIdTo=${partyRelationship.roleTypeIdTo}&amp;roleTypeIdFrom=${partyRelationship.roleTypeIdFrom}&amp;partyIdFrom=${partyRelationship.partyIdFrom}&amp;fromDate=${partyRelationship.fromDate}&amp;partyId=${partyId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>&nbsp;
+          <#if security.hasEntityPermission("PARTYMGR", "_REL_UPDATE", session)>
+            <tr>
+              <form method="post" name="updatePartyRel${partyRelationship_index}" action="<@ofbizUrl>updatePartyRelationship</@ofbizUrl>">
+                <input type="hidden" name="partyId" value="${partyId}"/>
+                <input type="hidden" name="partyIdFrom" value="${partyRelationship.partyIdFrom}"/>
+                <input type="hidden" name="roleTypeIdFrom" value="${partyRelationship.roleTypeIdFrom}"/>
+                <input type="hidden" name="partyIdTo" value="${partyRelationship.partyIdTo}"/>
+                <input type="hidden" name="roleTypeIdTo" value="${partyRelationship.roleTypeIdTo}"/>
+                <input type="hidden" name="fromDate" value="${partyRelationship.fromDate}"/>
+                <td>
+                  <b>${uiLabelMap.CommonComments}: </b><input type="text" size="50" name="comments" value="${partyRelationship.comments?if_exists}"/>
                 </td>
-                </#if>
-              </tr>
-              <#if security.hasEntityPermission("PARTYMGR", "_REL_UPDATE", session)>
-              <tr>
-                <td colspan="3" align="right">
-                    <form method="post" name="updatePartyRel${partyRelationship_index}" action="<@ofbizUrl>updatePartyRelationship</@ofbizUrl>">
-                        <input type="hidden" name="partyId" value="${partyId}"/>
-                        <input type="hidden" name="partyIdFrom" value="${partyRelationship.partyIdFrom}"/>
-                        <input type="hidden" name="roleTypeIdFrom" value="${partyRelationship.roleTypeIdFrom}"/>
-                        <input type="hidden" name="partyIdTo" value="${partyRelationship.partyIdTo}"/>
-                        <input type="hidden" name="roleTypeIdTo" value="${partyRelationship.roleTypeIdTo}"/>
-                        <input type="hidden" name="fromDate" value="${partyRelationship.fromDate}"/>
-                        <span class="tabletext"><b>${uiLabelMap.CommonThru}: </b></span><input type="text" size="24" class="inputBox" name="thruDate" value="${partyRelationship.thruDate?if_exists}"/>
-                        <a href="javascript:call_cal(document.updatePartyRel${partyRelationship_index}.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-                        <#-- ${partyRelationship.statusId}-->
-                        <span class="tabletext"><b>${uiLabelMap.CommonComments}: </b></span><input type="text" size="50" class="inputBox" name="comments" value="${partyRelationship.comments?if_exists}"/>
-                        <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"/>
-                    </form>
+                <td>
+                  <b>${uiLabelMap.CommonThru}: </b><input type="text" size="24" name="thruDate" value="${partyRelationship.thruDate?if_exists}"/>
+                  <a href="javascript:call_cal(document.updatePartyRel${partyRelationship_index}.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
                 </td>
-              </tr>
-              </#if>
-          </#list>
-        </table>
-        <#else/>
-          <div class="tabletext">${uiLabelMap.PartyNoPartyRelationshipsFound}</div>
-        </#if>
-    </div>
-
-  <#if security.hasEntityPermission("PARTYMGR", "_REL_UPDATE", session)>
-    <div><hr class="sepbar"></div>
-    <div class="screenlet-body">
-        <form name="addPartyRelationshipTo" method="post" action="<@ofbizUrl>createPartyRelationship</@ofbizUrl>">
-          <input type="hidden" name="partyId" value="${partyId}"/>
-          <input type="hidden" name="partyIdFrom" value="${partyId}"/>
-          <div class="tabletext" style="font-weight: bold;">
-            ${uiLabelMap.PartyPartyWithId}
-            <input type="text" size="20" name="partyIdTo" class="inputBox"/>
-            <a href="javascript:call_fieldlookup2(document.addPartyRelationshipTo.partyIdTo,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-            ${uiLabelMap.PartyPartyInTheRoleOf}
-            <select name="roleTypeIdTo" class="selectBox">
-              <#list roleTypes as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
-              </#list>
-            </select>
-            ${uiLabelMap.CommonIsA}
-            <select name="partyRelationshipTypeId" class="selectBox">
-              <#list relateTypes as relateType>
-                <option value="${relateType.partyRelationshipTypeId}">${relateType.get("partyRelationshipName",locale)}<#-- [${relateType.partyRelationshipTypeId}]--></option>
-              </#list>
-            </select>
-            ${uiLabelMap.PartyPartyOfTheRoleParty}
-            <select name="roleTypeIdFrom" class="selectBox">
-              <#list roleTypesForCurrentParty as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
-              </#list>
-            </select>
-            <#-- set security group specific to this party relationship -->
-            <br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}
-            <select name="securityGroupId" class="selectBox">
-              <option value="">&nbsp;</option>
-              <#list securityGroups as securityGroup>
-                <option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
-              </#list>
-            </select><br/>
-            ${uiLabelMap.CommonFrom} <input type="text" size="24" name="fromDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipTo.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-            ${uiLabelMap.CommonThru} <input type="text" size="24" name="thruDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipTo.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-          </div>
-          <div><span class="tabletext">${uiLabelMap.CommonComments}:&nbsp;&nbsp;</span><input type="text" size="60" name="comments" class="inputBox"/></div>
-          <div><a href="javascript:document.addPartyRelationshipTo.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></div>
-        </form>
+                <td class="button-col">
+                  <#-- ${partyRelationship.statusId}-->
+                  <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
+                </td>
+              </form>
+            </tr>
+          <#else>
+            <tr>
+              <td>
+                <b>${uiLabelMap.CommonComments}: </b>${partyRelationship.comments?if_exists}
+              </td>
+              <td>
+                <b>${uiLabelMap.CommonThru}: </b>${partyRelationship.thruDate?if_exists}
+              </td>
+              <td>&nbsp;</td>
+            </tr>
+          </#if>
+        </#list>
+      </table>
+    <#else/>
+      ${uiLabelMap.PartyNoPartyRelationshipsFound}
+    </#if>
+  </div>
+</div>
+<#if security.hasEntityPermission("PARTYMGR", "_REL_UPDATE", session)>
+  <div class="screenlet">
+    <div class="screenlet-title-bar">
+      <h3>${uiLabelMap.PartyNewRelationship}</h3>
     </div>
-    <div><hr class="sepbar"></div>
     <div class="screenlet-body">
-        <form name="addPartyRelationshipFrom" method="post" action="<@ofbizUrl>createPartyRelationship</@ofbizUrl>">
-          <input type="hidden" name="partyId" value="${partyId}"/>
-          <input type="hidden" name="partyIdTo" value="${partyId}"/>
-          <div class="tabletext" style="font-weight: bold;">
-              ${uiLabelMap.PartyPartyCurrentInTheRoleOf}
-            <select name="roleTypeIdTo" class="selectBox">
-              <#list roleTypesForCurrentParty as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
-              </#list>
-            </select>
-            ${uiLabelMap.CommonIsA}
-            <select name="partyRelationshipTypeId" class="selectBox">
-              <#list relateTypes as relateType>
-                <option value="${relateType.partyRelationshipTypeId}">${relateType.get("partyRelationshipName",locale)}<#-- [${relateType.partyRelationshipTypeId}]--></option>
-              </#list>
-            </select>
-            ${uiLabelMap.PartyPartyWithId}
-            <input type="text" size="20" name="partyIdFrom" class="inputBox"/>
-            <a href="javascript:call_fieldlookup2(document.addPartyRelationshipFrom.partyIdFrom,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
-            ${uiLabelMap.PartyPartyInTheRoleOf}
-            <select name="roleTypeIdFrom" class="selectBox">
-              <#list roleTypes as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
-              </#list>
-            </select>
-            <br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}
-            <select name="securityGroupId" class="selectBox">
-              <option value="">&nbsp;</option>
-              <#list securityGroups as securityGroup>
-                <option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
-              </#list>
-            </select><br/>
-            ${uiLabelMap.CommonFrom} <input type="text" size="24" name="fromDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipFrom.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-            ${uiLabelMap.CommonThru} <input type="text" size="24" name="thruDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipFrom.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
-          </div>
-          <div><span class="tabletext">${uiLabelMap.CommonComments}:&nbsp;&nbsp;</span><input type="text" size="60" name="comments" class="inputBox"/></div>
-          <div><a href="javascript:document.addPartyRelationshipFrom.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></div>
-        </form>
+      <form name="addPartyRelationshipTo" method="post" action="<@ofbizUrl>createPartyRelationship</@ofbizUrl>">
+        <input type="hidden" name="partyId" value="${partyId}"/>
+        <input type="hidden" name="partyIdFrom" value="${partyId}"/>
+        <b>
+          ${uiLabelMap.PartyPartyWithId}
+          <input type="text" size="20" name="partyIdTo"/>
+          <a href="javascript:call_fieldlookup2(document.addPartyRelationshipTo.partyIdTo,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+          ${uiLabelMap.PartyPartyInTheRoleOf}
+          <select name="roleTypeIdTo">
+            <#list roleTypes as roleType>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
+            </#list>
+          </select>
+          ${uiLabelMap.CommonIsA}
+          <select name="partyRelationshipTypeId">
+            <#list relateTypes as relateType>
+              <option value="${relateType.partyRelationshipTypeId}">${relateType.get("partyRelationshipName",locale)}<#-- [${relateType.partyRelationshipTypeId}]--></option>
+            </#list>
+          </select>
+          ${uiLabelMap.PartyPartyOfTheRoleParty}
+          <select name="roleTypeIdFrom">
+            <#list roleTypesForCurrentParty as roleType>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
+            </#list>
+          </select>
+          <#-- set security group specific to this party relationship -->
+          <br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}
+          <select name="securityGroupId">
+            <option value="">&nbsp;</option>
+            <#list securityGroups as securityGroup>
+              <option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
+            </#list>
+          </select><br/>
+          ${uiLabelMap.CommonFrom} <input type="text" size="24" name="fromDate"/><a href="javascript:call_cal(document.addPartyRelationshipTo.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+          ${uiLabelMap.CommonThru} <input type="text" size="24" name="thruDate"/><a href="javascript:call_cal(document.addPartyRelationshipTo.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+        </b>
+        ${uiLabelMap.CommonComments}:&nbsp;&nbsp;<input type="text" size="60" name="comments"/>
+        <a href="javascript:document.addPartyRelationshipTo.submit()" class="smallSubmit">${uiLabelMap.CommonAdd}</a>
+      </form>
+      <hr>
+      <form name="addPartyRelationshipFrom" method="post" action="<@ofbizUrl>createPartyRelationship</@ofbizUrl>">
+        <input type="hidden" name="partyId" value="${partyId}"/>
+        <input type="hidden" name="partyIdTo" value="${partyId}"/>
+        <b>
+          ${uiLabelMap.PartyPartyCurrentInTheRoleOf}
+          <select name="roleTypeIdTo">
+            <#list roleTypesForCurrentParty as roleType>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
+            </#list>
+          </select>
+          ${uiLabelMap.CommonIsA}
+          <select name="partyRelationshipTypeId">
+            <#list relateTypes as relateType>
+              <option value="${relateType.partyRelationshipTypeId}">${relateType.get("partyRelationshipName",locale)}<#-- [${relateType.partyRelationshipTypeId}]--></option>
+            </#list>
+          </select>
+          ${uiLabelMap.PartyPartyWithId}
+          <input type="text" size="20" name="partyIdFrom"/>
+          <a href="javascript:call_fieldlookup2(document.addPartyRelationshipFrom.partyIdFrom,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+          ${uiLabelMap.PartyPartyInTheRoleOf}
+          <select name="roleTypeIdFrom">
+            <#list roleTypes as roleType>
+              <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
+            </#list>
+          </select>
+          <br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}
+          <select name="securityGroupId">
+            <option value="">&nbsp;</option>
+            <#list securityGroups as securityGroup>
+              <option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
+            </#list>
+          </select><br/>
+          ${uiLabelMap.CommonFrom} <input type="text" size="24" name="fromDate"/><a href="javascript:call_cal(document.addPartyRelationshipFrom.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+          ${uiLabelMap.CommonThru} <input type="text" size="24" name="thruDate"/><a href="javascript:call_cal(document.addPartyRelationshipFrom.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+        </b>
+        ${uiLabelMap.CommonComments}:&nbsp;&nbsp;<input type="text" size="60" name="comments"/>
+        <a href="javascript:document.addPartyRelationshipFrom.submit()" class="smallSubmit">${uiLabelMap.CommonAdd}</a>
+      </form>
     </div>
-  </#if>
-</div>
+  </div>
+</#if>
+<!-- end EditPartyRelationships.ftl -->

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sat Mar  3 01:41:15 2007
@@ -20,15 +20,14 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
-    <form name="EditPerson" type="single" target="updatePerson" title="" default-map-name="person"
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+
+    <form name="EditPerson" type="single" target="updatePerson" default-map-name="person"
+        focus-field-name="salutation">
         <alt-target use-when="person==null" target="createPerson"/>
         <auto-fields-service service-name="updatePerson"/>
-
-        <field use-when="person!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+        <field use-when="person!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field use-when="person==null&amp;&amp;partyId==null" name="partyId" title="${uiLabelMap.PartyPartyId}"><ignored/></field>
-        <field use-when="person==null&amp;&amp;partyId!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyId}]" widget-style="tabletext"><display also-hidden="false"/></field>
-
+        <field use-when="person==null&amp;&amp;partyId!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyId}]"><display also-hidden="false"/></field>
         <field name="gender">
             <drop-down allow-empty="true">
                 <option key="M" description="${uiLabelMap.CommonMale}"/>
@@ -44,80 +43,69 @@
                 <option key="W" description="${uiLabelMap.PartyMaritalStatusWidowed}"/>
             </drop-down>
         </field>
-
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
+        <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
-    <form name="EditPartyGroup" type="single" target="updatePartyGroup" title="" default-map-name="partyGroup"
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-        <alt-target use-when="partyGroup==null" target="createPartyGroup"/>
-        <auto-fields-service service-name="updatePartyGroup"/>
 
-        <field use-when="partyGroup!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+    <form name="EditPartyGroup" type="single" target="updatePartyGroup" default-map-name="partyGroup"
+        focus-field-name="groupName">
+            <alt-target use-when="partyGroup==null" target="createPartyGroup"/>
+        <auto-fields-service service-name="updatePartyGroup"/>
+        <field use-when="partyGroup!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field use-when="partyGroup==null&amp;&amp;partyId==null" name="partyId" title="${uiLabelMap.PartyPartyId}"><ignored/></field>
-        <field use-when="partyGroup==null&amp;&amp;partyId!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyId}]" widget-style="tabletext"><display also-hidden="false"/></field>
-
+        <field use-when="partyGroup==null&amp;&amp;partyId!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyId}]"><display also-hidden="false"/></field>
         <field name="partyTypeId"><ignored/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
+        <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
-    <form name="AddUserLogin" type="single"
-            target="createUserLogin" title=""
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-        <auto-fields-service service-name="createUserLogin"/>
 
+    <form name="AddUserLogin" type="single" target="createUserLogin"
+        focus-field-name="userLoginId">
+        <auto-fields-service service-name="createUserLogin"/>
         <field name="partyId"><hidden/></field>
         <field name="currentPassword"><password/></field>
         <field name="currentPasswordVerify"><password/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
+        <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
-    <form name="updatePassword" type="single"
-        target="updatePassword" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+
+    <form name="updatePassword" type="single" target="updatePassword"
+        focus-field-name="currentPassword">
         <actions>
             <set field="passwordHint" from-field="editUserLogin.passwordHint"/>
         </actions>
         <auto-fields-service service-name="updatePassword"/>
-
         <field name="partyId"><hidden/></field>
         <field name="userLoginId"><hidden/></field>
         <field name="currentPassword"><password/></field>
         <field name="newPassword"><password/></field>
         <field name="newPasswordVerify"><password/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
+        <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
-    <form name="updateUserLoginSecurity" type="single"
-            target="updateUserLoginSecurity" title="" default-map-name="editUserLogin"
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-        <auto-fields-service service-name="updateUserLoginSecurity"/>
 
+    <form name="updateUserLoginSecurity" type="single" target="updateUserLoginSecurity" default-map-name="editUserLogin">
+        <auto-fields-service service-name="updateUserLoginSecurity"/>
         <field name="partyId"><hidden/></field>
         <field name="userLoginId"><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
+        <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
 
-    <form name="EditVendor" type="single"
-        target="updateVendor" title="" default-map-name="vendor"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-
+    <form name="EditVendor" type="single" target="updateVendor" default-map-name="vendor"
+        focus-field-name="manifestCompanyName">
         <alt-target use-when="vendor==null" target="createVendor"/>
         <auto-fields-service service-name="updateVendor" map-name="vendor"/>
-
         <field name="partyId"><hidden value="${partyId}"/></field>
         <field name="manifestCompanyName" title="${uiLabelMap.PartyManifestCompanyName}"></field>
         <field name="manifestCompanyTitle" title="${uiLabelMap.PartyManifestCompanyTitle}"></field>
         <field name="manifestLogoUrl" title="${uiLabelMap.PartyManifestLogoUrl}"></field>
         <field name="manifestPolicies" title="${uiLabelMap.PartyManifestPolicies}"><textarea cols="60" rows="15"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
 
     <!-- PartyRelationship -->
-    <form name="AddPartyRelationshipType" type="single"
-        target="createPartyRelationshipType" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+    <form name="AddPartyRelationshipType" type="single" target="createPartyRelationshipType">
         <auto-fields-service service-name="createPartyRelationshipType"/>
         <field name="partyId"><hidden/></field>
         <field name="hasTable"><hidden/></field>
@@ -142,12 +130,12 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
 
     <!-- PartyTaxAuthInfo -->
-    <form name="AddPartyTaxAuthInfo" type="single" target="createPartyTaxAuthInfo" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+    <form name="AddPartyTaxAuthInfo" type="single" target="createPartyTaxAuthInfo"
+        focus-field-name="taxAuthGeoId">
         <auto-fields-service service-name="createPartyTaxAuthInfo"/>
         <field name="partyId"><hidden/></field>
         <field name="taxAuthGeoId">
@@ -179,42 +167,38 @@
             </drop-down>
         </field>
         <field name="taxAuthPartyId"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
-    <form name="UpdatePartyTaxAuthInfo" type="list" target="updatePartyTaxAuthInfo" title="" list-name="partyTaxInfos"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+
+    <form name="UpdatePartyTaxAuthInfo" type="list" list-name="partyTaxInfos" target="updatePartyTaxAuthInfo">
         <auto-fields-service service-name="updatePartyTaxAuthInfo"/>
         <field name="partyId"><hidden/></field>
-        <field name="taxAuthGeoId" widget-style="tabletext"><display-entity entity-name="Geo" key-field-name="geoId" description="[${geoId}] ${geoName}" also-hidden="true"/></field>
-        <field name="taxAuthPartyId" widget-style="tabletext">
+        <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="[${geoId}] ${geoName}" also-hidden="true"/></field>
+        <field name="taxAuthPartyId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}" also-hidden="true">
-                <sub-hyperlink target="viewprofile?partyId=${taxAuthPartyId}" description="${taxAuthPartyId}" link-style="buttontext"/>
+                <sub-hyperlink target="viewprofile?partyId=${taxAuthPartyId}" description="${taxAuthPartyId}" link-style="smallSubmit"/>
             </display-entity>
         </field>
-        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
-
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="deleteLink" title="" widget-style="buttontext">
+        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="deleteLink" title="" widget-style="smallSubmit">
             <hyperlink target="deletePartyTaxAuthInfo?partyId=${partyId}&amp;taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}&amp;fromDate=${fromDate}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
 
-    <form name="AddPartyNote" type="single"
-            target="createPartyNote" title=""
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+    <form name="AddPartyNote" type="single" target="createPartyNote"
+        focus-field-name="noteId">
         <auto-fields-service service-name="createPartyNote"/>
-
         <field name="partyId"><hidden/></field>
-        <field name="note" widget-style="textAreaBox"><textarea cols="70" rows="10"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="note"><textarea cols="70" rows="10"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
+        <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
 
     <!-- PartyRate -->
-    <form name="AddPartyRate" type="single"
-        target="createPartyRate" title=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+    <form name="AddPartyRate" type="single" target="createPartyRate"
+        focus-field-name="rateTypeId">
         <auto-fields-service service-name="createPartyRate"/>
         <field name="partyId"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
@@ -224,11 +208,10 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
-    <form name="ListPartyRates" type="list"
-        target="updatePartyRate" title="" list-name="partyTaxInfos"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+
+    <form name="ListPartyRates" type="list" list-name="partyTaxInfos" target="updatePartyRate">
         <actions>
             <entity-condition entity-name="PartyRate">
                 <condition-expr field-name="partyId" env-name="partyId"/>
@@ -238,30 +221,27 @@
         </actions>
         <auto-fields-service service-name="updatePartyRate"/>
         <field name="partyId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="tabletext"><display-entity entity-name="RateType" also-hidden="true"/></field>
-        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
-        
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="deleteLink" title="" widget-style="buttontext">
+        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"><display-entity entity-name="RateType" also-hidden="true"/></field>
+        <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="deleteLink" title="" widget-style="smallSubmit">
             <hyperlink target="deletePartyRate?partyId=${partyId}&amp;rateTypeId=${rateTypeId}&amp;fromDate=${fromDate}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    
-    <form name="NewUser" type="single"
-            target="${target}${previousParams}" title=""
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+
+    <form name="NewUser" type="single" target="${target}${previousParams}"
+        style="basic-form form-widget" focus-field-name="USER_TITLE">
         <field name="USER_TITLE" title="${uiLabelMap.CommonTitle}"><text size="10" maxlength="30"/></field>
-        <field name="USER_FIRST_NAME" title="${uiLabelMap.PartyFirstName}" tooltip="*"><text size="30" maxlength="60"/></field>
+        <field name="USER_FIRST_NAME" title="${uiLabelMap.PartyFirstName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
         <field name="USER_MIDDLE_NAME" title="${uiLabelMap.PartyMiddleInitial}"><text size="4" maxlength="4"/></field>
-        <field name="USER_LAST_NAME" title="${uiLabelMap.PartyLastName}" tooltip="*"><text size="30" maxlength="60"/></field>
+        <field name="USER_LAST_NAME" title="${uiLabelMap.PartyLastName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
         <field name="USER_SUFFIX" title="${uiLabelMap.PartySuffix}"><text size="10" maxlength="30"/></field>
-
-        <field name="ShippingAddressTitle" title="${uiLabelMap.PartyAddressMailingShipping}"><display description=" " also-hidden="false"/></field>
-        <field name="USER_ADDRESS1" title="${uiLabelMap.CommonAddress1}" tooltip="*" title-style="tabletext"><text size="30" maxlength="60"/></field>
-        <field name="USER_ADDRESS2" title="${uiLabelMap.CommonAddress2}" title-style="tabletext"><text size="30" maxlength="60"/></field>
-        <field name="USER_CITY" title="${uiLabelMap.CommonCity}" tooltip="*" title-style="tabletext"><text size="30" maxlength="60"/></field>
-        <field name="USER_STATE" title="${uiLabelMap.CommonState}" tooltip="*" title-style="tabletext">
+        <field name="ShippingAddressTitle" title="${uiLabelMap.PartyAddressMailingShipping}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_ADDRESS1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+        <field name="USER_ADDRESS2" title="${uiLabelMap.CommonAddress2}"><text size="30" maxlength="60"/></field>
+        <field name="USER_CITY" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
+        <field name="USER_STATE" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${uiLabelMap.CommonState}: [${geoId}] ${geoName}">
                     <entity-constraint name="geoTypeId" value="STATE"/>
@@ -273,8 +253,8 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="USER_POSTAL_CODE" title="${uiLabelMap.CommonZipPostalCode}" tooltip="*" title-style="tabletext"><text size="10" maxlength="30"/></field>
-        <field name="USER_COUNTRY" title="${uiLabelMap.CommonCountry}" tooltip="*" title-style="tabletext">
+        <field name="USER_POSTAL_CODE" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field>
+        <field name="USER_COUNTRY" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}">
                     <entity-constraint name="geoTypeId" value="COUNTRY"/>
@@ -282,55 +262,45 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="USER_ADDRESS_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowAddressSolicitation}?" title-style="tabletext">
+        <field name="USER_ADDRESS_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowAddressSolicitation}?">
             <drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down>
         </field>
-
-        <field name="HomePhoneTitle" title="${uiLabelMap.PartyHomePhone}"><display description=" " also-hidden="false"/></field>
-        <field name="USER_HOME_COUNTRY" title="${uiLabelMap.PartyCountryCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_HOME_AREA" title="${uiLabelMap.PartyAreaCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_HOME_CONTACT" title="${uiLabelMap.PartyPhoneNumber}" title-style="tabletext"><text size="15" maxlength="15"/></field>
-        <field name="USER_HOME_EXT" title="${uiLabelMap.PartyContactExt}" title-style="tabletext"><text size="6" maxlength="10"/></field>
-        <field name="USER_HOME_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?" title-style="tabletext"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
-
-        <field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}"><display description=" " also-hidden="false"/></field>
-        <field name="USER_WORK_COUNTRY" title="${uiLabelMap.PartyCountryCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}" title-style="tabletext"><text size="15" maxlength="15"/></field>
-        <field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}" title-style="tabletext"><text size="6" maxlength="10"/></field>
-        <field name="USER_WORK_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?" title-style="tabletext"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
-
-        <field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}"><display description=" " also-hidden="false"/></field>
-        <field name="USER_FAX_COUNTRY" title="${uiLabelMap.PartyCountryCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}" title-style="tabletext"><text size="15" maxlength="15"/></field>
-        <field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}" title-style="tabletext"><text size="6" maxlength="10"/></field>
-        <field name="USER_FAX_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?" title-style="tabletext"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
-
-        <field name="MobilePhoneTitle" title="${uiLabelMap.PartyContactMobilePhoneNumber}"><display description=" " also-hidden="false"/></field>
-        <field name="USER_MOBILE_COUNTRY" title="${uiLabelMap.PartyCountryCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_MOBILE_AREA" title="${uiLabelMap.PartyAreaCode}" title-style="tabletext"><text size="4" maxlength="10"/></field>
-        <field name="USER_MOBILE_CONTACT" title="${uiLabelMap.PartyPhoneNumber}" title-style="tabletext"><text size="15" maxlength="15"/></field>
-        <field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?" title-style="tabletext"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
-
-        <field name="EmailAddressTitle" title="${uiLabelMap.PartyEmailAddress}"><display description=" " also-hidden="false"/></field>
-        <field name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" title-style="tabletext" tooltip="*"><text size="60" maxlength="250"/></field>
-        <field name="USER_EMAIL_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?" title-style="tabletext"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
-        <!-- <field name="USER_ORDER_EMAIL" title="Order Emails (comma separated)" title-style="tabletext"><text size="60" maxlength="250"/></field> -->
-
-
-        <field use-when="displayPassword!=null" name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="*"><text size="30" maxlength="250"/></field>
-        <field use-when="displayPassword!=null" name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="*"><password size="15" maxlength="250"/></field>
-        <field use-when="displayPassword!=null" name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}"><password size="15" maxlength="250"/></field>
-
+        <field name="HomePhoneTitle" title="${uiLabelMap.PartyHomePhone}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_HOME_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_HOME_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_HOME_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+        <field name="USER_HOME_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
+        <field name="USER_HOME_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
+        <field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_WORK_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+        <field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
+        <field name="USER_WORK_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
+        <field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_FAX_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+        <field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
+        <field name="USER_FAX_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
+        <field name="MobilePhoneTitle" title="${uiLabelMap.PartyContactMobilePhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_MOBILE_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_MOBILE_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
+        <field name="USER_MOBILE_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
+        <field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
+        <field name="EmailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
+        <field name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="60" maxlength="250"/></field>
+        <field name="USER_EMAIL_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></field>
+        <!-- <field name="USER_ORDER_EMAIL" title="Order Emails (comma separated)" ><text size="60" maxlength="250"/></field> -->
+        <field use-when="displayPassword!=null" name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="250"/></field>
+        <field use-when="displayPassword!=null" name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><password size="15" maxlength="250"/></field>
+        <field use-when="displayPassword!=null" name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field>
         <field name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="* ${uiLabelMap.PartyCustomerTemporaryPassword}"><text size="30" maxlength="250"/></field>
-
-        <field name="RequiredNote" title=""><display description="${uiLabelMap.PartyRequiredNote}" also-hidden="false"/></field>
-
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
+        <!--<field name="RequiredNote" title=""><display description="${uiLabelMap.PartyRequiredNote}" also-hidden="false"/></field> -->
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
     </form>
-    <form name="ListSegmentRoles" type="list" target="updateSegmentGroupRole" title=""
-        default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+
+    <form name="ListSegmentRoles" type="list" target="updateSegmentGroupRole">
         <actions>
             <entity-and entity-name="SegmentGroupRole">
                 <field-map field-name="partyId" />
@@ -338,25 +308,23 @@
         </actions>
         <field name="segmentGroupId" title="${uiLabelMap.PartySegmentGroupId}">
             <display-entity entity-name="SegmentGroup">
-                <sub-hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup?segmentGroupId=${segmentGroupId}" target-type="inter-app" link-style="buttontext"/>
+                <sub-hyperlink description="${segmentGroupId}" target="/marketing/control/viewSegmentGroup?segmentGroupId=${segmentGroupId}" target-type="inter-app" link-style="smallSubmit"/>
             </display-entity>
         </field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRole}">
             <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
         </field>
-        <field name="deleteLink" title="" widget-style="buttontext">
+        <field name="deleteLink" title="" widget-style="smallSubmit">
             <hyperlink target="deleteSegmentGroupRole?segmentGroupId=${segmentGroupId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="AddSegmentRole" type="single"
-            target="createSegmentRole" title="" default-map-name="segmentGroupRole"
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
 
+    <form name="AddSegmentRole" type="single" target="createSegmentRole" default-map-name="segmentGroupRole"
+        focus-field-name="segmentGroupId">
         <field name="segmentGroupId" title="${uiLabelMap.PartySegmentGroupId}">
             <lookup target-form-name="LookupSegmentGroup"/>
         </field>
-
         <field name="partyId"><hidden/></field>
         <field name="roleTypeId">
             <drop-down>
@@ -365,23 +333,22 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <!-- <field name="cancelLink" title="" widget-style="buttontext"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> -->
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
+        <!-- <field name="cancelLink" title="" widget-style="smallSubmit"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> -->
     </form>
-    <form name="EditPartyAttribute" type="single"
-            target="updatePartyAttribute" title="" default-map-name="attribute"
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
 
+    <form name="EditPartyAttribute" type="single" target="updatePartyAttribute" default-map-name="attribute"
+        focus-field-name="attrName">
         <alt-target use-when="attribute==null" target="createPartyAttribute"/>
         <auto-fields-service service-name="updatePartyAttribute" map-name="attribute"/>
         <field name="partyId"><hidden value="${partyId}"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
     
     <!-- Party Content Form -->
     
-    <form name="AddPartyContent" target="updatePartyContent" title="" type="upload" default-map-name="content"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+    <form name="AddPartyContent" target="updatePartyContent" type="upload" default-map-name="content"
+        focus-field-name="contentTypeId">
         <actions>
             <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
                 <field-map field-name="statusId" env-name="content.statusId"/>
@@ -393,9 +360,9 @@
         <alt-target use-when="content==null" target="createPartyContent"/>
         <auto-fields-entity entity-name="Content" />
         <field name="partyId" map-name="parameters"><hidden/></field>
-        <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+        <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field use-when="content==null&amp;&amp;contentId==null" name="contentId"><ignored/></field>
-        <field use-when="content==null&amp;&amp;contentId!=null" name="contentId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field>
+        <field use-when="content==null&amp;&amp;contentId!=null" name="contentId"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field>
         <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field>        
         <field name="dataResourceId">
             <lookup target-form-name="LookupDataResource"/>
@@ -405,7 +372,7 @@
                 <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
             </drop-down>
         </field>
-        <field name="statusId" use-when="content==null" widget-style="selectBox">
+        <field name="statusId" use-when="content==null">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
@@ -413,7 +380,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="statusId" use-when="content!=null" widget-style="selectBox">
+        <field name="statusId" use-when="content!=null">
                 <drop-down allow-empty="false" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${content.statusId}"/>
@@ -441,13 +408,12 @@
                <entity-options description="${categoryName}" entity-name="DataCategory" key-field-name="dataCategoryId"/>
             </drop-down>
         </field>
-
-        <field name="createButton" use-when="content==null" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="updateButton" use-when="content!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="createButton" use-when="content==null"><submit button-type="button"/></field>
+        <field name="updateButton" use-when="content!=null"><submit button-type="button"/></field>
     </form>
-    <form name="ListPartyContents" target="" separate-columns="false"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        title="" type="list">
+
+    <form name="ListPartyContents" type="list"
+        separate-columns="false">
         <actions>
             <entity-and entity-name="ContentAndRole">
                 <field-map field-name="partyId"/>
@@ -455,9 +421,9 @@
         </actions>
         <field name="partyId"><hidden/></field>
         <field name="contentId"><hidden/></field>
-        <field name="contentName" widget-style="tabletext">
+        <field name="contentName">
             <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
-                <sub-hyperlink target="EditPartyContents?contentId=${contentId}&amp;amp;partyId=${partyId}" description="${contentId}" link-style="buttontext"/>
+                <sub-hyperlink target="EditPartyContents?contentId=${contentId}&amp;amp;partyId=${partyId}" description="${contentId}" link-style="smallSubmit"/>
             </display-entity>
         </field>
         <field name="description"><display/></field>
@@ -469,8 +435,9 @@
         <field name="dataResourceId" title="${uiLabelMap.FormFieldTitle_dataResourceName}" use-when="dataResourceId!=null">
             <display-entity entity-name="DataResource" description="${dataResourceName}"/>
         </field>
-        <field name="editLink" title="" widget-style="buttontext">
+        <field name="editLink" title="" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditPartyContents?contentId=${contentId}&amp;partyId=${partyId}&amp;dataResourceId=${dataResourceId}"/>
         </field>
     </form>    
+
 </forms>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl Sat Mar  3 01:41:15 2007
@@ -17,79 +17,72 @@
 under the License.
 -->
 
-<br/>
-<TABLE border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
-  <TR>
-    <TD width="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
+<!-- begin addressMatchMap.ftl -->
+<div id="address-match-map" class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <h3>${uiLabelMap.PageTitleAddressMatchMap}</h3>
+      <li><a href="<@ofbizUrl>findAddressMatch</@ofbizUrl>">${uiLabelMap.PageTitleFindMatches}</a></li>
+    </ul>
+    <br class="clear" />
+  </div>
+  <div class="screenlet-body">
+    <table class="basic-table" cellspacing="0">
+      <form name="addaddrmap" method="post" action="<@ofbizUrl>createAddressMatchMap</@ofbizUrl>">
         <tr>
-          <td valign="middle" align="left">
-            <div class="boxhead">${uiLabelMap.PageTitleAddressMatchMap}</div>
+          <td class="label">${uiLabelMap.PartyAddressMatchKey}</td>
+          <td><input type="text" name="mapKey"/></td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyAddressMatchValue}</td>
+          <td><input type="text" name="mapValue"/></td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.CommonSequence}</td>
+          <td><input type="text" size="5" name="sequenceNum" value="0"/></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td><a href="javascript:document.addaddrmap.submit()" class="smallSubmit">${uiLabelMap.CommonCreate}</a></td>
+        </tr>
+      </form>
+      <tr><td colspan="2">&nbsp;</td></tr>
+      <form name="importaddrmap"method="post" enctype="multipart/form-data" action="<@ofbizUrl>importAddressMatchMapCsv</@ofbizUrl>">
+        <tr>
+          <td></td>
+          <td>
+            <input type="file" name="uploadedFile" size="14"/>
+            <input type="submit" value="${uiLabelMap.CommonUpload} CSV"/>
+            <p>${uiLabelMap.PartyAddressMatchMessage1}</p>
           </td>
-          <td valign="middle" align="right">
-            <a href="<@ofbizUrl>findAddressMatch</@ofbizUrl>" class="submenutextright">${uiLabelMap.PageTitleFindMatches}</a>
+        </tr>
+      </form>
+      <#if addressMatchMaps?has_content>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+          <td colspan="2">
+            <table class="basic-table dark-grid" cellspacing="0">
+              <tr class="header-row">
+                <td>${uiLabelMap.PartyAddressMatchKey}</td>
+                <td>=></td>
+                <td>${uiLabelMap.PartyAddressMatchValue}</td>
+                <td>${uiLabelMap.CommonSequence}</td>
+                <td class="button-col"><a href="<@ofbizUrl>clearAddressMatchMap</@ofbizUrl>">${uiLabelMap.CommonClear} ${uiLabelMap.CommonAll}</a></td>
+              </tr>
+              <#list addressMatchMaps as map>
+                <tr>
+                  <td>${map.mapKey}</td>
+                  <td>=></td>
+                  <td>${map.mapValue}</td>
+                  <td>${map.sequenceNum?if_exists}</td>
+                  <td class="button-col"><a href="<@ofbizUrl>removeAddressMatchMap?mapKey=${map.mapKey}&mapValue=${map.mapValue}</@ofbizUrl>">${uiLabelMap.CommonDelete}</a></td>
+                </tr>
+              </#list>
+            </table>
           </td>
         </tr>
-      </table>
-    </TD>
-  </TR>
-  <TR>
-    <TD width="100%" >
-      <center>
-      <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
-        <form name="addaddrmap" method="post" action="<@ofbizUrl>createAddressMatchMap</@ofbizUrl>">
-          <tr>
-            <td><span class="tabletext">&nbsp;${uiLabelMap.PartyAddressMatchKey}:&nbsp;</span></td>
-            <td><input type="text" class="inputBox" name="mapKey"></td>
-            <td><span class="tabletext">&nbsp;${uiLabelMap.PartyAddressMatchValue}:&nbsp;</span></td>
-            <td><input type="text" class="inputBox" name="mapValue"></td>
-            <td><span class="tabletext">&nbsp;${uiLabelMap.CommonSequence}:&nbsp;</span></td>
-            <td><input type="text" class="inputBox" size="5" name="sequenceNum" value="0"></td>
-            <td>
-              <a href="javascript:document.addaddrmap.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a>&nbsp;&nbsp;
-            </td>
-          </tr>
-        </form>
-        <tr><td colspan="5">&nbsp;</td></tr>
-        <form name="importaddrmap"method="post" enctype="multipart/form-data" action="<@ofbizUrl>importAddressMatchMapCsv</@ofbizUrl>" style="margin: 0;">
-          <tr>
-            <td colspan="5" align="center">
-              <input type="file" name="uploadedFile" size="14" class="inputBox"/>
-              <input type="submit" value="${uiLabelMap.CommonUpload} CSV" class="smallSubmit"/>
-              <div class="tabletext">${uiLabelMap.PartyAddressMatchMessage1}</span>
-            </td>
-          </tr>
-        </form>
-        <tr><td colspan="5">&nbsp;</td></tr>
-        <#if addressMatchMaps?has_content>
-          <tr>
-            <td colspan="5">
-              <table border="0" cellspacing="5" cellpadding="5">
-                  <tr>
-                    <td><div class="tableheadtext">${uiLabelMap.PartyAddressMatchKey}</td>
-                    <td><div class="tableheadtext">=></td>
-                    <td><div class="tableheadtext">${uiLabelMap.PartyAddressMatchValue}</td>
-                    <td>&nbsp;</td>
-                    <td><a href="<@ofbizUrl>clearAddressMatchMap</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear} ${uiLabelMap.CommonAll}</a></td>
-                  </tr>
-                  <tr><td colspan="5"><hr class="sepbar"/></td></tr>
-                <#list addressMatchMaps as map>
-                  <tr>
-                    <td><div class="tabletext">${map.mapKey}</td>
-                    <td><div class="tabletext">=></td>
-                    <td><div class="tabletext">${map.mapValue}</td>
-                    <td><div class="tabletext">[${map.sequenceNum?if_exists}]</td>
-                    <td><a href="<@ofbizUrl>removeAddressMatchMap?mapKey=${map.mapKey}&mapValue=${map.mapValue}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td>
-                  </tr>
-                </#list>
-              </table>
-            </td>
-          </tr>
-        </#if>
-      </table>
-      </center>
-    </TD>
-  </TR>
-
-</TABLE>
-
+      </#if>
+    </table>
+  </div>
+</div>
+<!-- end addressMatchMap.ftl -->