svn commit: r614033 [1/2] - in /ofbiz/trunk/applications/party: config/ webapp/partymgr/party/ webapp/partymgr/party/profileblocks/ widget/partymgr/

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

svn commit: r614033 [1/2] - in /ofbiz/trunk/applications/party: config/ webapp/partymgr/party/ webapp/partymgr/party/profileblocks/ widget/partymgr/

mrisaliti
Author: mrisaliti
Date: Mon Jan 21 14:31:57 2008
New Revision: 614033

URL: http://svn.apache.org/viewvc?rev=614033&view=rev
Log:
Party forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1583)

Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties
    ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl
    ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties Mon Jan 21 14:31:57 2008
@@ -387,6 +387,7 @@
 PartyPartyIDUserLoginID=Codice Cliente Fornitori / Codice Utente
 PartyPartyInTheRoleOf=nel ruolo di
 PartyPartyNotDefined=Soggetto non definito
+PartyPartyRequests=Richieste
 PartyPartyTo=Soggetto A
 PartyPartyWithId=Il Soggetto con Codice
 PartyPassportExpire=Passaporto Scaduto
@@ -468,6 +469,7 @@
 PartyServicemgntCustRequestId=Gestione Servizio Codice Richiesta Cliente/Fornitore
 PartyServiceNotForPostalAddress=Questo servizio (createContactMech) non dovrebbe essere usaato per POSTAL_ADDRESS tipo ContactMechs, usare il servizio createPostalAddress
 PartyServiceNotForTelecomNumber=Questo servizio (createContactMech) non dovrebbe essere usaato per TELECOM_NUMBER tipo ContactMechs, usare il servizio createTelecomNumber
+PartyShipperAccount=Conto Corriere
 PartyShoppingListDetail=Dettagli Lista Acquisto
 PartyShoppingListEmpty=Lista Acquisto Vuota
 PartyShoppingLists=Liste Acquisto

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?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl Mon Jan 21 14:31:57 2008
@@ -25,41 +25,37 @@
   <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>
+          <tr class="header-row">
+            <td>${uiLabelMap.CommonDescription}/${uiLabelMap.CommonComments}</td>
+            <td colspan="2">${uiLabelMap.CommonFromDate}/${uiLabelMap.CommonThruDate}</td>            
+          </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>
-              ${uiLabelMap.PartyParty} <b>${partyRelationship.partyIdTo}</b>
+              <div>
+              ${uiLabelMap.PartyParty}&nbsp;<span class="label">${partyRelationship.partyIdTo}</span>
               <#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>
+              ${uiLabelMap.CommonIsA}&nbsp;<span class="label">${(partyRelationshipType.get("partyRelationshipName",locale))?default("${uiLabelMap.CommonNA}")}</span>
+              ${uiLabelMap.CommonOf} ${uiLabelMap.PartyParty}&nbsp;<span class="label">${partyRelationship.partyIdFrom}</span>
               <#if "_NA_" != partyRelationship.roleTypeIdFrom>
-                ${uiLabelMap.PartyRole} <b>${roleTypeFrom.get("description",locale)}</b>
+                ${uiLabelMap.PartyRole}&nbsp;<span class="label">${roleTypeFrom.get("description",locale)}</span>
               </#if>
               <#if partyRelationship.securityGroupId?exists>
-                ${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity} <b>${partyRelationship.getRelatedOne("SecurityGroup").get("description",locale)}</b>
+                ${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}&nbsp;<span class="label">${partyRelationship.getRelatedOne("SecurityGroup").get("description",locale)}</span>
               </#if>
+              </div>
+            </td>
+            <td colspan="2">
+                ${partyRelationship.fromDate}
+                <#if security.hasEntityPermission("PARTYMGR", "_REL_DELETE", session)>
+                    <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>
+                </#if>
             </td>
-            <td>${partyRelationship.fromDate}</td>
-            <#if security.hasEntityPermission("PARTYMGR", "_REL_DELETE", session)>
-              <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>
           <#if security.hasEntityPermission("PARTYMGR", "_REL_UPDATE", session)>
             <tr>
               <form method="post" name="updatePartyRel${partyRelationship_index}" action="<@ofbizUrl>updatePartyRelationship</@ofbizUrl>">
@@ -70,14 +66,11 @@
                 <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}"/>
+                  <input type="text" size="50" maxlength="30" name="comments" value="${partyRelationship.comments?if_exists}"/>
                 </td>
-                <td>
-                  <b>${uiLabelMap.CommonThru}: </b><input type="text" size="24" name="thruDate" value="${partyRelationship.thruDate?if_exists}"/>
+                <td colspan="2">
+                  <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>
-                <td class="button-col">
-                  <#-- ${partyRelationship.statusId}-->
                   <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
                 </td>
               </form>
@@ -85,12 +78,11 @@
           <#else>
             <tr>
               <td>
-                <b>${uiLabelMap.CommonComments}: </b>${partyRelationship.comments?if_exists}
+                ${partyRelationship.comments?if_exists}
               </td>
-              <td>
-                <b>${uiLabelMap.CommonThru}: </b>${partyRelationship.thruDate?if_exists}
+              <td colspan="2">
+                ${partyRelationship.thruDate?if_exists}
               </td>
-              <td>&nbsp;</td>
             </tr>
           </#if>
         </#list>
@@ -187,4 +179,4 @@
     </div>
   </div>
 </#if>
-<!-- end EditPartyRelationships.ftl -->
+<!-- end EditPartyRelationships.ftl -->
\ No newline at end of file

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?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Mon Jan 21 14:31:57 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
     <form name="EditPerson" type="single" target="updatePerson" default-map-name="person"
-        focus-field-name="salutation">
+        focus-field-name="salutation" header-row-style="header-row" default-table-style="basic-table">
         <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}"><display/></field>
@@ -77,7 +77,7 @@
     </form>
 
     <form name="EditPartyGroup" type="single" target="updatePartyGroup" default-map-name="partyGroup"
-            focus-field-name="groupName">
+            focus-field-name="groupName" header-row-style="header-row" default-table-style="basic-table">
         <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>
@@ -98,7 +98,7 @@
     </form>
 
     <form name="AddUserLogin" type="single" target="createUserLogin"
-        focus-field-name="userLoginId">
+        focus-field-name="userLoginId" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createUserLogin"/>
         <field name="partyId"><hidden/></field>
         <field name="enabled"><hidden/></field>
@@ -112,7 +112,7 @@
     </form>
 
     <form name="updatePassword" type="single" target="updatePassword"
-        focus-field-name="currentPassword">
+        focus-field-name="currentPassword" header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <set field="passwordHint" from-field="editUserLogin.passwordHint"/>
         </actions>
@@ -126,7 +126,8 @@
         <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
     </form>
 
-    <form name="updateUserLoginSecurity" type="single" target="updateUserLoginSecurity" default-map-name="editUserLogin">
+    <form name="updateUserLoginSecurity" type="single" target="updateUserLoginSecurity" default-map-name="editUserLogin"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="updateUserLoginSecurity"/>
         <field name="partyId"><hidden/></field>
         <field name="userLoginId"><hidden/></field>
@@ -135,7 +136,7 @@
     </form>
 
     <form name="EditVendor" type="single" target="updateVendor" default-map-name="vendor"
-        focus-field-name="manifestCompanyName">
+        focus-field-name="manifestCompanyName" header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="vendor==null" target="createVendor"/>
         <auto-fields-service service-name="updateVendor" map-name="vendor"/>
         <field name="partyId"><hidden value="${partyId}"/></field>
@@ -147,7 +148,8 @@
     </form>
 
     <!-- PartyRelationship -->
-    <form name="AddPartyRelationshipType" type="single" target="createPartyRelationshipType">
+    <form name="AddPartyRelationshipType" type="single" target="createPartyRelationshipType"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPartyRelationshipType"/>
         <field name="partyId"><hidden/></field>
         <field name="hasTable"><hidden/></field>
@@ -177,7 +179,7 @@
 
     <!-- PartyTaxAuthInfo -->
     <form name="AddPartyTaxAuthInfo" type="single" target="createPartyTaxAuthInfo"
-        focus-field-name="taxAuthGeoId">
+        focus-field-name="taxAuthGeoId" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPartyTaxAuthInfo"/>
         <field name="partyId"><hidden/></field>
         <field name="taxAuthGeoId">
@@ -218,7 +220,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
 
-    <form name="UpdatePartyTaxAuthInfo" type="list" list-name="partyTaxInfos" target="updatePartyTaxAuthInfo">
+    <form name="UpdatePartyTaxAuthInfo" type="list" list-name="partyTaxInfos" target="updatePartyTaxAuthInfo"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updatePartyTaxAuthInfo"/>
         <field name="partyId"><hidden/></field>
         <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="[${geoId}] ${geoName}" also-hidden="true"/></field>
@@ -242,7 +245,7 @@
     </form>
 
     <form name="AddPartyNote" type="single" target="createPartyNote"
-        focus-field-name="noteId">
+        focus-field-name="noteId" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPartyNote"/>
         <field name="partyId"><hidden/></field>
         <field name="noteId" tooltip="${uiLabelMap.PartyOptional}"><hidden/></field>
@@ -254,7 +257,7 @@
 
     <!-- PartyRate -->
     <form name="AddPartyRate" type="single" target="createPartyRate"
-        focus-field-name="rateTypeId">
+        focus-field-name="rateTypeId" header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPartyRate"/>
         <field name="partyId"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
@@ -273,7 +276,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListPartyRates" type="list" list-name="partyTaxInfos" target="updatePartyRate">
+    <form name="ListPartyRates" type="list" list-name="partyTaxInfos" target="updatePartyRate"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="PartyRate">
                 <condition-expr field-name="partyId" env-name="partyId"/>
@@ -293,7 +297,7 @@
     </form>
 
     <form name="NewUser" type="single" target="${target}${previousParams}"
-        style="basic-form form-widget" focus-field-name="USER_TITLE">
+        focus-field-name="USER_TITLE" header-row-style="header-row" default-table-style="basic-table">
         <field name="USE_ADDRESS"><hidden value="${USE_ADDRESS}"/></field>
         <field name="require_email"><hidden value="${require_email}"/></field>
         <field name="USER_TITLE" title="${uiLabelMap.CommonTitle}"><text size="10" maxlength="30"/></field>
@@ -361,7 +365,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
     </form>
 
-    <form name="ListSegmentRoles" type="list" target="updateSegmentGroupRole">
+    <form name="ListSegmentRoles" type="list" target="updateSegmentGroupRole"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="SegmentGroupRole">
                 <field-map field-name="partyId" />
@@ -382,7 +387,7 @@
     </form>
 
     <form name="AddSegmentRole" type="single" target="createSegmentRole" default-map-name="segmentGroupRole"
-        focus-field-name="segmentGroupId">
+        focus-field-name="segmentGroupId" header-row-style="header-row" default-table-style="basic-table">
         <field name="segmentGroupId" title="${uiLabelMap.PartySegmentGroupId}">
             <lookup target-form-name="LookupSegmentGroup"/>
         </field>
@@ -399,7 +404,7 @@
     </form>
 
     <form name="EditPartyAttribute" type="single" target="updatePartyAttribute" default-map-name="attribute"
-        focus-field-name="attrName">
+        focus-field-name="attrName" header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="attribute==null" target="createPartyAttribute"/>
         <auto-fields-service service-name="updatePartyAttribute" map-name="attribute"/>
         <field name="partyId"><hidden value="${partyId}"/></field>
@@ -409,7 +414,7 @@
     <!-- Party Content Form -->
     
     <form name="AddPartyContent" target="updatePartyContent" type="upload" default-map-name="content"
-        focus-field-name="contentTypeId">
+        focus-field-name="contentTypeId" header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
                 <field-map field-name="statusId" env-name="content.statusId"/>
@@ -478,8 +483,8 @@
         <field name="updateButton" use-when="content!=null"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListPartyContents" type="list"
-        separate-columns="false">
+    <form name="ListPartyContents" type="list" separate-columns="false"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="PartyContentDetail">
                 <field-map field-name="partyId"/>
@@ -507,7 +512,8 @@
         </field>
     </form>    
 
-    <form name="ApplyServiceCredit" type="single" target="applyServiceCredit" default-map-name="serviceCredit" focus-field-name="amount">
+    <form name="ApplyServiceCredit" type="single" target="applyServiceCredit" default-map-name="serviceCredit" focus-field-name="amount"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createServiceCredit" map-name="serviceCredit"/>
         <field name="finAccountId">
             <drop-down allow-empty="true">
@@ -538,7 +544,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     
-    <form name="ListCarrierAccounts" type="list" target="updatePartyCarrierAccount">
+    <form name="ListCarrierAccounts" type="list" target="updatePartyCarrierAccount"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="PartyCarrierAccount" list-name="carrierAccounts" filter-by-date="true">
                 <condition-expr field-name="partyId" env-name="parameters.partyId"></condition-expr>
@@ -556,7 +563,8 @@
         </field>
     </form>
     
-    <form name="EditCarrierAccount" type="single" target="createPartyCarrierAccount" title="">
+    <form name="EditCarrierAccount" type="single" target="createPartyCarrierAccount" title=""
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPartyCarrierAccount"/>
         <field name="partyId"><hidden/></field>
         <field name="carrierPartyId">
@@ -571,4 +579,4 @@
         <field name="accountNumber" title="${uiLabelMap.AccountingAccountNumber}" tooltip="${uiLabelMap.CommonRequired}"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>  
-</forms>
+</forms>
\ No newline at end of file

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?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl Mon Jan 21 14:31:57 2008
@@ -23,7 +23,7 @@
       <li class="head3">${uiLabelMap.PageTitleAddressMatchMap}</li>
       <li><a href="<@ofbizUrl>findAddressMatch</@ofbizUrl>">${uiLabelMap.PageTitleFindMatches}</a></li>
     </ul>
-    <br class="clear" />
+    <br class="clear"/>
   </div>
   <div class="screenlet-body">
     <table class="basic-table" cellspacing="0">
@@ -56,32 +56,41 @@
           </td>
         </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>
-      </#if>
     </table>
   </div>
 </div>
-<!-- end addressMatchMap.ftl -->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.PageTitleAddressMatchMap}</li>      
+    </ul>
+    <br class="clear"/>
+  </div>
+  <div class="screenlet-body">
+      <#if addressMatchMaps?has_content>        
+        <table class="basic-table hover-bar" 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>
+          <#assign alt_row = false>
+          <#list addressMatchMaps as map>
+            <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+              <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>
+            <#-- toggle the row color -->
+
+            <#assign alt_row = !alt_row>
+          </#list>
+        </table>
+      </#if>
+  </div>
+</div>
+<!-- end addressMatchMap.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Mon Jan 21 14:31:57 2008
@@ -24,7 +24,7 @@
       <li class="head3">${uiLabelMap.PartyShoppingLists}</li>
       <li><a href="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>?partyId=${partyId?if_exists}">${uiLabelMap.CommonCreateNew}</a></li>
     </ul>
-    <br class="clear" />
+    <br class="clear"/>
   </div>
   <div class="screenlet-body">
     <#if shoppingLists?has_content>
@@ -56,7 +56,7 @@
       <li><a href="/ordermgr/control/createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.PartyCreateNewCustRequest}</a></li>
       <li><a href="/ordermgr/control/loadCartFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.OrderNewOrder}</a></li>
     </ul>
-    <br class="clear" />
+    <br class="clear"/>
   </div>
   <div class="screenlet-body">
     <form name="updateList" method="post" action="<@ofbizUrl>updateShoppingList</@ofbizUrl>">
@@ -91,8 +91,8 @@
             <select name="isPublic" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>>
               <option>${shoppingList.isPublic}</option>
               <option value="${shoppingList.isPublic}">--</option>
-              <option>Y</option>
-              <option>N</option>
+              <option>${uiLabelMap.CommonYes}</option>
+              <option>${uiLabelMap.CommonNo}</option>
             </select>
           </td>
         </tr>                          
@@ -131,23 +131,23 @@
       <li class="head3">${uiLabelMap.PartyChildShoppingList} - ${shoppingList.listName}</li>
       <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>">${uiLabelMap.PartyAddChildListsToCart}</a></li>
     </ul>
-    <br class="clear" />
+    <br class="clear"/>
   </div>
   <div class="screenlet-body">
     <table class="basic-table" cellspacing="0">
       <tr class="header-row">
         <td>${uiLabelMap.PartyListName}</td>
- <td>&nbsp;</td>
+        <td>&nbsp;</td>
       </tr>
       <#list childShoppingListDatas as childShoppingListData>
         <#assign childShoppingList = childShoppingListData.childShoppingList>
         <tr>
           <td class="button-col"><a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a></li>
-  <td class="button-col align-float">
+          <td class="button-col align-float">
             <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyGotoList}</a>
             <a href="<@ofbizUrl>addListToCart?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyAddListToCart}</a>
-      </td>                      
- </tr>
+          </td>                      
+        </tr>
       </#list>
     </table>
   </div>
@@ -160,7 +160,7 @@
       <li class="head3">${uiLabelMap.PartyListItems} - ${shoppingList.listName}</li>
         <#-- <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyAddListToCart}</a></li> -->
     </ul>
-    <br class="clear" />
+    <br class="clear"/>
   </div>
   <div class="screenlet-body">
     <#if shoppingListItemDatas?has_content>
@@ -173,9 +173,7 @@
           <td>${uiLabelMap.PartyTotal}</td>
           <td>&nbsp;</td>
         </tr>
-        <tr>
-          <td colspan="6"><hr></td>
-        </tr>
+        <#assign alt_row = false>        
         <#list shoppingListItemDatas as shoppingListItemData>
           <#assign shoppingListItem = shoppingListItemData.shoppingListItem>
           <#assign product = shoppingListItemData.product>
@@ -184,7 +182,7 @@
           <#assign totalPrice = shoppingListItemData.totalPrice>
           <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs?if_exists>
           <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")>
-          <tr>
+          <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
             <td><a href="/catalog/control/EditProduct?productId=${shoppingListItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${shoppingListItem.productId} -
               ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists}
             </td>
@@ -200,7 +198,7 @@
                     value="${shoppingListItem.quantityPurchased?if_exists?string.number}"
                   </#if>>
               </td>
-    </form>
+            </form>
             <td class="align-float"><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></td>
             <td class="align-float"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></td>
             <td class="button-col align-float">
@@ -208,6 +206,9 @@
               <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
             </td>
           </tr>
+          <#-- toggle the row color -->
+
+          <#assign alt_row = !alt_row>
         </#list>
       </table>
     <#else>
@@ -231,4 +232,4 @@
   </div>
 </div>
 </#if>
-<!-- begin editShoppingList.ftl -->
+<!-- begin editShoppingList.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Mon Jan 21 14:31:57 2008
@@ -21,7 +21,11 @@
 <#if !mechMap.contactMech?exists>
   <#-- When creating a new contact mech, first select the type, then actually create -->
   <#if !preContactMechTypeId?has_content>
-    <h1>${uiLabelMap.PartyCreateNewContact}</h1>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.PartyCreateNewContact}</h3>        
+  </div>
+  <div class="screenlet-body">
     <form method="post" action="<@ofbizUrl>editcontactmech</@ofbizUrl>" name="createcontactmechform">
       <input type="hidden" name="DONE_PAGE" value="${donePage}">
       <input type="hidden" name="partyId" value="${partyId}">
@@ -39,11 +43,17 @@
         </tr>
       </table>
     </form>
-  </#if>
+  </div>
+</div>
+    </#if>
 </#if>
 <#if mechMap.contactMechTypeId?has_content>
   <#if !mechMap.contactMech?has_content>
-    <h1>${uiLabelMap.PartyCreateNewContact}</h1>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.PartyCreateNewContact}</h3>        
+  </div>
+  <div class="screenlet-body">
     <div class="button-bar">
       <a href="<@ofbizUrl>authview/${donePage?if_exists}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
       <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
@@ -51,7 +61,7 @@
     <#if contactMechPurposeType?exists>
       <p>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</p>
     </#if>
-    <table cellspacing="0">
+    <table class="basic-table" cellspacing="0">
       <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform">
         <input type="hidden" name="DONE_PAGE" value="${donePage}">
         <input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}">
@@ -61,18 +71,22 @@
         <#if contactMechPurposeTypeId?exists><input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurposeTypeId?if_exists}"></#if>
         <#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}'></#if>
   <#else>
-    <h1>${uiLabelMap.PartyEditContactInformation}</h1>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.PartyEditContactInformation}</h3>        
+  </div>
+  <div class="screenlet-body">    
     <div class="button-bar">
       <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
       <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
     </div>
     <div id="mech-purpose-types">
-      <table cellspacing="0">
+      <table class="basic-table" cellspacing="0">
       <#if mechMap.purposeTypes?has_content>
         <tr>
           <td class="label">${uiLabelMap.PartyContactPurposes}</td>
           <td>
-            <table class="basic-table dark-grid" cellspacing="0">
+            <table class="basic-table" cellspacing="0">
               <#if mechMap.partyContactMechPurposes?has_content>
                 <#list mechMap.partyContactMechPurposes as partyContactMechPurpose>
                   <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
@@ -235,9 +249,10 @@
   <div class="button-bar">
     <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
     <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+  </div>  
   </div>
-  </div>
+</div>
 <#else>
   <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
 </#if>
-<!-- end editcontactmech.ftl -->
+<!-- end editcontactmech.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl Mon Jan 21 14:31:57 2008
@@ -18,123 +18,127 @@
 -->
 
 <!-- begin editcreditcard.ftl -->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
     <#if !creditCard?exists>
-      <h1>${uiLabelMap.AccountingAddNewCreditCard}</h1>
+      <h3>${uiLabelMap.AccountingAddNewCreditCard}</h3>
       <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
     <#else>
-      <h1>${uiLabelMap.AccountingEditCreditCard}</h1>
+      <h3>${uiLabelMap.AccountingEditCreditCard}</h3>
       <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;">
         <input type="hidden" name="paymentMethodId" value="${paymentMethodId}">
     </#if>
-    <div class="button-bar">
-      <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
-      <a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
-    </div>
-  <input type="hidden" name="partyId" value="${partyId}"/>
-  <table class="basic-table" cellspacing="0">
+  </div>
+  <div class="screenlet-body">    
+        <div class="button-bar">
+          <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+          <a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+        </div>
+        <input type="hidden" name="partyId" value="${partyId}"/>
+        <table class="basic-table" cellspacing="0">
 
-    ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
-    <tr>
-      <td class="label">${uiLabelMap.AccountingBillingAddress}</td>
-      <td width="5">&nbsp;</td>
-      <td>
-        <#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
-        <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="smallSubmit">
-          [Create New Address]</a>&nbsp;&nbsp;
-        -->
-        <table cellspacing="0">
-        <#assign hasCurrent = false>
-        <#if curPostalAddress?has_content>
-          <#assign hasCurrent = true>
-          <tr>
-            <td class="button-col">
-              <input type="radio" name="contactMechId" value="${curContactMechId}" checked>
-            </td>
-            <td>
-              <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p>
-              <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
-                <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
-                <p>
-                  <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b>
-                  <#if curPartyContactMechPurpose.thruDate?exists>
-                    (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
-                  </#if>
-                </p>
+        ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
+        <tr>
+          <td class="label">${uiLabelMap.AccountingBillingAddress}</td>
+          <td width="5">&nbsp;</td>
+          <td>
+            <#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
+            <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="smallSubmit">
+              [Create New Address]</a>&nbsp;&nbsp;
+            -->
+            <table cellspacing="0">
+            <#assign hasCurrent = false>
+            <#if curPostalAddress?has_content>
+              <#assign hasCurrent = true>
+              <tr>
+                <td class="button-col">
+                  <input type="radio" name="contactMechId" value="${curContactMechId}" checked>
+                </td>
+                <td>
+                  <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p>
+                  <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
+                    <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+                    <p>
+                      <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b>
+                      <#if curPartyContactMechPurpose.thruDate?exists>
+                        (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
+                      </#if>
+                    </p>
+                  </#list>
+                  <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
+                  <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
+                  <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if>
+                  <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if>
+                  <p>${curPostalAddress.city?if_exists}<#if curPostalAddress.stateProvinceGeoId?has_content>,&nbsp;${curPostalAddress.stateProvinceGeoId?if_exists}</#if>&nbsp;${curPostalAddress.postalCode?if_exists}</p>
+                  <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if>
+                  <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(curPartyContactMech.fromDate.toString())?if_exists})</p>
+                  <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${curPartyContactMech.thruDate.toString()}</b></p></#if>
+                </td>
+              </tr>
+            <#else>
+               <#-- <tr>
+                <td align="left" valign="top" colspan="2">
+                  ${uiLabelMap.PartyBillingAddressNotSelected}
+                </td>
+              </tr> -->
+            </#if>
+              <#-- is confusing
+              <tr>
+                <td align="left" valign="top" colspan="2">
+                  <b>Select a New Billing Address:</b>
+                </td>
+              </tr>
+              -->
+              <#list postalAddressInfos as postalAddressInfo>
+                <#assign contactMech = postalAddressInfo.contactMech>
+                <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes>
+                <#assign postalAddress = postalAddressInfo.postalAddress>
+                <#assign partyContactMech = postalAddressInfo.partyContactMech>
+                <tr>
+                  <td class="button-col">
+                    <input type="radio" name="contactMechId" value="${contactMech.contactMechId}">
+                  </td>
+                  <td>
+                    <#list partyContactMechPurposes as partyContactMechPurpose>
+                      <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+                      <p>
+                        <b>${contactMechPurposeType.get("description",locale)?if_exists}</b>
+                        <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
+                      </p>
+                    </#list>
+                    <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
+                    <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
+                    <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if>
+                    <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if>
+                    <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>,&nbsp;${postalAddress.stateProvinceGeoId}</#if>&nbsp;${postalAddress.postalCode?if_exists}</p>
+                    <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if>
+                    <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(partyContactMech.fromDate.toString())?if_exists})</p>
+                    <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${partyContactMech.thruDate.toString()}</b></p></#if>
+                  </td>
+                </tr>
               </#list>
-              <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
-              <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
-              <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if>
-              <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if>
-              <p>${curPostalAddress.city?if_exists}<#if curPostalAddress.stateProvinceGeoId?has_content>,&nbsp;${curPostalAddress.stateProvinceGeoId?if_exists}</#if>&nbsp;${curPostalAddress.postalCode?if_exists}</p>
-              <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if>
-              <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(curPartyContactMech.fromDate.toString())?if_exists})</p>
-              <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${curPartyContactMech.thruDate.toString()}</b></p></#if>
-            </td>
-          </tr>
-        <#else>
-           <#-- <tr>
-            <td align="left" valign="top" colspan="2">
-              ${uiLabelMap.PartyBillingAddressNotSelected}
-            </td>
-          </tr> -->
-        </#if>
-          <#-- is confusing
-          <tr>
-            <td align="left" valign="top" colspan="2">
-              <b>Select a New Billing Address:</b>
-            </td>
-          </tr>
-          -->
-          <#list postalAddressInfos as postalAddressInfo>
-            <#assign contactMech = postalAddressInfo.contactMech>
-            <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes>
-            <#assign postalAddress = postalAddressInfo.postalAddress>
-            <#assign partyContactMech = postalAddressInfo.partyContactMech>
-            <tr>
-              <td class="button-col">
-                <input type="radio" name="contactMechId" value="${contactMech.contactMechId}">
-              </td>
-              <td>
-                <#list partyContactMechPurposes as partyContactMechPurpose>
-                  <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
-                  <p>
-                    <b>${contactMechPurposeType.get("description",locale)?if_exists}</b>
-                    <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
-                  </p>
-                </#list>
-                <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
-                <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
-                <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if>
-                <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if>
-                <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>,&nbsp;${postalAddress.stateProvinceGeoId}</#if>&nbsp;${postalAddress.postalCode?if_exists}</p>
-                <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if>
-                <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(partyContactMech.fromDate.toString())?if_exists})</p>
-                <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${partyContactMech.thruDate.toString()}</b></p></#if>
-              </td>
-            </tr>
-          </#list>
-          <#if !postalAddressInfos?has_content && !curContactMech?exists>
-              <tr><td colspan="2">${uiLabelMap.PartyNoContactInformation}.</td></tr>
-          </#if>
-          <#-- not yet supported in party manager
-          <tr>
-            <td align="right" valigh="top" width="1%">
-              <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked</#if>>
-            </td>
-            <td align="left" valign="middle" width="80%">
-              ${uiLabelMap.PartyCreateNewBillingAddress}.
-            </td>
-          </tr>
-          -->
+              <#if !postalAddressInfos?has_content && !curContactMech?exists>
+                  <tr><td colspan="2">${uiLabelMap.PartyNoContactInformation}.</td></tr>
+              </#if>
+              <#-- not yet supported in party manager
+              <tr>
+                <td align="right" valigh="top" width="1%">
+                  <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked</#if>>
+                </td>
+                <td align="left" valign="middle" width="80%">
+                  ${uiLabelMap.PartyCreateNewBillingAddress}.
+                </td>
+              </tr>
+              -->
+            </table>
+          </td>
+        </tr>
         </table>
-      </td>
-    </tr>
-  </table>
-  </form>
-
-  <div class="button-bar">
-    <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
-    <a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+      </form>
+      <div class="button-bar">
+        <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+        <a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+      </div>
   </div>
-<!-- end editcreditcard.ftl -->
-
+</div>
+<!-- end editcreditcard.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl Mon Jan 21 14:31:57 2008
@@ -18,157 +18,161 @@
 -->
 
 <!-- begin editeftaccount.ftl -->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
     <#if !eftAccount?exists>
-      <h1>${uiLabelMap.AccountingAddNewEftAccount}</h1>
+      <h3>${uiLabelMap.AccountingAddNewEftAccount}</h3>
       <form method="post" action='<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
     <#else>
-      <h1>${uiLabelMap.PageTitleEditEftAccount}</h1>
+      <h3>${uiLabelMap.PageTitleEditEftAccount}</h3>
       <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
         <input type="hidden" name='paymentMethodId' value='${paymentMethodId}'>
     </#if>
-    <div class="button-bar">
-      <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
-      <a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
-    </div>
-    <input type="hidden" name="partyId" value="${partyId}"/>
-    <table class="basic-table" cellspacing="0">
-    <tr>
-      <td class="label">${uiLabelMap.AccountingNameAccount}</td>
-      <td>
-        <input type="text" class='required' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}">
-        <span class="tooltip">${uiLabelMap.CommonRequired}</span>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.AccountingCompanyNameAccount}</td>
-      <td>
-        <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}">
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.AccountingBankName}</td>
-      <td>
-        <input type="text" class='required' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}">
-        <span class="tooltip">${uiLabelMap.CommonRequired}</span>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.AccountingRoutingNumber}</td>
-      <td>
-        <input type="text" class='required' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}">
-        <span class="tooltip">${uiLabelMap.CommonRequired}</span>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.AccountingAccountType}</td>
-      <td>
-        <select name="accountType" class='required'>
-          <option>${eftAccountData.accountType?if_exists}</option>
-          <option></option>
-          <option>${uiLabelMap.CommonChecking}</option>
-          <option>${uiLabelMap.CommonSavings}</option>
-        </select>
-        <span class="tooltip">${uiLabelMap.CommonRequired}</span>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.AccountingAccountNumber}</td>
-      <td>
-        <input type="text" class='required' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}">
-        <span class="tooltip">${uiLabelMap.CommonRequired}</span>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.CommonDescription}</td>
-      <td>
-        <input type="text" class='required' size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
-        <span class="tooltip">${uiLabelMap.CommonRequired}</span>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyBillingAddress}</td>
-      <td>
-        <#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
-        <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="smallSubmit">
-          [Create New Address]</a>&nbsp;&nbsp;
-        -->
-        <table cellspacing="0">
-        <#if curPostalAddress?exists>
-          <tr>
-            <td class="button-col">
-              <input type="radio" name="contactMechId" value="${curContactMechId}" checked>
-            </td>
-            <td>
-              <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p>
-              <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
-                <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
-                <p><b>${curContactMechPurposeType.get("description",locale)?if_exists}</b></p>
-                <#if curPartyContactMechPurpose.thruDate?exists>
-                  <p>(${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})</p>
-                </#if>
+  </div>
+  <div class="screenlet-body">    
+        <div class="button-bar">
+          <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+          <a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+        </div>
+        <input type="hidden" name="partyId" value="${partyId}"/>
+        <table class="basic-table" cellspacing="0">
+        <tr>
+          <td class="label">${uiLabelMap.AccountingNameAccount}</td>
+          <td>
+            <input type="text" class='required' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}">
+            <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.AccountingCompanyNameAccount}</td>
+          <td>
+            <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}">
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.AccountingBankName}</td>
+          <td>
+            <input type="text" class='required' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}">
+            <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.AccountingRoutingNumber}</td>
+          <td>
+            <input type="text" class='required' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}">
+            <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.AccountingAccountType}</td>
+          <td>
+            <select name="accountType" class='required'>
+              <option>${eftAccountData.accountType?if_exists}</option>
+              <option></option>
+              <option>${uiLabelMap.CommonChecking}</option>
+              <option>${uiLabelMap.CommonSavings}</option>
+            </select>
+            <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.AccountingAccountNumber}</td>
+          <td>
+            <input type="text" class='required' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}">
+            <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.CommonDescription}</td>
+          <td>
+            <input type="text" class='required' size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+            <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyBillingAddress}</td>
+          <td>
+            <#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
+            <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="smallSubmit">
+              [Create New Address]</a>&nbsp;&nbsp;
+            -->
+            <table cellspacing="0">
+            <#if curPostalAddress?exists>
+              <tr>
+                <td class="button-col">
+                  <input type="radio" name="contactMechId" value="${curContactMechId}" checked>
+                </td>
+                <td>
+                  <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p>
+                  <#list curPartyContactMechPurposes as curPartyContactMechPurpose>
+                    <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+                    <p><b>${curContactMechPurposeType.get("description",locale)?if_exists}</b></p>
+                    <#if curPartyContactMechPurpose.thruDate?exists>
+                      <p>(${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})</p>
+                    </#if>
+                  </#list>
+                  <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
+                  <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
+                  <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if>
+                  <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if>
+                  <p>${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>,&nbsp;${curPostalAddress.stateProvinceGeoId}</#if>&nbsp;${curPostalAddress.postalCode}</p>
+                  <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if>
+                  <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(curPartyContactMech.fromDate.toString())?if_exists})</p>
+                  <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${curPartyContactMech.thruDate.toString()}</b></p></#if>
+                </td>
+              </tr>
+            <#else>
+               <#-- <tr>
+                <td align="left" valign="top" colspan='2'>
+                  ${uiLabelMap.PartyNoBillingAddress}</div>
+                </td>
+              </tr> -->
+            </#if>
+              <#-- is confusing
+              <tr>
+                <td align="left" valign="top" colspan='2'>
+                  <b>Select a New Billing Address:</b></div>
+                </td>
+              </tr>
+              -->
+              <#list postalAddressInfos as postalAddressInfo>
+                <#assign contactMech = postalAddressInfo.contactMech>
+                <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes>
+                <#assign postalAddress = postalAddressInfo.postalAddress>
+                <#assign partyContactMech = postalAddressInfo.partyContactMech>
+                <tr>
+                  <td class="button-col">
+                    <input type='radio' name='contactMechId' value='${contactMech.contactMechId}'>
+                  </td>
+                  <td>
+                    <#list partyContactMechPurposes as partyContactMechPurpose>
+                      <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
+                      <p><b>${contactMechPurposeType.get("description",locale)?if_exists}</b></p>
+                      <#if partyContactMechPurpose.thruDate?exists><p>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</p></#if>
+                    </#list>
+                    <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
+                    <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
+                    <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if>
+                    <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if>
+                    <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>,&nbsp;${postalAddress.stateProvinceGeoId}</#if>&nbsp;${postalAddress.postalCode}</p>
+                    <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if>
+                    <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(partyContactMech.fromDate.toString())?if_exists})</p>
+                    <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${partyContactMech.thruDate.toString()}</b></p></#if>
+                  </td>
+                </tr>
               </#list>
-              <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if>
-              <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if>
-              <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if>
-              <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if>
-              <p>${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>,&nbsp;${curPostalAddress.stateProvinceGeoId}</#if>&nbsp;${curPostalAddress.postalCode}</p>
-              <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if>
-              <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(curPartyContactMech.fromDate.toString())?if_exists})</p>
-              <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${curPartyContactMech.thruDate.toString()}</b></p></#if>
-            </td>
-          </tr>
-        <#else>
-           <#-- <tr>
-            <td align="left" valign="top" colspan='2'>
-              ${uiLabelMap.PartyNoBillingAddress}</div>
-            </td>
-          </tr> -->
-        </#if>
-          <#-- is confusing
-          <tr>
-            <td align="left" valign="top" colspan='2'>
-              <b>Select a New Billing Address:</b></div>
-            </td>
-          </tr>
-          -->
-          <#list postalAddressInfos as postalAddressInfo>
-            <#assign contactMech = postalAddressInfo.contactMech>
-            <#assign partyContactMechPurposes = postalAddressInfo.partyContactMechPurposes>
-            <#assign postalAddress = postalAddressInfo.postalAddress>
-            <#assign partyContactMech = postalAddressInfo.partyContactMech>
-            <tr>
-              <td class="button-col">
-                <input type='radio' name='contactMechId' value='${contactMech.contactMechId}'>
-              </td>
-              <td>
-                <#list partyContactMechPurposes as partyContactMechPurpose>
-                  <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
-                  <p><b>${contactMechPurposeType.get("description",locale)?if_exists}</b></p>
-                  <#if partyContactMechPurpose.thruDate?exists><p>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</p></#if>
-                </#list>
-                <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if>
-                <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if>
-                <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if>
-                <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if>
-                <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>,&nbsp;${postalAddress.stateProvinceGeoId}</#if>&nbsp;${postalAddress.postalCode}</p>
-                <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if>
-                <p>(${uiLabelMap.CommonUpdated}:&nbsp;${(partyContactMech.fromDate.toString())?if_exists})</p>
-                <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}:&nbsp;${partyContactMech.thruDate.toString()}</b></p></#if>
-              </td>
-            </tr>
-          </#list>
-          <#if !postalAddressInfos?has_content && !curContactMech?exists>
-              <tr><td colspan='2'>${uiLabelMap.PartyNoContactInformation}.</td></tr>
-          </#if>
+              <#if !postalAddressInfos?has_content && !curContactMech?exists>
+                  <tr><td colspan='2'>${uiLabelMap.PartyNoContactInformation}.</td></tr>
+              </#if>
+            </table>
+          </td>
+        </tr>
         </table>
-      </td>
-    </tr>
-  </table>
-  </form>
-
-  <div class="button-bar">
-    <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
-    <a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+      </form>
+      <div class="button-bar">
+        <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+        <a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+      </div>
   </div>
-<!-- end editeftaccount.ftl -->
-  
+</div>
+<!-- end editeftaccount.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl Mon Jan 21 14:31:57 2008
@@ -18,81 +18,84 @@
 -->
 
 <!-- begin editgiftcard.ftl -->
+<div class="screenlet">
+  <div class="screenlet-title-bar">
     <#if !giftCard?exists>
-      <h1>${uiLabelMap.AccountingCreateNewGiftCard}</h1>
+      <h3>${uiLabelMap.AccountingCreateNewGiftCard}</h3>
       <form method="post" action="<@ofbizUrl>createGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
     <#else>
-      <h1>${uiLabelMap.AccountingEditGiftCard}</h1>
+      <h3>${uiLabelMap.AccountingEditGiftCard}</h3>
       <form method="post" action="<@ofbizUrl>updateGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;">
         <input type="hidden" name="paymentMethodId" value="${paymentMethodId}">
     </#if>
-
-    <input type="hidden" name="partyId" value="${partyId}"/>
-    <div class="button-bar">
-      <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
-      <a href="javascript:document.editgiftcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
-    </div>
-
-    <table class="basic-table" cellspacing="0">
-    <tr>
-      <td class="label">${uiLabelMap.AccountingCardNumber}</td>
-      <td>
-        <input type="text" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber?if_exists}">
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.AccountingPinNumber}</td>
-      <td>
-        <input type="text" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}">
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.CommonExpireDate}</td>
-      <td>
-        <#assign expMonth = "">
-        <#assign expYear = "">
-        <#if giftCardData?exists && giftCardData.expireDate?exists>
-          <#assign expDate = giftCard.expireDate>
-          <#if (expDate?exists && expDate.indexOf("/") > 0)>
-            <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
-            <#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
-          </#if>
-        </#if>
-        <select name="expMonth" onchange="javascript:makeExpDate();">
-          <#if giftCardData?has_content && expMonth?has_content>
-            <#assign ccExprMonth = expMonth>
-          <#else>
-            <#assign ccExprMonth = requestParameters.expMonth?if_exists>
-          </#if>
-          <#if ccExprMonth?has_content>
-            <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option>
-          </#if>
-          ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
-        </select>
-        <select name="expYear" onchange="javascript:makeExpDate();">
-          <#if giftCard?has_content && expYear?has_content>
-            <#assign ccExprYear = expYear>
-          <#else>
-            <#assign ccExprYear = requestParameters.expYear?if_exists>
-          </#if>
-          <#if ccExprYear?has_content>
-            <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option>
-          </#if>
-          ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.CommonDescription}</td>
-      <td>
-        <input type="text" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
-      </td>
-    </tr>
-  </table>
-  </form>
-
-  <div class="button-bar">
-    <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
-    <a href="javascript:document.editgiftcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
   </div>
-<!-- end editgiftcard.ftl -->
+  <div class="screenlet-body">
+        <input type="hidden" name="partyId" value="${partyId}"/>
+        <div class="button-bar">
+          <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+          <a href="javascript:document.editgiftcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+        </div>
+        <table class="basic-table" cellspacing="0">
+        <tr>
+          <td class="label">${uiLabelMap.AccountingCardNumber}</td>
+          <td>
+            <input type="text" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber?if_exists}">
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.AccountingPinNumber}</td>
+          <td>
+            <input type="text" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}">
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.CommonExpireDate}</td>
+          <td>
+            <#assign expMonth = "">
+            <#assign expYear = "">
+            <#if giftCardData?exists && giftCardData.expireDate?exists>
+              <#assign expDate = giftCard.expireDate>
+              <#if (expDate?exists && expDate.indexOf("/") > 0)>
+                <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
+                <#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
+              </#if>
+            </#if>
+            <select name="expMonth" onchange="javascript:makeExpDate();">
+              <#if giftCardData?has_content && expMonth?has_content>
+                <#assign ccExprMonth = expMonth>
+              <#else>
+                <#assign ccExprMonth = requestParameters.expMonth?if_exists>
+              </#if>
+              <#if ccExprMonth?has_content>
+                <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option>
+              </#if>
+              ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
+            </select>
+            <select name="expYear" onchange="javascript:makeExpDate();">
+              <#if giftCard?has_content && expYear?has_content>
+                <#assign ccExprYear = expYear>
+              <#else>
+                <#assign ccExprYear = requestParameters.expYear?if_exists>
+              </#if>
+              <#if ccExprYear?has_content>
+                <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option>
+              </#if>
+              ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.CommonDescription}</td>
+          <td>
+            <input type="text" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+          </td>
+        </tr>
+        </table>
+      </form>
+      <div class="button-bar">
+        <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a>
+        <a href="javascript:document.editgiftcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
+      </div>
+  </div>
+</div>
+<!-- end editgiftcard.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl Mon Jan 21 14:31:57 2008
@@ -23,7 +23,7 @@
       <li class="head3">${uiLabelMap.PageTitleAddressMatches}</li>
       <li><a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>">${uiLabelMap.PageTitleAddressMatchMap}</a></li>
     </ul>
-    <br class="clear" />
+    <br class="clear"/>
   </div>
   <div class="screenlet-body">
     <table class="basic-table" cellspacing="0">
@@ -98,7 +98,7 @@
                     <#elseif group?has_content>
                       <td colspan="2">${group.groupName}</td>
                     <#else>
-                      <td colspan="2">[unknown partyType]</td>
+                      <td colspan="2">${uiLabelMap.PartyUnknown}</td>
                     </#if>
                     <td>${Static["org.ofbiz.party.party.PartyWorker"].makeMatchingString(delegator, match.address1)}</td>
                     <td>${Static["org.ofbiz.party.party.PartyWorker"].makeMatchingString(delegator, match.address2?default("N/A"))}</td>
@@ -116,3 +116,4 @@
       </#if>
     </table>
   </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Mon Jan 21 14:31:57 2008
@@ -33,7 +33,7 @@
         <li><a href="javascript:document.lookupparty.submit();">${uiLabelMap.PartyLookupParty}</a></li>
       </#if>
     </ul>
- <br class="clear" />
+    <br class="clear"/>
   </div>
   <#if parameters.hideFields?default("N") != "Y">
     <div class="screenlet-body">
@@ -47,7 +47,7 @@
         <input type="hidden" name="hideFields" value="Y"/>
         <table cellspacing="0">
           <tr>
-            <td class="label">${uiLabelMap.PartyContactInformation} :</td>
+            <td class="label">${uiLabelMap.PartyContactInformation}</td>
             <td>
               <input type="radio" name="extInfo" value="N" onclick="javascript:refreshInfo();" <#if extInfo == "N">checked="checked"</#if>/>${uiLabelMap.CommonNone}&nbsp;
               <input type="radio" name="extInfo" value="P" onclick="javascript:refreshInfo();" <#if extInfo == "P">checked="checked"</#if>/>${uiLabelMap.PartyPostal}&nbsp;
@@ -56,27 +56,27 @@
             </td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.PartyPartyId} :</td>
+            <td class="label">${uiLabelMap.PartyPartyId}</td>
             <td><input type="text" name="partyId" value="${parameters.partyId?if_exists}"/></td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.PartyUserLogin} :</td>
+            <td class="label">${uiLabelMap.PartyUserLogin}</td>
             <td><input type="text" name="userLoginId" value="${parameters.userLoginId?if_exists}"/></td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.PartyLastName} :</td>
+            <td class="label">${uiLabelMap.PartyLastName}</td>
             <td><input type="text" name="lastName" value="${parameters.lastName?if_exists}"/></td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.PartyFirstName} :</td>
+            <td class="label">${uiLabelMap.PartyFirstName}</td>
             <td><input type="text" name="firstName" value="${parameters.firstName?if_exists}"/></td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.PartyPartyGroupName} :</td>
+            <td class="label">${uiLabelMap.PartyPartyGroupName}</td>
             <td><input type="text" name="groupName" value="${parameters.groupName?if_exists}"/></td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.PartyRoleType} :</td>
+            <td class="label">${uiLabelMap.PartyRoleType}</td>
             <td>
               <select name="roleTypeId">
                 <#if currentRole?has_content>
@@ -91,33 +91,33 @@
             </td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.ProductInventoryItemId} :</td>
+            <td class="label">${uiLabelMap.ProductInventoryItemId}</td>
             <td><input type="text" name="inventoryItemId" value="${parameters.inventoryItemId?if_exists}"/></td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.ProductSerialNumber} :</td>
+            <td class="label">${uiLabelMap.ProductSerialNumber}</td>
             <td><input type="text" name="serialNumber" value="${parameters.serialNumber?if_exists}"/></td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.ProductSoftIdentifier} :</td>
+            <td class="label">${uiLabelMap.ProductSoftIdentifier}</td>
             <td><input type="text" name="softIdentifier" value="${parameters.softIdentifier?if_exists}"/></td>
           </tr>
           <#if extInfo == "P">
             <tr><td colspan="3"><hr/></td></tr>
             <tr>
-              <td class="label">${uiLabelMap.CommonAddress1} :</td>
+              <td class="label">${uiLabelMap.CommonAddress1}</td>
               <td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td>
             </tr>
             <tr>
-              <td class="label">${uiLabelMap.CommonAddress2} :</td>
+              <td class="label">${uiLabelMap.CommonAddress2}</td>
               <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td>
             </tr>
             <tr>
-              <td class="label">${uiLabelMap.CommonCity} :</td>
+              <td class="label">${uiLabelMap.CommonCity}</td>
               <td><input type="text" name="city" value="${parameters.city?if_exists}"/></td>
             </tr>
             <tr>
-              <td class="label">${uiLabelMap.CommonStateProvince} :</td>
+              <td class="label">${uiLabelMap.CommonStateProvince}</td>
               <td>
                 <select name="stateProvinceGeoId">
                   <#if currentStateGeo?has_content>
@@ -130,34 +130,34 @@
               </td>
             </tr>
             <tr>
-              <td class="label">${uiLabelMap.PartyPostalCode} :</td>
+              <td class="label">${uiLabelMap.PartyPostalCode}</td>
               <td><input type="text" name="postalCode" value="${parameters.postalCode?if_exists}"/></td>
             </tr>
           </#if>
           <#if extInfo == "T">
             <tr><td colspan="3"><hr/></td></tr>
             <tr>
-              <td class="label">${uiLabelMap.PartyCountryCode} :</td>
+              <td class="label">${uiLabelMap.PartyCountryCode}</td>
               <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td>
             </tr>
             <tr>
-              <td class="label">${uiLabelMap.PartyAreaCode} :</td>
+              <td class="label">${uiLabelMap.PartyAreaCode}</td>
               <td><input type="text" name="areaCode" value="${parameters.areaCode?if_exists}"/></td>
             </tr>
             <tr>
-              <td class="label">${uiLabelMap.PartyContactNumber} :</td>
+              <td class="label">${uiLabelMap.PartyContactNumber}</td>
               <td><input type="text" name="contactNumber" value="${parameters.contactNumber?if_exists}"/></td>
             </tr>
           </#if>
           <#if extInfo == "O">
             <tr><td colspan="3"><hr/></td></tr>
             <tr>
-              <td class="label">${uiLabelMap.PartyContactInformation} :</td>
+              <td class="label">${uiLabelMap.PartyContactInformation}</td>
               <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td>
             </tr>
           </#if>
           <tr><td colspan="3"><hr/></td></tr>
-          <tr>
+          <tr align="center">
             <td>&nbsp;</td>
             <td>
               <input type="submit" value="${uiLabelMap.PartyLookupParty}" onClick="javascript:document.lookupparty.submit();"/>
@@ -197,7 +197,7 @@
             </#if>
           </#if>
       </ul>
-      <br class="clear" />
+      <br class="clear"/>
     </div>
     <#if partyList?has_content>
       <table class="basic-table" cellspacing="0">
@@ -226,10 +226,10 @@
           <td>${uiLabelMap.PartyType}</td>
           <td>&nbsp;</td>
         </tr>
-        <#assign rowClass = "2">
+        <#assign alt_row = false>
         <#list partyList as partyRow>
           <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists>
-          <tr<#if rowClass == "1"> class="alternate-row"</#if>>
+          <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
             <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td>
             <td>
               <#if partyRow.containsKey("userLoginId")>
@@ -294,11 +294,7 @@
             </td>
           </tr>
           <#-- toggle the row color -->
-          <#if rowClass == "2">
-            <#assign rowClass = "1">
-          <#else>
-            <#assign rowClass = "2">
-          </#if>
+          <#assign alt_row = !alt_row>
         </#list>
       </table>
     <#else>
@@ -322,4 +318,4 @@
     <br/>
   </div>
 </#if>
-<!-- end findParty.ftl -->
+<!-- end findParty.ftl -->
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Mon Jan 21 14:31:57 2008
@@ -27,39 +27,38 @@
     <div class="screenlet-title-bar">
       <h3>${uiLabelMap.PartyLink}</h3>
     </div>
-    <div class="screenlet-body">
-      <center>
+    <div class="screenlet-body" align="center">      
         <#if partyTo?has_content && partyFrom?has_content>
           <form name="linkparty" method="post" action="<@ofbizUrl>setPartyLink</@ofbizUrl>">
             <div class="head1 alert">
               ${uiLabelMap.PartyLinkMessage1}
             </div>
-            <br />
+            <br/>
             <div>
-              <span class="label">${uiLabelMap.PartyLink}:</span>
+              <span class="label">${uiLabelMap.PartyLink}</span>
               <input type="hidden" name="partyId" value="${partyFrom.partyId}"/>
               <#if personFrom?has_content>
                 ${personFrom.lastName}, ${personFrom.firstName}
               <#elseif groupFrom?has_content>
                 ${groupFrom.groupName}
               <#else>
-                [${uiLabelMap.PartyUnknown}]
+                ${uiLabelMap.PartyUnknown}
               </#if>
-              &nbsp;[${partyFrom.partyId}]
+              &nbsp;${partyFrom.partyId}
             </div>
             <div>
-              <span class="label">${uiLabelMap.CommonTo}:</span>
+              <span class="label">${uiLabelMap.CommonTo}</span>
               <input type="hidden" name="partyIdTo" value="${partyTo.partyId}"/>
               <#if personTo?has_content>
                 ${personTo.lastName}, ${personTo.firstName}
               <#elseif groupTo?has_content>
                 ${groupTo.groupName}
               <#else>
-                [${uiLabelMap.PartyUnknown}]
+                ${uiLabelMap.PartyUnknown}
               </#if>
-              &nbsp;[${partyTo.partyId}]
+              &nbsp;${partyTo.partyId}
             </div>
-            <br />
+            <br/>
             <div>
               <a href="javascript:document.linkparty.submit()" class="smallSubmit">${uiLabelMap.CommonConfirm}</a>
             </div>
@@ -78,9 +77,8 @@
               <a href="javascript:document.linkpartycnf.submit()" class="smallSubmit">${uiLabelMap.CommonLink}</a>
             </div>
           </form>
-        </#if>
-      </center>
+        </#if>      
     </div>
   </div>
 </#if>
-<!-- end linkparty.ftl -->
+<!-- end linkparty.ftl -->
\ No newline at end of file