You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2011/11/08 21:51:33 UTC
svn commit: r1199452 - in /ofbiz/branches/release11.04: ./
specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
Author: jleroux
Date: Tue Nov 8 20:51:33 2011
New Revision: 1199452
URL: http://svn.apache.org/viewvc?rev=1199452&view=rev
Log:
"Applied fix from trunk for revision: 1199450"
------------------------------------------------------------------------
r1199450 | jleroux | 2011-11-08 21:50:36 +0100 (mar., 08 nov. 2011) | 1 line
A patch from Kiran Gawde https://issues.apache.org/jira/browse/OFBIZ-4553 "Duplicate 'Continue Shopping' link on order complete page"
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 20:51:33 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4:951708-952957
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199450
Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl?rev=1199452&r1=1199451&r2=1199452&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl Tue Nov 8 20:51:33 2011
@@ -22,7 +22,6 @@ under the License.
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}
<a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.EcommerceContinueShopping}</a>
- <a href="<@o...@ofbizUrl>" class="buttontextbig">${uiLabelMap.EcommerceContinueShopping}</a>
<#else>
<h3>${uiLabelMap.OrderSpecifiedNotFound}.</h3>
</#if>