Index: applications/content/webapp/content/website/WebSiteTabBar.ftl =================================================================== --- applications/content/webapp/content/website/WebSiteTabBar.ftl (revision 504942) +++ applications/content/webapp/content/website/WebSiteTabBar.ftl (working copy) @@ -25,5 +25,5 @@ ${uiLabelMap.ContentWebSite} ${uiLabelMap.PartyParties} -
${uiLabelMap.ContentWebSite} <#if (webSite.siteName)?has_content>"${webSite.siteName}" [${uiLabelMap.CommonId}:${webSite.webSiteId}]
+
${uiLabelMap.ContentWebSite} <#if (webSite.siteName)?has_content>"${webSite.siteName}" [${uiLabelMap.CommonId}:${webSite.webSiteId}]
Index: applications/party/config/PartyUiLabels.properties =================================================================== --- applications/party/config/PartyUiLabels.properties (revision 504942) +++ applications/party/config/PartyUiLabels.properties (working copy) @@ -352,6 +352,7 @@ PartyNoContactInformation=No contact information on file. PartyNoContent=No Content PartyNoMatch=No records match. +PartyNoNameFound=No name found PartyNoNameGroup=No name (group) PartyNoNotesForParty=No notes for this party. PartyNoParent=No Parent Index: applications/party/webapp/partymgr/includes/appheader.ftl =================================================================== --- applications/party/webapp/partymgr/includes/appheader.ftl (revision 504942) +++ applications/party/webapp/partymgr/includes/appheader.ftl (working copy) @@ -22,32 +22,35 @@ <#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin> <#if (requestAttributes.checkLoginUrl)?exists><#assign checkLoginUrl = requestAttributes.checkLoginUrl> -<#assign unselectedLeftClassName = "headerButtonLeft"> -<#assign unselectedRightClassName = "headerButtonRight"> -<#assign selectedLeftClassMap = {(page.headerItem)?default("void") : "headerButtonLeftSelected"}> -<#assign selectedRightClassMap = {(page.headerItem)?default("void") : "headerButtonRightSelected"}> + +<#assign selected = page.headerItem?default("void")> -
 ${uiLabelMap.PartyManagerApplication} 
-
-
${uiLabelMap.CommonMain}
-
${uiLabelMap.CommonFind}
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> -
${uiLabelMap.CommonCreate}
- - <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> -
${uiLabelMap.PartyLink}
- -
${uiLabelMap.PartyCommunications}
-
${uiLabelMap.PartyVisits}
-
${uiLabelMap.PartyClassifications}
- <#if security.hasEntityPermission("SECURITY", "_VIEW", session)> -
${uiLabelMap.CommonSecurity}
- - <#if userLogin?has_content> -
${uiLabelMap.CommonLogout}
- <#else> -
${uiLabelMap.CommonLogin}
- -
${uiLabelMap.PageTitleAddressMatchMap}
-
 
+
+
${uiLabelMap.PartyManagerApplication}
+ + +
+ Index: applications/party/webapp/partymgr/includes/partymenus.ftl =================================================================== --- applications/party/webapp/partymgr/includes/partymenus.ftl (revision 0) +++ applications/party/webapp/partymgr/includes/partymenus.ftl (revision 0) @@ -0,0 +1,74 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap> +<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security> +<#assign selected = tabButtonItem?default("void")> + + +
+ +
+
+
+ +
+
+
+

${uiLabelMap.PartyTheProfileOf} +<#if lookupPerson?has_content> + ${lookupPerson.personalTitle?if_exists} + ${lookupPerson.firstName?if_exists} + ${lookupPerson.middleName?if_exists} + ${lookupPerson.lastName?if_exists} + ${lookupPerson.suffix?if_exists} +<#elseif lookupGroup?has_content> + ${lookupGroup.groupName} (${(lookupPartyType.get("description",locale))?if_exists}) +<#else> + (${uiLabelMap.PartyNoNameFound}) + +

+ Index: applications/party/webapp/partymgr/party/createparty.ftl =================================================================== --- applications/party/webapp/partymgr/party/createparty.ftl (revision 0) +++ applications/party/webapp/partymgr/party/createparty.ftl (revision 0) @@ -0,0 +1,38 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap> +<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security> + + +
+
+
${uiLabelMap.PartyCreateNewParty}
+
+
+

+
+
+ Index: applications/party/webapp/partymgr/party/findparty.ftl =================================================================== --- applications/party/webapp/partymgr/party/findparty.ftl (revision 504942) +++ applications/party/webapp/partymgr/party/findparty.ftl (working copy) @@ -17,6 +17,7 @@ under the License. --> + <#assign extInfo = parameters.extInfo?default("N")> -
-
-
-
- <#if parameters.hideFields?default("N") == "Y"> - ${uiLabelMap.CommonShowLookupFields} - <#else> - <#if partyList?exists>${uiLabelMap.CommonHideFields} - ${uiLabelMap.PartyLookupParty} - -
-
-
 ${uiLabelMap.PartyFindParty}
-
+
+
+ +
+
<#if parameters.hideFields?default("N") != "Y">
- - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#if extInfo == "P"> + - - - + + - - - + + - - - + + - - - + + - - - + + + + <#if extInfo == "T"> + - - - + + - - - + + - <#if extInfo == "P"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#if extInfo == "T"> - - - - - - - - - - - - - - - - - - <#if extInfo == "O"> - - - - - - - + + + + + + <#if extInfo == "O"> - + + -
${uiLabelMap.PartyContactInformation} : + checked="checked"/>${uiLabelMap.CommonNone}  + checked="checked"/>${uiLabelMap.PartyPostal}  + checked="checked"/>${uiLabelMap.PartyTelecom}  + checked="checked"/>${uiLabelMap.CommonOther}  +
${uiLabelMap.PartyPartyId} :
${uiLabelMap.PartyUserLogin} :
<${uiLabelMap.PartyLastName} :
${uiLabelMap.PartyFirstName} :
${uiLabelMap.PartyPartyGroupName} :
${uiLabelMap.PartyRoleType} : + +
${uiLabelMap.PartyContactInformation} :
  -
- checked="checked"/>${uiLabelMap.CommonNone}  - checked="checked"/>${uiLabelMap.PartyPostal}  - checked="checked"/>${uiLabelMap.PartyTelecom}  - checked="checked"/>${uiLabelMap.CommonOther}  -
- 		${uiLabelMap.CommonAddress1} :
${uiLabelMap.PartyPartyId} :
 ${uiLabelMap.CommonAddress2} :
${uiLabelMap.PartyUserLogin} :
 ${uiLabelMap.CommonCity} :
${uiLabelMap.PartyLastName} :
 ${uiLabelMap.CommonStateProvince} : + +
${uiLabelMap.PartyFirstName} :
 ${uiLabelMap.PartyPostalCode} :
${uiLabelMap.PartyPartyGroupName} :
 ${uiLabelMap.PartyCountryCode} :
${uiLabelMap.PartyRoleType} :
  - - ${uiLabelMap.PartyAreaCode} :
${uiLabelMap.CommonAddress1} :
 
${uiLabelMap.CommonAddress2} :
 
${uiLabelMap.CommonCity} :
 
${uiLabelMap.CommonStateProvince} :
  - -
${uiLabelMap.PartyPostalCode} :
 
${uiLabelMap.PartyCountryCode} :
 
${uiLabelMap.PartyAreaCode} :
 
${uiLabelMap.PartyContactNumber} :
 
${uiLabelMap.PartyContactInfoList} :
 
${uiLabelMap.PartyContactNumber} :
-
- ${uiLabelMap.PartyLookupParty} - ${uiLabelMap.CommonShowAllRecords} -
- 		${uiLabelMap.PartyContactInfoList} :
- + +
+ +   + + ${uiLabelMap.PartyLookupParty} + ${uiLabelMap.CommonShowAllRecords} + + + +
@@ -199,136 +180,107 @@ //--> - <#if partyList?exists> -
- - - + + + <#-- toggle the row color --> + <#if rowClass == "viewManyTR2"> + <#assign rowClass = "viewManyTR1"> + <#else> + <#assign rowClass = "viewManyTR2"> + + +
- - - - - -
${uiLabelMap.PartyPartiesFound}
 -
- <#if (partyListSize > 0)> - <#if (viewIndex > 0)> - " class="submenutext">${uiLabelMap.CommonPrevious} - <#else> - ${uiLabelMap.CommonPrevious} - - ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize} - <#if (partyListSize > highIndex)> - " class="submenutextright">${uiLabelMap.CommonNext} - <#else> - ${uiLabelMap.CommonNext} - +<#if partyList?exists> +
+
+
+
    +
  • ${uiLabelMap.PartyPartiesFound}
    • + <#if (partyListSize > 0)> + <#if (partyListSize > highIndex)> +
  • ">${uiLabelMap.CommonNext}
    • + <#else> +
  • ${uiLabelMap.CommonNext}
    • + +
  • ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}
    • + <#if (viewIndex > 0)> +
  • ">${uiLabelMap.CommonPrevious}
    • + <#else> +
  • ${uiLabelMap.CommonPrevious}
    • + + +
+
+
+ <#if partyList?has_content> + + + + + + <#if extInfo?default("") == "P"> + + + <#if extInfo?default("") == "T"> + + + + + + <#assign rowClass = "viewManyTR2"> + <#list partyList as partyRow> + <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists> + + + - -
${uiLabelMap.PartyPartyId}${uiLabelMap.PartyUserLogin}${uiLabelMap.PartyName}${uiLabelMap.PartyPostalCode}${uiLabelMap.PartyAreaCode}${uiLabelMap.PartyType} 
${partyRow.partyId} + <#if partyRow.containsKey("userLoginId")> + ${partyRow.userLoginId?default("N/A")} + <#else> + <#assign userLogins = partyRow.getRelated("UserLogin")> + <#if (userLogins.size() > 0)> + <#if (userLogins.size() > 1)> + (${uiLabelMap.CommonMany}) + <#else> + <#assign userLogin = userLogins.get(0)> + ${userLogin.userLoginId} -   - -
- - - - - - - <#if extInfo?default("") == "P"> - - - <#if extInfo?default("") == "T"> - - - - - - - <#if partyList?has_content> - <#assign rowClass = "viewManyTR2"> - <#list partyList as partyRow> - <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists> - - - - - <#if extInfo?default("") == "P"> - - - <#if extInfo?default("") == "T"> - - - - - - <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> <#else> - <#assign rowClass = "viewManyTR2"> + (${uiLabelMap.CommonNone}) - - <#else> - - - + + + + <#if extInfo?default("") == "P"> + - <#if lookupErrorMessage?exists> - - - + <#if extInfo?default("") == "T"> + -
${uiLabelMap.PartyPartyId}
${uiLabelMap.PartyUserLogin}
${uiLabelMap.PartyName}
${uiLabelMap.PartyPostalCode}
${uiLabelMap.PartyAreaCode}
${uiLabelMap.PartyType}
 
${partyRow.partyId} -
- <#if partyRow.containsKey("userLoginId")> - ${partyRow.userLoginId?default("N/A")} - <#else> - <#assign userLogins = partyRow.getRelated("UserLogin")> - <#if (userLogins.size() > 0)> - <#if (userLogins.size() > 1)> - (${uiLabelMap.CommonMany}) - <#else> - <#assign userLogin = userLogins.get(0)> - ${userLogin.userLoginId} - - <#else> - (${uiLabelMap.CommonNone}) - - -
- 		-
- <#if partyRow.containsKey("lastName")> - <#if partyRow.lastName?has_content> - ${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName} - <#else> - (${uiLabelMap.PartyNoNameFound}) - - <#elseif partyRow.containsKey("groupName")> - <#if partyRow.groupName?has_content> - ${partyRow.groupName} - <#else> - (${uiLabelMap.PartyNoNameFound}) - - <#else> - ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)} - -
-
${partyRow.postalCode?if_exists}
${partyRow.areaCode?if_exists}
<#if partyType.description?exists>${partyType.get("description", locale)}<#else>???
 - -
- ${uiLabelMap.CommonDetails}  - <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)> - ${uiLabelMap.OrderOrders}  - - <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> - ${uiLabelMap.OrderNewOrder}  - -
-
- ${uiLabelMap.PartyNoPartiesFound} -   ${uiLabelMap.CommonCreateNew} -
+ <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)> + <#if partyName?has_content> + ${partyName} + <#else> + (${uiLabelMap.PartyNoNameFound}) + + ${partyRow.postalCode?if_exists}
${lookupErrorMessage}
${partyRow.areaCode?if_exists}
-
- + 		<#if partyType.description?exists>${partyType.get("description", locale)}<#else>??? + ${uiLabelMap.CommonDetails} + <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)> + ${uiLabelMap.OrderOrders} + + <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> + ${uiLabelMap.OrderNewOrder} + +
+ <#else> +
+ ${uiLabelMap.PartyNoPartiesFound} + ${uiLabelMap.CommonCreateNew} +
+ + <#if lookupErrorMessage?exists> +

${lookupErrorMessage}

+ +
+ + Index: applications/party/webapp/partymgr/party/PartyForms.xml =================================================================== --- applications/party/webapp/partymgr/party/PartyForms.xml (revision 504942) +++ applications/party/webapp/partymgr/party/PartyForms.xml (working copy) @@ -20,8 +20,7 @@ -
+ @@ -48,9 +47,8 @@ -
- + + @@ -248,9 +246,7 @@ -
+ @@ -259,9 +255,9 @@ - - - + + + @@ -273,8 +269,8 @@ - - + + @@ -282,40 +278,40 @@ - + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - + + + Index: applications/party/webapp/partymgr/party/viewprofile.ftl =================================================================== --- applications/party/webapp/partymgr/party/viewprofile.ftl (revision 504942) +++ applications/party/webapp/partymgr/party/viewprofile.ftl (working copy) @@ -17,444 +17,413 @@ under the License. --> + <#if party?has_content> -
- <#if showOld> - ${uiLabelMap.PartyHideOld} - <#else> - ${uiLabelMap.PartyShowOld} - -
-
- -
-
+
+ <#if showOld> + ${uiLabelMap.PartyHideOld} + <#else> + ${uiLabelMap.PartyShowOld} + +
+
+
+
+
+ +
-<#if lookupPerson?has_content> - - - - - - - <#if lookupPerson.nickname?has_content> - - - <#if lookupPerson.gender?has_content> - - - <#if lookupPerson.birthDate?has_content> - - - <#if lookupPerson.height?has_content> - - - <#if lookupPerson.weight?has_content> - - - <#if lookupPerson.mothersMaidenName?has_content> - - - <#if lookupPerson.maritalStatus?has_content> - - - <#if lookupPerson.socialSecurityNumber?has_content> - - - <#if lookupPerson.passportNumber?has_content> - - - <#if lookupPerson.passportExpireDate?has_content> - - - <#if lookupPerson.totalYearsWorkExperience?has_content> - - - <#if lookupPerson.comments?has_content> - - -
${uiLabelMap.PartyName}
  -
- ${lookupPerson.personalTitle?if_exists} - ${lookupPerson.firstName?if_exists} - ${lookupPerson.middleName?if_exists} - ${lookupPerson.lastName?if_exists} - ${lookupPerson.suffix?if_exists} -
-
${uiLabelMap.PartyNickname}
 
${lookupPerson.nickname}
${uiLabelMap.PartyGender}
 
${lookupPerson.gender}
${uiLabelMap.PartyBirthDate}
 
${lookupPerson.birthDate.toString()}
${uiLabelMap.PartyHeight}
 
${lookupPerson.height}
${uiLabelMap.PartyWeight}
 
${lookupPerson.weight}
${uiLabelMap.PartyMothersMaidenName}
 
${lookupPerson.mothersMaidenName}
${uiLabelMap.PartyMaritalStatus}
 
${lookupPerson.maritalStatus}
${uiLabelMap.PartySocialSecurityNumber}
 
${lookupPerson.socialSecurityNumber}
${uiLabelMap.PartyPassportNumber}
 
${lookupPerson.passportNumber}
${uiLabelMap.PartyPassportExpire}
 
${lookupPerson.passportExpireDate.toString()}
${uiLabelMap.PartyYearsWork}
 
${lookupPerson.totalYearsWorkExperience}
${uiLabelMap.PartyComments}
 
${lookupPerson.comments}
-<#elseif lookupGroup?has_content> -
${lookupGroup.groupName} (${(lookupPartyType.get("description",locale))?if_exists})
-<#else> -
${uiLabelMap.PartyInformationNotFound}
- - <#if partyNameHistoryList?has_content> + <#if lookupPerson?has_content> + + + + + + <#if lookupPerson.nickname?has_content> + + + <#if lookupPerson.gender?has_content> + + + <#if lookupPerson.birthDate?has_content> + + + <#if lookupPerson.height?has_content> + + + <#if lookupPerson.weight?has_content> + + + <#if lookupPerson.mothersMaidenName?has_content> + + + <#if lookupPerson.maritalStatus?has_content> + + + <#if lookupPerson.socialSecurityNumber?has_content> + + + <#if lookupPerson.passportNumber?has_content> + + + <#if lookupPerson.passportExpireDate?has_content> + + + <#if lookupPerson.totalYearsWorkExperience?has_content> + + + <#if lookupPerson.comments?has_content> + + +
${uiLabelMap.PartyName} + ${lookupPerson.personalTitle?if_exists} + ${lookupPerson.firstName?if_exists} + ${lookupPerson.middleName?if_exists} + ${lookupPerson.lastName?if_exists} + ${lookupPerson.suffix?if_exists} +
${uiLabelMap.PartyNickname}${lookupPerson.nickname}
${uiLabelMap.PartyGender}${lookupPerson.gender}
${uiLabelMap.PartyBirthDate}${lookupPerson.birthDate.toString()}
${uiLabelMap.PartyHeight}${lookupPerson.height}
${uiLabelMap.PartyWeight}${lookupPerson.weight}
${uiLabelMap.PartyMothersMaidenName}${lookupPerson.mothersMaidenName}
${uiLabelMap.PartyMaritalStatus}${lookupPerson.maritalStatus}
${uiLabelMap.PartySocialSecurityNumber}${lookupPerson.socialSecurityNumber}
${uiLabelMap.PartyPassportNumber}${lookupPerson.passportNumber}
${uiLabelMap.PartyPassportExpire}${lookupPerson.passportExpireDate.toString()}
${uiLabelMap.PartyYearsWork}${lookupPerson.totalYearsWorkExperience}
${uiLabelMap.PartyComments}${lookupPerson.comments}
+ <#elseif lookupGroup?has_content> +
${lookupGroup.groupName} (${(lookupPartyType.get("description",locale))?if_exists})
+ <#else> +
${uiLabelMap.PartyInformationNotFound}
+ + <#if partyNameHistoryList?has_content>
-
${uiLabelMap.PartyHistoryName}
+
${uiLabelMap.PartyHistoryName}
<#list partyNameHistoryList as partyNameHistory> - <#if lookupPerson?has_content> -
${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.personalTitle?if_exists} ${partyNameHistory.firstName?if_exists} ${partyNameHistory.middleName?if_exists} ${partyNameHistory.lastName?if_exists} ${partyNameHistory.suffix?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})
- <#elseif lookupGroup?has_content> -
${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.groupName?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})
- + <#if lookupPerson?has_content> +
${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.personalTitle?if_exists} ${partyNameHistory.firstName?if_exists} ${partyNameHistory.middleName?if_exists} ${partyNameHistory.lastName?if_exists} ${partyNameHistory.suffix?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})
+ <#elseif lookupGroup?has_content> +
${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.groupName?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})
+ - +
-
+
<#-- ============================================================= --> -<#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists> -
-
-
 ${uiLabelMap.PartyLoyaltyPoints}
+ <#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists> +
+
+
${uiLabelMap.PartyLoyaltyPoints}
+
+
+ ${uiLabelMap.PartyYouHave} ${totalSubRemainingAmount} ${uiLabelMap.PartyPointsFrom} ${totalOrders} ${uiLabelMap.PartyOrderInLast} ${monthsToInclude} ${uiLabelMap.CommonMonths}. +
-
-
${uiLabelMap.PartyYouHave} ${totalSubRemainingAmount} ${uiLabelMap.PartyPointsFrom} ${totalOrders} ${uiLabelMap.PartyOrderInLast} ${monthsToInclude} ${uiLabelMap.CommonMonths}.
-
-
- + <#-- ============================================================= --> -
-
-
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> - ${uiLabelMap.CommonCreateNew} - -
-
 ${uiLabelMap.PartyContactInformation}
+
+
+
    +
  • ${uiLabelMap.PartyContactInformation}
    • + <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> +
  • ${uiLabelMap.CommonCreateNew}
    • + +
+
- <#if contactMeches?has_content> - - - - - - - - - <#list contactMeches as contactMechMap> - <#assign contactMech = contactMechMap.contactMech> - <#assign partyContactMech = contactMechMap.partyContactMech> - + <#if contactMeches?has_content> +
${uiLabelMap.PartyContactType}
 
${uiLabelMap.PartyContactInformation}
${uiLabelMap.PartyContactSolicitingOk}
 
- - - + + + + + <#list contactMeches as contactMechMap> + <#assign contactMech = contactMechMap.contactMech> + <#assign partyContactMech = contactMechMap.partyContactMech> + + + + - - - <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> - - - <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)> - - - - -
-
 ${contactMechMap.contactMechType.get("description",locale)}
- 		  - <#list contactMechMap.partyContactMechPurposes as partyContactMechPurpose> + ${uiLabelMap.PartyContactType}${uiLabelMap.PartyContactInformation}${uiLabelMap.PartyContactSolicitingOk} 
${contactMechMap.contactMechType.get("description",locale)} + <#list contactMechMap.partyContactMechPurposes as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> -
- <#if contactMechPurposeType?has_content> - ${contactMechPurposeType.get("description",locale)} - <#else> - ${uiLabelMap.PartyMechPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}" - - <#if partyContactMechPurpose.thruDate?has_content> +
+ <#if contactMechPurposeType?has_content> + ${contactMechPurposeType.get("description",locale)} + <#else> + ${uiLabelMap.PartyMechPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}" + + <#if partyContactMechPurpose.thruDate?has_content> (${uiLabelMap.CommonExpire}: ${partyContactMechPurpose.thruDate.toString()}) - -
- - <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId> + +
+ + <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId> <#assign postalAddress = contactMechMap.postalAddress> -
- <#if postalAddress.toName?has_content>${uiLabelMap.PartyAddrToName}: ${postalAddress.toName}
- <#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}
- ${postalAddress.address1?if_exists}
- <#if postalAddress.address2?has_content>${postalAddress.address2}
+
+ <#if postalAddress.toName?has_content>${uiLabelMap.PartyAddrToName}: ${postalAddress.toName}
+ <#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}
+ ${postalAddress.address1?if_exists}
+ <#if postalAddress.address2?has_content>${postalAddress.address2}
${postalAddress.city?if_exists}, <#if postalAddress.stateProvinceGeoId?has_content> - <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")> - ${stateProvince.abbreviation?default(stateProvince.geoId)} + <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")> + ${stateProvince.abbreviation?default(stateProvince.geoId)} ${postalAddress.postalCode?if_exists} - <#if postalAddress.countryGeoId?has_content>
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")> - ${country.geoName?default(country.geoId)} + <#if postalAddress.countryGeoId?has_content>
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")> + ${country.geoName?default(country.geoId)}
<#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> - <#assign addr1 = postalAddress.address1?if_exists> - <#if (addr1.indexOf(" ") > 0)> - <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> - <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> - (lookup:whitepages.com) - + <#assign addr1 = postalAddress.address1?if_exists> + <#if (addr1.indexOf(" ") > 0)> + <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> + <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> + (lookup:whitepages.com) + - <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> + <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> -
+
${telecomNumber.countryCode?if_exists} <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-${telecomNumber.contactNumber?default("000-0000")} <#if partyContactMech.extension?has_content>${uiLabelMap.PartyContactExt} ${partyContactMech.extension} <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> - (lookup:anywho.com) - (lookup:whitepages.com) + (lookup:anywho.com) + (lookup:whitepages.com)
- <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> -
+ <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> +
${contactMech.infoString?if_exists} - (${uiLabelMap.CommonSendEmail}) + (${uiLabelMap.CommonSendEmail})
- <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId> -
+ <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId> +
${contactMech.infoString?if_exists} <#assign openAddress = contactMech.infoString?default("")> <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress> - (${uiLabelMap.CommonOpenPageNewWindow}) + (${uiLabelMap.CommonOpenPageNewWindow})
- <#else> -
- ${contactMech.infoString?if_exists} -
- -
(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})
- <#if partyContactMech.thruDate?has_content>
${uiLabelMap.PartyContactEffectiveThru}: ${partyContactMech.thruDate.toString()}
- <#-- create cust request --> - <#if custRequestTypes?exists> -
- - - - - - - -
- -
(${partyContactMech.allowSolicitation?if_exists})
  - - - -
- <#else> -
${uiLabelMap.PartyNoContactInformation}
- + <#else> +
${contactMech.infoString?if_exists}
+ +
(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})
+ <#if partyContactMech.thruDate?has_content>
${uiLabelMap.PartyContactEffectiveThru}: ${partyContactMech.thruDate.toString()}
+ <#-- create cust request --> + <#if custRequestTypes?exists> +
+ + + + + +
+ + + (${partyContactMech.allowSolicitation?if_exists}) + + <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> + ${uiLabelMap.CommonUpdate} + + <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)> + ${uiLabelMap.CommonExpire} + + + + + + <#else> + ${uiLabelMap.PartyNoContactInformation} +
-
+
<#-- Payment Info ============================================================= --> -
-
-
- <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)> - ${uiLabelMap.AccountingCreateNewCreditCard} - ${uiLabelMap.AccountingCreateNewGiftCard} - ${uiLabelMap.AccountingCreateNewEftAccount} - -
-
 ${uiLabelMap.PartyPaymentMethodInformation}
+
+
+ +
- <#if paymentMethodValueMaps?has_content> - + <#if paymentMethodValueMaps?has_content> +
+ <#list paymentMethodValueMaps as paymentMethodValueMap> + <#assign paymentMethod = paymentMethodValueMap.paymentMethod/> - + <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId> + <#assign creditCard = paymentMethodValueMap.creditCard/> + + + --> + <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId> + <#assign giftCard = paymentMethodValueMap.giftCard> + + + --> + <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId> + <#assign eftAccount = paymentMethodValueMap.eftAccount> + + + --> + <#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId> + + + --> + + <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session)> + ${uiLabelMap.CommonExpire} + <#else> +   + + <#-- closes out orphaned -
- - <#list paymentMethodValueMaps as paymentMethodValueMap> - <#assign paymentMethod = paymentMethodValueMap.paymentMethod/> - - <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId> - <#assign creditCard = paymentMethodValueMap.creditCard/> - - - - <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId> - <#assign giftCard = paymentMethodValueMap.giftCard> - - - - <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId> - <#assign eftAccount = paymentMethodValueMap.eftAccount> - - - - <#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId> - - - - - - - -
-
- - ${uiLabelMap.AccountingCreditCard}:  - <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}  - <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard}  - ${creditCard.firstNameOnCard}  - <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard}  - ${creditCard.lastNameOnCard} - <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard} -  -  - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> - ${creditCard.cardType} - ${creditCard.cardNumber} - ${creditCard.expireDate} - <#else> - ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} - - - <#if paymentMethod.description?has_content>(${paymentMethod.description}) - <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) - <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) - <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate}) -
- 		  -
- <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)> - Manual Tx - - <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> - ${uiLabelMap.CommonUpdate} - -
- 		-
- - ${uiLabelMap.AccountingGiftCard}: - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> - ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}] - <#else> - <#if giftCard?has_content && giftCard.cardNumber?has_content> - <#assign giftCardNumber = ""> - <#assign pcardNumber = giftCard.cardNumber> - <#if pcardNumber?has_content> - <#assign psize = pcardNumber?length - 4> - <#if 0 < psize> - <#list 0 .. psize-1 as foo> - <#assign giftCardNumber = giftCardNumber + "*"> - - <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]> - <#else> - <#assign giftCardNumber = pcardNumber> - - - - ${giftCardNumber?default("N/A")} - - - <#if paymentMethod.description?has_content>(${paymentMethod.description}) - <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) - <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) - <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()} -
- 		  - <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> - - - -
- - ${uiLabelMap.PartyEftAccount}: ${eftAccount.nameOnAccount} - <#if eftAccount.bankName?has_content>${uiLabelMap.PartyBank}: ${eftAccount.bankName} <#if eftAccount.accountNumber?has_content>${uiLabelMap.PartyAccount} #: ${eftAccount.accountNumber} - - <#if paymentMethod.description?has_content>(${paymentMethod.description}) - <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) - <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) - <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()} -
- 		  - <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> - - - -
- Company Check - <#if paymentMethod.description?has_content>(${paymentMethod.description}) - <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) - <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) - <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()} -
- 		   - <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session)> - - -
- 		+ ${uiLabelMap.AccountingCreditCard} + + <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}  + <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard}  + ${creditCard.firstNameOnCard}  + <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard}  + ${creditCard.lastNameOnCard} + <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard} +  -  + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> + ${creditCard.cardType} + ${creditCard.cardNumber} + ${creditCard.expireDate} + <#else> + ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} + + <#if paymentMethod.description?has_content>(${paymentMethod.description}) + <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) + <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) + <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate}) + + <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)> + Manual Tx + + <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> + ${uiLabelMap.CommonUpdate} + + <#-- + ${uiLabelMap.AccountingGiftCard} + + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> + ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}] + <#else> + <#if giftCard?has_content && giftCard.cardNumber?has_content> + <#assign giftCardNumber = ""> + <#assign pcardNumber = giftCard.cardNumber> + <#if pcardNumber?has_content> + <#assign psize = pcardNumber?length - 4> + <#if 0 < psize> + <#list 0 .. psize-1 as foo> + <#assign giftCardNumber = giftCardNumber + "*"> + + <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]> + <#else> + <#assign giftCardNumber = pcardNumber> + + + + ${giftCardNumber?default("N/A")} + + <#if paymentMethod.description?has_content>(${paymentMethod.description}) + <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) + <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) + <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()} + + <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> + ${uiLabelMap.CommonUpdate} + + <#-- + ${uiLabelMap.PartyEftAccount} + + ${eftAccount.nameOnAccount} - <#if eftAccount.bankName?has_content>${uiLabelMap.PartyBank}: ${eftAccount.bankName} <#if eftAccount.accountNumber?has_content>${uiLabelMap.PartyAccount} #: ${eftAccount.accountNumber} <#if paymentMethod.description?has_content>(${paymentMethod.description}) + <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) + <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) + <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()} + + <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> + ${uiLabelMap.CommonUpdate} + + <#-- + <#-- TODO: Convert hard-coded text to UI label properties --> + Company Check + + <#if paymentMethod.description?has_content>(${paymentMethod.description}) + <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId}) + <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists}) + <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()} + +   + <#-- elements inside conditionals -->
- <#else> -
${uiLabelMap.PartyNoPaymentMethodInformation}
- + + + <#else> + ${uiLabelMap.PartyNoPaymentMethodInformation} +
-
+
<#-- AVS Strings --> -
-
-
 ${uiLabelMap.PartyCybersourceAvsOver}
+
+
+
${uiLabelMap.PartyCybersourceAvsOver}
-
- ${uiLabelMap.PartyAvsString}: ${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")} - <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> - ${uiLabelMap.CommonEdit} - <#if avsOverride?exists> - ${uiLabelMap.CommonReset} - - -
+ ${uiLabelMap.PartyAvsString}${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")} + <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> + ${uiLabelMap.CommonEdit} + <#if avsOverride?exists> + ${uiLabelMap.CommonReset} + +
-
+
<#-- UserLogins --> -
-
-
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> - ${uiLabelMap.CommonCreateNew} - -
-
 ${uiLabelMap.PartyUserName}
+
+
+ +
- <#if userLogins?exists> - + <#if userLogins?exists> +
<#list userLogins as userUserLogin> - - - - - + + + - - + + +
${uiLabelMap.PartyUserLogin}
 
${userUserLogin.userLoginId}
 -
+
${uiLabelMap.PartyUserLogin}${userUserLogin.userLoginId} <#assign enabled = uiLabelMap.PartyEnabled> <#if (userUserLogin.enabled)?default("Y") == "N"> <#if userUserLogin.disabledDateTime?exists> @@ -465,227 +434,223 @@ <#assign enabled = uiLabelMap.PartyDisabled + " - " + disabledTime> ${enabled} - - - <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> - ${uiLabelMap.CommonEdit}  - - <#if security.hasEntityPermission("SECURITY", "_VIEW", session)> - ${uiLabelMap.PartySecurityGroups}  - -
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> + ${uiLabelMap.CommonEdit} + + <#if security.hasEntityPermission("SECURITY", "_VIEW", session)> + ${uiLabelMap.PartySecurityGroups} + +
- <#else> -
${uiLabelMap.PartyNoUserLogin}
- + <#else> + ${uiLabelMap.PartyNoUserLogin} +
-
+
<#-- Party Attributes --> -
-
-
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> - ${uiLabelMap.CommonCreateNew} - -
-
 ${uiLabelMap.PartyAttributes}
+
+
+ +
- <#if attributes?has_content> - - <#list attributes as attr> - - - - - - -
-
 ${uiLabelMap.CommonName}: ${attr.attrName}
- 		-
 ${uiLabelMap.CommonValue}: ${attr.attrValue}
- 		- ${uiLabelMap.CommonEdit} -
- <#else> -
${uiLabelMap.PartyNoPartyAttributesFound}
- + <#if attributes?has_content> + + <#list attributes as attr> + + + + + + +
+ ${uiLabelMap.CommonName}: ${attr.attrName} + + ${uiLabelMap.CommonValue}: ${attr.attrValue} + + ${uiLabelMap.CommonEdit} +
+ <#else> + ${uiLabelMap.PartyNoPartyAttributesFound} +
-
+
<#-- Visits --> -
-
-
- ${uiLabelMap.CommonListAll} -
-
 ${uiLabelMap.PartyLastVisit}
+
+
+ +
- <#if visits?exists> - - - - - - - - - + <#if visits?has_content> +
${uiLabelMap.PartyVisitId}
${uiLabelMap.PartyUserLogin}
${uiLabelMap.PartyNewUser}
${uiLabelMap.PartyWebApp}
${uiLabelMap.PartyClientIP}
${uiLabelMap.CommonFromDate}
${uiLabelMap.CommonThruDate}
+ + + + + + + + - - - <#list visits as visitObj> - <#if (visitObj_index > 4)><#break> - - - - - - - - - + <#if (visitObj_index > 4)><#break> + + + + + + + + +
${uiLabelMap.PartyVisitId}${uiLabelMap.PartyUserLogin}${uiLabelMap.PartyNewUser}${uiLabelMap.PartyWebApp}${uiLabelMap.PartyClientIP}${uiLabelMap.CommonFromDate}${uiLabelMap.CommonThruDate}
${visitObj.visitId?if_exists}
${visitObj.userLoginId?if_exists}
${visitObj.userCreated?if_exists}
${visitObj.webappName?if_exists}
${visitObj.clientIpAddress?if_exists}
${(visitObj.fromDate.toString())?if_exists}
${(visitObj.thruDate.toString())?if_exists}
+ ${visitObj.visitId?if_exists} + ${visitObj.userLoginId?if_exists}${visitObj.userCreated?if_exists}${visitObj.webappName?if_exists}${visitObj.clientIpAddress?if_exists}${(visitObj.fromDate.toString())?if_exists}${(visitObj.thruDate.toString())?if_exists}
- <#else> -
${uiLabelMap.PartyNoVisitFound}
- + <#else> + ${uiLabelMap.PartyNoVisitFound} +
-
+
<#-- Current Cart --> -<#if isCustomer?exists> -
-
-
+ <#if isCustomer?exists> +
+
+
    +
  • ${uiLabelMap.PartyCurrentShoppingCart}
    • <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> - <#if savedCartListId?has_content> - <#assign listParam = "&shoppingListId=" + savedCartListId> - <#else> - <#assign listParam = ""> - - ${uiLabelMap.CommonEdit} + <#if savedCartListId?has_content> + <#assign listParam = "&shoppingListId=" + savedCartListId> + <#else> + <#assign listParam = ""> + +
  • ${uiLabelMap.CommonEdit}
    • -
-
 ${uiLabelMap.PartyCurrentShoppingCart}
-
-
+ +
+
+
<#if savedCartItems?has_content> - - - - - - - - +
${uiLabelMap.PartySequenceId}
${uiLabelMap.PartyProductId}
${uiLabelMap.PartyQuantity}
${uiLabelMap.PartyQuantityPurchased}
  
+ + + + + - - - <#list savedCartItems as savedCartItem> - - - + + + +
${uiLabelMap.PartySequenceId}${uiLabelMap.PartyProductId}${uiLabelMap.PartyQuantity}${uiLabelMap.PartyQuantityPurchased}
${savedCartItem.shoppingListItemSeqId?if_exists}
${savedCartItem.productId?if_exists} -
${savedCartItem.quantity?if_exists}
${savedCartItem.quantityPurchased?if_exists}
${savedCartItem.shoppingListItemSeqId?if_exists}${savedCartItem.productId?if_exists}${savedCartItem.quantity?if_exists}${savedCartItem.quantityPurchased?if_exists}
<#else> -
${uiLabelMap.PartyNoShoppingCartSavedForParty}
+ ${uiLabelMap.PartyNoShoppingCartSavedForParty} +
-
- + <#-- Party Content --> -
-
-
 ${uiLabelMap.PartyContent}
+
+
+
${uiLabelMap.PartyContent}
- - <#if partyContent?has_content> - <#list partyContent as pContent> - <#assign content = pContent.getRelatedOne("Content")> - <#assign contentType = content.getRelatedOneCache("ContentType")> - <#assign mimeType = content.getRelatedOneCache("MimeType")?if_exists> - <#assign status = content.getRelatedOneCache("StatusItem")> - <#assign pcPurpose = pContent.getRelatedOne("Enumeration")> - - - - - - - <#-- --> - - - - <#else> -
${uiLabelMap.PartyNoContent}
- + <#if partyContent?has_content> +
${content.contentId} -
${pcPurpose.description?if_exists}
${content.contentName?if_exists}
${(contentType.get("description",locale))?if_exists}
${(mimeType.description)?if_exists}
${(status.get("description",locale))?if_exists}
${contentRole.fromDate?if_exists}
 - ${uiLabelMap.CommonView} - ${uiLabelMap.CommonRemove} -
+ <#list partyContent as pContent> + <#assign content = pContent.getRelatedOne("Content")> + <#assign contentType = content.getRelatedOneCache("ContentType")> + <#assign mimeType = content.getRelatedOneCache("MimeType")?if_exists> + <#assign status = content.getRelatedOneCache("StatusItem")> + <#assign pcPurpose = pContent.getRelatedOne("Enumeration")> + + + + + + + + <#-- --> + + +
${content.contentId}${pcPurpose.description?if_exists}${content.contentName?if_exists}${(contentType.get("description",locale))?if_exists}${(mimeType.description)?if_exists}${(status.get("description",locale))?if_exists}${contentRole.fromDate?if_exists} + ${uiLabelMap.CommonView} + ${uiLabelMap.CommonRemove} +
-
 
-
-
${uiLabelMap.PartyAttachContent} -
 
-
- - - - - - - - -
-
+ <#else> + ${uiLabelMap.PartyNoContent} + +
+
${uiLabelMap.PartyAttachContent}
+
+ + + + + + + + +
-
+
<#-- Party Notes --> -
-
-
- <#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)> - ${uiLabelMap.CommonCreateNew} - -
-
 ${uiLabelMap.CommonNotes}
+
+
+ +
- <#if notes?has_content> + <#if notes?has_content> <#list notes as noteRef> - - <#if noteRef_has_next> @@ -693,12 +658,13 @@
-
 ${uiLabelMap.CommonBy}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, noteRef.noteParty, true)}
-
 ${uiLabelMap.CommonAt}: ${noteRef.noteDateTime.toString()}
+ 		+
${uiLabelMap.CommonBy}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, noteRef.noteParty, true)}
+
${uiLabelMap.CommonAt}: ${noteRef.noteDateTime.toString()}
 -
${noteRef.noteInfo}
+ 		+ ${noteRef.noteInfo}
- <#else> -
${uiLabelMap.PartyNoNotesForParty}
- + <#else> + ${uiLabelMap.PartyNoNotesForParty} +
-
+
<#else> - ${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${partyId?if_exists} + ${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${partyId?if_exists} + Index: applications/party/widget/partymgr/CommonScreens.xml =================================================================== --- applications/party/widget/partymgr/CommonScreens.xml (revision 504942) +++ applications/party/widget/partymgr/CommonScreens.xml (working copy) @@ -64,60 +64,11 @@
- - - - -
- - - - - -
-
- - - - -
-
- - - - - -
- - - -
- - - - - - - - - - -
- - + + +
- @@ -275,3 +226,11 @@ + + + + + + + + Index: applications/party/widget/partymgr/PartyScreens.xml =================================================================== --- applications/party/widget/partymgr/PartyScreens.xml (revision 504942) +++ applications/party/widget/partymgr/PartyScreens.xml (working copy) @@ -533,18 +533,9 @@ - - - - - - - - - - - + + + Index: framework/images/webapp/images/maincss.css =================================================================== --- framework/images/webapp/images/maincss.css (revision 504942) +++ framework/images/webapp/images/maincss.css (working copy) @@ -21,54 +21,60 @@ /* See the "ecommain.css" file for ecommerce. */ /* ===== General Styles ===== */ +a, a:visited { +color: #000099; +text-decoration: none; +} + +a:hover { +text-decoration: underline; +} + BODY { -font-size: 10px; +font-size: 62.5%; text-decoration: none; font-family: Verdana, Arial, Helvetica, sans-serif; background: #D4D0C8; -margin-top: 0px; -margin-right: 0px; -margin-bottom: 0px; -margin-left: 0px; +margin: 0; } FORM { -margin: 0px; +margin: 0; } -INPUT { +INPUT, .inputBox { font-family: Verdana, Arial, Helvetica, sans-serif; background: #FFFFFF; -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; +font-size: 1.1em; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em; } /* The "smallSubmit" class can be used to decorate links (A elements) and make them similar to form's buttons. */ INPUT[type="submit"], .smallSubmit { font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 8pt; +font-size: 1.1em; font-weight: bold; text-decoration: none; color: #000099; -background: white; -border: #999999 solid 1px; -margin: 2px; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em; } INPUT[type="submit"]:hover, .smallSubmit:hover { -color: red; +color: #ff0000; text-decoration: underline; } -SELECT { +SELECT, .selectBox { font-family: Verdana, Arial, Helvetica, sans-serif; background: #FFFFFF; -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; +font-size: 1.1em; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em; } UL { @@ -77,22 +83,22 @@ } H1 { -margin: 0px; -font-size: 12pt; +margin: 0; +font-size: 1.6em; font-weight: bold; color: #000099; } H2 { -margin: 0px; -font-size: 10pt; +margin: 0; +font-size: 1.2em; font-weight: bold; color: #000000; } H3 { -margin: 0px; -font-size: 8pt; +margin: 0; +font-size: 1.1em; font-weight: bold; color: #000000; } @@ -102,42 +108,42 @@ } TH, .tableheadtext { -font-size: 10px; +font-size: 1em; font-weight: bold; text-decoration: none; -color: black; +color: #000000; } .endcolumns { clear: both; -height: 0px; +height: 0; visibility: hidden; } .head1 { -margin: 0px; -font-size: 12pt; +margin: 0; +font-size: 1.6em; font-weight: bold; color: #000099; } .head2 { -margin: 0px; -font-size: 10pt; +margin: 0; +font-size: 1.2em; font-weight: bold; color: #000000; } .head3 { -margin: 0px; -font-size: 8pt; +margin: 0; +font-size: 1.1em; font-weight: bold; color: #000000; } .info { -margin: 0px; +margin: 0; font-style: normal; color: #000000; } @@ -145,11 +151,11 @@ DIV.graybox { font-weight: bold; background: #CCCCCC; -border: 1px solid #000000; +border: 0.1em solid #000000; text-align: center; -margin: 2px auto; +margin: 0.2em auto; width: auto; -padding: 4px; +padding: 0.4em; } DIV.tabletexthidden { @@ -179,7 +185,7 @@ } .contenttext { -font-size: 8pt; +font-size: 1.1em; } .headerboxoutside { @@ -189,10 +195,10 @@ .headerboxtop { background: #FFFFFF; -padding: 4px; +padding: 0.4em; border-color: #FFFFFF; border-style: solid; -border-width: 1px 1px 0px 1px; +border-width: 0.1em 0.1em 0 0.1em; } .headerboxbottom { @@ -200,12 +206,12 @@ padding: 0; border-color: #FFFFFF; border-style: solid; -border-width: 0px 1px 1px 1px; +border-width: 0 0.1em 0.1em 0.1em; } .boxhead { -margin: 0px; -font-size: 8pt; +margin: 0; +font-size: 1.1em; font-weight: bold; text-decoration: none; color: #FFFFFF; @@ -216,96 +222,106 @@ } DIV.boxtop { -margin-top: 0; margin-right: auto; margin-bottom: 0; margin-left: auto; -padding: 0; text-align: center; +margin: 0 auto 0 auto; +padding: 0; +text-align: center; background: #000099; -padding-top: 1px; -padding-bottom: 1px; -padding-right: 4px; -padding-left: 4px; +padding: 0.1em 0.4em 0.1em 0.4em; border-color: #999999; border-style: solid; -border-width: 0px 0px 0px 0px; +border: 0; } DIV.boxhead-left { -border: none; float: left; margin: 0; padding: 0; width: auto; -font-size: 8pt; +border: none; +float: left; +margin: 0; +padding: 0; +width: auto; +font-size: 1.1em; font-weight: bold; text-decoration: none; color: #FFFFFF; } DIV.boxhead-fill { -margin: 0; padding: 0; border: none; text-align: center; width: 0; -font-size: 8pt; +margin: 0; +padding: 0; +border: none; +text-align: center; +width: 0; +font-size: 1.1em; font-weight: bold; text-decoration: none; color: #FFFFFF; } DIV.boxhead-right { -border: none; float: right; margin: 0; padding: 0; width: auto; -font-size: 8pt; +border: none; +float: right; +margin: 0; +padding: 0; +width: auto; +font-size: 1.1em; font-weight: bold; text-decoration: none; color: #FFFFFF; } A.boxheadbutton { -margin: 0px; -font-size: 8pt; +margin: 0; +font-size: 1.1em; font-weight: bold; text-decoration: none; color: #FFFFFF; } A.boxheadbutton:hover { -margin: 0px; -font-size: 8pt; +margin: 0; +font-size: 1.1em; font-weight: bold; text-decoration: none; -color: red; +color: #ff0000; } .boxoutside { background: #FFFFFF; -padding: 0px; +padding: 0; border-color: #999999; border-style: solid; -border-width: 1px 1px 1px 1px; +border-width: 0.1em; } .boxtop { background: #000099; -padding-top: 1px; -padding-bottom: 1px; -padding-right: 4px; -padding-left: 4px; +padding: 0.1em 0.4em 0.1em 0.4em; border-color: #999999; border-style: solid; -border-width: 0px 0px 0px 0px; +border-width: 0; } .boxbottom { background: #FFFFFF; -padding: 4px; +padding: 0.4em; border-color: #999999; border-style: solid; -border-width: 0px 0px 0px 0px; +border-width: 0; } .button { -border-style: outset; border-color: #9999CC; border-width: 2px; +border-style: outset; +border-color: #9999CC; +border-width: 0.2em; background: #dddddd; -padding-right: 5px; padding-left: 5px; +padding-right: 0.5em; +padding-left: 0.5em; } /* ===== Tab/Button Bar Styles ===== */ .tabContainer { background: #FFFFFF; -padding-top: 4px; -margin-bottom: 10px; +padding-top: 0.4em; +margin-bottom: 1em; } A.tabButton { @@ -313,19 +329,16 @@ text-decoration: none; color: #000099; background: #D4D0C8; -padding-right: 5px; -padding-left: 5px; -padding-top: 1px; -padding-bottom: 1px; +padding: 0.1em 0.5em 0.1em 0.5em; white-space: nowrap; -border: solid #000099 1px; -line-height: 20px; +border: solid #000099 0.1em; +line-height: 2em; } A.tabButton:hover { color: #FFFFFF; background: #000099; -border: solid #000099 1px; +border: solid #000099 0.1em; } A.tabButtonSelected { @@ -333,36 +346,33 @@ text-decoration: none; color: #FFFFFF; background: #000099; -padding-right: 5px; -padding-left: 5px; -padding-top: 1px; -padding-bottom: 1px; +padding: 0.1em 0.5em 0.1em 0.5em; white-space: nowrap; -border: solid #000099 1px; +border: solid #000099 0.1em; } A.tabButtonSelected:hover { color: #FFFFFF; -border: solid #000099 1px; +border: solid #000099 0.1em; } A.tableheadbutton { font-weight: bold; text-decoration: none; -color: black; +color: #000000; } A.tableheadbutton:hover { font-weight: bold; text-decoration: underline; -color: red; +color: #ff0000; } .browsecategorytext { font-weight: bold; text-decoration: none; color: #000099; -text-indent: -10px; +text-indent: -1em; } A.browsecategorybutton { @@ -385,11 +395,11 @@ A.buttontext, .buttontextdisabled { font-weight: bold; text-decoration: none; -background: white; -border: #999999 solid 1px; -margin: 2px 2px 2px 2px; -padding: 1px 4px 1px 4px; -line-height: 18px; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em 0.2em 0.2em 0.2em; +padding: 0.1em 0.4em 0.1em 0.4em; +white-space: nowrap; } A.buttontext { @@ -397,7 +407,7 @@ } A.buttontext:hover { -color: red; +color: #ff0000; text-decoration: underline; } @@ -408,7 +418,7 @@ } A.linktext:hover { -color: red; +color: #ff0000; text-decoration: underline; } @@ -424,101 +434,107 @@ A.headerbuttontext:hover { -color: black; +color: #000000; text-decoration: underline; } .submenutextinfo { +font-size: 0.9em; font-weight: bold; text-decoration: none; -color: white; -padding-left: 5px; -padding-right: 5px; -border-right: 1px solid #5886C6 +color: #ffffff; +padding-left: 0.5em; +padding-right: 0.5em; +border-right: 0.1em solid #5886C6 } .submenutext, A.submenutext, A.submenutext:visited { +font-size: 0.9em; font-weight: bold; text-decoration: none; -color: yellow; -padding-left: 2px; -padding-right: 5px; -border-right: 1px solid #5886C6 +color: #ffff00; +padding-left: 0.2em; +padding-right: 0.5em; +border-right: 0.1em solid #5886C6 } A.submenutext:hover { -color: yellow; +color: #ffff00; text-decoration: underline; } .submenutextdisabled, A.submenutextdisabled { +font-size: 0.9em; font-weight: bold; text-decoration: none; color: #CCCCCC; -padding-left: 2px; -padding-right: 5px; -border-right: 1px solid #5886C6 +padding-left: 0.2em; +padding-right: 0.5em; +border-right: 0.1em solid #5886C6 } A.submenutextdisabled:hover { font-weight: bold; text-decoration: underline; -color: yellow; +color: #ffff00; } .submenutextinforight { +font-size: 0.9em; font-weight: bold; text-decoration: none; -color: white; -padding-left: 2px; +color: #ffffff; +padding-left: 0.2em; } .submenutextright, A.submenutextright { +font-size: 0.9em; font-weight: bold; text-decoration: none; -color: yellow; -padding-left: 2px; +color: #ffff00; +padding-left: 0.2em; } A.submenutextright:hover { -color: yellow; +color: #ffff00; text-decoration: underline; } .submenutextrightdisabled, A.submenutextrightdisabled { +font-size: 0.9em; font-weight: bold; text-decoration: none; color: #CCCCCC; -padding-left: 2px; +padding-left: 0.2em; } A.submenutextrightdisabled:hover { text-decoration: underline; -color: yellow; +color: #ffff00; } A.lightbuttontext { font-weight: bold; text-decoration: none; -color: yellow; +color: #ffff00; border: none; } A.lightbuttontext:hover { -color: yellow; +color: #ffff00; text-decoration: underline; } A.lightbuttontextsmall { -font-size: 8px; +font-size: 0.8em; font-weight: bold; text-decoration: none; -color: yellow; +color: #ffff00; border: none; } A.lightbuttontextsmall:hover { -color: yellow; +color: #ffff00; text-decoration: underline; } @@ -529,13 +545,13 @@ } A.buttontextbig, .buttontextbigdisabled { -font-size: 15px; +font-size: 1.5em; font-weight: bold; text-decoration: none; -background: white; -border: #999999 solid 1px; -margin: 2px 2px 2px 2px; -padding: 1px 4px 1px 4px; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em; +padding: 0.1em 0.4em 0.1em 0.4em; } A.buttontextbig { color: #000099; @@ -544,13 +560,13 @@ color: #CCCCCC; } A.buttontextbig:hover { -color: red; +color: #ff0000; text-decoration: underline; } A IMG.imageborder { border-style: solid; -border-width: 1px; +border-width: 0.1em; border-color: #999999; } @@ -559,14 +575,14 @@ text-decoration: none; color: #000099; background: #B4B0AA; -border-right: solid white 1px; -padding-right: 10px; -padding-left: 10px; +border-right: solid #ffffff 0.1em; +padding-right: 1em; +padding-left: 1em; } .headerButtonLeft:hover { background: #D4D0C8; -color: black; +color: #000000; text-decoration: underline; } @@ -575,9 +591,9 @@ text-decoration: none; color: #000099; background: #D4D0C8; -border-right: solid white 1px; -padding-right: 10px; -padding-left: 10px; +border-right: solid #ffffff 0.1em; +padding-right: 1em; +padding-left: 1em; } .headerButtonRight { @@ -585,15 +601,15 @@ text-decoration: none; color: #000099; background: #B4B0AA; -border-left: solid white 1px; -padding-right: 10px; -padding-left: 10px; +border-left: solid #ffffff 0.1em; +padding-right: 1em; +padding-left: 1em; text-align: right; } .headerButtonRight:hover { background: #D4D0C8; -color: black; +color: #000000; text-decoration: underline; } @@ -602,15 +618,15 @@ text-decoration: none; color: #000099; background: #D4D0C8; -border-left: solid white 1px; -padding-right: 10px; -padding-left: 10px; +border-left: solid #ffffff 0.1em; +padding-right: 1em; +padding-left: 1em; } .headerCenter { background: #B4B0AA; -padding-right: 10px; -padding-left: 10px; +padding-right: 1em; +padding-left: 1em; font-weight: bold; text-decoration: none; color: #000000; @@ -621,44 +637,44 @@ text-decoration: none; color: #000099; background: #D4D0C8; -padding-right: 10px; -padding-left: 10px; +padding-right: 1em; +padding-left: 1em; } A.headerCenter:hover { background: #D4D0C8; -color: black; +color: #000000; text-decoration: underline; } .headerCenterSelected { background: #D4D0C8; -padding-right: 10px; -padding-left: 10px; -font-size: 8pt; +padding-right: 1em; +padding-left: 1em; +font-size: 1.1em; font-weight: bold; text-decoration: none; color: #000000; } .headerCompanyName { -margin: 0px; -font-size: 12pt; +margin: 0; +font-size: 1.6em; font-weight: bold; color: #000099; white-space: nowrap; } .headerCompanySubtitle { -margin: 0px; -font-size: xx-small; +margin: 0; +font-size: 0.8em; color: #330099; white-space: nowrap; } .insideHeaderText { font-weight: bold; -color: black; +color: #000000; } A.insideHeaderLink { @@ -668,7 +684,7 @@ } A.insideHeaderLink:hover { -color: black; +color: #000000; text-decoration: underline; } @@ -679,91 +695,87 @@ } .headersmalltext { -font-size: 8pt; +font-size: 1.1em; font-weight: bold; -color: black; +color: #000000; } a.headersmalllink { -font-size: 8pt; +font-size: 1.1em; font-weight: bold; color: #000099; text-decoration: none; } a.headersmalllink:hover { -color: red; +color: #ff0000; } HR.sepbar { -font-size: xx-small; width: 100%; -height: 1px; +height: 0.1em; background: #999999; -border-width: 0px; +border: 0; } .errorMessage { -margin: 0px; -font-size: 8pt; +margin: 0; +font-size: 1.1em; font-weight: bold; -color: red; +color: #ff0000; } .eventMessage { -margin: 0px; -font-size: 8pt; +margin: 0; +font-size: 1.1em; font-weight: bold; color: #000099; } .ontab { -font-size: 8pt; -background: black; -padding: 2px; +font-size: 1.1em; +background: #000000; +padding: 0.2em; border-style: inset; -border-width: 3px; +border-width: 0.3em; } a.onlnk { -font-size: 8pt; +font-size: 1.1em; font-weight: bold; color: #FFFFFF; text-decoration: none; -padding: 2px; +padding: 0.2em; } .offtab { background: #CCCCCC; -padding: 2px; +padding: 0.2em; border-style: outset; -border-width: 3px; +border-width: 0.3em; } a.offlnk { font-weight: bold; color: #000099; text-decoration: none; -padding: 2px; +padding: 0.2em; } a.offlnk:hover { -color: red; +color: #ff0000; } .areaheader { font-weight: bold; color: #FFFFFF; width: 100%; -background: black; -padding: 2px; +background: #000000; +padding: 0.2em; } .edittable { border-color: #000000 #000000 #003333; border-style: solid; -border-top-width: thin; -border-right-width: thin; -border-bottom-width: thin; -border-left-width: thin +border-width: thin; } .viewOneTR1 { @@ -788,91 +800,74 @@ .editInputBox { background: #FFFFFF; -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; +font-size: 1.1em; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em; } -.inputBox { -background: #FFFFFF; -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; -} - -.selectBox { -background: #FFFFFF; -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; -} - .textAreaBox { -background: #FFFFFF; -font-size: 8pt; -background: white; -border: #999999 solid 1px; -margin: 2px; +font-size: 1.1em; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em; } .radioButton { background: #FFFFFF; -font-size: 8pt; +font-size: 1.1em; } .checkBox { background: #FFFFFF; -font-size: 8pt; +font-size: 1.1em; } .mediumSubmit,.largeSubmit,.loginButton { -font-size: 10pt; +font-size: 1.4em; font-weight: bold; text-decoration: none; color: #000099; -background: white; -border: #999999 solid 1px; -margin: 2px; +background: #ffffff; +border: #999999 solid 0.1em; +margin: 0.2em; } .mediumSubmit:hover,.largeSubmit:hover,.loginButton:hover { -color: red; +color: #ff0000; text-decoration: underline; } .smallAltSubmit,.mediumAltSubmit,.largeAltSubmit { -font-size: 8pt; +font-size: 1.1em; } .basePrice { -color: black; +color: #000000; } .normalPrice { -color: green; +color: #008000; } .salePrice { -color: red; +color: #ff0000; } /* Form layout styles to simulate a table-style layout */ .form-row { clear: both; -padding-top: 2px; +padding-top: 0.2em; } .form-label { float: left; -width: 180px; +width: 18em; text-align: right; -padding-top: 5px; +padding-top: 0.5em; } .form-field { float: left; -margin-left: 10px; +margin-left: 1em; text-align: left; } @@ -882,34 +877,34 @@ } .productsummary-container { -margin-top: 5px; -margin-bottom: 5px; -border-top: #999 solid 1px; +margin-top: 0.5em; +margin-bottom: 0.5em; +border-top: #999 solid 0.1em; } .productsummary { position: relative; -padding: 5px; -border-bottom: #999 solid 1px; +padding: 0.5em; +border-bottom: #999 solid 0.1em; /* using min-height as an alternative to clear: both; because that, in some browsers, will clear the top-level columns and not just in this div (Mozilla based, namely) */ -min-height: 60px; +min-height: 6em; overflow: auto; } .productsummary .smallimage { float: left; /* position: absolute; top: 5px; left: 5px; */ -margin: 0px 5px 5px 0px; +margin: 0 0.5em 0.5em 0; } .productsummary .smallimage img { -border: #CCC solid 1px; -height: 50px; +border: #CCC solid 0.1em; +height: 5em; } .productsummary .productbuy { float: right; -width: 130px; -margin: 5px; +width: 13em; +margin: 0.5em; text-align: right; } @@ -920,34 +915,34 @@ /* ===== Product Detail Styles ===== */ #productdetail #long-description { -margin-top: 10px; -padding-top: 5px; -border-top: #999 solid 1px; +margin-top: 1em; +padding-top: 0.5em; +border-top: #999 solid 0.1em; } #productdetail #reviews { -margin-top: 10px; -padding-top: 5px; -border-top: #999 solid 1px; +margin-top: 1em; +padding-top: 0.5em; +border-top: #999 solid 0.1em; } #productdetail #associated-products { -margin-top: 10px; -padding-top: 5px; -border-top: #999 solid 1px; +margin-top: 1em; +padding-top: 0.5em; +border-top: #999 solid 0.1em; } .treeWrapper { -color:black; +color:#000000; background:#ffffff; -font-size:12pt; +font-size: 1.6em; font-weight:normal; text-align:left; text-decoration:none; -margin-left:12px; -margin-top:2px; -border-top:1px solid black; -border-left:1px solid black; +margin-left: 1.2em; +margin-top: 0.2em; +border-top: 0.1em solid #000000; +border-left: 0.1em solid #000000; } .lefthalf{ left:0; @@ -975,49 +970,50 @@ /* ==== Styles For Form Widgets === */ .formTableBordered { width: 100%; -border: 1px solid #999999; +border: 0.1em solid #999999; } /* ==== Styles For The Html Log === */ .DEBUG { text-decoration: none; -color: gray; +color: #808080; } .WARN { text-decoration: none; font-weight: bold; -color: blue; +color: #0000ff; } .INFO{ text-decoration: none; -color:green; +color: #008000; } .ERROR { text-decoration: none; font-weight: bold; -color: red; -border: 2px solid red; +color: #ff0000; +border: 0.2em solid #ff0000; } /* ==== Styles Copied From tabstyles.css === */ .treewrapper { -margin-left: 10px; +margin-left: 1em; } .treeitem { -color: blue; +color: #0000ff; +font-size: 1.4em; font-weight: bold; -border: #888888 solid 1px; +border: #888888 solid 0.1em; } DIV.centerarea { -margin-left: 10px; -margin-right: 10px; -margin-top: 10px; +margin-left: 1em; +margin-right: 1em; +margin-top: 1em; } .whitearea { @@ -1040,7 +1036,7 @@ .tabdowncenter { background-image: url(/images/tabs/tab_down_fill.gif); background-color: #B4B0AA; -font-size: 15pt; +font-size: 1.05em; text-align: center; vertical-align: middle; color: #000000; @@ -1060,7 +1056,7 @@ .tabupcenter { background-image: url(/images/tabs/tab_up_fill.gif); background-color: #D4D0C8; -font-size: 15pt; +font-size: 1.05em; text-align: center; vertical-align: middle; color: #000000; @@ -1069,8 +1065,8 @@ .tabupleft { background-image: url(/images/tabs/tab_up_left.gif); background-color: #D4D0C8; -border-width: 0px; -padding: 0px; +border: 0; +padding: 0; } .tabupright { @@ -1079,7 +1075,7 @@ } A.tablink,A.tablink:hover,A.tablinkselected,A.tablinkselected:hover { -font-size: 8pt; +font-size: 1.05em; font-weight: bold; text-align: center; text-decoration: none; @@ -1092,8 +1088,8 @@ .apptitle { background-color: #000099; -line-height: 2; -font-size: 10pt; +line-height: 2em; +font-size: 1.3em; font-weight: bold; color: #FFFFFF; display: block; @@ -1102,29 +1098,44 @@ DIV.row { background-color: #B4B0AA; -margin-top: 0; margin-right: auto; margin-bottom: 0; margin-left: auto; -padding: 0; text-align: center; +margin: 0 auto 0 auto; +padding: 0; +text-align: center; } DIV.col { -border: none; float: left; margin: 0; padding: 0; width: auto; +border: none; +float: left; +margin: 0; +padding: 0; +width: auto; } DIV.col-fill { -font-weight: bold; text-decoration: none; -background-color: #B4B0AA; color: #000099; -margin: 0; padding: 0; border: none; text-align: center; width: 0; +font-weight: bold; +text-decoration: none; +background-color: #B4B0AA; +color: #000099; +margin: 0; +padding: 0; +border: none; +text-align: center; +width: 0; } DIV.col-right { -border: none; float: right; margin: 0; padding: 0; width: auto; +border: none; +float: right; +margin: 0; +padding: 0; +width: auto; } DIV.contentarea { background-color: #FFFFFF; -border: solid black 1px; -margin-top: 10px; -padding: 10px; +border: solid #000000 0.1em; +margin-top: 1em; +padding: 1em; } DIV.endcolumns { @@ -1133,7 +1144,7 @@ DIV.simple-right-small { float: right; -width: 20px; +width: 2em; text-align: right; } @@ -1145,23 +1156,20 @@ DIV.screenlet { background-color: #FFFFFF; -border: 1px solid #999999; -margin-bottom: 10px; +border: 0.1em solid #999999; +margin-bottom: 1em; height:auto !important; height:1% } DIV.screenlet-header { background-color: #000099; -padding-top: 1px; -padding-bottom: 3px; -padding-right: 4px; -padding-left: 4px; +padding: 0.1em 0.4em 0.3em 0.4em; height:auto !important; height:1% } DIV.screenlet-body { background-color: #FFFFFF; -padding: 4px; +padding: 0.4em; height:auto !important; height:1% } @@ -1174,26 +1182,28 @@ } #column-container .left { -float: left; margin-right: 10px; +float: left; +margin-right: 1em; /* alt: position: absolute; top: 0px; left: 0px; */ -width: 220px; +width: 22em; } #column-container .right { -float: right; margin-left: 10px; -width: 220px; +float: right; +margin-left: 1em; +width: 22em; } #column-container .leftonly { -margin-left: 230px; +margin-left: 23em; width: auto; } #column-container .rightonly { -margin-right: 230px; +margin-right: 23em; width: auto; } #column-container .center { -margin-left: 230px; -margin-right: 230px; +margin-left: 23em; +margin-right: 23em; width: auto; } #column-container .nocolumns { @@ -1202,13 +1212,471 @@ DIV.column-left-wide { float: left; -width: 300px; +width: 30em; background-color: #CCCCCC; -border: black solid 2px; +border: #000000 solid 0.2em; overflow: auto; } +/* ===== New Styles ===== */ +/* ================================ */ +/* ===== Used to clear floats ===== */ +/* ================================ */ +.clear { +clear: both; +height: 0; +visibility: hidden; +} +/* =============================== */ +/* ===== Used for alert text ===== */ +/* =============================== */ +.alert { +color: #ff0000; +} + +/* ================================== */ +/* ===== Used to align elements ===== */ +/* ================================== */ + +.alignFloat { +float: right; +} + +.alignText { +/* Style for justification */ +text-align: right; +} + +.alignTop { +vertical-align: top; +} + +.horizList { +/* Style for simple horizontal list */ +display: inline; /* IE Fix */ +height: 1%; /* IE fix */ +} + +.horizList li { +float: left; +} + +/* ==================================== */ +/* ===== Masthead (Header) Styles ===== */ +/* ==================================== */ + +.mastHead { +background-color: #FFFFFF; +color: #000000; +font-weight: bold; +padding: 0.5em; +height: 1%; /* IE Fix */ +} + +.mastHead a { +color: #000099; +font-weight: bold; +} + +.mastHead a:hover { +color: #000000; +} + +.mastHead .logoArea { +float: left; +} + +.mastHead .controlArea { +text-align: right; +} + +/* ========================================= */ +/* ===== Footer Styles ===================== */ +/* ========================================= */ + +#footer { +} + +/* ================================================== */ +/* ===== Main Navigation (App Menu) Styles ========== */ +/* ================================================== */ + +#mainNavigation { +background-color: #ffffff; +border-bottom: 1px solid #D4D0C8; /* Mozilla fix */ +} + +#mainNavigation ul { +list-style-type: none; +margin: 0; +padding: 0; +height: 1%; /* IE fix */ +} + +#mainNavigation ul li { +background-color: #B4B0AA; +display: inline; +float: left; +margin: 0; +padding: 0; +} + +#mainNavigation ul a { +color: #000000; +display: block; +font-size: 1.1em; +font-weight: bold; +padding: 0.2em 0.5em 0.2em 0.5em; +text-align: center; +text-decoration: none; +} + +#mainNavigation ul .selected { +/* selected tab */ +background-color: #D4D0C8; +} + +#mainNavigation ul .selected a { +background-color: #D4D0C8; +color: #000099; +} + +#mainNavigation ul a:hover { +background-color: #D4D0C8; +color: #000099; +} + +#mainNavigation ul .selected a:hover { +color: #000000; +} + +/* ========================================================= */ +/* ===== Component Navigation (App Header) Styles ========== */ +/* ========================================================= */ + +#appNavigation { +background-color: #B4B0AA; +} + +#appNavigation .title { +background-color: #000099; +color: #ffffff; +font-size: 1.3em; +font-weight: bold; +padding: 0.4em; +} + +#appNavigation ul { +display: inline; /* IE Fix */ +list-style-type: none; +margin: 0; +padding: 0; +} + +#appNavigation ul li { +margin: 0; +padding: 0; +} + +#appNavigation ul a { +background-color: #B4B0AA; +color: #000099; +display: block; +font-size: 1em; +font-weight: bold; +padding: 0 1em 0 1em; +text-decoration: none; +} + +#appNavigation ul a:hover { +background-color: #D4D0C8; +color: #000000; +} + +#appNavigation ul .selected, #appNavigation ul .selected a { +background-color: #D4D0C8; +} + +#appNavigation .mainTabs li { +border-right: solid #ffffff 0.1em; +float: left; +} + +#appNavigation .loginTabs li { +border-left: solid #ffffff 0.1em; +float: right; +} + +/* ================================================= */ +/* ===== Screenlet Title Bar/Navigation Styles ===== */ +/* ================================================= */ + +.screenletTitleBar { +background-color: #000099; +color: #ffffff; +height: 1%; /* IE fix */ +} + +.screenletTitleBar div { +font-size: 1.1em; +font-weight: bold; +padding: 0.2em 0.5em 0.2em 0.5em; +} + +.screenletTitleBar ul { +display: inline; /* IE Fix */ +list-style-type: none; +margin: 0; +padding: 0; +} + +.screenletTitleBar ul li { +background-color: #000099; +border-left: 0.1em solid #5886C6; +float: right; +font-size: 1em; +font-weight: bold; +margin: 0; +padding: 0.2em 0.5em 0.2em 0.5em; +color: #ffffff; +} + +.screenletTitleBar ul .title { +background-color: #000099; +border-left: none; +float:left; +font-size: 1.1em; +padding: 0.2em 0.5em 0.2em 0.5em; +} + +.screenletTitleBar ul .disabled { +color: #CCCCCC; +} + +.screenletTitleBar ul a { +color: #ffff00; +display: block; +margin: 0; +padding: 0; +text-decoration: none; +} + +.screenletTitleBar ul a:hover { +text-decoration: underline; +} + +/* ======================================== */ +/* ===== Button Bar Navigation Styles ===== */ +/* ======================================== */ + +.buttonBar { +background-color: #ffffff; +height: 1%; /* IE fix */ +margin-bottom: 1.0em; +padding-top: 0.4em; +} + +.buttonBar ul { +display: inline; /* IE Fix */ +list-style-type: none; +margin: 0; +padding: 0; +} + +.buttonBar ul li { +float: left; +font-size: 1em; +font-weight: bold; +margin: 0; +padding: 0.1em 0.4em 0.1em 0.4em; +} + +.buttonBar ul a { +display: block; +font-size: 1em; +font-weight: bold; +padding: 0.1em 0.5em 0.1em 0.5em; +text-decoration: none; +white-space: nowrap; +} + +.buttonBar ul a:hover { +background-color: #000099; +color: #ffffff; +} + +/* ===== Button style one decorator ===== */ + +.buttonStyle1 ul li { +background-color: #ffffff; +color: #000099; +} + +.buttonStyle1 ul a { +background-color: #D4D0C8; +border: solid #000099 0.1em; +color: #000099; +} + +.buttonStyle1 ul .selected, .buttonStyle1 ul .selected a { +background-color: #000099; +color: #ffffff; +} + +.buttonStyle1 ul a:hover { +background-color: #000099; +color: #ffffff; +} + +/* ===== Button style two decorator ===== */ + +.buttonStyle2 ul li { +background-color: #ffffff; +color: #000099; +} + +.buttonStyle2 ul #selected, .buttonStyle2 ul .selected a { +background-color: #000099; +color: #ffffff; +} + +.buttonStyle2 ul a { +background-color: #ffffff; +border: solid #000099 0.1em; +color: #000099; +} + +.buttonStyle2 ul a:hover { +background-color: #000099; +color: #ffffff; +} + +/* ===== Button bar decorator ===== */ + +.toolBar { +background-color: #D4D0C8; +border: 0.1em solid #000099; +padding: 0.2em; +} + +.toolBar ul li { +background-color: #D4D0C8; +padding: 0.1em; +} + +/* ======================== */ +/* ===== Table Styles ===== */ +/* ======================== */ + +.basicTable { +width: 100%; +} + +.basicTable, .basicTable .headerRow:hover { +background-color: #ffffff; +color: #000000; +} + +.basicTable tr { +/* Style for all rows */ +} + +.basicTable tr td { +/* Style for all cells */ +padding: 0.1em; +} + +.basicTable tr .label, .label { +/* field labels for forms */ +font-weight: bold; +text-align: right; +padding-right: 1.5em; +white-space: nowrap; +width: 1%; +} + +.basicTable tr td a { +color: #000099; +font-weight: bold; +text-decoration: none; +} + +.basicTable tr td a:hover { +color: #000099; +text-decoration: underline; +} + +.basicTable tr th, .basicTable .headerRow { +font-weight: bold; +text-align: left; +} + +.basicTable .headerRow:hover, .basicTable tr th:hover{ +background-color: #ffffff; +color: #000000; +} + +.basicTable .headerRow td { +border-bottom: 0.1em solid #999999; +} + +.basicTable .viewManyTR1 { +/* Alternating row style */ +background-color: #eeeeee; +} + +.basicTable tr .buttonCol { +/* button column style - for the small +collection of buttons used in lists */ +vertical-align: top; +} + +.basicTable tr .buttonCol a { +background: #ffffff; +border: #999999 solid 0.1em; +color: #000099; +display: block; +float: left; +font-weight: bold; +margin: 0.1em 0.2em 0.1em 0.2em; +padding: 0.1em 0.4em 0.1em 0.4em; +text-decoration: none; +white-space: nowrap; +} + +.basicTable tr .buttonCol a:hover { +text-decoration: underline; +} + +/* ===== Table decorator - Hover bar ===== */ + +.hoverBar tr:hover { +cursor: default; +background-color: #cccccc; +} + +/* ===== Table decorator - Grid ===== */ + +.darkGrid td { +/* dark grid */ +border: 0.1em solid #000000; +} + +.lightGrid td { +/* light grid */ +border: 0.1em solid #cccccc; +} + + + + + + + + + + Index: framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java =================================================================== --- framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (revision 504942) +++ framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (working copy) @@ -103,16 +103,18 @@ // render the tooltip, in other methods too String tooltip = modelFormField.getTooltip(context); if (UtilValidate.isNotEmpty(tooltip)) { - buffer.append(""); } - buffer.append("> -["); + buffer.append(" -["); buffer.append(tooltip); - buffer.append("]- "); + buffer.append("]- "); + if (UtilValidate.isNotEmpty(tooltipStyle)) { + buffer.append(""); + } } } @@ -134,22 +136,25 @@ public void renderDisplayField(StringBuffer buffer, Map context, DisplayField displayField) { ModelFormField modelFormField = displayField.getModelFormField(); - buffer.append(""); } - // add a style of red if this is a date/time field and redWhen is true - if (modelFormField.shouldBeRed(context)) { - buffer.append(" style=\"color: red;\""); + if (str.length() > 0) { + buffer.append(str); } - - buffer.append(">"); buffer.append(displayField.getDescription(context)); - buffer.append(""); + if (str.length() > 0) { + buffer.append(""); + } if (displayField instanceof DisplayEntityField) { this.makeHyperlinkString(buffer, ((DisplayEntityField) displayField).getSubHyperlink(), context); @@ -157,7 +162,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -173,7 +178,7 @@ hyperlinkField.getDescription(context), hyperlinkField.getTargetWindow(context)); this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } public void makeHyperlinkString(StringBuffer buffer, ModelFormField.SubHyperlink subHyperlink, Map context) { @@ -264,7 +269,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -338,7 +343,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -535,7 +540,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -692,7 +697,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -705,15 +710,13 @@ // never used: ModelForm modelForm = modelFormField.getModelForm(); String currentValue = modelFormField.getEntry(context); - buffer.append(""); } - buffer.append(">"); buffer.append(""); // any description by it? - buffer.append(""); + if (UtilValidate.isNotEmpty(className)) { + buffer.append(""); + } this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -794,7 +799,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -904,7 +909,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -937,7 +942,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -964,7 +969,7 @@ buffer.append("/>"); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -982,17 +987,17 @@ String titleText = UtilHttp.encodeAmpersands(tempTitleText); if (UtilValidate.isNotEmpty(titleText)) { - buffer.append(""); } - buffer.append(">"); renderHyperlinkTitle(buffer, context, modelFormField, titleText); - buffer.append(""); + if (UtilValidate.isNotEmpty(modelFormField.getTitleStyle())) { + buffer.append(""); + } - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } } @@ -1002,7 +1007,6 @@ public void renderSingleFormFieldTitle(StringBuffer buffer, Map context, ModelFormField modelFormField) { boolean requiredField = modelFormField.getRequiredField(); if (requiredField) { - buffer.append(""); } - buffer.append(">"); renderHyperlinkTitle(buffer, context, modelFormField, modelFormField.getTitle(context)); - buffer.append(""); + if (UtilValidate.isNotEmpty(requiredStyle)) { + buffer.append(""); + } - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } else { renderFieldTitle(buffer, context, modelFormField); } @@ -1028,6 +1033,7 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm) */ public void renderFormOpen(StringBuffer buffer, Map context, ModelForm modelForm) { + buffer.append("\r\n"); buffer.append("
"); + buffer.append("\">"); this.appendWhitespace(buffer); } @@ -1064,6 +1070,7 @@ */ public void renderFormClose(StringBuffer buffer, Map context, ModelForm modelForm) { buffer.append("
"); + buffer.append("\r\n"); this.appendWhitespace(buffer); } @@ -1106,6 +1113,7 @@ } buffer.append(""); + buffer.append("\r\n"); this.appendWhitespace(buffer); } @@ -1113,13 +1121,13 @@ public void renderFormatListWrapperOpen(StringBuffer buffer, Map context, ModelForm modelForm) { if(UtilValidate.isNotEmpty(modelForm.getDefaultTableStyle())) { - buffer.append(""); } else { - buffer.append(""); + buffer.append("
"); // DEJ 20050101 removed the width=\"100%\", doesn't look very good with CSS float: left based side "columns" } @@ -1127,7 +1135,7 @@ } public void renderFormatListWrapperClose(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append("
"); + buffer.append(" "); this.appendWhitespace(buffer); String queryString = null; @@ -1149,7 +1157,7 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatHeaderRowOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm) */ public void renderFormatHeaderRowOpen(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append(""); + buffer.append(" "); this.appendWhitespace(buffer); } @@ -1173,7 +1181,7 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatHeaderRowCellOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm, org.ofbiz.widget.form.ModelFormField) */ public void renderFormatHeaderRowCellOpen(StringBuffer buffer, Map context, ModelForm modelForm, ModelFormField modelFormField) { - buffer.append(""); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1193,7 +1201,7 @@ } public void renderFormatHeaderRowFormCellOpen(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append(""); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1216,21 +1224,21 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatHeaderRowFormCellTitleSeparator(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm, boolean) */ public void renderFormatHeaderRowFormCellTitleSeparator(StringBuffer buffer, Map context, ModelForm modelForm, ModelFormField modelFormField, boolean isLast) { - buffer.append(""); } - buffer.append(">"); if (isLast) { buffer.append(" - "); } else { buffer.append(" - "); } - buffer.append(""); + if (UtilValidate.isNotEmpty(titleStyle)) { + buffer.append(""); + } } /* (non-Javadoc) @@ -1239,7 +1247,7 @@ public void renderFormatItemRowOpen(StringBuffer buffer, Map context, ModelForm modelForm) { Integer itemIndex = (Integer)context.get("itemIndex"); - buffer.append(""); + buffer.append(" "); this.appendWhitespace(buffer); } @@ -1275,7 +1283,7 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatItemRowCellOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm, org.ofbiz.widget.form.ModelFormField) */ public void renderFormatItemRowCellOpen(StringBuffer buffer, Map context, ModelForm modelForm, ModelFormField modelFormField) { - buffer.append(""); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1298,7 +1306,7 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatItemRowFormCellOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm) */ public void renderFormatItemRowFormCellOpen(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append(""); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1318,13 +1326,13 @@ } public void renderFormatSingleWrapperOpen(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append(""); + buffer.append("
"); this.appendWhitespace(buffer); } public void renderFormatSingleWrapperClose(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append("
"); + buffer.append(" "); this.appendWhitespace(buffer); } @@ -1333,7 +1341,7 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatFieldRowOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm) */ public void renderFormatFieldRowOpen(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append(""); + buffer.append(" "); this.appendWhitespace(buffer); } @@ -1342,7 +1350,7 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatFieldRowClose(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelForm) */ public void renderFormatFieldRowClose(StringBuffer buffer, Map context, ModelForm modelForm) { - buffer.append(""); + buffer.append(" "); this.appendWhitespace(buffer); } @@ -1351,15 +1359,19 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatFieldRowTitleCellOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelFormField) */ public void renderFormatFieldRowTitleCellOpen(StringBuffer buffer, Map context, ModelFormField modelFormField) { - buffer.append(""); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1374,22 +1386,24 @@ * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatFieldRowSpacerCell(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelFormField) */ public void renderFormatFieldRowSpacerCell(StringBuffer buffer, Map context, ModelFormField modelFormField) { - buffer.append(" "); + // Embedded styling - bad idea + //buffer.append(" "); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) * @see org.ofbiz.widget.form.FormStringRenderer#renderFormatFieldRowWidgetCellOpen(java.lang.StringBuffer, java.util.Map, org.ofbiz.widget.form.ModelFormField, int) */ public void renderFormatFieldRowWidgetCellOpen(StringBuffer buffer, Map context, ModelFormField modelFormField, int positions, int positionSpan, Integer nextPositionInRow) { - buffer.append(" 1) { - buffer.append("30"); - } else { - buffer.append("80"); - } - buffer.append("%\" align=\"left\""); +// buffer.append(" 1) { +// buffer.append("30"); +// } else { +// buffer.append("80"); +// } +// buffer.append("%\""); + buffer.append(" 0) { buffer.append(" colspan=\""); // do a span of 1 for this column, plus 3 columns for each spanned @@ -1405,7 +1419,7 @@ } buffer.append(">"); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1483,24 +1497,24 @@ buffer.append("/>"); - buffer.append(" "); } - buffer.append('>'); buffer.append(" "); buffer.append(ignoreCase); - buffer.append(""); + if (UtilValidate.isNotEmpty(modelFormField.getTitleStyle())) { + buffer.append(""); + } this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1555,9 +1569,8 @@ buffer.append("/>"); - buffer.append(" "); - buffer.append(" "); } - buffer.append('>'); buffer.append(" "); - buffer.append(""); + if (UtilValidate.isNotEmpty(modelFormField.getTitleStyle())) { + buffer.append(""); + } this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1745,13 +1758,11 @@ buffer.append("\"/>"); } - buffer.append(" "); } - buffer.append('>'); buffer.append(" "); - buffer.append(" "); + if (UtilValidate.isNotEmpty(modelFormField.getTitleStyle())) { + buffer.append(" "); + } buffer.append("
"); @@ -1829,13 +1842,11 @@ buffer.append("\"/>"); } - buffer.append(" "); } - buffer.append('>'); buffer.append(" "); - buffer.append(""); + if (UtilValidate.isNotEmpty(modelFormField.getTitleStyle())) { + buffer.append(""); + } this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -1937,7 +1950,7 @@ this.makeHyperlinkString(buffer, lookupField.getSubHyperlink(), context); this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } public void renderNextPrev(StringBuffer buffer, Map context, ModelForm modelForm) { @@ -1988,7 +2001,7 @@ String paginateAnchor = modelForm.getPaginateTargetAnchor(); if (paginateAnchor != null) anchor = "#" + paginateAnchor; - buffer.append("\n"); + buffer.append("
\n"); buffer.append(" \n"); buffer.append(" \n"); + buffer.append(" \n"); buffer.append(" \n"); - buffer.append("
\n"); buffer.append(" \n"); @@ -2023,9 +2036,9 @@ } buffer.append(" \n"); - buffer.append("
\n"); + buffer.append(" \n"); this.appendWhitespace(buffer); } @@ -2078,7 +2091,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -2138,7 +2151,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } /* (non-Javadoc) @@ -2192,7 +2205,7 @@ this.appendTooltip(buffer, context, modelFormField); - this.appendWhitespace(buffer); + //this.appendWhitespace(buffer); } public void renderFieldGroupOpen(StringBuffer buffer, Map context, ModelForm.FieldGroup fieldGroup) { @@ -2213,7 +2226,7 @@ } public void renderBanner(StringBuffer buffer, Map context, ModelForm.Banner banner) { - buffer.append(""); + buffer.append("
"); String style = banner.getStyle(context); String leftStyle = banner.getLeftTextStyle(context); if (UtilValidate.isEmpty(leftStyle)) leftStyle = style; @@ -2222,7 +2235,7 @@ String leftText = banner.getLeftText(context); if (UtilValidate.isNotEmpty(leftText)) { - buffer.append("
"); + buffer.append(" "); if (UtilValidate.isNotEmpty(leftStyle)) { buffer.append(""); + buffer.append(" "); if (UtilValidate.isNotEmpty(style)) { buffer.append(""); + buffer.append(" "); if (UtilValidate.isNotEmpty(rightStyle)) { buffer.append(""); } - buffer.append("
"); + buffer.append(" "); } /**