svn commit: r450553 - in /incubator/ofbiz/trunk/applications/order: config/OrderUiLabels.properties webapp/ordermgr/order/orderheader.ftl

[sichen]

Author: sichen
Date: Wed Sep 27 12:41:00 2006
New Revision: 450553

URL: http://svn.apache.org/viewvc?view=rev&rev=450553
Log:
Small change to layout of payment info box when there are no payment preferences

Modified:
    incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl

Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=450553&r1=450552&r2=450553
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties Wed Sep 27 12:41:00 2006
@@ -162,7 +162,7 @@
 OrderNoOrderFound = No Order Found
 OrderNoOrderFoundForParty=No orders found for partyId
 OrderNoOrderItemsToDisplay = No order items to display.
-OrderNoOrderPaymentPreferences = No preferences associated with this order.
+OrderNoOrderPaymentPreferences = No payment preferences associated with this order.
 OrderNoPurchasePaymentMethod=No Purchase Payment Method Information Found.
 OrderNoPurchaseProduct=No Purchased Product Information Found.
 OrderNoPurchaseSpecified=No Purchase Order was specified

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl?view=diff&rev=450553&r1=450552&r2=450553
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl Wed Sep 27 12:41:00 2006
@@ -258,8 +258,8 @@
               <div class="boxhead">&nbsp;${uiLabelMap.AccountingPaymentInformation}</div>
           </div>
           <div class="screenlet-body">
-          <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
              <table width="100%" border="0" cellpadding="1" cellspacing="0">
+             <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
                 <#list orderPaymentPreferences as orderPaymentPreference>
                   <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")>
                   <#if outputted?default("false") == "true">
@@ -517,10 +517,13 @@
                     </td>
                   </tr>
                 </#if>
-                </table>
            <#else>
-             <div class="tabletext">${uiLabelMap.OrderNoOrderPaymentPreferences}</div>
+            <tr>
+             <td colspan="7" align="center" class="tabletext">${uiLabelMap.OrderNoOrderPaymentPreferences}</td>
+            </tr>
            </#if>
+           <!-- TODO: Add new payment method here -->
+           </table>
          </div>
       </div>
       <#-- end of payment box -->