You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/03/03 10:41:17 UTC
svn commit: r514106 [5/6] - in /ofbiz/trunk/applications/party: config/
webapp/partymgr/WEB-INF/ webapp/partymgr/communication/
webapp/partymgr/contactlist/ webapp/partymgr/includes/
webapp/partymgr/lookup/ webapp/partymgr/party/ webapp/partymgr/securi...
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl Sat Mar 3 01:41:15 2007
@@ -17,444 +17,413 @@
under the License.
-->
+<!-- begin viewProfile.ftl -->
<#if party?has_content>
-<div style="text-align: right;">
- <#if showOld>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyHideOld}</a>
- <#else>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyShowOld}</a>
- </#if>
-</div>
-<br/>
-
-<div class="screenlet">
- <div class="screenlet-header">
+ <div class="align-float">
+ <#if showOld>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.PartyHideOld}</a>
+ <#else>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.PartyShowOld}</a>
+ </#if>
+ </div>
+ <br class="clear" />
+ <br/>
+ <div id="partyInformation" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
<#if lookupPerson?has_content>
- <div class="boxlink">
- <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
- <a href="<@o...@ofbizUrl>" class="submenutextright">
- <#if lookupPerson?has_content>${uiLabelMap.CommonUpdate}</#if></a>
- </#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyPersonalInformation}</div>
+ <h3>${uiLabelMap.PartyPersonalInformation}</h3>
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a></li>
+ </#if>
</#if>
<#if lookupGroup?has_content>
- <#assign lookupPartyType = party.getRelatedOneCache("PartyType")>
- <div class="boxlink">
- <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
- <a href="<@o...@ofbizUrl>" class="submenutextright">
- <#if lookupGroup?has_content>${uiLabelMap.CommonUpdate}</#if></a>
- </#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyPartyGroupInformation}</div>
+ <#assign lookupPartyType = party.getRelatedOneCache("PartyType")>
+ <h3>${uiLabelMap.PartyPartyGroupInformation}</h3>
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a></li>
+ </#if>
</#if>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
-<#if lookupPerson?has_content>
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td align="right" width="10%"><div class="tabletext"><b>${uiLabelMap.PartyName}</b></div></td>
- <td width="5"> </td>
- <td align="left" width="90%">
- <div class="tabletext">
- ${lookupPerson.personalTitle?if_exists}
- ${lookupPerson.firstName?if_exists}
- ${lookupPerson.middleName?if_exists}
- ${lookupPerson.lastName?if_exists}
- ${lookupPerson.suffix?if_exists}
- </div>
- </td>
- </tr>
- <#if lookupPerson.nickname?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyNickname}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.nickname}</div></td></tr>
- </#if>
- <#if lookupPerson.gender?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyGender}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.gender}</div></td></tr>
- </#if>
- <#if lookupPerson.birthDate?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyBirthDate}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.birthDate.toString()}</div></td></tr>
- </#if>
- <#if lookupPerson.height?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyHeight}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.height}</div></td></tr>
- </#if>
- <#if lookupPerson.weight?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyWeight}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.weight}</div></td></tr>
- </#if>
- <#if lookupPerson.mothersMaidenName?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyMothersMaidenName}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.mothersMaidenName}</div></td></tr>
- </#if>
- <#if lookupPerson.maritalStatus?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyMaritalStatus}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.maritalStatus}</div></td></tr>
- </#if>
- <#if lookupPerson.socialSecurityNumber?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartySocialSecurityNumber}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.socialSecurityNumber}</div></td></tr>
- </#if>
- <#if lookupPerson.passportNumber?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyPassportNumber}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.passportNumber}</div></td></tr>
- </#if>
- <#if lookupPerson.passportExpireDate?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyPassportExpire}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.passportExpireDate.toString()}</div></td></tr>
- </#if>
- <#if lookupPerson.totalYearsWorkExperience?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyYearsWork}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.totalYearsWorkExperience}</div></td></tr>
- </#if>
- <#if lookupPerson.comments?has_content>
- <tr><td align="right" nowrap><div class="tabletext"><b>${uiLabelMap.PartyComments}</b></div></td><td> </td><td align="left"><div class="tabletext">${lookupPerson.comments}</div></td></tr>
- </#if>
- </table>
-<#elseif lookupGroup?has_content>
- <div class="tabletext">${lookupGroup.groupName} (${(lookupPartyType.get("description",locale))?if_exists})</div>
-<#else>
- <div class="tabletext">${uiLabelMap.PartyInformationNotFound}</div>
-</#if>
- <#if partyNameHistoryList?has_content>
+ <#if lookupPerson?has_content>
+ <table class="basic-table" cellspacing="0">
+ <tr>
+ <td class="label">${uiLabelMap.PartyName}</td>
+ <td>
+ ${lookupPerson.personalTitle?if_exists}
+ ${lookupPerson.firstName?if_exists}
+ ${lookupPerson.middleName?if_exists}
+ ${lookupPerson.lastName?if_exists}
+ ${lookupPerson.suffix?if_exists}
+ </td>
+ </tr>
+ <#if lookupPerson.nickname?has_content>
+ <tr><td class="label">${uiLabelMap.PartyNickname}</td><td>${lookupPerson.nickname}</td></tr>
+ </#if>
+ <#if lookupPerson.gender?has_content>
+ <tr><td class="label">${uiLabelMap.PartyGender}</td><td>${lookupPerson.gender}</td></tr>
+ </#if>
+ <#if lookupPerson.birthDate?has_content>
+ <tr><td class="label">${uiLabelMap.PartyBirthDate}</td><td>${lookupPerson.birthDate.toString()}</td></tr>
+ </#if>
+ <#if lookupPerson.height?has_content>
+ <tr><td class="label">${uiLabelMap.PartyHeight}</td><td>${lookupPerson.height}</td></tr>
+ </#if>
+ <#if lookupPerson.weight?has_content>
+ <tr><td class="label">${uiLabelMap.PartyWeight}</td><td>${lookupPerson.weight}</td></tr>
+ </#if>
+ <#if lookupPerson.mothersMaidenName?has_content>
+ <tr><td class="label">${uiLabelMap.PartyMothersMaidenName}</td><td>${lookupPerson.mothersMaidenName}</td></tr>
+ </#if>
+ <#if lookupPerson.maritalStatus?has_content>
+ <tr><td class="label">${uiLabelMap.PartyMaritalStatus}</td><td>${lookupPerson.maritalStatus}</td></tr>
+ </#if>
+ <#if lookupPerson.socialSecurityNumber?has_content>
+ <tr><td class="label">${uiLabelMap.PartySocialSecurityNumber}</td><td>${lookupPerson.socialSecurityNumber}</td></tr>
+ </#if>
+ <#if lookupPerson.passportNumber?has_content>
+ <tr><td class="label">${uiLabelMap.PartyPassportNumber}</td><td>${lookupPerson.passportNumber}</td></tr>
+ </#if>
+ <#if lookupPerson.passportExpireDate?has_content>
+ <tr><td class="label">${uiLabelMap.PartyPassportExpire}</td><td>${lookupPerson.passportExpireDate.toString()}</td></tr>
+ </#if>
+ <#if lookupPerson.totalYearsWorkExperience?has_content>
+ <tr><td class="label">${uiLabelMap.PartyYearsWork}</td><td>${lookupPerson.totalYearsWorkExperience}</td></tr>
+ </#if>
+ <#if lookupPerson.comments?has_content>
+ <tr><td class="label">${uiLabelMap.PartyComments}</td><td>${lookupPerson.comments}</td></tr>
+ </#if>
+ </table>
+ <#elseif lookupGroup?has_content>
+ <div>${lookupGroup.groupName} (${(lookupPartyType.get("description",locale))?if_exists})</div>
+ <#else>
+ <div>${uiLabelMap.PartyInformationNotFound}</div>
+ </#if>
+ <#if partyNameHistoryList?has_content>
<div><hr class="sepbar"/></div>
- <div class="tableheadtext">${uiLabelMap.PartyHistoryName}</div>
+ <div>${uiLabelMap.PartyHistoryName}</div>
<#list partyNameHistoryList as partyNameHistory>
- <#if lookupPerson?has_content>
- <div class="tabletext">${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})</div>
- <#elseif lookupGroup?has_content>
- <div class="tabletext">${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.groupName?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})</div>
- </#if>
+ <#if lookupPerson?has_content>
+ <div>${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})</div>
+ <#elseif lookupGroup?has_content>
+ <div>${uiLabelMap.PartyHistoryWas}: ${partyNameHistory.groupName?if_exists} (${uiLabelMap.PartyHistoryChanged}: ${partyNameHistory.changeDate})</div>
+ </#if>
</#list>
- </#if>
+ </#if>
</div>
-</div>
+ </div>
<#-- ============================================================= -->
-<#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists>
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.PartyLoyaltyPoints}</div>
- </div>
- <div class="screenlet-body">
- <div class="tabletext">${uiLabelMap.PartyYouHave} ${totalSubRemainingAmount} ${uiLabelMap.PartyPointsFrom} ${totalOrders} ${uiLabelMap.PartyOrderInLast} ${monthsToInclude} ${uiLabelMap.CommonMonths}.</div>
+ <#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists>
+ <div id="totalOrders" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyLoyaltyPoints}</h3>
+ </div>
+ <div class="screenlet-body">
+ ${uiLabelMap.PartyYouHave} ${totalSubRemainingAmount} ${uiLabelMap.PartyPointsFrom} ${totalOrders} ${uiLabelMap.PartyOrderInLast} ${monthsToInclude} ${uiLabelMap.CommonMonths}.
+ </div>
</div>
-</div>
-</#if>
+ </#if>
<#-- ============================================================= -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
- </#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyContactInformation}</div>
+ <div id="partyContactInfo" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.PartyContactInformation}</h3>
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
- <#if contactMeches?has_content>
- <table width="100%" border="0" cellpadding="0">
- <tr align="left" valign=bottom>
- <th><div class="tableheadtext">${uiLabelMap.PartyContactType}</th>
- <th width="5"> </th>
- <th><div class="tableheadtext">${uiLabelMap.PartyContactInformation}</th>
- <th colspan="2"><div class="tableheadtext">${uiLabelMap.PartyContactSolicitingOk}</th>
- <th> </th>
- </tr>
- <#list contactMeches as contactMechMap>
- <#assign contactMech = contactMechMap.contactMech>
- <#assign partyContactMech = contactMechMap.partyContactMech>
- <tr><td colspan="7"><hr class="sepbar"></td></tr>
+ <#if contactMeches?has_content>
+ <table class="basic-table" cellspacing="0">
<tr>
- <td align="right" valign="top" width="10%">
- <div class="tabletext"> <b>${contactMechMap.contactMechType.get("description",locale)}</b></div>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
- <#list contactMechMap.partyContactMechPurposes as partyContactMechPurpose>
+ <th>${uiLabelMap.PartyContactType}</th>
+ <th>${uiLabelMap.PartyContactInformation}</th>
+ <th>${uiLabelMap.PartyContactSolicitingOk}</th>
+ <th> </th>
+ </tr>
+ <#list contactMeches as contactMechMap>
+ <#assign contactMech = contactMechMap.contactMech>
+ <#assign partyContactMech = contactMechMap.partyContactMech>
+ <tr><td colspan="4"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label align-top">${contactMechMap.contactMechType.get("description",locale)}</td>
+ <td>
+ <#list contactMechMap.partyContactMechPurposes as partyContactMechPurpose>
<#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
- <div class="tabletext">
- <#if contactMechPurposeType?has_content>
- <b>${contactMechPurposeType.get("description",locale)}</b>
- <#else>
- <b>${uiLabelMap.PartyMechPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
- </#if>
- <#if partyContactMechPurpose.thruDate?has_content>
+ <div>
+ <#if contactMechPurposeType?has_content>
+ <b>${contactMechPurposeType.get("description",locale)}</b>
+ <#else>
+ <b>${uiLabelMap.PartyMechPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
+ </#if>
+ <#if partyContactMechPurpose.thruDate?has_content>
(${uiLabelMap.CommonExpire}: ${partyContactMechPurpose.thruDate.toString()})
- </#if>
- </div>
- </#list>
- <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId>
+ </#if>
+ </div>
+ </#list>
+ <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId>
<#assign postalAddress = contactMechMap.postalAddress>
- <div class="tabletext">
- <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br/></#if>
- <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br/></#if>
- ${postalAddress.address1?if_exists}<br/>
- <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
+ <div>
+ <#if postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b> ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
${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)}
</#if>
${postalAddress.postalCode?if_exists}
- <#if postalAddress.countryGeoId?has_content><br/>
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.geoName?default(country.geoId)}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.geoName?default(country.geoId)}
</#if>
</div>
<#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)>
- <a target="_blank" href="http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18" class="linktext">(lookup:whitepages.com)</a>
- </#if>
+ <#assign addr1 = postalAddress.address1?if_exists>
+ <#if (addr1.indexOf(" ") > 0)>
+ <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
+ <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
+ <a target="_blank" href="http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18">(lookup:whitepages.com)</a>
+ </#if>
</#if>
- <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
+ <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>
<#assign telecomNumber = contactMechMap.telecomNumber>
- <div class="tabletext">
+ <div>
${telecomNumber.countryCode?if_exists}
<#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
<#if partyContactMech.extension?has_content>${uiLabelMap.PartyContactExt} ${partyContactMech.extension}</#if>
<#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
- <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8" class="linktext">(lookup:anywho.com)</a>
- <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode?if_exists}&s=&p=${telecomNumber.contactNumber?if_exists}&pt=b&x=40&y=9" class="linktext">(lookup:whitepages.com)</a>
+ <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8">(lookup:anywho.com)</a>
+ <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode?if_exists}&s=&p=${telecomNumber.contactNumber?if_exists}&pt=b&x=40&y=9">(lookup:whitepages.com)</a>
</#if>
</div>
- <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId>
- <div class="tabletext">
+ <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId>
+ <div>
${contactMech.infoString?if_exists}
- <a href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyId=${party.partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#...@ofbizUrl>" class="linktext">(${uiLabelMap.CommonSendEmail})</a>
+ <a href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyId=${party.partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#...@ofbizUrl>">(${uiLabelMap.CommonSendEmail})</a>
</div>
- <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId>
- <div class="tabletext">
+ <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId>
+ <div>
${contactMech.infoString?if_exists}
<#assign openAddress = contactMech.infoString?default("")>
<#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress></#if>
- <a target="_blank" href="${openAddress}" class="linktext">(${uiLabelMap.CommonOpenPageNewWindow})</a>
- </div>
- <#else>
- <div class="tabletext">
- ${contactMech.infoString?if_exists}
+ <a target="_blank" href="${openAddress}">(${uiLabelMap.CommonOpenPageNewWindow})</a>
</div>
- </#if>
- <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div>
- <#if partyContactMech.thruDate?has_content><div class="tabletext"><b>${uiLabelMap.PartyContactEffectiveThru}: ${partyContactMech.thruDate.toString()}</b></div></#if>
- <#-- create cust request -->
- <#if custRequestTypes?exists>
- <div>
- <form name="createCustRequestForm" action="<@o...@ofbizUrl>" method="POST">
- <input type="hidden" name="partyId" value="${party.partyId}"/>
- <input type="hidden" name="fromPartyId" value="${party.partyId}"/>
- <input type="hidden" name="fulfillContactMechId" value="${contactMech.contactMechId}"/>
- <select name="custRequestTypeId" class="inputBox">
- <#list custRequestTypes as type>
- <option value="${type.custRequestTypeId}">${type.get("description", locale)}</option>
- </#list>
- </select>
- <input type="submit" class="smallSubmit" value="${uiLabelMap.PartyCreateNewCustRequest}"/>
- </form>
- </div>
- </#if>
- </td>
- <td align="center" valign="top" nowrap width="1%"><div class="tabletext"><b>(${partyContactMech.allowSolicitation?if_exists})</b></div></td>
- <td width="5"> </td>
- <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
- <td align="right" valign="top" nowrap width="1%">
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a> </div>
- </td>
- </#if>
- <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)>
- <td align="right" valign="top" width="1%">
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonExpire}</a> </div>
- </td>
- </#if>
- </tr>
- </#list>
- </table>
- <#else>
- <div class="tabletext">${uiLabelMap.PartyNoContactInformation}</div>
- </#if>
+ <#else>
+ <div>${contactMech.infoString?if_exists}</div>
+ </#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div>
+ <#if partyContactMech.thruDate?has_content><div><b>${uiLabelMap.PartyContactEffectiveThru}: ${partyContactMech.thruDate.toString()}</b></div></#if>
+ <#-- create cust request -->
+ <#if custRequestTypes?exists>
+ <form name="createCustRequestForm" action="<@o...@ofbizUrl>" method="POST">
+ <input type="hidden" name="partyId" value="${party.partyId}"/>
+ <input type="hidden" name="fromPartyId" value="${party.partyId}"/>
+ <input type="hidden" name="fulfillContactMechId" value="${contactMech.contactMechId}"/>
+ <select name="custRequestTypeId">
+ <#list custRequestTypes as type>
+ <option value="${type.custRequestTypeId}">${type.get("description", locale)}</option>
+ </#list>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.PartyCreateNewCustRequest}"/>
+ </form>
+ </#if>
+ </td>
+ <td valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td>
+ <td class="button-col align-float">
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
+ </#if>
+ </td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoContactInformation}
+ </#if>
</div>
-</div>
+ </div>
<#-- Payment Info ============================================================= -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
- <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)>
- <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.AccountingCreateNewCreditCard}</a>
- <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.AccountingCreateNewGiftCard}</a>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.AccountingCreateNewEftAccount}</a>
- </#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyPaymentMethodInformation}</div>
+ <div id="partyPaymentMethod" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.PartyPaymentMethodInformation}</h3>
+ <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewCreditCard}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
- <#if paymentMethodValueMaps?has_content>
- <table width="100%" border="0" cellpadding="1">
+ <#if paymentMethodValueMaps?has_content>
+ <table class="basic-table" cellspacing="0">
+ <#list paymentMethodValueMaps as paymentMethodValueMap>
+ <#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
<tr>
- <td align="left">
- <table width="100%" cellpadding="2" cellspacing="0" border="0">
- <#list paymentMethodValueMaps as paymentMethodValueMap>
- <#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
- <tr>
- <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
- <#assign creditCard = paymentMethodValueMap.creditCard/>
- <td width="90%" valign="top">
- <div class="tabletext">
- <b>
- ${uiLabelMap.AccountingCreditCard}:
- <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard} </#if>
- <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
- ${creditCard.firstNameOnCard}
- <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if>
- ${creditCard.lastNameOnCard}
- <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if>
- -
- <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
- ${creditCard.cardType}
- ${creditCard.cardNumber}
- ${creditCard.expireDate}
- <#else>
- ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
- </#if>
- </b>
- <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
- <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
- <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate})</b></#if>
- </div>
- </td>
- <td width="5"> </td>
- <td align="right" valign="top" width="1%" nowrap>
- <div>
- <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
- <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}" class="buttontext">Manual Tx</a>
- </#if>
- <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a>
- </#if>
- </div>
- </td>
- <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
- <#assign giftCard = paymentMethodValueMap.giftCard>
- <td width="90%" valign="top">
- <div class="tabletext">
- <b>
- ${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 + "*">
- </#list>
- <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]>
- <#else>
- <#assign giftCardNumber = pcardNumber>
- </#if>
- </#if>
- </#if>
- ${giftCardNumber?default("N/A")}
- </#if>
- </b>
- <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
- <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
- <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</b></#if>
- </div>
- </td>
- <td width="5"> </td>
- <td align="right" valign="top" width="1%" nowrap>
- <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
- </#if>
- </td>
- <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
- <#assign eftAccount = paymentMethodValueMap.eftAccount>
- <td width="90%" valign="top">
- <div class="tabletext">
- <b>
- ${uiLabelMap.PartyEftAccount}: ${eftAccount.nameOnAccount} - <#if eftAccount.bankName?has_content>${uiLabelMap.PartyBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.PartyAccount} #: ${eftAccount.accountNumber}</#if>
- </b>
- <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
- <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
- <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</b></#if>
- </div>
- </td>
- <td width="5"> </td>
- <td align="right" valign="top" width="1%" nowrap>
- <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
- </#if>
- </td>
- <#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId>
- <td width="90%" valign="top">
- <div class="tabletext">
- <b>Company Check</b>
- <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
- <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
- <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
- <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</b></#if>
- </div>
- </td>
- <td width="5"> </td>
- <td align="right" valign="top" width="1%" nowrap> </td>
- </#if>
- <td align="right" valign="top" width="1%">
- <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session)>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonExpire}</a></div>
- </#if>
- </td>
- </tr>
- </#list>
- </table>
- </td>
+ <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
+ <#assign creditCard = paymentMethodValueMap.creditCard/>
+ <td class="label">
+ ${uiLabelMap.AccountingCreditCard}
+ </td>
+ <td>
+ <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard} </#if>
+ <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
+ ${creditCard.firstNameOnCard}
+ <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if>
+ ${creditCard.lastNameOnCard}
+ <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if>
+ -
+ <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
+ ${creditCard.cardType}
+ ${creditCard.cardNumber}
+ ${creditCard.expireDate}
+ <#else>
+ ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
+ </#if>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate})</#if>
+ </td>
+ <td class="button-col align-float">
+ <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
+ <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">Manual Tx</a>
+ </#if>
+ <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#-- </td> -->
+ <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
+ <#assign giftCard = paymentMethodValueMap.giftCard>
+ <td class="label" valign="top">
+ ${uiLabelMap.AccountingGiftCard}
+ </td>
+ <td>
+ <#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 + "*">
+ </#list>
+ <#assign giftCardNumber = giftCardNumber + pcardNumber[psize .. psize + 3]>
+ <#else>
+ <#assign giftCardNumber = pcardNumber>
+ </#if>
+ </#if>
+ </#if>
+ ${giftCardNumber?default("N/A")}
+ </#if>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</b></#if>
+ </td>
+ <td class="button-col align-float">
+ <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#-- </td> -->
+ <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
+ <#assign eftAccount = paymentMethodValueMap.eftAccount>
+ <td class="label" valign="top">
+ ${uiLabelMap.PartyEftAccount}
+ </td>
+ <td>
+ ${eftAccount.nameOnAccount} - <#if eftAccount.bankName?has_content>${uiLabelMap.PartyBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.PartyAccount} #: ${eftAccount.accountNumber}</#if> <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</#if>
+ </td>
+ <td class="button-col align-float">
+ <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ </#if>
+ <#-- </td> -->
+ <#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId>
+ <td class="label" valign="top">
+ <#-- TODO: Convert hard-coded text to UI label properties -->
+ Company Check
+ </td>
+ <td>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ <#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
+ <#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})</#if>
+ <#if paymentMethod.thruDate?has_content>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</#if>
+ </td>
+ <td class="button-col align-float">
+
+ <#-- </td> -->
+ </#if>
+ <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
+ <#else>
+
+ </#if>
+ </td> <#-- closes out orphaned <td> elements inside conditionals -->
</tr>
- </table>
- <#else>
- <div class="tabletext">${uiLabelMap.PartyNoPaymentMethodInformation}</div>
- </#if>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoPaymentMethodInformation}
+ </#if>
</div>
-</div>
+ </div>
<#-- AVS Strings -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.PartyCybersourceAvsOver}</div>
+ <div id="partyAVS" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyCybersourceAvsOver}</h3>
</div>
<div class="screenlet-body">
- <div class="tabletext">
- <b>${uiLabelMap.PartyAvsString}:</b> ${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")}
- <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
- <#if avsOverride?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonReset}</a>
- </#if>
- </#if>
- </div>
+ <span class="label">${uiLabelMap.PartyAvsString}</span>${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")}
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonEdit}</a>
+ <#if avsOverride?exists>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonReset}</a>
+ </#if>
+ </#if>
</div>
-</div>
+ </div>
<#-- UserLogins -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
- </#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyUserName}</div>
+ <div id="partyUserLogins" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.PartyUserName}</h3>
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
- <#if userLogins?exists>
- <table width="100%" border="0" cellpadding="1">
+ <#if userLogins?exists>
+ <table class="basic-table" cellspacing="0">
<#list userLogins as userUserLogin>
- <tr>
- <td align="right" valign="top" width="10%" nowrap><div class="tabletext"><b>${uiLabelMap.PartyUserLogin}</b></div></td>
- <td width="5"> </td>
- <td align="left" valign="top" width="40%"><div class="tabletext">${userUserLogin.userLoginId}</div></td>
- <td align="left" valign="top" width="30%">
- <div class="tabletext">
+ <tr>
+ <td class="label">${uiLabelMap.PartyUserLogin}</td>
+ <td>${userUserLogin.userLoginId}</td>
+ <td>
<#assign enabled = uiLabelMap.PartyEnabled>
<#if (userUserLogin.enabled)?default("Y") == "N">
<#if userUserLogin.disabledDateTime?exists>
@@ -465,227 +434,223 @@
<#assign enabled = uiLabelMap.PartyDisabled + " - " + disabledTime>
</#if>
${enabled}
- </div>
- </td>
- <td align="right" valign="top" width="20%">
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
- </#if>
- <#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartySecurityGroups}</a>
- </#if>
- </td>
- </tr>
+ </td>
+ <td class="button-col align-float">
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
+ </#if>
+ <#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.PartySecurityGroups}</a>
+ </#if>
+ </td>
+ </tr>
</#list>
</table>
- <#else>
- <div class="tabletext">${uiLabelMap.PartyNoUserLogin}</div>
- </#if>
+ <#else>
+ ${uiLabelMap.PartyNoUserLogin}
+ </#if>
</div>
-</div>
+ </div>
<#-- Party Attributes -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
- </#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyAttributes}</div>
+ <div id="partyAttributes" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.PartyAttributes}</h3>
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
- <#if attributes?has_content>
- <table width="100%" border="0" cellpadding="1">
- <#list attributes as attr>
- <tr>
- <td nowrap align="left" valign="top" width="1%">
- <div class="tabletext"> <b>${uiLabelMap.CommonName}: </b>${attr.attrName}</div>
- </td>
- <td align="left" valign="top" width="98%">
- <div class="tabletext"> <b>${uiLabelMap.CommonValue}: </b>${attr.attrValue}</div>
- </td>
- <td align="right" valign="top" width="1%">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
- </td>
- </tr>
- </#list>
- </table>
- <#else>
- <div class="tabletext">${uiLabelMap.PartyNoPartyAttributesFound}</div>
- </#if>
+ <#if attributes?has_content>
+ <table class="basic-table" cellspacing="0">
+ <#list attributes as attr>
+ <tr>
+ <td class="label">
+ ${uiLabelMap.CommonName}: ${attr.attrName}
+ </td>
+ <td>
+ ${uiLabelMap.CommonValue}: ${attr.attrValue}
+ </td>
+ <td class="button-col align-float">
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
+ </td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ ${uiLabelMap.PartyNoPartyAttributesFound}
+ </#if>
</div>
-</div>
+ </div>
<#-- Visits -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonListAll}</a>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyLastVisit}</div>
- </div>
- <div class="screenlet-body">
- <#if visits?exists>
- <table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tableheadtext">${uiLabelMap.PartyVisitId}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.PartyUserLogin}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.PartyNewUser}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.PartyWebApp}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.PartyClientIP}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.CommonFromDate}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.CommonThruDate}</div></td>
- </tr>
- <tr>
- <td colspan="7"><hr class="sepbar"></td>
+ <div id="partyVisits" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.PartyLastVisit}</h3>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonListAll}</a></li>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <#if visits?has_content>
+ <table class="basic-table" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.PartyVisitId}</td>
+ <td>${uiLabelMap.PartyUserLogin}</td>
+ <td>${uiLabelMap.PartyNewUser}</td>
+ <td>${uiLabelMap.PartyWebApp}</td>
+ <td>${uiLabelMap.PartyClientIP}</td>
+ <td>${uiLabelMap.CommonFromDate}</td>
+ <td>${uiLabelMap.CommonThruDate}</td>
</tr>
<#list visits as visitObj>
- <#if (visitObj_index > 4)><#break></#if>
- <tr>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${visitObj.visitId?if_exists}</a></td>
- <td><div class="tabletext">${visitObj.userLoginId?if_exists}</div></td>
- <td><div class="tabletext">${visitObj.userCreated?if_exists}</div></td>
- <td><div class="tabletext">${visitObj.webappName?if_exists}</div></td>
- <td><div class="tabletext">${visitObj.clientIpAddress?if_exists}</div></td>
- <td><div class="tabletext">${(visitObj.fromDate.toString())?if_exists}</div></td>
- <td><div class="tabletext">${(visitObj.thruDate.toString())?if_exists}</div></td>
- </tr>
+ <#if (visitObj_index > 4)><#break></#if>
+ <tr>
+ <td class="button-col">
+ <a href="<@o...@ofbizUrl>">${visitObj.visitId?if_exists}</a>
+ </td>
+ <td>${visitObj.userLoginId?if_exists}</td>
+ <td>${visitObj.userCreated?if_exists}</td>
+ <td>${visitObj.webappName?if_exists}</td>
+ <td>${visitObj.clientIpAddress?if_exists}</td>
+ <td>${(visitObj.fromDate.toString())?if_exists}</td>
+ <td>${(visitObj.thruDate.toString())?if_exists}</td>
+ </tr>
</#list>
</table>
- <#else>
- <div class="tabletext">${uiLabelMap.PartyNoVisitFound}</div>
- </#if>
+ <#else>
+ ${uiLabelMap.PartyNoVisitFound}
+ </#if>
</div>
-</div>
+ </div>
<#-- Current Cart -->
-<#if isCustomer?exists>
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
+ <#if isCustomer?exists>
+ <div id="partyShoppingCart" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.PartyCurrentShoppingCart}</h3>
<#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
- <#if savedCartListId?has_content>
- <#assign listParam = "&shoppingListId=" + savedCartListId>
- <#else>
- <#assign listParam = "">
- </#if>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonEdit}</a>
+ <#if savedCartListId?has_content>
+ <#assign listParam = "&shoppingListId=" + savedCartListId>
+ <#else>
+ <#assign listParam = "">
+ </#if>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
</#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.PartyCurrentShoppingCart}</div>
- </div>
- <div class="screenlet-body">
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
<#if savedCartItems?has_content>
- <table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <td><div class="tableheadtext">${uiLabelMap.PartySequenceId}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.PartyProductId}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.PartyQuantity}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.PartyQuantityPurchased}</div></td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <td colspan="7"><hr class="sepbar"></td>
+ <table class="basic-table" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.PartySequenceId}</td>
+ <td>${uiLabelMap.PartyProductId}</td>
+ <td>${uiLabelMap.PartyQuantity}</td>
+ <td>${uiLabelMap.PartyQuantityPurchased}</td>
</tr>
<#list savedCartItems as savedCartItem>
<tr>
- <td><div class="tabletext">${savedCartItem.shoppingListItemSeqId?if_exists}</div></td>
- <td><a href="/catalog/control/EditProduct?productId=${savedCartItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${savedCartItem.productId?if_exists}</a</td>
- <td><div class="tabletext">${savedCartItem.quantity?if_exists}</div></td>
- <td><div class="tabletext">${savedCartItem.quantityPurchased?if_exists}</div></td>
+ <td>${savedCartItem.shoppingListItemSeqId?if_exists}</td>
+ <td class="button-col"><a href="/catalog/control/EditProduct?productId=${savedCartItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${savedCartItem.productId?if_exists}</a></td>
+ <td>${savedCartItem.quantity?if_exists}</td>
+ <td>${savedCartItem.quantityPurchased?if_exists}</td>
</tr>
</#list>
</table>
<#else>
- <div class="tabletext">${uiLabelMap.PartyNoShoppingCartSavedForParty}</div>
+ ${uiLabelMap.PartyNoShoppingCartSavedForParty}
</#if>
+ </div>
</div>
-</div>
-</#if>
+ </#if>
<#-- Party Content -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead"> ${uiLabelMap.PartyContent}</div>
+ <div id="partyContent" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyContent}</h3>
</div>
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1">
- <#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")>
- <tr>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${content.contentId}</a>
- <td><div class="tabletext">${pcPurpose.description?if_exists}</div></td>
- <td><div class="tabletext">${content.contentName?if_exists}</div></td>
- <td><div class="tabletext">${(contentType.get("description",locale))?if_exists}</div></td>
- <td><div class="tabletext">${(mimeType.description)?if_exists}</div></td>
- <td><div class="tabletext">${(status.get("description",locale))?if_exists}</div></td>
- <#-- <td><div class="tabletext">${contentRole.fromDate?if_exists}</div></td> -->
- <td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
- </td>
- </tr>
- </#list>
- <#else>
- <div class="tabletext">${uiLabelMap.PartyNoContent}</div>
- </#if>
+ <#if partyContent?has_content>
+ <table class="basic-table" cellspacing="0">
+ <#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")>
+ <tr>
+ <td class="button-col"><a href="<@o...@ofbizUrl>">${content.contentId}</a></td>
+ <td>${pcPurpose.description?if_exists}</td>
+ <td>${content.contentName?if_exists}</td>
+ <td>${(contentType.get("description",locale))?if_exists}</td>
+ <td>${(mimeType.description)?if_exists}</td>
+ <td>${(status.get("description",locale))?if_exists}</td>
+ <#-- <td>${contentRole.fromDate?if_exists}</td> -->
+ <td class="button-col align-float">
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonView}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+ </td>
+ </tr>
+ </#list>
</table>
- <div> </div>
- <hr class="sepbar"/>
- <div align="left"><b><u>${uiLabelMap.PartyAttachContent}</u></b>
- <div> </div>
- <form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>" style="margin: 0;">
- <input type="hidden" name="dataCategoryId" value="PERSONAL"/>
- <input type="hidden" name="contentTypeId" value="DOCUMENT"/>
- <input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
- <input type="hidden" name="partyId" value="${partyId}"/>
- <input type="file" name="uploadedFile" size="20" class="inputBox"/>
- <select name="contentPurposeEnumId" class="inputBox">
- <option value="">Select Purpose</option>
- <#list contentPurposes as contentPurpose>
- <option value="${contentPurpose.enumId}">${contentPurpose.description?default(contentPurpose.enumId)}</option>
- </#list>
- </select>
- <select name="roleTypeId" class="inputBox">
- <option value="">Select Role</option>
- <#list roles as role>
- <option value="${role.roleTypeId}">${role.description?default(role.roleTypeId)}</option>
- </#list>
- </select>
- <input type="submit" value="${uiLabelMap.CommonUpload}" class="smallSubmit"/>
- </form>
- </div>
+ <#else>
+ ${uiLabelMap.PartyNoContent}
+ </#if>
+ <hr class="sepbar"/>
+ <div class="label">${uiLabelMap.PartyAttachContent}</div>
+ <form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="dataCategoryId" value="PERSONAL"/>
+ <input type="hidden" name="contentTypeId" value="DOCUMENT"/>
+ <input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
+ <input type="hidden" name="partyId" value="${partyId}"/>
+ <input type="file" name="uploadedFile" size="20"/>
+ <select name="contentPurposeEnumId">
+ <#-- TODO: Convert hard-coded text to UI label properties -->
+ <option value="">Select Purpose</option>
+ <#list contentPurposes as contentPurpose>
+ <option value="${contentPurpose.enumId}">${contentPurpose.description?default(contentPurpose.enumId)}</option>
+ </#list>
+ </select>
+ <select name="roleTypeId">
+ <#-- TODO: Convert hard-coded text to UI label properties -->
+ <option value="">Select Role</option>
+ <#list roles as role>
+ <option value="${role.roleTypeId}">${role.description?default(role.roleTypeId)}</option>
+ </#list>
+ </select>
+ <input type="submit" value="${uiLabelMap.CommonUpload}"/>
+ </form>
</div>
-</div>
+ </div>
<#-- Party Notes -->
-<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxlink">
- <#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)>
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
- </#if>
- </div>
- <div class="boxhead"> ${uiLabelMap.CommonNotes}</div>
+ <div id="partyNotes" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.CommonNotes}</h3>
+ <#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
</div>
<div class="screenlet-body">
- <#if notes?has_content>
+ <#if notes?has_content>
<table width="100%" border="0" cellpadding="1">
<#list notes as noteRef>
<tr>
- <td align="left" valign="top" width="35%">
- <div class="tabletext"> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, noteRef.noteParty, true)}</div>
- <div class="tabletext"> <b>${uiLabelMap.CommonAt}: </b>${noteRef.noteDateTime.toString()}</div>
+ <td>
+ <div><b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, noteRef.noteParty, true)}</div>
+ <div><b>${uiLabelMap.CommonAt}: </b>${noteRef.noteDateTime.toString()}</div>
</td>
- <td align="left" valign="top" width="65%">
- <div class="tabletext">${noteRef.noteInfo}</div>
+ <td>
+ ${noteRef.noteInfo}
</td>
</tr>
<#if noteRef_has_next>
@@ -693,12 +658,12 @@
</#if>
</#list>
</table>
- <#else>
- <div class="tabletext">${uiLabelMap.PartyNoNotesForParty}</div>
- </#if>
+ <#else>
+ ${uiLabelMap.PartyNoNotesForParty}
+ </#if>
</div>
-</div>
+ </div>
<#else>
- ${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${partyId?if_exists}
+ ${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId?if_exists}
</#if>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl Sat Mar 3 01:41:15 2007
@@ -18,114 +18,83 @@
-->
<#-- Party Roles -->
+<!-- begin viewroles.ftl -->
<br/>
-<TABLE border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
- <TR>
- <TD width="100%">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
- <tr>
- <td valign="middle" align="left">
- <div class="boxhead">${uiLabelMap.PartyMemberRoles}</div>
- </td>
- </tr>
- </table>
- </TD>
- </form>
- </TR>
- <TR>
- <TD width="100%">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom">
- <tr>
- <td>
- <#if partyRoles?has_content>
- <table width="100%" border="0" cellpadding="1">
- <#list partyRoles as userRole>
- <tr>
- <td align="right" valign="top" width="10%" nowrap><div class="tabletext"><b>${uiLabelMap.PartyRole}</b></div></td>
- <td width="5"> </td>
- <td align="left" valign="top" width="70%"><div class="tabletext">${userRole.get("description",locale)} [${userRole.roleTypeId}]</div></td>
- <#if hasDeletePermission>
- <td align="right" valign="top" width="20%">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
- </td>
- </#if>
- </tr>
- </#list>
- </table>
+<div id="partyRoles" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyMemberRoles}</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <#if partyRoles?has_content>
+ <#list partyRoles as userRole>
+ <tr>
+ <td class="label">${uiLabelMap.PartyRole}</td>
+ <td>${userRole.get("description",locale)} [${userRole.roleTypeId}]</td>
+ <#if hasDeletePermission>
+ <td class="button-col align-float">
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+ </td>
<#else>
- <div class="tabletext">${uiLabelMap.PartyNoPartyRolesFound}</div>
+ <td> </td>
</#if>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
- <#if hasUpdatePermission>
- <TR>
- <TD width="100%"><hr class="sepbar"></TD>
- </TR>
- <TR>
- <TD width="100%" >
- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom">
- <form name="addPartyRole" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="partyId" value="${partyId}">
+ </tr>
+ </#list>
+ <#else>
+ ${uiLabelMap.PartyNoPartyRolesFound}
+ </#if>
+ <#if hasUpdatePermission>
+ <tr><td colspan="3"><hr class="sepbar"></td></tr>
<tr>
- <td align="right" width="75%"><span class="tabletext"> ${uiLabelMap.PartyAddToRole}: </span></td>
- <td>
- <select name="roleTypeId" class="selectBox">
- <#list roles as role>
- <option value="${role.roleTypeId}">${role.get("description",locale)}</option>
- </#list>
- </select>
+ <td class="label">
+ ${uiLabelMap.PartyAddToRole}
</td>
<td>
- <a href="javascript:document.addPartyRole.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a>
+ <form name="addPartyRole" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="partyId" value="${partyId}"/>
+ <select name="roleTypeId">
+ <#list roles as role>
+ <option value="${role.roleTypeId}">${role.get("description",locale)}</option>
+ </#list>
+ </select>
+ <a href="javascript:document.addPartyRole.submit()" class="smallSubmit">${uiLabelMap.CommonAdd}</a>
+ </form>
</td>
+ <td> </td>
</tr>
- </form>
- </table>
- </TD>
- </TR>
- </#if>
-</TABLE>
+ </#if>
+ </table>
+ </div>
+</div>
<#-- Add role type -->
<#if hasCreatePermission>
<br/>
-<TABLE border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
- <TR>
- <TD width="100%">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
- <tr>
- <td valign="middle" align="left">
- <div class="boxhead">${uiLabelMap.PartyNewRoleType}</div>
- </td>
- </tr>
- </table>
- </TD>
- </form>
- </TR>
- <TR>
- <TD width="100%">
- <table width="100%" border="0" cellspacing="1" cellpadding="1" class="boxbottom">
- <form method="post" action="<@o...@ofbizUrl>" name="createroleform">
- <input type='hidden' name='party_id' value='${partyId}'>
- <input type='hidden' name='partyId' value='${partyId}'>
+<div id="newRoleType" class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyNewRoleType}</h3>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" action="<@o...@ofbizUrl>" name="createroleform">
+ <input type='hidden' name='party_id' value='${partyId}'>
+ <input type='hidden' name='partyId' value='${partyId}'>
+ <table cellspacing="0" class="basic-table">
<tr>
- <td width="16%"><div class="tabletext">${uiLabelMap.PartyRoleTypeId}</div></td>
- <td width="84%">
- <input type="text" name="roleTypeId" size="20" class="inputBox">*
+ <td class="label">${uiLabelMap.PartyRoleTypeId}</td>
+ <td>
+ <input type="text" name="roleTypeId" size="20" class="required"><span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
<tr>
- <td width="16%"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
- <td width="84%">
- <input type="text" name="description" size="30" class="inputBox">*
- <a href="javascript:document.createroleform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+ <td class="label">${uiLabelMap.CommonDescription}</td>
+ <td>
+ <input type="text" name="description" size="30" class="required"><span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
- </form>
+ <tr>
+ <td> </td>
+ <td><a href="javascript:document.createroleform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a></td>
</table>
- </TD>
- </TR>
-</TABLE>
+ </form>
+ </div>
+</div>
</#if>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl Sat Mar 3 01:41:15 2007
@@ -17,12 +17,16 @@
under the License.
-->
- <#assign unselectedClassName = "tabButton">
- <#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
- <#if groupId?has_content>
- <div class='tabContainer'>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditSecurityGroup?default(unselectedClassName)}">${uiLabelMap.PartySecurityGroups}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditSecurityGroupPermissions?default(unselectedClassName)}">${uiLabelMap.PartyPermissions}</a>
- <a href="<@o...@ofbizUrl>" class="${selectedClassMap.EditSecurityGroupUserLogins?default(unselectedClassName)}">${uiLabelMap.PartyUserLogins}</a>
- </div>
- </#if>
+<#if groupId?has_content>
+<!-- begin SecurityGroupTabBar.ftl -->
+ <#assign selected = page.tabButtonItem?default("void")>
+ <div class="button-bar button-style-1">
+ <ul>
+ <li<#if selected == "EditSecurityGroup"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.PartySecurityGroups}</a></li>
+ <li<#if selected == "EditSecurityGroupPermissions"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.PartyPermissions}</a></li>
+ <li<#if selected == "EditSecurityGroupUserLogins"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.PartyUserLogins}</a></li>
+ <br class="clear" />
+ </ul>
+ </div>
+<!-- end SecurityGroupTabBar.ftl -->
+</#if>
Added: ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css?view=auto&rev=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css Sat Mar 3 01:41:15 2007
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/* This CSS file is used for the Party Manager component. */
+
+#mech-purpose-types .basic-table {
+width: auto;
+margin-bottom: 1em;
+}
Added: ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.js?view=auto&rev=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.js (added)
+++ ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.js Sat Mar 3 01:41:15 2007
@@ -0,0 +1,33 @@
+/*
+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.
+*/
+
+function lookupParty(url) {
+ partyIdValue = document.lookupparty.partyId.value;
+ userLoginIdValue = document.lookupparty.userLoginId.value;
+ if (partyIdValue.length > 0 || userLoginIdValue.length > 0) {
+ document.lookupparty.action = url;
+ }
+ return true;
+}
+
+function refreshInfo() {
+ document.lookupparty.lookupFlag.value = "N";
+ document.lookupparty.hideFields.value = "N";
+ document.lookupparty.submit();
+}