svn commit: r1063383 - in /ofbiz/trunk/applications/order/webapp/ordermgr/order: orderinfo.ftl orderpaymentinfo.ftl ordershippinginfo.ftl

[jleroux]

Author: jleroux
Date: Tue Jan 25 18:04:20 2011
New Revision: 1063383

URL: http://svn.apache.org/viewvc?rev=1063383&view=rev
Log:
A part of "Order: PDF rendering in same browser window as OFBiz in stead of new 
window" (https://issues.apache.org/jira/browse/OFBIZ-4140) - OFBIZ-4140

Adds target-window="_BLANK" to FTL files

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1063383&r1=1063382&r2=1063383&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue Jan 
25 18:04:20 2011
@@ -26,7 +26,7 @@ under the License.
             <#assign orderType = orderHeader.getRelatedOne("OrderType")/>
             <li class="h3">&nbsp;${orderType?if_exists.get("description", 
locale)?default(uiLabelMap.OrderOrder)}&nbsp;${uiLabelMap.CommonNbr}<a 
href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> 
${externalOrder?if_exists} [&nbsp;<a 
href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" 
target="_blank">PDF</a>&nbsp;]</li>
             <#if currentStatus.statusId == "ORDER_APPROVED" && 
orderHeader.orderTypeId == "SALES_ORDER">
-              <li class="h3"><a 
href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
+              <li class="h3"><a target="_BLANK" 
href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
               <form name="PrintOrderPickSheet" method="post" 
action="<@ofbizUrl>orderPickSheet.pdf</@ofbizUrl>">
                 <input type="hidden" name="facilityId" 
value="${storeFacilityId?if_exists}"/>
                 <input type="hidden" name="orderId" 
value="${orderHeader.orderId?if_exists}"/>

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1063383&r1=1063382&r2=1063383&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl 
Tue Jan 25 18:04:20 2011
@@ -452,7 +452,7 @@ under the License.
             <td valign="top" width="60%">
               <#list invoices as invoice>
                 <div>${uiLabelMap.CommonNbr}<a 
href="/accounting/control/invoiceOverview?invoiceId=${invoice}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">${invoice}</a>
-                (<a 
href="/accounting/control/invoice.pdf?invoiceId=${invoice}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">PDF</a>)</div>
+                (<a target="_BLANK" 
href="/accounting/control/invoice.pdf?invoiceId=${invoice}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">PDF</a>)</div>
               </#list>
             </td>
             <td width="10%">&nbsp;</td>

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1063383&r1=1063382&r2=1063383&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl 
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl 
Tue Jan 25 18:04:20 2011
@@ -198,7 +198,7 @@ under the License.
        <ul>
          <li class="h3">&nbsp;${uiLabelMap.OrderShipmentInformation} - 
${shipGroup.shipGroupSeqId}</li>
          <li class="expanded"><a onclick="javascript:toggleScreenlet(this, 
'ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}', 'true', 
'${uiLabelMap.CommonExpand}', '${uiLabelMap.CommonCollapse}');" 
title="Collapse">&nbsp;</a></li>
-         <li><a 
href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&amp;shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup}
 PDF</a></li>
+         <li><a target="_BLANK" 
href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&amp;shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup}
 PDF</a></li>
        </ul>
        <br class="clear"/>
     </div>
@@ -574,7 +574,7 @@ under the License.
                 <#list shipGroupShipments as shipment>
                     <div>
                       ${uiLabelMap.CommonNbr}<a 
href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">${shipment.shipmentId}</a>&nbsp;&nbsp;
-                      <a 
href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
+                      <a target="_BLANK" 
href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
                       <#if "SALES_ORDER" == orderHeader.orderTypeId && 
"ORDER_COMPLETED" == orderHeader.statusId>
                         <#assign shipmentRouteSegments = 
delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : 
shipment.shipmentId})>
                         <#if shipmentRouteSegments?has_content>