You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/04/27 08:52:49 UTC
svn commit: r532989 - in
/ofbiz/trunk/applications/order/webapp/ordermgr/entry: orderHeaderInfo.ftl
orderShortcuts.ftl
Author: jacopoc
Date: Thu Apr 26 23:52:48 2007
New Revision: 532989
URL: http://svn.apache.org/viewvc?view=rev&rev=532989
Log:
Layout cleanups.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl?view=diff&rev=532989&r1=532988&r2=532989
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl Thu Apr 26 23:52:48 2007
@@ -30,84 +30,66 @@
<#assign shoppingCartSize = 0>
</#if>
-<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="center">
- <div class='boxhead'><b>${uiLabelMap.OrderOrderHeaderInfo}</b></div>
- </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%" border="0" cellpadding="2" cellspacing="0">
- <tr valign="top">
- <td class="tabletext"><b>${uiLabelMap.OrderOrderName}</b>:</td>
- <td class="tabletext">
- <form method="post" action="setOrderName" name="setCartOrderNameForm">
- <input type="text" name="orderName" class="inputBox" size="15" maxlength="200" value='${shoppingCart.getOrderName()?default("")}'/>
- <input type="submit" value="${uiLabelMap.CommonSet}" class="smallSubmit"/>
- </form>
- </td>
- </tr>
- <tr>
- <td><div class="tabletext"><b>${uiLabelMap.Party}</b>:</div></td>
- <td>
- <div class="tabletext">
- <a href="${customerDetailLink}${partyId}&${externalKeyParam?if_exists}" target="partymgr" class="buttontext">${partyId}</a>
- <#if partyMap.person?exists>
- ${partyMap.person.firstName?if_exists} ${partyMap.person.lastName?if_exists}
- </#if>
- <#if partyMap.partyGroup?exists>
- ${partyMap.partyGroup.groupName?if_exists}
- </#if>
- </div>
- </td>
- </tr>
- <#if shoppingCart.getOrderType() != "PURCHASE_ORDER">
- <tr valign="top">
- <td class="tabletext"><b>${uiLabelMap.OrderPONumber}</b>:</td>
- <td class="tabletext">
- <form method="post" action="setPoNumber" name="setCartPoNumberForm">
- <input type="text" name="correspondingPoId" class="inputBox" size="15" value='${shoppingCart.getPoNumber()?default("")}'/>
- <input type="submit" value="${uiLabelMap.CommonSet}" class="smallSubmit"/>
- </form>
- </td>
- </tr>
- </#if>
- <tr>
- <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.CommonCurrency}</b>:</div></td>
- <td valign="bottom"><div class="tabletext">${currencyUomId}</div></td>
- </tr>
- <#if agreementId?has_content>
- <tr>
- <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.AccountingAgreement}</b>:</div></td>
- <td valign="bottom"><div class="tabletext">${agreementId}</div></td>
- </tr>
- </#if>
- <#if quoteId?has_content>
- <tr>
- <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.OrderOrderQuote}</b>:</div></td>
- <td valign="bottom"><div class="tabletext">${quoteId}</div></td>
- </tr>
- </#if>
- <tr>
- <td colspan="2" align="right">
- <div class="tabletext"><b>${uiLabelMap.CommonTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b></div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
+<div class="screenlet">
+ <div class="screenlet-header">
+ <div class="boxhead">${uiLabelMap.OrderOrderHeaderInfo}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr valign="top">
+ <td><b>${uiLabelMap.OrderOrderName}</b>:</td>
+ <td>
+ <form method="post" action="setOrderName" name="setCartOrderNameForm">
+ <input type="text" name="orderName" size="15" maxlength="200" value='${shoppingCart.getOrderName()?default("")}'/>
+ <input type="submit" value="${uiLabelMap.CommonSet}"/>
+ </form>
+ </td>
+ </tr>
+ <tr>
+ <td><b>${uiLabelMap.Party}</b>:</td>
+ <td>
+ <a href="${customerDetailLink}${partyId}&${externalKeyParam?if_exists}" target="partymgr" class="buttontext">${partyId}</a>
+ <#if partyMap.person?exists>
+ ${partyMap.person.firstName?if_exists} ${partyMap.person.lastName?if_exists}
+ </#if>
+ <#if partyMap.partyGroup?exists>
+ ${partyMap.partyGroup.groupName?if_exists}
+ </#if>
+ </td>
+ </tr>
+ <#if shoppingCart.getOrderType() != "PURCHASE_ORDER">
+ <tr valign="top">
+ <td><b>${uiLabelMap.OrderPONumber}</b>:</td>
+ <td>
+ <form method="post" action="setPoNumber" name="setCartPoNumberForm">
+ <input type="text" name="correspondingPoId" size="15" value='${shoppingCart.getPoNumber()?default("")}'/>
+ <input type="submit" value="${uiLabelMap.CommonSet}"/>
+ </form>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td valign="bottom"><b>${uiLabelMap.CommonCurrency}</b>:</td>
+ <td valign="bottom">${currencyUomId}</td>
+ </tr>
+ <#if agreementId?has_content>
+ <tr>
+ <td valign="bottom"><b>${uiLabelMap.AccountingAgreement}</b>:</td>
+ <td valign="bottom">${agreementId}</td>
+ </tr>
+ </#if>
+ <#if quoteId?has_content>
+ <tr>
+ <td valign="bottom"><b>${uiLabelMap.OrderOrderQuote}</b>:</td>
+ <td valign="bottom">${quoteId}</td>
+ </tr>
+ </#if>
+ <tr>
+ <td colspan="2" align="right">
+ <b>${uiLabelMap.CommonTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b>
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
<br/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl?view=diff&rev=532989&r1=532988&r2=532989
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl Thu Apr 26 23:52:48 2007
@@ -19,89 +19,33 @@
<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists>
-<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="center">
- <div class='boxhead'><b>${uiLabelMap.OrderOrderShortcuts}</b></div>
- </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%" border="0" cellpadding="0" cellspacing="0">
- <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderRequirements}</a>
- </td>
- </tr>
- </#if>
- <#if shoppingCart.getOrderType() == "SALES_ORDER">
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOrderQuotes}</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateQuoteFromCart}</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateCustRequestFromCart}</a>
- </td>
- </tr>
- </#if>
- <tr>
- <td>
- <a href="/partymgr/control/findparty?${externalKeyParam?if_exists}" class="buttontext">${uiLabelMap.PartyFindParty}</a>
- </td>
- </tr>
- <#if shoppingCart.getOrderType() == "SALES_ORDER" && shoppingCart.items()?has_content>
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyCreateNewCustomer}</a>
- </td>
- </tr>
- </#if>
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyChangeParty}</a>
- </td>
- </tr>
- <#if security.hasEntityPermission("CATALOG", "_CREATE", session)>
- <tr>
- <td>
- <a href="/catalog/control/EditProduct?${externalKeyParam?if_exists}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a>
- </td>
- </tr>
- </#if>
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceQuickAdd}</a>
- </td>
- </tr>
- <#if shoppingLists?exists>
- <tr>
- <td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleShoppingList}</a>
- </td>
- </tr>
- </#if>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
+<div class="screenlet">
+ <div class="screenlet-header">
+ <div class="boxhead">${uiLabelMap.OrderOrderShortcuts}</div>
+ </div>
+ <div class="screenlet-body">
+ <ul>
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderRequirements}</a></li>
+ </#if>
+ <#if shoppingCart.getOrderType() == "SALES_ORDER">
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOrderQuotes}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateQuoteFromCart}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateCustRequestFromCart}</a></li>
+ </#if>
+ <li><a href="/partymgr/control/findparty?${externalKeyParam?if_exists}" class="buttontext">${uiLabelMap.PartyFindParty}</a></li>
+ <#if shoppingCart.getOrderType() == "SALES_ORDER" && shoppingCart.items()?has_content>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyCreateNewCustomer}</a></li>
+ </#if>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyChangeParty}</a></li>
+ <#if security.hasEntityPermission("CATALOG", "_CREATE", session)>
+ <li><a href="/catalog/control/EditProduct?${externalKeyParam?if_exists}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></li>
+ </#if>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceQuickAdd}</a></li>
+ <#if shoppingLists?exists>
+ <li><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleShoppingList}</a></li>
+ </#if>
+ </ul>
+ </div>
+</div>
<br/>