Author: jacopoc
Date: Fri May 18 23:25:36 2007
New Revision: 539694
URL: http://svn.apache.org/viewvc?view=rev&rev=539694
Log:
Layout fixes by Adrian Crum OFBIZ-996
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl
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=539694&r1=539693&r2=539694
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Fri May
18 23:25:36 2007
@@ -37,7 +37,7 @@
<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="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
<li><a
href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}">${uiLabelMap.PartyFindParty}</a></li>
</ul>
<br class="clear" />
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl?view=diff&rev=539694&r1=539693&r2=539694
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl Fri May
18 23:25:36 2007
@@ -19,181 +19,150 @@
<#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", 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" width='70%' >
- <div
class='boxhead'> ${uiLabelMap.OrderOrderStatisticsPage}</div>
- </TD>
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
- <tr>
- <td>
-
- <!--<div
class='head3'>${uiLabelMap.OrderOrderStatisticsPage}</div>-->
- <TABLE width='100%' cellpadding='2' cellspacing='0' border='0'>
- <TR>
- <td> </td>
- <td> </td>
- <td><div
class="tableheadtext">${uiLabelMap.CommonToday}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.OrderWTD}</div></td>
- <TD><div
class="tableheadtext">${uiLabelMap.OrderMTD}</div></td>
- <TD><div
class="tableheadtext">${uiLabelMap.OrderYTD}</div></td>
- </TR>
- <tr><td colspan="8"><hr class="sepbar"/></td></tr>
- <tr>
- <td colspan="7">
- <div
class="tableheadtext">${uiLabelMap.OrderOrdersTotals}</div>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderGrossDollarAmountsIncludesAdjustmentsAndPendingOrders}</div></td>
- <td><div class="tabletext">${dayItemTotal}</div></td>
- <td><div class="tabletext">${weekItemTotal}</div></td>
- <td><div class="tabletext">${monthItemTotal}</div></td>
- <td><div class="tabletext">${yearItemTotal}</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderPaidDollarAmountsIncludesAdjustments}</div></td>
- <td><div class="tabletext">${dayItemTotalPaid}</div></td>
- <td><div class="tabletext">${weekItemTotalPaid}</div></td>
- <td><div class="tabletext">${monthItemTotalPaid}</div></td>
- <td><div class="tabletext">${yearItemTotalPaid}</div></td>
- </tr>
-
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderPendingPaymentDollarAmountsIncludesAdjustments}</div></td>
- <td><div class="tabletext">${dayItemTotalPending}</div></td>
- <td><div class="tabletext">${weekItemTotalPending}</div></td>
- <td><div class="tabletext">${monthItemTotalPending}</div></td>
- <td><div class="tabletext">${yearItemTotalPending}</div></td>
- </tr>
- <tr><td colspan="8"><hr class="sepbar"/></td></tr>
- <tr>
- <td colspan="7">
- <div
class="tableheadtext">${uiLabelMap.OrderOrdersItemCounts}</div>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderGrossItemsSoldIncludesPromotionsAndPendingOrders}</div></td>
- <td><div
class="tabletext">${dayItemCount?string.number}</div></td>
- <td><div
class="tabletext">${weekItemCount?string.number}</div></td>
- <td><div
class="tabletext">${monthItemCount?string.number}</div></td>
- <td><div
class="tabletext">${yearItemCount?string.number}</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderPaidItemsSoldIncludesPromotions}</div></td>
- <td><div
class="tabletext">${dayItemCountPaid?string.number}</div></td>
- <td><div
class="tabletext">${weekItemCountPaid?string.number}</div></td>
- <td><div
class="tabletext">${monthItemCountPaid?string.number}</div></td>
- <td><div
class="tabletext">${yearItemCountPaid?string.number}</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderPendingPaymentItemsSoldIncludesPromotions}</div></td>
- <td><div
class="tabletext">${dayItemCountPending?string.number}</div></td>
- <td><div
class="tabletext">${weekItemCountPending?string.number}</div></td>
- <td><div
class="tabletext">${monthItemCountPending?string.number}</div></td>
- <td><div
class="tabletext">${yearItemCountPending?string.number}</div></td>
- </tr>
- <tr><td colspan="8"><hr class="sepbar"/></td></tr>
- <tr>
- <td colspan="7">
- <div
class="tableheadtext">${uiLabelMap.OrderOrdersPending}</div>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderWaitingPayment}</div></td>
- <td><div
class="tabletext">${waitingPayment?default(0)?string.number}</div></td>
- <td><div class="tabletext">--</div></td>
- <td><div class="tabletext">--</div></td>
- <td><div class="tabletext">--</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderWaitingApproval}</div></td>
- <td><div
class="tabletext">${waitingApproval?default(0)?string.number}</div></td>
- <td><div class="tabletext">--</div></td>
- <td><div class="tabletext">--</div></td>
- <td><div class="tabletext">--</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderWaitingCompletion}</div></td>
- <td><div
class="tabletext">${waitingComplete?default(0)?string.number}</div></td>
- <td><div class="tabletext">--</div></td>
- <td><div class="tabletext">--</div></td>
- <td><div class="tabletext">--</div></td>
- </tr>
- <tr><td colspan="8"><hr class="sepbar"/></td></tr>
- <tr>
- <td colspan="7">
- <div
class="tableheadtext">${uiLabelMap.OrderStatusChanges}</div>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderOrdered}</div></td>
- <td><div
class="tabletext">${dayOrder?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${weekOrder?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${monthOrder?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${yearOrder?size?default(0)?string.number}</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderApproved}</div></td>
- <td><div
class="tabletext">${dayApprove?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${weekApprove?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${monthApprove?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${yearApprove?size?default(0)?string.number}</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderCompleted}</div></td>
- <td><div
class="tabletext">${dayComplete?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${weekComplete?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${monthComplete?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${yearComplete?size?default(0)?string.number}</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderCancelled}</div></td>
- <td><div
class="tabletext">${dayCancelled?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${weekCancelled?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${monthCancelled?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${yearCancelled?size?default(0)?string.number}</div></td>
- </tr>
- <tr>
- <td> </td>
- <td><div
class="tabletext">${uiLabelMap.OrderRejected}</div></td>
- <td><div
class="tabletext">${dayRejected?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${weekRejected?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${monthRejected?size?default(0)?string.number}</div></td>
- <td><div
class="tabletext">${yearRejected?size?default(0)?string.number}</div></td>
- </tr>
-
- </TABLE>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
-
-<br/>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.OrderOrderStatisticsPage}</h3>
+ </div>
+ <#--<div class='head3'>${uiLabelMap.OrderOrderStatisticsPage}</div>-->
+ <table class="basic-table" cellspacing='0'>
+ <tr>
+ <th> </th>
+ <th> </th>
+ <th>${uiLabelMap.CommonToday}</th>
+ <th>${uiLabelMap.OrderWTD}</th>
+ <th>${uiLabelMap.OrderMTD}</th>
+ <th>${uiLabelMap.OrderYTD}</th>
+ </tr>
+ <tr><td colspan="6"><hr/></td></tr>
+ <tr>
+ <td colspan="6"><b>${uiLabelMap.OrderOrdersTotals}</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+
<td>${uiLabelMap.OrderGrossDollarAmountsIncludesAdjustmentsAndPendingOrders}</td>
+ <td>${dayItemTotal}</td>
+ <td>${weekItemTotal}</td>
+ <td>${monthItemTotal}</td>
+ <td>${yearItemTotal}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderPaidDollarAmountsIncludesAdjustments}</td>
+ <td>${dayItemTotalPaid}</td>
+ <td>${weekItemTotalPaid}</td>
+ <td>${monthItemTotalPaid}</td>
+ <td>${yearItemTotalPaid}</td>
+ </tr>
+ <tr>
+ <td> </td>
+
<td>${uiLabelMap.OrderPendingPaymentDollarAmountsIncludesAdjustments}</td>
+ <td>${dayItemTotalPending}</td>
+ <td>${weekItemTotalPending}</td>
+ <td>${monthItemTotalPending}</td>
+ <td>${yearItemTotalPending}</td>
+ </tr>
+ <tr><td colspan="6"><hr/></td></tr>
+ <tr>
+ <td colspan="6"><b>${uiLabelMap.OrderOrdersItemCounts}</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+
<td>${uiLabelMap.OrderGrossItemsSoldIncludesPromotionsAndPendingOrders}</td>
+ <td>${dayItemCount?string.number}</td>
+ <td>${weekItemCount?string.number}</td>
+ <td>${monthItemCount?string.number}</td>
+ <td>${yearItemCount?string.number}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderPaidItemsSoldIncludesPromotions}</td>
+ <td>${dayItemCountPaid?string.number}</td>
+ <td>${weekItemCountPaid?string.number}</td>
+ <td>${monthItemCountPaid?string.number}</td>
+ <td>${yearItemCountPaid?string.number}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderPendingPaymentItemsSoldIncludesPromotions}</td>
+ <td>${dayItemCountPending?string.number}</td>
+ <td>${weekItemCountPending?string.number}</td>
+ <td>${monthItemCountPending?string.number}</td>
+ <td>${yearItemCountPending?string.number}</td>
+ </tr>
+ <tr><td colspan="6"><hr/></td></tr>
+ <tr>
+ <td colspan="6"><b>${uiLabelMap.OrderOrdersPending}</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderWaitingPayment}</td>
+ <td>${waitingPayment?default(0)?string.number}</td>
+ <td>--</td>
+ <td>--</td>
+ <td>--</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderWaitingApproval}</td>
+ <td>${waitingApproval?default(0)?string.number}</td>
+ <td>--</td>
+ <td>--</td>
+ <td>--</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderWaitingCompletion}</td>
+ <td>${waitingComplete?default(0)?string.number}</td>
+ <td>--</td>
+ <td>--</td>
+ <td>--</td>
+ </tr>
+ <tr><td colspan="6"><hr/></td></tr>
+ <tr>
+ <td colspan="6"><b>${uiLabelMap.OrderStatusChanges}</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderOrdered}</td>
+ <td>${dayOrder?size?default(0)?string.number}</td>
+ <td>${weekOrder?size?default(0)?string.number}</td>
+ <td>${monthOrder?size?default(0)?string.number}</td>
+ <td>${yearOrder?size?default(0)?string.number}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderApproved}</td>
+ <td>${dayApprove?size?default(0)?string.number}</td>
+ <td>${weekApprove?size?default(0)?string.number}</td>
+ <td>${monthApprove?size?default(0)?string.number}</td>
+ <td>${yearApprove?size?default(0)?string.number}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderCompleted}</td>
+ <td>${dayComplete?size?default(0)?string.number}</td>
+ <td>${weekComplete?size?default(0)?string.number}</td>
+ <td>${monthComplete?size?default(0)?string.number}</td>
+ <td>${yearComplete?size?default(0)?string.number}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderCancelled}</td>
+ <td>${dayCancelled?size?default(0)?string.number}</td>
+ <td>${weekCancelled?size?default(0)?string.number}</td>
+ <td>${monthCancelled?size?default(0)?string.number}</td>
+ <td>${yearCancelled?size?default(0)?string.number}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>${uiLabelMap.OrderRejected}</td>
+ <td>${dayRejected?size?default(0)?string.number}</td>
+ <td>${weekRejected?size?default(0)?string.number}</td>
+ <td>${monthRejected?size?default(0)?string.number}</td>
+ <td>${yearRejected?size?default(0)?string.number}</td>
+ </tr>
+ </table>
+ </div>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
</#if>
