svn commit: r514106 [3/6] - in /ofbiz/trunk/applications/part
Locked
svn commit: r514106 [3/6] - in /ofbiz/trunk/applications/part
 
|
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Sat Mar 3 01:41:15 2007 @@ -17,328 +17,219 @@ under the License. --> -<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 editShoppingList.ftl --> +<br /> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.PartyShoppingLists}</h3> + <li><a href="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>?partyId=${partyId?if_exists}">${uiLabelMap.CommonCreateNew}</a></li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <#if shoppingLists?has_content> + <form name="selectShoppingList" method="post" action="<@ofbizUrl>editShoppingList</@ofbizUrl>"> + <select name="shoppingListId"> + <#if shoppingList?has_content> + <option value="${shoppingList.shoppingListId}">${shoppingList.listName}</option> + <option value="${shoppingList.shoppingListId}">--</option> + </#if> + <#list allShoppingLists as list> + <option value="${list.shoppingListId}">${list.listName}</option> + </#list> + </select> + <a href="javascript:document.selectShoppingList.submit();" class="smallSubmit">${uiLabelMap.CommonEdit}</a> + </form> + <#else> + ${uiLabelMap.PartyNoShoppingListsParty}. + </#if> + </div> +</div> +<br/> +<#if shoppingList?has_content> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.PartyShoppingListDetail} - ${shoppingList.listName}</h3> + <li><a href="javascript:document.updateList.submit();">${uiLabelMap.CommonSave}</a></li> + <li><a href="/ordermgr/control/createQuoteFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}&applyStorePromotions=N">${uiLabelMap.PartyCreateNewQuote}</a></li> + <li><a href="/ordermgr/control/createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.PartyCreateNewCustRequest}</a></li> + <li><a href="/ordermgr/control/loadCartFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.OrderNewOrder}</a></li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <form name="updateList" method="post" action="<@ofbizUrl>updateShoppingList</@ofbizUrl>"> + <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"> + <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}"> + <table class="basic-table" cellspacing='0'> + <tr> + <td class="label">${uiLabelMap.PartyListName}</td> + <td><input type="text" size="25" name="listName" value="${shoppingList.listName}" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> + </tr> <tr> - <td valign="middle" align="left"> - <div class="boxhead"> ${uiLabelMap.PartyShoppingLists}</div> - </td> - <td valign="middle" align="right"> - <a href="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>?partyId=${partyId?if_exists}" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> - <#-- <a href="<@ofbizUrl>viewprofile?partyId=${partyId?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.PartyProfile}</a> --> - </td> + <td class="label">${uiLabelMap.CommonDescription}</td> + <td><input type="text" size="70" name="description" value="${shoppingList.description?if_exists}" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> </tr> - </table> - </TD> - </TR> - <TR> - <TD width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> <tr> + <td class="label">${uiLabelMap.PartyListType}</td> <td> - <#if shoppingLists?has_content> - <form name="selectShoppingList" method="post" action="<@ofbizUrl>editShoppingList</@ofbizUrl>"> - <select name="shoppingListId" class="selectBox"> - <#if shoppingList?has_content> - <option value="${shoppingList.shoppingListId}">${shoppingList.listName}</option> - <option value="${shoppingList.shoppingListId}">--</option> - </#if> - <#list allShoppingLists as list> - <option value="${list.shoppingListId}">${list.listName}</option> - </#list> - </select> - - <a href="javascript:document.selectShoppingList.submit();" class="buttontext">${uiLabelMap.CommonEdit}</a> - </form> - <#else> - <div class="tabletext">${uiLabelMap.PartyNoShoppingListsParty}.</div> - </#if> + <select name="shoppingListTypeId" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> + <#if shoppingListType?exists> + <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option> + <option value="${shoppingListType.shoppingListTypeId}">--</option> + </#if> + <#list shoppingListTypes as shoppingListType> + <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option> + </#list> + </select> </td> - </tr> - </table> - </TD> - </TR> -</TABLE> -<br/> - -<#if shoppingList?has_content> -<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> <tr> - <td valign="middle" align="left"> - <div class="boxhead"> ${uiLabelMap.PartyShoppingListDetail} - ${shoppingList.listName}</div> - </td> - <td valign="middle" align="right"> - <a href="/ordermgr/control/loadCartFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}" class="submenutext">${uiLabelMap.OrderNewOrder}</a> - <a href="/ordermgr/control/createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}" class="submenutext">${uiLabelMap.PartyCreateNewCustRequest}</a> - <a href="/ordermgr/control/createQuoteFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}&applyStorePromotions=N" class="submenutext">${uiLabelMap.PartyCreateNewQuote}</a> - <a href="javascript:document.updateList.submit();" class="submenutextright">${uiLabelMap.CommonSave}</a> + <td class="label">${uiLabelMap.PartyPublic}?</td> + <td> + <select name="isPublic" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> + <option>${shoppingList.isPublic}</option> + <option value="${shoppingList.isPublic}">--</option> + <option>Y</option> + <option>N</option> + </select> </td> - </tr> - </table> - </TD> - </TR> - <TR> - <TD width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + </tr> <tr> + <td class="label">${uiLabelMap.PartyParentList}</td> <td> - <form name="updateList" method="post" action="<@ofbizUrl>updateShoppingList</@ofbizUrl>"> - <input type="hidden" class="inputBox" name="shoppingListId" value="${shoppingList.shoppingListId}"> - <input type="hidden" class="inputBox" name="partyId" value="${shoppingList.partyId?if_exists}"> - <table border='0' width='100%' cellspacing='0' cellpadding='0'> - <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyListName}</div></td> - <td><input type="text" class="inputBox" size="25" name="listName" value="${shoppingList.listName}" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> - </tr> - <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td> - <td><input type="text" class="inputBox" size="70" name="description" value="${shoppingList.description?if_exists}" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> - </tr> - <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyListType}</div></td> - <td> - <select name="shoppingListTypeId" class="selectBox" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> - <#if shoppingListType?exists> - <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option> - <option value="${shoppingListType.shoppingListTypeId}">--</option> - </#if> - <#list shoppingListTypes as shoppingListType> - <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option> - </#list> - </select> - </td> - </tr> - <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyPublic}?</div></td> - <td> - <select name="isPublic" class="selectBox" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> - <option>${shoppingList.isPublic}</option> - <option value="${shoppingList.isPublic}">--</option> - <option>Y</option> - <option>N</option> - </select> - </td> - </tr> - <tr> - <td><div class="tableheadtext">${uiLabelMap.PartyParentList}</div></td> - <td> - <select name="parentShoppingListId" class="selectBox" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> - <#if parentShoppingList?exists> - <option value="${parentShoppingList.shoppingListId}">${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}</option> - </#if> - <option value="">${uiLabelMap.PartyNoParent}</option> - <#list allShoppingLists as newParShoppingList> - <option value="${newParShoppingList.shoppingListId}">${newParShoppingList.listName?default(newParShoppingList.shoppingListId)}</option> - </#list> - </select> - <#if parentShoppingList?exists> - <a href="<@ofbizUrl>editShoppingList?shoppingListId=${parentShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGotoParent} (${parentShoppingList.listName?default(parentShoppingList.shoppingListId)})</a> - </#if> - </td> - </tr> - <#if shoppingList.listName?default("") != "auto-save"> - <tr> - <td><div class="tableheadtext"> </div></td> - <td align="left"> - <a href="javascript:document.updateList.submit();" class="buttontext">${uiLabelMap.CommonSave}</a> - </td> - </tr> - </#if> - </table> - </form> + <select name="parentShoppingListId" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> + <#if parentShoppingList?exists> + <option value="${parentShoppingList.shoppingListId}">${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}</option> + </#if> + <option value="">${uiLabelMap.PartyNoParent}</option> + <#list allShoppingLists as newParShoppingList> + <option value="${newParShoppingList.shoppingListId}">${newParShoppingList.listName?default(newParShoppingList.shoppingListId)}</option> + </#list> + </select> + <#if parentShoppingList?exists> + <a href="<@ofbizUrl>editShoppingList?shoppingListId=${parentShoppingList.shoppingListId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGotoParent} (${parentShoppingList.listName?default(parentShoppingList.shoppingListId)})</a> + </#if> </td> </tr> - </table> - </TD> - </TR> -</TABLE> - + <#if shoppingList.listName?default("") != "auto-save"> + <tr> + <td> </td> + <td><a href="javascript:document.updateList.submit();" class="smallSubmit">${uiLabelMap.CommonSave}</a></td> + </tr> + </#if> + </table> + </form> + </div> +</div> <#if childShoppingListDatas?has_content> <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.PartyChildShoppingList} - ${shoppingList.listName}</div> - </td> - <td valign="middle" align="right"> - <a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>" class="submenutextright">${uiLabelMap.PartyAddChildListsToCart}</a> - </td> - </tr> - </table> - </TD> - </TR> - <TR> - <TD width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> - <tr> - <td> - <table width='100%' cellspacing="0" cellpadding="1" border="0"> - <TR> - <TD NOWRAP><div class='tabletext'><b>${uiLabelMap.PartyListName}</b></div></TD> - <td> </td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.PartyChildShoppingList} - ${shoppingList.listName}</h3> + <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>">${uiLabelMap.PartyAddChildListsToCart}</a></li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.PartyListName}</td> <td> </td> - </TR> - <#list childShoppingListDatas as childShoppingListData> - <#assign childShoppingList = childShoppingListData.childShoppingList> - <tr> - <td nowrap align="left"> - <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a> - </td> - <td align="right"> - <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyGotoList}</a> - <a href="<@ofbizUrl>addListToCart?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyAddListToCart}</a> - </td> + </tr> + <#list childShoppingListDatas as childShoppingListData> + <#assign childShoppingList = childShoppingListData.childShoppingList> + <tr> + <td class="button-col"><a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a></li> + <td class="button-col align-float"> + <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyGotoList}</a> + <a href="<@ofbizUrl>addListToCart?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyAddListToCart}</a> + </td> </tr> - </#list> - </table> - </td> - </tr> - </table> - </TD> - </TR> -</TABLE> + </#list> + </table> + </div> +</div> </#if> - <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.PartyListItems} - ${shoppingList.listName}</div> - </td> - <#-- - <td valign="middle" align="right"> - <a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.PartyAddListToCart}</a> - </td> - --> - </tr> - </table> - </TD> - </TR> - <TR> - <TD width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> - <tr> - <td> - <#if shoppingListItemDatas?has_content> - <table width='100%' cellspacing="0" cellpadding="1" border="0"> - <TR> - <TD NOWRAP><div class='tabletext'><b>${uiLabelMap.PartyProduct}</b></div></TD> - <TD NOWRAP align="center"><div class='tabletext'><b>${uiLabelMap.PartyQuantity}</b></div></TD> - <TD NOWRAP align="center"><div class='tabletext'><b>${uiLabelMap.PartyQuantityPurchased}</b></div></TD> - <TD NOWRAP align="right"><div class='tabletext'><b>${uiLabelMap.PartyPrice}</b></div></TD> - <TD NOWRAP align="right"><div class='tabletext'><b>${uiLabelMap.PartyTotal}</b></div></TD> - <td> </td> - </TR> - <TR> - <td colspan="7"><hr class="sepbar"></td> - </TR> - <#list shoppingListItemDatas as shoppingListItemData> - <#assign shoppingListItem = shoppingListItemData.shoppingListItem> - <#assign product = shoppingListItemData.product> - <#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)> - <#assign unitPrice = shoppingListItemData.unitPrice> - <#assign totalPrice = shoppingListItemData.totalPrice> - <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs?if_exists> - <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")> - - <tr> - <td> - <div class='tabletext'> - <a href="/catalog/control/EditProduct?productId=${shoppingListItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}" class='buttontext'>${shoppingListItem.productId} - - ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists} - </div> - </td> - <form method="post" action="<@ofbizUrl>updateShoppingListItem</@ofbizUrl>" name='listform_${shoppingListItem.shoppingListItemSeqId}' style='margin: 0;'> - <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"> - <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"> - <td nowrap align="center"> - <div class='tabletext'> - <input size="6" class='inputBox' type="text" name="quantity" value="${shoppingListItem.quantity?string.number}"> - </div> - </td> - <td nowrap align="center"> - <div class='tabletext'> - <input size="6" class='inputBox' type="text" name="quantityPurchased" - <#if shoppingListItem.quantityPurchased?has_content> - value="${shoppingListItem.quantityPurchased?if_exists?string.number}" - </#if> - > - </div> - </td> - </form> - <td nowrap align="right"> - <div class="tabletext"><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></div> - </td> - <td nowrap align="right"> - <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> - </td> - <td align="right" nowrap> - <a href="javascript:document.listform_${shoppingListItem.shoppingListItemSeqId}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> - <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> - </td> - </tr> - </#list> - <tr><td colspan="7"><hr class='sepbar'></td></tr> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - </tr> - </table> - <#else> - <div class='head2'>${uiLabelMap.PartyShoppingListEmpty}.</div> - </#if> - </td> - </tr> - </table> - </TD> - </TR> -</TABLE> - +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${uiLabelMap.PartyListItems} - ${shoppingList.listName}</h3> + <#-- <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyAddListToCart}</a></li> --> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <#if shoppingListItemDatas?has_content> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.PartyProduct}</td> + <td>${uiLabelMap.PartyQuantity}</td> + <td>${uiLabelMap.PartyQuantityPurchased}</td> + <td>${uiLabelMap.PartyPrice}</td> + <td>${uiLabelMap.PartyTotal}</td> + <td> </td> + </tr> + <tr> + <td colspan="6"><hr></td> + </tr> + <#list shoppingListItemDatas as shoppingListItemData> + <#assign shoppingListItem = shoppingListItemData.shoppingListItem> + <#assign product = shoppingListItemData.product> + <#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)> + <#assign unitPrice = shoppingListItemData.unitPrice> + <#assign totalPrice = shoppingListItemData.totalPrice> + <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs?if_exists> + <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")> + <tr> + <td><a href="/catalog/control/EditProduct?productId=${shoppingListItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${shoppingListItem.productId} - + ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists} + </td> + <form method="post" action="<@ofbizUrl>updateShoppingListItem</@ofbizUrl>" name='listform_${shoppingListItem.shoppingListItemSeqId}'> + <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"> + <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"> + <td> + <input size="6" type="text" name="quantity" value="${shoppingListItem.quantity?string.number}"> + </td> + <td> + <input size="6" type="text" name="quantityPurchased" + <#if shoppingListItem.quantityPurchased?has_content> + value="${shoppingListItem.quantityPurchased?if_exists?string.number}" + </#if>> + </td> + </form> + <td class="align-float"><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></td> + <td class="align-float"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></td> + <td class="button-col align-float"> + <a href="javascript:document.listform_${shoppingListItem.shoppingListItemSeqId}.submit();">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a> + </td> + </tr> + </#list> + </table> + <#else> + ${uiLabelMap.PartyShoppingListEmpty}. + </#if> + </div> +</div> <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.PartyQuickAddList}</div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width="100%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> - <tr> - <td> - <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> - <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"> - <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}"> - <input type="text" class="inputBox" name="productId" value=""> - <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}"> - <input type="submit" class="smallSubmit" value="${uiLabelMap.PartyAddToShoppingList}"> - </form> - </td> - </tr> - </table> - </td> - </tr> -</table> - +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.PartyQuickAddList}</h3> + </div> + <div class="screenlet-body"> + <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> + <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"> + <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}"> + <input type="text" name="productId" value=""> + <input type="text" size="5" name="quantity" value="${requestParameters.quantity?default("1")}"> + <input type="submit" value="${uiLabelMap.PartyAddToShoppingList}"> + </form> + </div> +</div> </#if> +<!-- begin editShoppingList.ftl --> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Sat Mar 3 01:41:15 2007 @@ -17,39 +17,42 @@ under the License. --> - <#if !mechMap.contactMech?exists> - <#-- When creating a new contact mech, first select the type, then actually create --> - <#if !preContactMechTypeId?has_content> - <p class="head1">${uiLabelMap.PartyCreateNewContact}</p> +<!-- begin editcontactmech.ftl --> +<#if !mechMap.contactMech?exists> + <#-- When creating a new contact mech, first select the type, then actually create --> + <#if !preContactMechTypeId?has_content> + <h1>${uiLabelMap.PartyCreateNewContact}</h1> <form method="post" action="<@ofbizUrl>editcontactmech</@ofbizUrl>" name="createcontactmechform"> <input type="hidden" name="DONE_PAGE" value="${donePage}"> <input type="hidden" name="partyId" value="${partyId}"> - <table width="90%" border="0" cellpadding="2" cellspacing="0"> + <table class="basic-table" cellspacing="0"> <tr> - <td width="26%"><div class="tabletext">${uiLabelMap.PartySelectContactType}:</div></td> - <td width="74%"> - <select name="preContactMechTypeId" class="selectBox"> + <td class="label">${uiLabelMap.PartySelectContactType}</td> + <td> + <select name="preContactMechTypeId""> <#list mechMap.contactMechTypes as contactMechType> <option value="${contactMechType.contactMechTypeId}">${contactMechType.get("description",locale)}</option> </#list> - </select> <a href="javascript:document.createcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonCreate}]</a> + </select> + <a href="javascript:document.createcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonCreate}</a> </td> </tr> </table> </form> - </#if> </#if> - - <#if mechMap.contactMechTypeId?has_content> - <#if !mechMap.contactMech?has_content> - <p class="head1">${uiLabelMap.PartyCreateNewContact}</p> - <a href="<@ofbizUrl>authview/${donePage?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> - <a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> - <#if contactMechPurposeType?exists> - <div>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</div> - </#if> - <table width="90%" border="0" cellpadding="2" cellspacing="0"> - <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform"> +</#if> +<#if mechMap.contactMechTypeId?has_content> + <#if !mechMap.contactMech?has_content> + <h1>${uiLabelMap.PartyCreateNewContact}</h1> + <div class="button-bar"> + <a href="<@ofbizUrl>authview/${donePage?if_exists}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> + <#if contactMechPurposeType?exists> + <p>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</p> + </#if> + <table cellspacing="0"> + <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform"> <input type="hidden" name="DONE_PAGE" value="${donePage}"> <input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}"> <input type="hidden" name="partyId" value="${partyId}"> @@ -57,44 +60,44 @@ <#if preContactMechTypeId?exists><input type="hidden" name="preContactMechTypeId" value="${preContactMechTypeId}"></#if> <#if contactMechPurposeTypeId?exists><input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurposeTypeId?if_exists}"></#if> <#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}'></#if> - <#else> - <p class="head1">${uiLabelMap.PartyEditContactInformation}</p> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> - <a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> - <table width="90%" border="0" cellpadding="2" cellspacing="0"> - <#if mechMap.purposeTypes?has_content> + <#else> + <h1>${uiLabelMap.PartyEditContactInformation}</h1> + <div class="button-bar"> + <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> + <div id="mech-purpose-types"> + <table cellspacing="0"> + <#if mechMap.purposeTypes?has_content> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyContactPurposes}</div></td> - <td width="5"> </td> - <td width="74%"> - <table border="0" cellspacing="1" bgcolor="black"> - <#if mechMap.partyContactMechPurposes?has_content> - <#list mechMap.partyContactMechPurposes as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <tr> - <td bgcolor="white"> - <div class="tabletext"> + <td class="label">${uiLabelMap.PartyContactPurposes}</td> + <td> + <table class="basic-table dark-grid" cellspacing="0"> + <#if mechMap.partyContactMechPurposes?has_content> + <#list mechMap.partyContactMechPurposes as partyContactMechPurpose> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> + <tr> + <td> <#if contactMechPurposeType?has_content> - <b>${contactMechPurposeType.get("description",locale)}</b> + ${contactMechPurposeType.get("description",locale)} <#else> - <b>${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b> + ${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}" </#if> (${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()}) <#if partyContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpire}: ${partyContactMechPurpose.thruDate.toString()}</#if> - </div></td> - <td bgcolor="white"><div><a href="<@ofbizUrl>deletePartyContactMechPurpose?partyId=${partyId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${partyContactMechPurpose.contactMechPurposeTypeId}&fromDate=${partyContactMechPurpose.fromDate.toString()}&DONE_PAGE=${donePage?replace("=","%3d")}&useValues=true</@ofbizUrl>" class="buttontext"> ${uiLabelMap.CommonDelete} </a></div></td> - </tr> - </#list> - </#if> - + </td> + <td class="button-col"><a href="<@ofbizUrl>deletePartyContactMechPurpose?partyId=${partyId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${partyContactMechPurpose.contactMechPurposeTypeId}&fromDate=${partyContactMechPurpose.fromDate.toString()}&DONE_PAGE=${donePage?replace("=","%3d")}&useValues=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonDelete}</a></td> + </tr> + </#list> + </#if> <tr> <form method="post" action="<@ofbizUrl>createPartyContactMechPurpose</@ofbizUrl>" name="newpurposeform"> - <input type="hidden" name="partyId" value="${partyId}"> - <input type="hidden" name="DONE_PAGE" value="${donePage}"> - <input type="hidden" name="useValues" value="true"> - <input type="hidden" name="contactMechId" value="${contactMechId?if_exists}"> - <td bgcolor="white"> - <select name="contactMechPurposeTypeId" class="selectBox"> + <input type="hidden" name="partyId" value="${partyId}"> + <input type="hidden" name="DONE_PAGE" value="${donePage}"> + <input type="hidden" name="useValues" value="true"> + <input type="hidden" name="contactMechId" value="${contactMechId?if_exists}"> + <td class="button-col"> + <select name="contactMechPurposeTypeId"> <option></option> <#list mechMap.purposeTypes as contactMechPurposeType> <option value="${contactMechPurposeType.contactMechPurposeTypeId}">${contactMechPurposeType.get("description",locale)}</option> @@ -102,81 +105,71 @@ </select> </td> </form> - <td bgcolor="white"><div><a href="javascript:document.newpurposeform.submit()" class="buttontext"> ${uiLabelMap.PartyAddPurpose} </a></div></td> + <td><a href="javascript:document.newpurposeform.submit()" class="smallSubmit">${uiLabelMap.PartyAddPurpose}</a></td> </tr> </table> - </td> - </tr> - </#if> - <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform"> + </tr> + </#if> + <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform"> <input type="hidden" name="contactMechId" value="${contactMechId}"> <input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}"> <input type="hidden" name="partyId" value="${partyId}"> <input type="hidden" name="DONE_PAGE" value="${donePage?if_exists}"> - </#if> - + </#if> <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyToName}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}"> + <td class="label">${uiLabelMap.PartyToName}</td> + <td> + <input type="text" size="30" maxlength="60" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}"> + <td class="label">${uiLabelMap.PartyAttentionName}</td> + <td> + <input type="text" size="30" maxlength="60" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}"> - *</td> + <td class="label">${uiLabelMap.PartyAddressLine1}</td> + <td> + <input type="text" size="30" maxlength="30" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}"> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}"> + <td class="label">${uiLabelMap.PartyAddressLine2}</td> + <td> + <input type="text" size="30" maxlength="30" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyCity}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}"> - *</td> + <td class="label">${uiLabelMap.PartyCity}</td> + <td> + <input type="text" size="30" maxlength="30" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}"> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyState}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="stateProvinceGeoId" class="selectBox"> + <td class="label">${uiLabelMap.PartyState}</td> + <td> + <select name="stateProvinceGeoId"> <option>${(mechMap.postalAddress.stateProvinceGeoId)?if_exists}</option> <option></option> ${screens.render("component://common/widget/CommonScreens.xml#states")} </select> - *</td> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}"> - *</td> + <td class="label">${uiLabelMap.PartyZipCode}</td> + <td> + <input type="text" size="12" maxlength="10" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}"> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="countryGeoId" class="selectBox"> + <td class="label">${uiLabelMap.CommonCountry}</td> + <td> + <select name="countryGeoId"> <#if (mechMap.postalAddress?exists) && (mechMap.postalAddress.countryGeoId?exists)> - <#assign defaultCountryGeoId = (mechMap.postalAddress.countryGeoId)> - <option selected value="${defaultCountryGeoId}"> + <#assign defaultCountryGeoId = (mechMap.postalAddress.countryGeoId)> + <option selected value="${defaultCountryGeoId}"> <#else> <#assign defaultCountryGeoId = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "country.geo.id.default")> <option selected value="${defaultCountryGeoId}"> @@ -187,56 +180,54 @@ <option></option> ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> - *</td> + </td> </tr> <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId?if_exists> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyPhoneNumber}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}"> - - <input type="text" class="inputBox" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}"> - - <input type="text" class="inputBox" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}"> - ${uiLabelMap.PartyContactExt} <input type="text" class="inputBox" size="6" maxlength="10" name="extension" value="${(mechMap.partyContactMech.extension)?default(request.getParameter('extension')?if_exists)}"> + <td class="label">${uiLabelMap.PartyPhoneNumber}</td> + <td> + <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}"> + - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}"> + - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}"> + ${uiLabelMap.PartyContactExt} <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.partyContactMech.extension)?default(request.getParameter('extension')?if_exists)}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext"></div></td> - <td width="5"> </td> - <td><div class="tabletext">[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyContactExt}]</div></td> + <td class="label"></td> + <td>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyContactExt}]</td> </tr> <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.get("description",locale)}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}"> - *</td> + <td class="label">${mechMap.contactMechType.get("description",locale)}</td> + <td> + <input type="text" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}"> + </td> </tr> <#else> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.get("description",locale)}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}"> - *</td> - </tr> - </#if> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyContactAllowSolicitation}?</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="allowSolicitation" class="selectBox"> - <option>${(mechMap.partyContactMech.allowSolicitation)?if_exists}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> - </select> + <td class="label">${mechMap.contactMechType.get("description",locale)}</td> + <td> + <input type="text" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}"> </td> </tr> + </#if> + <tr> + <td class="label">${uiLabelMap.PartyContactAllowSolicitation}?</td> + <td> + <select name="allowSolicitation"> + <option>${(mechMap.partyContactMech.allowSolicitation)?if_exists}</option> + <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + </select> + </td> + </tr> </form> </table> - - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> - <a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> - <#else> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> - </#if> + <div class="button-bar"> + <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> + </div> +<#else> + <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a> +</#if> +<!-- end editcontactmech.ftl --> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl Sat Mar 3 01:41:15 2007 @@ -17,31 +17,31 @@ under the License. --> +<!-- begin editcreditcard.ftl --> <#if !creditCard?exists> - <p class="head1">${uiLabelMap.AccountingAddNewCreditCard}</p> + <h1>${uiLabelMap.AccountingAddNewCreditCard}</h1> <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> <#else> - <p class="head1">${uiLabelMap.AccountingEditCreditCard}</p> + <h1>${uiLabelMap.AccountingEditCreditCard}</h1> <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> <input type="hidden" name="paymentMethodId" value="${paymentMethodId}"> </#if> - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editcreditcardform.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.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> <input type="hidden" name="partyId" value="${partyId}"/> - <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.AccountingCompanyNameCard}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnCard" value="${creditCardData.companyNameOnCard?if_exists}"> + <td class="label">${uiLabelMap.AccountingCompanyNameCard}</td> + <td> + <input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${creditCardData.companyNameOnCard?if_exists}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingPrefixCard}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="titleOnCard" class="selectBox"> + <td class="label">${uiLabelMap.AccountingPrefixCard}</td> + <td> + <select name="titleOnCard"> <option value="">${uiLabelMap.CommonSelectOne}</option> <option<#if (creditCardData.titleOnCard?default("") == "${uiLabelMap.CommonTitleMr}")> checked</#if>>${uiLabelMap.CommonTitleMr}</option> <option<#if (creditCardData.titleOnCard?default("") == "Mrs.")> checked</#if>>${uiLabelMap.CommonTitleMrs}</option> @@ -51,31 +51,29 @@ </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingFirstNameCard}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCardData.firstNameOnCard)?if_exists}"> - *</td> + <td class="label">${uiLabelMap.AccountingFirstNameCard}</td> + <td> + <input type="text" class="required" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCardData.firstNameOnCard)?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingMiddleNameCard}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCardData.middleNameOnCard)?if_exists}"> + <td class="label">${uiLabelMap.AccountingMiddleNameCard}</td> + <td> + <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCardData.middleNameOnCard)?if_exists}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingLastNameCard}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCardData.lastNameOnCard)?if_exists}"> - *</td> + <td class="label">${uiLabelMap.AccountingLastNameCard}</td> + <td> + <input type="text" class="required" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCardData.lastNameOnCard)?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingSuffixCard}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="suffixOnCard" class="selectBox"> + <td class="label">${uiLabelMap.AccountingSuffixCard}</td> + <td> + <select name="suffixOnCard"> <option value="">${uiLabelMap.CommonSelectOne}</option> <option<#if (creditCardData.suffixOnCard?default("") == "Jr.")> checked</#if>>Jr.</option> <option<#if (creditCardData.suffixOnCard?default("") == "Sr.")> checked</#if>>Sr.</option> @@ -87,22 +85,20 @@ </select> </td> </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardType}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="cardType" class="selectBox"> + <td class="label">${uiLabelMap.AccountingCardType}</td> + <td> + <select name="cardType" class="required"> <option>${creditCardData.cardType?if_exists}</option> <option></option> ${screens.render("component://common/widget/CommonScreens.xml#cctypes")} </select> - *</td> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td> - <td width="5"> </td> - <td width="74%"> + <td class="label">${uiLabelMap.AccountingCardNumber}</td> + <td> <#if creditCardData?has_content> <#-- create a display version of the card where all but the last four digits are * --> <#assign cardNumberDisplay = ""> @@ -120,20 +116,19 @@ </#if> </#if> </#if> - <input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}"> - *</td> + <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <#--<tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardSecurityCode}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class="inputBox" size="5" maxlength="10" name="cardSecurityCode" value="${creditCardData.cardSecurityCode?if_exists}"> + <td class="label">${uiLabelMap.AccountingCardSecurityCode}</td> + <td> + <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCardData.cardSecurityCode?if_exists}"> </td> </tr>--> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingExpirationDate}</div></td> - <td width="5"> </td> - <td width="74%"> + <td class="label">${uiLabelMap.AccountingExpirationDate}</td> + <td> <#assign expMonth = ""> <#assign expYear = ""> <#if creditCard?exists> @@ -143,73 +138,70 @@ <#assign expYear = expDate.substring(expDate.indexOf("/")+1)> </#if> </#if> - <select name="expMonth" class="selectBox"> + <select name="expMonth" class="required"> <option><#if tryEntity>${expMonth?if_exists}<#else>${requestParameters.expMonth?if_exists}</#if></option> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} </select> - <select name="expYear" class="selectBox"> + <select name="expYear" class="required"> <option><#if tryEntity>${expYear?if_exists}<#else>${requestParameters.expYear?if_exists}</#if></option> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} </select> - *</td> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </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> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingBillingAddress}</div></td> - <td width="5"> </td> - <td width="74%"> + <td class="label">${uiLabelMap.AccountingBillingAddress}</td> + <td> <#-- Removed because is confusing, can add but would have to come back here with all data populated as before... - <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="smallSubmit"> [Create New Address]</a> --> - <table width="100%" border="0" cellpadding="1"> + <table cellspacing="0"> <#assign hasCurrent = false> <#if curPostalAddress?has_content> <#assign hasCurrent = true> <tr> - <td align="right" valign="top" width="1%"> + <td class="button-col"> <input type="radio" name="contactMechId" value="${curContactMechId}" checked> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div> + <td> + <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p> <#list curPartyContactMechPurposes as curPartyContactMechPurpose> <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <div class="tabletext"> + <p> <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b> <#if curPartyContactMechPurpose.thruDate?exists> (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()}) </#if> - </div> + </p> </#list> - <div class="tabletext"> - <#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br/></#if> - <#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br/></#if> - ${curPostalAddress.address1?if_exists}<br/> - <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br/></#if> - ${curPostalAddress.city?if_exists}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId?if_exists}</#if> ${curPostalAddress.postalCode?if_exists} - <#if curPostalAddress.countryGeoId?exists><br/>${curPostalAddress.countryGeoId}</#if> - </div> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> - <#if curPartyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if> + <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if> + <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if> + <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if> + <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if> + <p>${curPostalAddress.city?if_exists}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId?if_exists}</#if> ${curPostalAddress.postalCode?if_exists}</p> + <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if> + <p>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</p> + <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></p></#if> </td> </tr> <#else> <#-- <tr> <td align="left" valign="top" colspan="2"> - <div class="tabletext">${uiLabelMap.PartyBillingAddressNotSelected}</div> + ${uiLabelMap.PartyBillingAddressNotSelected} </td> </tr> --> </#if> <#-- is confusing <tr> <td align="left" valign="top" colspan="2"> - <div class="tabletext"><b>Select a New Billing Address:</b></div> + <b>Select a New Billing Address:</b> </td> </tr> --> @@ -219,32 +211,30 @@ <#assign postalAddress = postalAddressInfo.postalAddress> <#assign partyContactMech = postalAddressInfo.partyContactMech> <tr> - <td align="right" valign="top" width="1%"> + <td class="button-col"> <input type="radio" name="contactMechId" value="${contactMech.contactMechId}"> </td> - <td align="left" valign="middle" width="80%"> + <td> <#list partyContactMechPurposes as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <div class="tabletext"> - <b>${contactMechPurposeType.get("description",locale)?if_exists}</b> - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> - </div> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> + <p> + <b>${contactMechPurposeType.get("description",locale)?if_exists}</b> + <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> + </p> </#list> - <div class="tabletext"> - <#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br/></#if> - ${postalAddress.address1?if_exists}<br/> - <#if postalAddress.address2?exists>${postalAddress.address2}<br/></#if> - ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode} - <#if postalAddress.countryGeoId?exists><br/>${postalAddress.countryGeoId}</#if> - </div> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> - <#if partyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if> + <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if> + <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if> + <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if> + <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if> + <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode}</p> + <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if> + <p>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</p> + <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></p></#if> </td> </tr> </#list> <#if !postalAddressInfos?has_content && !curContactMech?exists> - <tr><td colspan="2"><div class="tabletext">${uiLabelMap.PartyNoContactInformation}.</div></td></tr> + <tr><td colspan="2">${uiLabelMap.PartyNoContactInformation}.</td></tr> </#if> <#-- not yet supported in party manager <tr> @@ -252,7 +242,7 @@ <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked</#if>> </td> <td align="left" valign="middle" width="80%"> - <span class="tabletext">${uiLabelMap.PartyCreateNewBillingAddress}.</span> + ${uiLabelMap.PartyCreateNewBillingAddress}. </td> </tr> --> @@ -262,5 +252,9 @@ </table> </form> - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editcreditcardform.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.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> +<!-- end editcreditcard.ftl --> + Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl?view=diff&rev=514106&r1=514105&r2=514106 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl Sat Mar 3 01:41:15 2007 @@ -17,121 +17,117 @@ under the License. --> +<!-- begin editeftaccount.ftl --> <#if !eftAccount?exists> - <p class="head1">${uiLabelMap.AccountingAddNewEftAccount}</p> + <h1>${uiLabelMap.AccountingAddNewEftAccount}</h1> <form method="post" action='<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'> <#else> - <p class="head1">${uiLabelMap.PageTitleEditEftAccount}</p> + <h1>${uiLabelMap.PageTitleEditEftAccount}</h1> <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'> <input type="hidden" name='paymentMethodId' value='${paymentMethodId}'> </#if> - - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editeftaccountform.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.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> <input type="hidden" name="partyId" value="${partyId}"/> - <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.AccountingNameAccount}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}"> - *</td> + <td class="label">${uiLabelMap.AccountingNameAccount}</td> + <td> + <input type="text" class='required' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCompanyNameAccount}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}"> + <td class="label">${uiLabelMap.AccountingCompanyNameAccount}</td> + <td> + <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}"> </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}"> - *</td> + <td class="label">${uiLabelMap.AccountingBankName}</td> + <td> + <input type="text" class='required' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}"> - *</td> + <td class="label">${uiLabelMap.AccountingRoutingNumber}</td> + <td> + <input type="text" class='required' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td> - <td width="5"> </td> - <td width="74%"> - <select name="accountType" class='selectBox'> + <td class="label">${uiLabelMap.AccountingAccountType}</td> + <td> + <select name="accountType" class='required'> <option>${eftAccountData.accountType?if_exists}</option> <option></option> <option>${uiLabelMap.CommonChecking}</option> <option>${uiLabelMap.CommonSavings}</option> </select> - *</td> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td> - <td width="5"> </td> - <td width="74%"> - <input type="text" class='inputBox' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}"> - *</td> + <td class="label">${uiLabelMap.AccountingAccountNumber}</td> + <td> + <input type="text" class='required' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td 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> + <td class="label">${uiLabelMap.CommonDescription}</td> + <td> + <input type="text" class='required' size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}"> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> + </td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyBillingAddress}</div></td> - <td width="5"> </td> - <td width="74%"> + <td class="label">${uiLabelMap.PartyBillingAddress}</td> + <td> <#-- Removed because is confusing, can add but would have to come back here with all data populated as before... - <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>editcontactmech</@ofbizUrl>" class="smallSubmit"> [Create New Address]</a> --> - <table width="100%" border="0" cellpadding="1"> + <table cellspacing="0"> <#if curPostalAddress?exists> <tr> - <td align="right" valign="top" width="1%"> + <td class="button-col"> <input type="radio" name="contactMechId" value="${curContactMechId}" checked> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div> + <td> + <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p> <#list curPartyContactMechPurposes as curPartyContactMechPurpose> <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <div class="tabletext"> - <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b> - <#if curPartyContactMechPurpose.thruDate?exists> - (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()}) - </#if> - </div> + <p><b>${curContactMechPurposeType.get("description",locale)?if_exists}</b></p> + <#if curPartyContactMechPurpose.thruDate?exists> + <p>(${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})</p> + </#if> </#list> - <div class="tabletext"> - <#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br/></#if> - <#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br/></#if> - ${curPostalAddress.address1?if_exists}<br/> - <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br/></#if> - ${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode} - <#if curPostalAddress.countryGeoId?exists><br/>${curPostalAddress.countryGeoId}</#if> - </div> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> - <#if curPartyContactMech.thruDate?exists><div class='tabletext'><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if> + <#if curPostalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}</p></#if> + <#if curPostalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}</p></#if> + <#if curPostalAddress.address1?exists><p>${curPostalAddress.address1}</p></#if> + <#if curPostalAddress.address2?exists><p>${curPostalAddress.address2}</p></#if> + <p>${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode}</p> + <#if curPostalAddress.countryGeoId?exists><p>${curPostalAddress.countryGeoId}</p></#if> + <p>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</p> + <#if curPartyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></p></#if> </td> </tr> <#else> <#-- <tr> <td align="left" valign="top" colspan='2'> - <div class="tabletext">${uiLabelMap.PartyNoBillingAddress}</div> + ${uiLabelMap.PartyNoBillingAddress}</div> </td> </tr> --> </#if> <#-- is confusing <tr> <td align="left" valign="top" colspan='2'> - <div class="tabletext"><b>Select a New Billing Address:</b></div> + <b>Select a New Billing Address:</b></div> </td> </tr> --> @@ -141,32 +137,28 @@ <#assign postalAddress = postalAddressInfo.postalAddress> <#assign partyContactMech = postalAddressInfo.partyContactMech> <tr> - <td align="right" valign="top" width="1%"> + <td class="button-col"> <input type='radio' name='contactMechId' value='${contactMech.contactMechId}'> </td> - <td align="left" valign="top" width="80%"> + <td> <#list partyContactMechPurposes as partyContactMechPurpose> - <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> - <div class="tabletext"> - <b>${contactMechPurposeType.get("description",locale)?if_exists}</b> - <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> - </div> + <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> + <p><b>${contactMechPurposeType.get("description",locale)?if_exists}</b></p> + <#if partyContactMechPurpose.thruDate?exists><p>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</p></#if> </#list> - <div class="tabletext"> - <#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br/></#if> - ${postalAddress.address1?if_exists}<br/> - <#if postalAddress.address2?exists>${postalAddress.address2}<br/></#if> - ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode} - <#if postalAddress.countryGeoId?exists><br/>${postalAddress.countryGeoId}</#if> - </div> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> - <#if partyContactMech.thruDate?exists><div class='tabletext'><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if> + <#if postalAddress.toName?exists><p><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}</p></#if> + <#if postalAddress.attnName?exists><p><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}</p></#if> + <#if postalAddress.address1?exists><p>${postalAddress.address1}</p></#if> + <#if postalAddress.address2?exists><p>${postalAddress.address2}</p></#if> + <p>${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode}</p> + <#if postalAddress.countryGeoId?exists><p>${postalAddress.countryGeoId}</p></#if> + <p>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</p> + <#if partyContactMech.thruDate?exists><p><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></p></#if> </td> </tr> </#list> <#if !postalAddressInfos?has_content && !curContactMech?exists> - <tr><td colspan='2'><div class="tabletext">${uiLabelMap.PartyNoContactInformation}.</div></td></tr> + <tr><td colspan='2'>${uiLabelMap.PartyNoContactInformation}.</td></tr> </#if> </table> </td> @@ -174,5 +166,9 @@ </table> </form> - <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editeftaccountform.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.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> + </div> +<!-- end editeftaccount.ftl --> + |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |