svn commit: r514106 [4/6] - in /ofbiz/trunk/applications/part
Locked
svn commit: r514106 [4/6] - in /ofbiz/trunk/applications/part
 
|
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl Sat Mar 3 01:41:15 2007 @@ -17,38 +17,38 @@ under the License. --> +<!-- begin editgiftcard.ftl --> <#if !giftCard?exists> - <p class="head1">${uiLabelMap.AccountingCreateNewGiftCard}</p> + <h1>${uiLabelMap.AccountingCreateNewGiftCard}</h1> <form method="post" action="<@ofbizUrl>createGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> <#else> - <p class="head1">${uiLabelMap.AccountingEditGiftCard}</p> + <h1>${uiLabelMap.AccountingEditGiftCard}</h1> <form method="post" action="<@ofbizUrl>updateGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> <input type="hidden" name="paymentMethodId" value="${paymentMethodId}"> </#if> <input type="hidden" name="partyId" value="${partyId}"/> - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editgiftcardform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> + <div class="button-bar"> + <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> + <a href="javascript:document.editgiftcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> - <table width="90%" border="0" cellpadding="2" cellspacing="0"> + <table class="basic-table" cellspacing="0"> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber?if_exists}"> + <td class="label">${uiLabelMap.AccountingCardNumber}</td> + <td> + <input type="text" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber?if_exists}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingPinNumber}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}"> + <td class="label">${uiLabelMap.AccountingPinNumber}</td> + <td> + <input type="text" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonExpireDate}</div></td> - <td width="5"> </td> - <td width="74%"> + <td class="label">${uiLabelMap.CommonExpireDate}</td> + <td> <#assign expMonth = ""> <#assign expYear = ""> <#if giftCardData?exists && giftCardData.expireDate?exists> @@ -58,7 +58,7 @@ <#assign expYear = expDate.substring(expDate.indexOf("/")+1)> </#if> </#if> - <select name="expMonth" class="selectBox" onchange="javascript:makeExpDate();"> + <select name="expMonth" onchange="javascript:makeExpDate();"> <#if giftCardData?has_content && expMonth?has_content> <#assign ccExprMonth = expMonth> <#else> @@ -69,7 +69,7 @@ </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} </select> - <select name="expYear" class="selectBox" onchange="javascript:makeExpDate();"> + <select name="expYear" onchange="javascript:makeExpDate();"> <#if giftCard?has_content && expYear?has_content> <#assign ccExprYear = expYear> <#else> @@ -83,14 +83,16 @@ </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}"> + <td class="label">${uiLabelMap.CommonDescription}</td> + <td> + <input type="text" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}"> </td> </tr> </table> </form> - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editgiftcardform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> + <div class="button-bar"> + <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> + <a href="javascript:document.editgiftcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> +<!-- end editgiftcard.ftl --> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl Sat Mar 3 01:41:15 2007 @@ -17,128 +17,105 @@ under the License. --> -<br/> -<TABLE border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside"> - <TR> - <TD width="100%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop"> +<!-- begin findMatches.ftl --> +<div id="address-match-map" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.PageTitleAddressMatches}</h3> + <li><a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>">${uiLabelMap.PageTitleAddressMatchMap}</a></li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <table class="basic-table" cellspacing="0"> + <form name="matchform" method="post" action="<@ofbizUrl>findAddressMatch?match=true</@ofbizUrl>"> <tr> - <td valign="middle" align="left"> - <div class="boxhead">${uiLabelMap.PageTitleAddressMatches}</div> - </td> - <td valign="middle" align="right"> - <a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>" class="submenutextright">${uiLabelMap.PageTitleAddressMatchMap}</a> + <td class="label">${uiLabelMap.PartyLastName}</td> + <td><input type="text" name="lastName" class="required" value="${parameters.lastName?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyFirstName}</td> + <td><input type="text" name="firstName" class="required" value="${parameters.firstName?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonAddress1}</td> + <td><input type="text" name="address1" class="required" value="${parameters.address1?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonAddress2}</td> + <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonCity}</td> + <td><input type="text" name="city" class="required" value="${parameters.city?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonStateProvince}</td> + <td> + <select name="stateProvinceGeoId"> + <#if currentStateGeo?has_content> + <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option> + <option value="${currentStateGeo.geoId}">---</option> + </#if> + <option value="ANY">${uiLabelMap.CommonAny} ${uiLabelMap.CommonStateProvince}</option> + ${screens.render("component://common/widget/CommonScreens.xml#states")} + </select> </td> </tr> - </table> - </TD> - </TR> - <TR> - <TD width="100%" > - <center> - <table border="0" cellspacing="0" cellpadding="2" class="boxbottom"> - <form name="matchform" method="post" action="<@ofbizUrl>findAddressMatch?match=true</@ofbizUrl>"> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyLastName} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="lastName" value="${parameters.lastName?if_exists}"/>*</td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyFirstName} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="firstName" value="${parameters.firstName?if_exists}"/>*</td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonAddress1} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="address1" value="${parameters.address1?if_exists}"/>*</td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonAddress2} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="address2" value="${parameters.address2?if_exists}"/></td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonCity} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="city" value="${parameters.city?if_exists}"/>*</td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonStateProvince} :</div></td> - <td width="5%"> </td> - <td> - <select name="stateProvinceGeoId" class="selectBox"> - <#if currentStateGeo?has_content> - <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option> - <option value="${currentStateGeo.geoId}">---</option> - </#if> - <option value="ANY">${uiLabelMap.CommonAny} ${uiLabelMap.CommonStateProvince}</option> - ${screens.render("component://common/widget/CommonScreens.xml#states")} - </select> - </td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyZipCode} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="postalCode" value="${parameters.postalCode?if_exists}"/>*</td> - </tr> - <tr> - <td colspan="2"> </td> - <td><input type="submit" value="${uiLabelMap.PageTitleFindMatches}" class="smallSubmit"></td> - </tr> - </form> - <tr><td colspan="5"> </td></tr> - + <tr> + <td class="label">${uiLabelMap.PartyZipCode}</td> + <td><input type="text" name="postalCode" class="required" value="${parameters.postalCode?if_exists}"/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td> + </tr> + <tr> + <td></td> + <td><input type="submit" value="${uiLabelMap.PageTitleFindMatches}"></td> + </tr> + </form> + <#if match?has_content> <tr><td colspan="5"> </td></tr> - <#if match?has_content> - <tr> - <td colspan="5"> - <table border="0" cellspacing="5" cellpadding="5" width="100%"> - <tr> - <td align="center" colspan="7"> - <div class="tabletext"><font color="blue"><b>${uiLabelMap.PartyAddressMatching}:</b> ${lastName} / ${firstName} @ ${addressString}</font></div> - </td> - </tr> + <tr> + <td colspan="2"> + <#if matches?has_content> + <table cellspacing="0" class="basic-table"> + <tr> + <td class="label" colspan="7">${uiLabelMap.PartyAddressMatching} ${lastName} / ${firstName} @ ${addressString}</td> + </tr> + <tr class="header-row"> + <td>${uiLabelMap.PartyLastName}</td> + <td>${uiLabelMap.PartyFirstName}</td> + <td>${uiLabelMap.CommonAddress1}</td> + <td>${uiLabelMap.CommonAddress2}</td> + <td>${uiLabelMap.CommonCity}</td> + <td>${uiLabelMap.PartyZipCode}</td> + <td>${uiLabelMap.PartyPartyId}</td> + </tr> + <#list matches as match> + <#assign person = match.getRelatedOne("Party").getRelatedOne("Person")?if_exists> + <#assign group = match.getRelatedOne("Party").getRelatedOne("PartyGroup")?if_exists> <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyLastName}</td> - <td><div class="tableheadtext">${uiLabelMap.PartyFirstName}</td> - <td><div class="tableheadtext">${uiLabelMap.CommonAddress1}</td> - <td><div class="tableheadtext">${uiLabelMap.CommonAddress2}</td> - <td><div class="tableheadtext">${uiLabelMap.CommonCity}</td> - <td><div class="tableheadtext">${uiLabelMap.PartyZipCode}</td> - <td><div class="tableheadtext">${uiLabelMap.PartyPartyId}</td> + <#if person?has_content> + <td>${person.lastName}</td> + <td>${person.firstName}</td> + <#elseif group?has_content> + <td colspan="2">${group.groupName}</td> + <#else> + <td colspan="2">[unknown partyType]</td> + </#if> + <td>${Static["org.ofbiz.party.party.PartyWorker"].makeMatchingString(delegator, match.address1)}</td> + <td>${Static["org.ofbiz.party.party.PartyWorker"].makeMatchingString(delegator, match.address2?default("N/A"))}</td> + <td>${match.city}</td> + <td>${match.postalCode}</td> + <td class="button-col"><a href="<@ofbizUrl>viewprofile?partyId=${match.partyId}</@ofbizUrl>">${match.partyId}</a></td> </tr> - <#if matches?has_content> - <#list matches as match> - <#assign person = match.getRelatedOne("Party").getRelatedOne("Person")?if_exists> - <#assign group = match.getRelatedOne("Party").getRelatedOne("PartyGroup")?if_exists> - <tr> - <#if person?has_content> - <td><div class="tabletext">${person.lastName}</td> - <td><div class="tabletext">${person.firstName}</td> - <#elseif group?has_content> - <td colspan="2"><div class="tabletext">${group.groupName}</td> - <#else> - <td colspan="2"><div class="tabletext">[unknown partyType]</td> - </#if> - <td><div class="tabletext">${Static["org.ofbiz.party.party.PartyWorker"].makeMatchingString(delegator, match.address1)}</td> - <td><div class="tabletext">${Static["org.ofbiz.party.party.PartyWorker"].makeMatchingString(delegator, match.address2?default("N/A"))}</td> - <td><div class="tabletext">${match.city}</td> - <td><div class="tabletext">${match.postalCode}</td> - <td><a href="<@ofbizUrl>viewprofile?partyId=${match.partyId}</@ofbizUrl>" class="buttontext">${match.partyId}</a></td> - </tr> - </#list> - <#else> - <tr><td align="center" colspan="7"><div class="tabletext">${uiLabelMap.PartyNoMatch}</div></td></tr> - </#if> + </#list> </table> - </td> - </tr> - </#if> - </table> - </center> - </TD> - </TR> - -</TABLE> - + <#else> + ${uiLabelMap.PartyNoMatch} + </#if> + </td> + </tr> + </#if> + </table> + </div> + </div> +<!-- end findMatches.ftl --> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Sat Mar 3 01:41:15 2007 @@ -17,176 +17,135 @@ under the License. --> -<script language="JavaScript" type="text/javascript"> -function lookupParty(click) { - partyIdValue = document.lookupparty.partyId.value; - userLoginIdValue = document.lookupparty.userlogin_id.value; - if (partyIdValue.length > 1 || userLoginIdValue.length > 1) { - document.lookupparty.action = "<@ofbizUrl>viewprofile</@ofbizUrl>"; - } else { - document.lookupparty.action = "<@ofbizUrl>findparty</@ofbizUrl>"; - } - - if (click) { - document.lookupparty.submit(); - } - return true; -} -function refreshInfo() { - document.lookupparty.lookupFlag.value = "N"; - document.lookupparty.hideFields.value = "N"; - document.lookupparty.submit(); -} -</script> - <#assign extInfo = parameters.extInfo?default("N")> -<div class="screenlet"> - <div class="screenlet-header"> - <div class="boxlink"> - <div class="tabletext"> - <#if parameters.hideFields?default("N") == "Y"> - <a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonShowLookupFields}</a> - <#else> - <#if partyList?exists><a href="<@ofbizUrl>findparty?hideFields=Y${paramList}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonHideFields}</a></#if> - <a href="javascript:document.lookupparty.submit();" class="submenutextright">${uiLabelMap.PartyLookupParty}</a> - </#if> - </div> - </div> - <div class="boxhead"> ${uiLabelMap.PartyFindParty}</div> - </div> + +<!-- begin findParty.ftl --> +<div id="findPartyParameters" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.PartyFindParty}</h3> + <#if parameters.hideFields?default("N") == "Y"> + <li><a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>">${uiLabelMap.CommonShowLookupFields}</a></li> + <#else> + <#if partyList?exists><li><a href="<@ofbizUrl>findparty?hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonHideFields}</a></li></#if> + <li><a href="javascript:document.lookupparty.submit();">${uiLabelMap.PartyLookupParty}</a></li> + </#if> + </ul> + <br class="clear" /> + </div> <#if parameters.hideFields?default("N") != "Y"> <div class="screenlet-body"> - <form method="post" name="lookupparty" action="<@ofbizUrl>findparty</@ofbizUrl>" onsubmit="javascript:lookupParty();"> - <input type="hidden" name="lookupFlag" value="Y"/> - <input type="hidden" name="hideFields" value="Y"/> - <table border="0" cellspacing="0" cellpadding="2"> + <form method="post" name="lookupparty" action="<@ofbizUrl>findparty</@ofbizUrl>" class="basic-form" onsubmit="javascript:lookupParty('<@ofbizUrl>viewprofile</@ofbizUrl>');"> + <input type="hidden" name="lookupFlag" value="Y"/> + <input type="hidden" name="hideFields" value="Y"/> + <table cellspacing="0"> + <tr> + <td class="label">${uiLabelMap.PartyContactInformation} :</td> + <td> + <input type="radio" name="extInfo" value="N" onclick="javascript:refreshInfo();" <#if extInfo == "N">checked="checked"</#if>/>${uiLabelMap.CommonNone} + <input type="radio" name="extInfo" value="P" onclick="javascript:refreshInfo();" <#if extInfo == "P">checked="checked"</#if>/>${uiLabelMap.PartyPostal} + <input type="radio" name="extInfo" value="T" onclick="javascript:refreshInfo();" <#if extInfo == "T">checked="checked"</#if>/>${uiLabelMap.PartyTelecom} + <input type="radio" name="extInfo" value="O" onclick="javascript:refreshInfo();" <#if extInfo == "O">checked="checked"</#if>/>${uiLabelMap.CommonOther} + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyPartyId} :</td> + <td><input type="text" name="partyId" value="${parameters.partyId?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyUserLogin} :</td> + <td><input type="text" name="userLoginId" value="${parameters.userLoginId?if_exists}"/></td> + </tr> + <tr> + <td class="label"><${uiLabelMap.PartyLastName} :</td> + <td><input type="text" name="lastName" value="${parameters.lastName?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyFirstName} :</td> + <td><input type="text" name="firstName" value="${parameters.firstName?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyPartyGroupName} :</td> + <td><input type="text" name="groupName" value="${parameters.groupName?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.PartyRoleType} :</td> + <td> + <select name="roleTypeId"> + <#if currentRole?has_content> + <option value="${currentRole.roleTypeId}">${currentRole.get("description",locale)}</option> + <option value="${currentRole.roleTypeId}">---</option> + </#if> + <option value="ANY">${uiLabelMap.CommonAnyRoleType}</option> + <#list roleTypes as roleType> + <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option> + </#list> + </select> + </td> + </tr> + <#if extInfo == "P"> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> - <td width="25%" align="right" nowrap><div class="tableheadtext">${uiLabelMap.PartyContactInformation} :</div></td> - <td width="5%"> </td> - <td nowrap> - <div class="tabletext"> - <input type="radio" name="extInfo" value="N" onclick="javascript:refreshInfo();" <#if extInfo == "N">checked="checked"</#if>/>${uiLabelMap.CommonNone} - <input type="radio" name="extInfo" value="P" onclick="javascript:refreshInfo();" <#if extInfo == "P">checked="checked"</#if>/>${uiLabelMap.PartyPostal} - <input type="radio" name="extInfo" value="T" onclick="javascript:refreshInfo();" <#if extInfo == "T">checked="checked"</#if>/>${uiLabelMap.PartyTelecom} - <input type="radio" name="extInfo" value="O" onclick="javascript:refreshInfo();" <#if extInfo == "O">checked="checked"</#if>/>${uiLabelMap.CommonOther} - </div> - </td> + <td class="label">${uiLabelMap.CommonAddress1} :</td> + <td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyPartyId} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="partyId" value="${parameters.partyId?if_exists}"/></td> + <td class="label">${uiLabelMap.CommonAddress2} :</td> + <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyUserLogin} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="userLoginId" value="${parameters.userLoginId?if_exists}"/></td> + <td class="label">${uiLabelMap.CommonCity} :</td> + <td><input type="text" name="city" value="${parameters.city?if_exists}"/></td> + </tr> + <tr> + <td class="label">${uiLabelMap.CommonStateProvince} :</td> + <td> + <select name="stateProvinceGeoId"> + <#if currentStateGeo?has_content> + <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option> + <option value="${currentStateGeo.geoId}">---</option> + </#if> + <option value="ANY">${uiLabelMap.CommonAnyStateProvince}</option> + ${screens.render("component://common/widget/CommonScreens.xml#states")} + </select> + </td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyLastName} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="lastName" value="${parameters.lastName?if_exists}"/></td> + <td class="label">${uiLabelMap.PartyPostalCode} :</td> + <td><input type="text" name="postalCode" value="${parameters.postalCode?if_exists}"/></td> </tr> + </#if> + <#if extInfo == "T"> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyFirstName} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="firstName" value="${parameters.firstName?if_exists}"/></td> + <td class="label">${uiLabelMap.PartyCountryCode} :</td> + <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyPartyGroupName} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="groupName" value="${parameters.groupName?if_exists}"/></td> + <td class="label">${uiLabelMap.PartyAreaCode} :</td> + <td><input type="text" name="areaCode" value="${parameters.areaCode?if_exists}"/></td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyRoleType} :</div></td> - <td width="5%"> </td> - <td> - <select name="roleTypeId" class="selectBox"> - <#if currentRole?has_content> - <option value="${currentRole.roleTypeId}">${currentRole.get("description",locale)}</option> - <option value="${currentRole.roleTypeId}">---</option> - </#if> - <option value="ANY">${uiLabelMap.CommonAnyRoleType}</option> - <#list roleTypes as roleType> - <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option> - </#list> - </select> - </td> + <td class="label">${uiLabelMap.PartyContactNumber} :</td> + <td><input type="text" name="contactNumber" value="${parameters.contactNumber?if_exists}"/></td> </tr> - <#if extInfo == "P"> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonAddress1} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="address1" value="${parameters.address1?if_exists}"/></td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonAddress2} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="address2" value="${parameters.address2?if_exists}"/></td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonCity} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="city" value="${parameters.city?if_exists}"/></td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.CommonStateProvince} :</div></td> - <td width="5%"> </td> - <td> - <select name="stateProvinceGeoId" class="selectBox"> - <#if currentStateGeo?has_content> - <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option> - <option value="${currentStateGeo.geoId}">---</option> - </#if> - <option value="ANY">${uiLabelMap.CommonAnyStateProvince}</option> - ${screens.render("component://common/widget/CommonScreens.xml#states")} - </select> - </td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyPostalCode} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="postalCode" value="${parameters.postalCode?if_exists}"/></td> - </tr> - </#if> - <#if extInfo == "T"> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyCountryCode} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="countryCode" value="${parameters.countryCode?if_exists}"/></td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyAreaCode} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="areaCode" value="${parameters.areaCode?if_exists}"/></td> - </tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyContactNumber} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="contactNumber" value="${parameters.contactNumber?if_exists}"/></td> - </tr> - </#if> - <#if extInfo == "O"> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> - <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyContactInfoList} :</div></td> - <td width="5%"> </td> - <td><input type="text" class="inputBox" name="infoString" value="${parameters.infoString?if_exists}"/></td> - </tr> - </#if> + </#if> + <#if extInfo == "O"> <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> - <td colspan="3" align="center"> - <div class="tabletext"> - <a href="javascript:document.lookupparty.submit();" class="buttontext">${uiLabelMap.PartyLookupParty}</a> - <a href="<@ofbizUrl>findparty?showAll=Y&hideFields=Y&lookupFlag=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonShowAllRecords}</a> - </div> - </td> + <td class="label">${uiLabelMap.PartyContactInfoList} :</td> + <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td> </tr> - </table> - <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.lookupparty.submit();"/> + </#if> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr> + <td> </td> + <td> + <input type="submit" value="${uiLabelMap.PartyLookupParty}" onClick="javascript:document.lookupparty.submit();"/> + <a href="<@ofbizUrl>findparty?showAll=Y&hideFields=Y&lookupFlag=Y</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonShowAllRecords}</a> + </td> + </tr> + </table> </form> </div> </#if> @@ -199,133 +158,113 @@ //--> </script> </#if> - <#if partyList?exists> - <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 width="50%"><div class="boxhead">${uiLabelMap.PartyPartiesFound}</div></td> - <td width="50%"> - <div class="boxhead" align="right"> - <#if (partyListSize > 0)> - <#if (viewIndex > 0)> - <a href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&hideFields=${parameters.hideFields?default("N")}${paramList}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> - <#else> - <span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span> - </#if> - <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</span> - <#if (partyListSize > highIndex)> - <a href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&hideFields=${parameters.hideFields?default("N")}${paramList}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> - <#else> - <span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span> - </#if> +<#if partyList?exists> + <br/> + <div id="findPartyResults" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.PartyPartiesFound}</h3> + <#if (partyListSize > 0)> + <#if (partyListSize > highIndex)> + <li><a class="nav-next" href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&hideFields=${parameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li> + <#else> + <li class="disabled">${uiLabelMap.CommonNext}</li> + </#if> + <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li> + <#if (viewIndex > 0)> + <li><a class="nav-previous" href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&hideFields=${parameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li> + <#else> + <li class="disabled">${uiLabelMap.CommonPrevious}</li> + </#if> + </#if> + </ul> + <br class="clear" /> + </div> + <#if partyList?has_content> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.PartyPartyId}</td> + <td>${uiLabelMap.PartyUserLogin}</td> + <td>${uiLabelMap.PartyName}</td> + <#if extInfo?default("") == "P"> + <td>${uiLabelMap.PartyPostalCode}</td> + </#if> + <#if extInfo?default("") == "T"> + <td>${uiLabelMap.PartyAreaCode}</td> + </#if> + <td>${uiLabelMap.PartyType}</td> + <td> </td> + </tr> + <#assign rowClass = "2"> + <#list partyList as partyRow> + <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists> + <tr<#if rowClass == "1"> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> + <td> + <#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> - - </div> - </td> - </tr> - </table> - - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyPartyId}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartyUserLogin}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartyName}</div></td> - <#if extInfo?default("") == "P"> - <td><div class="tableheadtext">${uiLabelMap.PartyPostalCode}</div></td> - </#if> - <#if extInfo?default("") == "T"> - <td><div class="tableheadtext">${uiLabelMap.PartyAreaCode}</div></td> + <#else> + (${uiLabelMap.CommonNone}) + </#if> </#if> - <td><div class="tableheadtext">${uiLabelMap.PartyType}</div></td> - <td> </td> - </tr> - <tr><td colspan="6"><hr class="sepbar"/></td></tr> - <#if partyList?has_content> - <#assign rowClass = "viewManyTR2"> - <#list partyList as partyRow> - <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists> - <tr class="${rowClass}"> - <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>" class="linktext">${partyRow.partyId}</a></td> - <td> - <div class="tabletext"> - <#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> - <#else> - (${uiLabelMap.CommonNone}) - </#if> - </#if> - </div> - </td> - <td> - <div class="tabletext"> - <#if partyRow.lastName?has_content> - ${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName}</#if> - <#elseif partyRow.groupName?has_content> - ${partyRow.groupName} - <#else> - <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)> - <#if partyName?has_content> - ${partyName} - <#else> - (${uiLabelMap.PartyNoNameFound}) - </#if> - </#if> - </div> - </td> - <#if extInfo?default("") == "P"> - <td><div class="tabletext">${partyRow.postalCode?if_exists}</div></td> - </#if> - <#if extInfo?default("") == "T"> - <td><div class="tabletext">${partyRow.areaCode?if_exists}</div></td> - </#if> - <td><div class="tabletext"><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></div></td> - <td align="right"> - <!-- this is all on one line so that no break will be inserted --> - <div class="tabletext"><span style="white-space: nowrap;"> - <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a> - <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)> - <a href="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.OrderOrders}</a> - </#if> - <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> - <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.OrderNewOrder}</a> - </#if> - </span></div> - </td> - </tr> - <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> + </td> + <td> + <#if partyRow.lastName?has_content> + ${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName}</#if> + <#elseif partyRow.groupName?has_content> + ${partyRow.groupName} + <#else> + <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)> + <#if partyName?has_content> + ${partyName} <#else> - <#assign rowClass = "viewManyTR2"> + (${uiLabelMap.PartyNoNameFound}) </#if> - </#list> - <#else> - <tr> - <td colspan="5"> - <span class="head3">${uiLabelMap.PartyNoPartiesFound}</span> - <a href="<@ofbizUrl>createnew</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew}</a> - </td> - </tr> + </#if> + </td> + <#if extInfo?default("") == "P"> + <td>${partyRow.postalCode?if_exists}</td> </#if> - <#if lookupErrorMessage?exists> - <tr> - <td colspan="5"><div class="head3">${lookupErrorMessage}</div></td> - </tr> + <#if extInfo?default("") == "T"> + <td>${partyRow.areaCode?if_exists}</td> </#if> - </table> - </td> - </tr> - </table> - </#if> + <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td> + <td class="button-col align-float"> + <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a> + <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)> + <a href="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrders}</a> + </#if> + <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> + <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderNewOrder}</a> + </#if> + </td> + </tr> + <#-- toggle the row color --> + <#if rowClass == "2"> + <#assign rowClass = "1"> + <#else> + <#assign rowClass = "2"> + </#if> + </#list> + </table> + <#else> + <div class="screenlet-body"> + <span class="head3">${uiLabelMap.PartyNoPartiesFound}</span> + <a href="<@ofbizUrl>createnew</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCreateNew}</a> + </div> + </#if> + <#if lookupErrorMessage?exists> + <div><h3>${lookupErrorMessage}</h3></div> + </#if> + </div> +</#if> +<!-- end findParty.ftl --> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Sat Mar 3 01:41:15 2007 @@ -21,93 +21,65 @@ <#assign partyId = requestParameters.partyId?if_exists> <#assign partyIdTo = requestParameters.partyIdTo?if_exists> +<!-- begin linkparty.ftl --> <br/> <#if hasUpdatePermission> - -<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.PartyLink}</div> - </td> - </tr> - </table> - </TD> - </TR> - <TR> - <TD width="100%" > + <div id="linkParty" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.PartyLink}</h3> + </div> + <div class="screenlet-body"> <center> - <table border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <#if partyTo?has_content && partyFrom?has_content> <form name="linkparty" method="post" action="<@ofbizUrl>setPartyLink</@ofbizUrl>"> - <tr> - <td colspan="2" align="center"> - <div class="head1"> - <font color="red"> - ${uiLabelMap.PartyLinkMessage1} - </font> - </div> - </td> - </tr> - <tr><td colspan="2"> </td></tr> - <tr> - <td align="right"><span class="tabletext"> ${uiLabelMap.PartyLink}: </span></td> - <td> + <div class="head1 alert"> + ${uiLabelMap.PartyLinkMessage1} + </div> + <br /> + <div> + <span class="label">${uiLabelMap.PartyLink}:</span> <input type="hidden" name="partyId" value="${partyFrom.partyId}"/> - <span class="tabletext"> - <#if personFrom?has_content> - ${personFrom.lastName}, ${personFrom.firstName} - <#elseif groupFrom?has_content> - ${groupFrom.groupName} - <#else> - [${uiLabelMap.PartyUnknown}] - </#if> - <b>[${partyFrom.partyId}]</b> - </span> - </td> - </tr> - <tr> - <td align="right"><span class="tabletext"> ${uiLabelMap.CommonTo}: </span></td> - <td> + <#if personFrom?has_content> + ${personFrom.lastName}, ${personFrom.firstName} + <#elseif groupFrom?has_content> + ${groupFrom.groupName} + <#else> + [${uiLabelMap.PartyUnknown}] + </#if> + [${partyFrom.partyId}] + </div> + <div> + <span class="label">${uiLabelMap.CommonTo}:</span> <input type="hidden" name="partyIdTo" value="${partyTo.partyId}"/> - <span class="tabletext"> - <#if personTo?has_content> - ${personTo.lastName}, ${personTo.firstName} - <#elseif groupTo?has_content> - ${groupTo.groupName} - <#else> - [${uiLabelMap.PartyUnknown}] - </#if> - <b>[${partyTo.partyId}]</b> - </span> - </td> - </tr> - <tr><td colspan="2"> </td></tr> - <tr> - <td colspan="2" align="center"> - <a href="javascript:document.linkparty.submit()" class="buttontext">${uiLabelMap.CommonConfirm}</a> - </td> - </tr> - </form> + <#if personTo?has_content> + ${personTo.lastName}, ${personTo.firstName} + <#elseif groupTo?has_content> + ${groupTo.groupName} + <#else> + [${uiLabelMap.PartyUnknown}] + </#if> + [${partyTo.partyId}] + </div> + <br /> + <div> + <a href="javascript:document.linkparty.submit()" class="smallSubmit">${uiLabelMap.CommonConfirm}</a> + </div> + <br /> + </form> <#else> <form name="linkpartycnf" method="post" action="<@ofbizUrl>linkparty</@ofbizUrl>"> - <tr> - <td><span class="tabletext"> ${uiLabelMap.PartyLink}: </span></td> - <td><input type="text" class="inputBox" name="partyId" value="${partyId?if_exists}"></td> - <td><span class="tabletext"> ${uiLabelMap.CommonTo}: </span></td> - <td><input type="text" class="inputBox" name="partyIdTo" value="${partyIdTo?if_exists}"></td> - <td> - <a href="javascript:document.linkpartycnf.submit()" class="buttontext">${uiLabelMap.CommonLink}</a> - </td> - </tr> + <div> + <span class="label">${uiLabelMap.PartyLink}</span> + <input type="text" name="partyId" value="${partyId?if_exists}"/> + + <span class="label">${uiLabelMap.CommonTo}</span> + <input type="text" name="partyIdTo" value="${partyIdTo?if_exists}"/> + <a href="javascript:document.linkpartycnf.submit()" class="smallSubmit">${uiLabelMap.CommonLink}</a> + </div> </form> </#if> - </table> </center> - </TD> - </TR> - -</TABLE> + </div> + </div> </#if> +<!-- end linkparty.ftl --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |