You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/09/17 14:11:14 UTC
svn commit: r816159 -
/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
Author: mor
Date: Thu Sep 17 12:11:14 2009
New Revision: 816159
URL: http://svn.apache.org/viewvc?rev=816159&view=rev
Log:
Markup improvements.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=816159&r1=816158&r2=816159&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl Thu Sep 17 12:11:14 2009
@@ -16,186 +16,107 @@
specific language governing permissions and limitations
under the License.
-->
-
+<div>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.OrderSalesHistory}</div>
- </div>
- <div class="screenlet-body">
- <table width="100%" cellpadding="1" cellspacing="0" border="0">
- <tr>
- <td width="30%">
- <div class="tabletext"><b>${uiLabelMap.CommonDate}</b></div>
- </td>
- <td width="10"> </td>
- <td width="15%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</span></b></div>
- </td>
- <td width="10"> </td>
- <td width="15%">
- <div class="tabletext"><b>${uiLabelMap.CommonAmount}</b></div>
- </td>
- <td width="10"> </td>
- <td width="15%">
- <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div>
- </td>
- <td width="10"> </td>
- <td width="15%">
- <div class="tabletext"><b>${uiLabelMap.OrderInvoices}</b></div>
- </td>
- </tr>
- <#list orderHeaderList as orderHeader>
- <#assign status = orderHeader.getRelatedOneCache("StatusItem")>
- <tr><td colspan="9"><hr/></td></tr>
+ <h3>${uiLabelMap.OrderSalesHistory}</h3>
+ <table id="orderSalesHistory" summary="This table display order sales history.">
+ <thead>
<tr>
- <td>
- <div class="tabletext"><span style="white-space: nowrap;">${orderHeader.orderDate.toString()}</span></div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext">${orderHeader.orderId}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext"><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext">${status.get("description",locale)}</div>
- </td>
- <#-- invoices -->
- <td width="10"> </td>
- <#assign invoices = delegator.findByAnd("OrderItemBilling", Static["org.ofbiz.base.util.UtilMisc"].toMap("orderId", "${orderHeader.orderId}"), Static["org.ofbiz.base.util.UtilMisc"].toList("invoiceId"))>
- <#if invoices?has_content>
- <td>
- <#list invoices as invoice>
- <a href="<@o...@ofbizUrl>" class="buttontext">(${invoice.invoiceId} PDF) </a>
- </#list>
- </td>
- <#else>
- <td width="10"> </td>
- </#if>
- <td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a>
- </td>
+ <th>${uiLabelMap.CommonDate}</th>
+ <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
+ <th>${uiLabelMap.CommonAmount}</th>
+ <th>${uiLabelMap.CommonStatus}</th>
+ <th>${uiLabelMap.OrderInvoices}</th>
+ <th></th>
</tr>
- </#list>
- <#if !orderHeaderList?has_content>
- <tr><td colspan="9"><h3>${uiLabelMap.OrderNoOrderFound}</h3></td></tr>
- </#if>
+ </thead>
+ <tbody>
+ <#list orderHeaderList as orderHeader>
+ <#assign status = orderHeader.getRelatedOneCache("StatusItem")>
+ <tr>
+ <td>${orderHeader.orderDate.toString()}</td>
+ <td>${orderHeader.orderId}</td>
+ <td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom /></td>
+ <td>${status.get("description",locale)}</td>
+ <#-- invoices -->
+ <#assign invoices = delegator.findByAnd("OrderItemBilling", Static["org.ofbiz.base.util.UtilMisc"].toMap("orderId", "${orderHeader.orderId}"), Static["org.ofbiz.base.util.UtilMisc"].toList("invoiceId")) />
+ <#if invoices?has_content>
+ <td>
+ <#list invoices as invoice>
+ <a href="<@o...@ofbizUrl>" class="button">(${invoice.invoiceId} PDF)</a>
+ </#list>
+ </td>
+ <#else>
+ <td></td>
+ </#if>
+ <td><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonView}</a></td>
+ </tr>
+ </#list>
+ <#if !orderHeaderList?has_content>
+ <tr><td colspan="9">${uiLabelMap.OrderNoOrderFound}</td></tr>
+ </#if>
+ </tbody>
</table>
- </div>
</div>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.OrderPurchaseHistory}</div>
- </div>
- <div class="screenlet-body">
- <table width="100%" cellpadding="1" cellspacing="0" border="0">
- <tr>
- <td width="30%">
- <div class="tabletext"><b>${uiLabelMap.CommonDate}</b></div>
- </td>
- <td width="10"> </td>
- <td width="15%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</span></b></div>
- </td>
- <td width="10"> </td>
- <td width="15%">
- <div class="tabletext"><b>${uiLabelMap.CommonAmount}</b></div>
- </td>
- <td width="10"> </td>
- <td width="15%">
- <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div>
- </td>
- <td width="10"> </td>
- <td width="15%"><b></b></td>
- </tr>
- <#if porderHeaderList?has_content>
+ <h3>${uiLabelMap.OrderPurchaseHistory}</h3>
+ <table id="orderPurchaseHistory" summary="This table display order purchase history.">
+ <thead>
+ <tr>
+ <th>${uiLabelMap.CommonDate}</th>
+ <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
+ <th>${uiLabelMap.CommonAmount}</th>
+ <th>${uiLabelMap.CommonStatus}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <#if porderHeaderList?has_content>
<#list porderHeaderList as porderHeader>
<#assign pstatus = porderHeader.getRelatedOneCache("StatusItem")>
- <tr><td colspan="9"><hr/></td></tr>
<tr>
- <td>
- <div class="tabletext"><span style="white-space: nowrap;">${porderHeader.orderDate.toString()}</span></div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext">${porderHeader.orderId}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext"><@ofbizCurrency amount=porderHeader.grandTotal isoCode=porderHeader.currencyUom/></div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext">${pstatus.get("description",locale)}</div>
- </td>
- <td width="10"> </td>
- <td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a>
- </td>
+ <td>${porderHeader.orderDate.toString()}</td>
+ <td>${porderHeader.orderId}</td>
+ <td><@ofbizCurrency amount=porderHeader.grandTotal isoCode=porderHeader.currencyUom /></td>
+ <td>${pstatus.get("description",locale)}</td>
+ <td><a href="<@o...@ofbizUrl>" class="buttont">${uiLabelMap.CommonView}</a></td>
</tr>
</#list>
</#if>
<#if !porderHeaderList?has_content>
- <tr><td colspan="9"><h3>${uiLabelMap.OrderNoOrderFound}</h3></td></tr>
+ <tr><td colspan="9">${uiLabelMap.OrderNoOrderFound}</td></tr>
</#if>
+ </tbody>
</table>
- </div>
</div>
<div class="screenlet">
- <div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.EcommerceDownloadsAvailableTitle}</div>
- </div>
- <div class="screenlet-body">
- <table width="100%" cellpadding="1" cellspacing="0" border="0">
+ <h3>${uiLabelMap.EcommerceDownloadsAvailableTitle}</h3>
+ <table id="availableTitleDownload" summary="This table display available title for download.">
+ <thead>
<tr>
- <td width="10%">
- <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</span></b></div>
- </td>
- <td width="10"> </td>
- <td width="20%">
- <div class="tabletext"><b>${uiLabelMap.ProductProductName}</b></div>
- </td>
- <td width="10"> </td>
- <td width="10%">
- <div class="tabletext"><b>${uiLabelMap.CommonName}</b></div>
- </td>
- <td width="10"> </td>
- <td width="40%">
- <div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div>
- </td>
- <td width="10"> </td>
- <td width="10%"><b></b></td>
+ <th>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</th>
+ <th>${uiLabelMap.ProductProductName}</th>
+ <th>${uiLabelMap.CommonName}</th>
+ <th>${uiLabelMap.CommonDescription}</th>
+ <th></th>
</tr>
+ </thead>
+ <tbody>
<#list downloadOrderRoleAndProductContentInfoList as downloadOrderRoleAndProductContentInfo>
- <tr><td colspan="9"><hr/></td></tr>
<tr>
+ <td>${downloadOrderRoleAndProductContentInfo.orderId}</td>
+ <td>${downloadOrderRoleAndProductContentInfo.productName}</td>
+ <td>${downloadOrderRoleAndProductContentInfo.contentName?if_exists}</td>
+ <td>${downloadOrderRoleAndProductContentInfo.description?if_exists}</td>
<td>
- <div class="tabletext">${downloadOrderRoleAndProductContentInfo.orderId}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext">${downloadOrderRoleAndProductContentInfo.productName}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext">${downloadOrderRoleAndProductContentInfo.contentName?if_exists}</div>
- </td>
- <td width="10"> </td>
- <td>
- <div class="tabletext">${downloadOrderRoleAndProductContentInfo.description?if_exists}</div>
- </td>
- <td width="10"> </td>
- <td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">Download</a>
+ <a href="<@o...@ofbizUrl>" class="button">Download</a>
</td>
</tr>
</#list>
<#if !downloadOrderRoleAndProductContentInfoList?has_content>
- <tr><td colspan="9"><h3>${uiLabelMap.EcommerceDownloadNotFound}</h3></td></tr>
+ <tr><td colspan="9">${uiLabelMap.EcommerceDownloadNotFound}</td></tr>
</#if>
+ </tbody>
</table>
- </div>
</div>
+</div>
\ No newline at end of file