Author: mor
Date: Wed Jul 9 03:21:41 2008
New Revision: 675132
URL:
http://svn.apache.org/viewvc?rev=675132&view=revLog:
Fix :
1) Grammatically corrected label OrderIntructions --> OrderInstructions
2) There was no label CommonInstructions so used OrderInstructions instead
3) Instructions in Shipment Information screenlet on Order Detail Page was not wrapping
Thanks to Ratnesh Upadhyay for providing patch for all of the above
Modified:
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=675132&r1=675131&r2=675132&view=diff==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Wed Jul 9 03:21:41 2008
@@ -4107,7 +4107,7 @@
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸¸à¸</value>
<value xml:lang="zh">æå
³ä½ çä¿¡æ¯</value>
</property>
- <property key="OrderIntructions">
+ <property key="OrderInstructions">
<value xml:lang="cs">Poznámky-pÅipomÃnky-pokyny</value>
<value xml:lang="de">Anweisungen</value>
<value xml:lang="en">Instructions</value>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=675132&r1=675131&r2=675132&view=diff==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderheader.ftl Wed Jul 9 03:21:41 2008
@@ -415,7 +415,7 @@
<tr><td colspan="7"><hr class="sepbar"/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderIntructions}</b></div>
+ <div class="tabletext"> <b>${uiLabelMap.OrderInstructions}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
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=675132&r1=675131&r2=675132&view=diff==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Jul 9 03:21:41 2008
@@ -185,11 +185,11 @@
<tr><td colspan="3"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <span class="label"> ${uiLabelMap.CommonInstructions}</span>
+ <span class="label"> ${uiLabelMap.OrderInstructions}</span>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <span class="label">${shipGroup.shippingInstructions}</span>
+ <div>${shipGroup.shippingInstructions}</div>
</td>
</tr>
</#if>