svn commit: r539200 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: jaz
Date: Thu May 17 17:54:44 2007 New Revision: 539200 URL: http://svn.apache.org/viewvc?view=rev&rev=539200 Log: few more small UI updates Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl Thu May 17 17:54:44 2007 @@ -17,9 +17,9 @@ under the License. --> -<div class="boxtop"> +<div class="screenlet-title-bar"> <div class="boxhead-right"> - <a href="<@ofbizUrl>orderentry</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOrderItems}</a> + <a href="<@ofbizUrl>orderentry</@ofbizUrl>" class="lightbuttontext">${uiLabelMap.OrderOrderItems}</a> </div> <div class="boxhead-left"> ${uiLabelMap.CommonCreate} @@ -31,3 +31,4 @@ </div> <div class="boxhead-fill"> </div> </div> + Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Thu May 17 17:54:44 2007 @@ -17,33 +17,35 @@ under the License. --> -<div class="button-bar"> - <a href="<@ofbizUrl>emptycart</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearOrder}</a> - <#if (shoppingCart.size() > 0)> - <a href="javascript:document.cartform.submit()" class="buttontext">${uiLabelMap.OrderRecalculateOrder}</a> - <a href="javascript:removeSelected();" class="buttontext">${uiLabelMap.OrderRemoveSelected}</a> - <#else> - <span class="buttontextdisabled">${uiLabelMap.OrderRecalculateOrder}</span> - <span class="buttontextdisabled">${uiLabelMap.OrderRemoveSelected}</span> - </#if> - <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> - <#if shoppingCart.getOrderPartyId() == "_NA_" || (shoppingCart.size() = 0)> - <span class="buttontextdisabled">${uiLabelMap.OrderFinalizeOrder}</span> - <#else> - <a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderFinalizeOrder}</a> - </#if> - <#else> - <#if shoppingCart.size() = 0> - <span class="buttontextdisabled">${uiLabelMap.OrderQuickFinalizeOrder}</span> - <span class="buttontextdisabled">${uiLabelMap.OrderFinalizeOrderDefault}</span> - <span class="buttontextdisabled">${uiLabelMap.OrderFinalizeOrder}</span> - <#else> - <a href="<@ofbizUrl>quickcheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickFinalizeOrder}</a> - <a href="<@ofbizUrl>finalizeOrder?finalizeMode=default</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderFinalizeOrderDefault}</a> - <a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderFinalizeOrder}</a> - </#if> - </#if> +<div class="button-bar tab-bar"> + <ul> + <li><a href="<@ofbizUrl>emptycart</@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li> + <#if (shoppingCart.size() > 0)> + <li><a href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li> + <li><a href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li> + <#else> + <li><span class="disabled">${uiLabelMap.OrderRecalculateOrder}</span></li> + <li><span class="disabled">${uiLabelMap.OrderRemoveSelected}</span></li> + </#if> + <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> + <#if shoppingCart.getOrderPartyId() == "_NA_" || (shoppingCart.size() = 0)> + <li><span class="disabled">${uiLabelMap.OrderFinalizeOrder}</span></li> + <#else> + <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> + </#if> + <#else> + <#if shoppingCart.size() = 0> + <li><span class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</span></li> + <li><span class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</span></li> + <li><span class="disabled">${uiLabelMap.OrderFinalizeOrder}</span></li> + <#else> + <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li> + <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=default</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li> + <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> + </#if> + </#if> </div> +<br/> <div class="screenlet-title-bar"> <h3> ${uiLabelMap.CommonCreate} Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Thu May 17 17:54:44 2007 @@ -33,26 +33,16 @@ <!-- Sales Order Entry --> <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)> <#if shoppingCartOrderType != "PURCHASE_ORDER"> -<table width="100%" border="0" align="center" cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td> - <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td valign="middle" align="left"> - <div class="boxhead"> - ${uiLabelMap.OrderSalesOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if> - </div> - </td> - <td valign="middle" align="right"> - <a href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.PartyFindParty}</a> - <a href="javascript:document.salesentryform.submit();" class="buttontext">${uiLabelMap.CommonContinue}</a> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> + <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</li> + <li><a href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}">${uiLabelMap.PartyFindParty}</a></li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> <form method="post" name="salesentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> <input type="hidden" name="finalizeMode" value="type"/> <input type="hidden" name="orderMode" value="SALES_ORDER"/> @@ -131,36 +121,24 @@ </td> </tr> </table> - </form> - </td> - </tr> -</table> + </div> +</div> </#if> </#if> <br/> <!-- Purchase Order Entry --> <#if security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> <#if shoppingCartOrderType != "SALES_ORDER"> -<table width="100%" border="0" align="center" cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td> - <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td valign="middle" align="left"> - <div class="boxhead"> - ${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if> - </div> - </td> - <td valign="middle" align="right"> - <a href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.PartyFindParty}</a> - <a href="javascript:document.poentryform.submit();" class="buttontext">${uiLabelMap.CommonContinue}</a> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> + <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li> + <li><a href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}">${uiLabelMap.PartyFindParty}</a></li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> <form method="post" name="poentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> <input type='hidden' name='finalizeMode' value='type'/> <input type='hidden' name='orderMode' value='PURCHASE_ORDER'/> @@ -217,8 +195,7 @@ </tr> </table> </form> - </td> - </tr> -</table> + </div> + </div> </#if> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Thu May 17 17:54:44 2007 @@ -18,28 +18,7 @@ --> <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> -<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 align="left"> - <div class="boxhead"> ${uiLabelMap.OrderOrderEntryCustomerInfo}</div> - </td> - <td nowrap align="right"> - <div class="tabletext"> - <a href="<@ofbizUrl>orderentry</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOrderItems}</a> - - <a href="<@ofbizUrl>setCustomer</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefresh}</a> - <a href="javascript:document.checkoutsetupform.submit();" class="buttontext">${uiLabelMap.CommonContinue}</a> - </div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width="100%"> + <div class="screenlet-body"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <form name="checkoutsetupform" method="post" action="<@ofbizUrl>createCustomer</@ofbizUrl>"> <input type="hidden" name="finalizeMode" value="cust"> @@ -168,10 +147,7 @@ </td> </tr> </table> - </td> - </tr> -</table> - + </div> <br/> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl Thu May 17 17:54:44 2007 @@ -19,22 +19,7 @@ <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> -<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td width='100%'> - - <#-- header table for company shipping addresses --> - - <br/> - <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td><div class="boxhead">${uiLabelMap.OrderSelectAShippingAddress}</div></td> - <td valign="middle" align="right"> - <a href="javascript:document.checkoutsetupform.submit();" class="buttontext">${uiLabelMap.CommonContinue}</a> - </td> - </tr> - </table> - + <div class="screenlet-body"> <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> <tr> <td> @@ -138,10 +123,7 @@ </td> </tr> </table> - </td> - </tr> -</table> - + </div> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Thu May 17 17:54:44 2007 @@ -20,16 +20,12 @@ <form method="post" name="agreementForm" action="<@ofbizUrl>setOrderCurrencyAgreementShipDates</@ofbizUrl>"> <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxtop"> - <div class="boxhead-right" align="right"> - <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonContinue}"> - </div> - <div class="boxhead-left"> - ${uiLabelMap.OrderOrderEntryCurrencyAgreementShipDates} - </div> - <div class="boxhead-fill"> </div> - </div> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.OrderOrderEntryCurrencyAgreementShipDates}</li> + <li><a href="javascript:document.agreementForm.submit()">${uiLabelMap.CommonContinue}</a></li> + </ul> + <br class="clear" /> </div> <div class="screenlet-body"> <table> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Thu May 17 17:54:44 2007 @@ -192,44 +192,38 @@ - <#-- select a party id to ship to instead --> - - <br/> - <form method="post" action="chooseOrderPartyAddress" name="partyshipform"> - - <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td><div class="boxhead">${uiLabelMap.OrderShipToAnotherParty}</div></td> - <td valign="middle" align="right"> - <a href="javascript:document.partyshipform.submit();" class="buttontext">${uiLabelMap.CommonContinue}</a> - </td> - </tr> - </table> - - <table width="100%" border="0" align="center" cellspacing='0' cellpadding='0' class='boxoutside'> - <tr><td> - <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> - <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'> - <tr><td colspan="4"> </td></tr> - <tr> - <td> </td> - <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td> - <td> </td> - <td valign='middle'> - <div class='tabletext'> - <input type='text' class='inputBox' name='partyId' value='${thisPartyId?if_exists}'/> - <a href="javascript:call_fieldlookup2(document.partyshipform.partyId,'LookupPartyName');"> - <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/> - </a> - </div> - </td> - </tr> - <tr><td colspan="4"> </td></tr> - </table> - </td></tr> - </table> - </form> + <#-- select a party id to ship to instead --> + <br/> + <form method="post" action="chooseOrderPartyAddress" name="partyshipform"> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.OrderShipToAnotherParty}</li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> + <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + <tr><td colspan="4"> </td></tr> + <tr> + <td> </td> + <td align='right' valign='middle' nowrap><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td> + <td> </td> + <td valign='middle'> + <div class='tabletext'> + <input type='text' class='inputBox' name='partyId' value='${thisPartyId?if_exists}'/> + <a href="javascript:call_fieldlookup2(document.partyshipform.partyId,'LookupPartyName');"> + <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> + <input type="submit" class="smallSubmit" value="Continue"> + </div> + </td> + </tr> + </table> + </div> + </div> + </form> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> </#if> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml?view=diff&rev=539200&r1=539199&r2=539200 ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml Thu May 17 17:54:44 2007 @@ -57,10 +57,14 @@ <decorator-section name="body"> <section> <widgets> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl"/></html> - </platform-specific> - <decorator-section-include name="body"/> + <container style="screenlet"> + <platform-specific> + <html><html-template location="component://order/webapp/ordermgr/entry/OrderEntryCatalogTabBar.ftl"/></html> + </platform-specific> + <container style="screenlet-body"> + <decorator-section-include name="body"/> + </container> + </container> </widgets> </section> </decorator-section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |