svn commit: r1200208 - in /ofbiz/branches/release11.04: ./ specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl

Author: jleroux
Date: Thu Nov 10 07:47:34 2011
New Revision: 1200208

URL: http://svn.apache.org/viewvc?rev=1200208&view=rev
Log:
"Applied fix from trunk for revision: 1200207  "
------------------------------------------------------------------------
r1200207 | jleroux | 2011-11-10 08:45:23 +0100 (jeu., 10 nov. 2011) | 3 lines

A patch from Kiran Gawde "OnePageCheckout billToAddress2 label has style info" https://issues.apache.org/jira/browse/OFBIZ-4554

shipToAddress2 doesn't have any style specified. So seems like the style for billToAddress2 was left over from old coding or someone added it by mistake. After removing style, it still looks good
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 10 07:47:34 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,1199450
+/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,1200207

Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=1200208&r1=1200207&r2=1200208&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Thu Nov 10 07:47:34 2011
@@ -584,7 +584,7 @@ under the License.
                               <input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1?if_exists}" />
                           </div>
                           <div>
-                              <label for="billToAddress2" style="margin-top: 9px;">${uiLabelMap.PartyAddressLine2}</label>
+                              <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label>
                               <input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2?if_exists}" size="30" />
                           </div>
                           <div>