From ee32a42d22c433727833457dc42f185fc667b83d Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Fri, 2 May 2014 14:49:46 +0000 Subject: [PATCH] change line endings in some templates --- .../tpl/form/user_checkout_noregistration.tpl | 120 ++++----- .../tpl/form/user_checkout_registration.tpl | 122 ++++----- .../views/azure/tpl/page/checkout/basket.tpl | 238 +++++++++--------- 3 files changed, 240 insertions(+), 240 deletions(-) diff --git a/changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl b/changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl index 5152d5b..0ff0648 100644 --- a/changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl +++ b/changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl @@ -1,61 +1,61 @@ -[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] -[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] -[{block name="user_checkout_noregistration"}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{block name="user_checkout_noregistration_form"}] - [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] - [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - - [{if !$oxcmp_user->oxuser__oxpassword->value }] - - [{else}] - - - [{/if}] - - - -
- [{ oxmultilang ident="PREVIOUS_STEP" }] - -
- -
-
-

[{ oxmultilang ident="NOTREGISTERED_ACCOUNTINFO" }]

-
    - [{ include file="form/fieldset/user_noaccount.tpl" }] -
-
-
-

[{ oxmultilang ident="BILLING_ADDRESS" }]

-
    - [{ include file="form/fieldset/user_billing.tpl" noFormSubmit=true blOrderRemark=true}] -
-
-
-

[{ oxmultilang ident="SHIPPING_ADDRESS" }]

-

showShipAddress()}]checked[{/if}] value="0">

-
    showShipAddress()}]style="display: none;"[{/if}]> - [{ include file="form/fieldset/user_shipping.tpl" noFormSubmit=true}] -
-
    -
  • - [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] -
    • -
-
-
- - [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] - -
- [{ oxmultilang ident="PREVIOUS_STEP" }] - -
- [{/block}] -
+[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] +[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] +[{block name="user_checkout_noregistration"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{block name="user_checkout_noregistration_form"}] + [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] + [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + [{if !$oxcmp_user->oxuser__oxpassword->value }] + + [{else}] + + + [{/if}] + + + +
+ [{ oxmultilang ident="PREVIOUS_STEP" }] + +
+ +
+
+

[{ oxmultilang ident="NOTREGISTERED_ACCOUNTINFO" }]

+
    + [{ include file="form/fieldset/user_noaccount.tpl" }] +
+
+
+

[{ oxmultilang ident="BILLING_ADDRESS" }]

+
    + [{ include file="form/fieldset/user_billing.tpl" noFormSubmit=true blOrderRemark=true}] +
+
+
+

[{ oxmultilang ident="SHIPPING_ADDRESS" }]

+

showShipAddress()}]checked[{/if}] value="0">

+
    showShipAddress()}]style="display: none;"[{/if}]> + [{ include file="form/fieldset/user_shipping.tpl" noFormSubmit=true}] +
+
    +
  • + [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] +
    • +
+
+
+ + [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] + +
+ [{ oxmultilang ident="PREVIOUS_STEP" }] + +
+ [{/block}] +
[{/block}] \ No newline at end of file diff --git a/changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl b/changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl index aa815cf..113a06f 100644 --- a/changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl +++ b/changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl @@ -1,61 +1,61 @@ -[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] -[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] -[{block name="user_checkout_registration"}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{block name="user_checkout_registration_form"}] - [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] - [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - - [{if !$oxcmp_user->oxuser__oxpassword->value }] - - [{else}] - - - [{/if}] - - - -
- [{ oxmultilang ident="PREVIOUS_STEP" }] - -
- -
-
-

[{ oxmultilang ident="ACCOUNT_INFORMATION" }]

-
    - [{ include file="form/fieldset/user_account.tpl" }] -
-
-
-

[{ oxmultilang ident="BILLING_ADDRESS" }]

-
    - [{ include file="form/fieldset/user_billing.tpl" noFormSubmit=true blSubscribeNews=false blOrderRemark=true}] -
-
-
-

[{ oxmultilang ident="SHIPPING_ADDRESS" }]

-

showShipAddress()}]checked[{/if}] value="0">

-
    showShipAddress()}]style="display: none;"[{/if}]> - [{ include file="form/fieldset/user_shipping.tpl" noFormSubmit=true}] -
-
    -
  • - [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] -
    • -
-
-
- - [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] - -
- [{ oxmultilang ident="PREVIOUS_STEP" }] - -
- [{/block}] -
-[{/block}] +[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] +[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] +[{block name="user_checkout_registration"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{block name="user_checkout_registration_form"}] + [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] + [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + [{if !$oxcmp_user->oxuser__oxpassword->value }] + + [{else}] + + + [{/if}] + + + +
+ [{ oxmultilang ident="PREVIOUS_STEP" }] + +
+ +
+
+

[{ oxmultilang ident="ACCOUNT_INFORMATION" }]

+
    + [{ include file="form/fieldset/user_account.tpl" }] +
+
+
+

[{ oxmultilang ident="BILLING_ADDRESS" }]

+
    + [{ include file="form/fieldset/user_billing.tpl" noFormSubmit=true blSubscribeNews=false blOrderRemark=true}] +
+
+
+

[{ oxmultilang ident="SHIPPING_ADDRESS" }]

+

showShipAddress()}]checked[{/if}] value="0">

+
    showShipAddress()}]style="display: none;"[{/if}]> + [{ include file="form/fieldset/user_shipping.tpl" noFormSubmit=true}] +
+
    +
  • + [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] +
    • +
+
+
+ + [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] + +
+ [{ oxmultilang ident="PREVIOUS_STEP" }] + +
+ [{/block}] +
+[{/block}] diff --git a/changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl b/changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl index cff4192..5b3377a 100644 --- a/changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl +++ b/changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl @@ -1,120 +1,120 @@ -[{capture append="oxidBlock_content"}] - - [{* ordering steps *}] - [{include file="page/checkout/inc/steps.tpl" active=1 }] - - [{block name="checkout_basket_main"}] - [{assign var="currency" value=$oView->getActCurrency() }] - [{if !$oxcmp_basket->getProductsCount() }] - [{block name="checkout_basket_emptyshippingcart"}] -
[{ oxmultilang ident="BASKET_EMPTY" }]
- [{/block}] - [{else }] -
- [{if $oView->showBackToShop()}] - [{block name="checkout_basket_backtoshop_top"}] -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{ $oViewConf->getHiddenSid() }] - - - -
-
- [{/block}] - [{/if}] - - [{if $oView->isLowOrderPrice() }] - [{block name="checkout_basket_loworderprice_top"}] -
[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
- [{/block}] - [{else}] - [{block name="basket_btn_next_top"}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{ $oViewConf->getHiddenSid() }] - - -
- [{/block}] - [{/if}] -
- -
- [{include file="page/checkout/inc/basketcontents.tpl" editable=true}] - - [{if $oViewConf->getShowVouchers()}] - [{block name="checkout_basket_vouchers"}] - [{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] - [{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-
- [{foreach from=$Errors.basket item=oEr key=key}] - [{if $oEr->getErrorClassType() == 'oxVoucherException'}] -
- [{ oxmultilang ident="COUPON_NOT_ACCEPTED" args=$oEr->getValue('voucherNr') }] - [{ oxmultilang ident="REASON" suffix="COLON" }] - [{ $oEr->getOxMessage() }] -
- [{/if}] - [{/foreach}] - - [{ $oViewConf->getHiddenSid() }] - - - - -

- [{ oxmultilang ident="ERROR_MESSAGE_INPUT_NOTALLFIELDS" }] -

- -
-
-
- [{/block}] - [{/if}] -
- - -
- [{if $oView->showBackToShop()}] - [{block name="checkout_basket_backtoshop_bottom"}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-
- [{ $oViewConf->getHiddenSid() }] - - - -
-
- [{/block}] - [{/if}] - - [{if $oView->isLowOrderPrice() }] - [{block name="checkout_basket_loworderprice_bottom"}] -
[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
- [{/block}] - [{else}] - [{block name="basket_btn_next_bottom"}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{ $oViewConf->getHiddenSid() }] - - -
- [{/block}] - [{/if}] -
- [{/if }] - [{if $oView->isWrapping() }] - [{include file="page/checkout/inc/wrapping.tpl"}] - [{/if}] - [{/block}] - [{insert name="oxid_tracker" title=$template_title }] -[{/capture}] - +[{capture append="oxidBlock_content"}] + + [{* ordering steps *}] + [{include file="page/checkout/inc/steps.tpl" active=1 }] + + [{block name="checkout_basket_main"}] + [{assign var="currency" value=$oView->getActCurrency() }] + [{if !$oxcmp_basket->getProductsCount() }] + [{block name="checkout_basket_emptyshippingcart"}] +
[{ oxmultilang ident="BASKET_EMPTY" }]
+ [{/block}] + [{else }] +
+ [{if $oView->showBackToShop()}] + [{block name="checkout_basket_backtoshop_top"}] +
+[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{ $oViewConf->getHiddenSid() }] + + + +
+
+ [{/block}] + [{/if}] + + [{if $oView->isLowOrderPrice() }] + [{block name="checkout_basket_loworderprice_top"}] +
[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+ [{/block}] + [{else}] + [{block name="basket_btn_next_top"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{ $oViewConf->getHiddenSid() }] + + +
+ [{/block}] + [{/if}] +
+ +
+ [{include file="page/checkout/inc/basketcontents.tpl" editable=true}] + + [{if $oViewConf->getShowVouchers()}] + [{block name="checkout_basket_vouchers"}] + [{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] + [{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] +
+[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{foreach from=$Errors.basket item=oEr key=key}] + [{if $oEr->getErrorClassType() == 'oxVoucherException'}] +
+ [{ oxmultilang ident="COUPON_NOT_ACCEPTED" args=$oEr->getValue('voucherNr') }] + [{ oxmultilang ident="REASON" suffix="COLON" }] + [{ $oEr->getOxMessage() }] +
+ [{/if}] + [{/foreach}] + + [{ $oViewConf->getHiddenSid() }] + + + + +

+ [{ oxmultilang ident="ERROR_MESSAGE_INPUT_NOTALLFIELDS" }] +

+ +
+
+
+ [{/block}] + [{/if}] +
+ + +
+ [{if $oView->showBackToShop()}] + [{block name="checkout_basket_backtoshop_bottom"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + + + +
+
+ [{/block}] + [{/if}] + + [{if $oView->isLowOrderPrice() }] + [{block name="checkout_basket_loworderprice_bottom"}] +
[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+ [{/block}] + [{else}] + [{block name="basket_btn_next_bottom"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{ $oViewConf->getHiddenSid() }] + + +
+ [{/block}] + [{/if}] +
+ [{/if}] + [{if $oView->isWrapping() }] + [{include file="page/checkout/inc/wrapping.tpl"}] + [{/if}] + [{/block}] + [{insert name="oxid_tracker" title=$template_title }] +[{/capture}] + [{include file="layout/page.tpl"}] \ No newline at end of file