Commit 8f055729 authored by Dirk Wildt's avatar Dirk Wildt

8.17.0

parent 2a81ab3e
...@@ -47,7 +47,10 @@ TODO ...@@ -47,7 +47,10 @@ TODO
* de.locallang.xlf * de.locallang.xlf
* locallang.xlf * locallang.xlf
* Templates/ * Templates/
* Foundation/5x/caddy.html * Foundation/5x
* caddy.html
* caddy_test_break.html
* caddy_wo_options_wo_fee.html
* Public/Css/2.0.0/caddy.css * Public/Css/2.0.0/caddy.css
Improvements Improvements
* #i0287: (c) 2019 * #i0287: (c) 2019
......
...@@ -114,11 +114,15 @@ ...@@ -114,11 +114,15 @@
<input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" /> <input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" />
<input type="hidden" name="tx_caddy_pi1[accordion]" value="2" /> <input type="hidden" name="tx_caddy_pi1[accordion]" value="2" />
<div class="row caddy_options"> <div class="row caddy_options">
<div id="caddy_shipping" class="col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_shipping" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SHIPPING_RADIO### ###SHIPPING_RADIO###
</div> </div>
<div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SPECIALS_CHECKBOX### ###SPECIALS_CHECKBOX###
</div>
<div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###INSURANCE_RADIO###
###RECYCLINGFEE_RADIO###
<div class="caddy_cleaner"></div> <div class="caddy_cleaner"></div>
</div> </div>
</div> </div>
......
...@@ -114,11 +114,15 @@ ...@@ -114,11 +114,15 @@
<input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" /> <input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" />
<input type="hidden" name="tx_caddy_pi1[accordion]" value="2" /> <input type="hidden" name="tx_caddy_pi1[accordion]" value="2" />
<div class="row caddy_options"> <div class="row caddy_options">
<div id="caddy_shipping" class="col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_shipping" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SHIPPING_RADIO### ###SHIPPING_RADIO###
</div> </div>
<div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SPECIALS_CHECKBOX### ###SPECIALS_CHECKBOX###
</div>
<div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###INSURANCE_RADIO###
###RECYCLINGFEE_RADIO###
<div class="caddy_cleaner"></div> <div class="caddy_cleaner"></div>
</div> </div>
</div> </div>
......
...@@ -118,11 +118,15 @@ ...@@ -118,11 +118,15 @@
<input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" /> <input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" />
<input type="hidden" name="tx_caddy_pi1[accordion]" value="2" /> <input type="hidden" name="tx_caddy_pi1[accordion]" value="2" />
<div class="row caddy_options"> <div class="row caddy_options">
<div id="caddy_shipping" class="col-12 col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_shipping" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SHIPPING_RADIO### ###SHIPPING_RADIO###
</div> </div>
<div id="caddy_specials" class="col-12 col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SPECIALS_CHECKBOX### ###SPECIALS_CHECKBOX###
</div>
<div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###INSURANCE_RADIO###
###RECYCLINGFEE_RADIO###
<div class="caddy_cleaner"></div> <div class="caddy_cleaner"></div>
</div> </div>
</div> </div>
......
...@@ -118,11 +118,15 @@ ...@@ -118,11 +118,15 @@
<input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" /> <input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" />
<input type="hidden" name="tx_caddy_pi1[accordion]" value="2" /> <input type="hidden" name="tx_caddy_pi1[accordion]" value="2" />
<div class="row caddy_options"> <div class="row caddy_options">
<div id="caddy_shipping" class="col-12 col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_shipping" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SHIPPING_RADIO### ###SHIPPING_RADIO###
</div> </div>
<div id="caddy_specials" class="col-12 col-xs-12 col-sm-12 col-md-6 col-lg-6"> <div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###SPECIALS_CHECKBOX### ###SPECIALS_CHECKBOX###
</div>
<div id="caddy_specials" class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
###INSURANCE_RADIO###
###RECYCLINGFEE_RADIO###
<div class="caddy_cleaner"></div> <div class="caddy_cleaner"></div>
</div> </div>
</div> </div>
......
...@@ -113,15 +113,16 @@ ...@@ -113,15 +113,16 @@
<input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" /> <input type="hidden" name="tx_caddy_pi1[updateByCaddy]" value="1" />
<input type="hidden" name="tx_caddy_pi1[accordion]" value="2" /> <input type="hidden" name="tx_caddy_pi1[accordion]" value="2" />
<div class="row caddy_options"> <div class="row caddy_options">
<div id="caddy_shipping" class="small-6 large-6 columns"> <div id="caddy_shipping" class="small-12 large-4 columns">
###SHIPPING_RADIO### ###SHIPPING_RADIO###
</div> </div>
<div id="caddy_specials" class="small-6 large-6 columns"> <div id="caddy_specials" class="small-12 large-4 columns">
###SPECIALS_CHECKBOX### ###SPECIALS_CHECKBOX###
<div class="caddy_cleaner"></div> <div class="caddy_cleaner"></div>
</div> </div>
<div class="small-0 large-4 columns"> <div id="caddy_insurance" class="small-12 large-4 columns">
&nbsp; ###INSURANCE_RADIO###
###RECYCLINGFEE_RADIO###
</div> </div>
</div> </div>
</form> <!-- /caddy-optionswopayment --> </form> <!-- /caddy-optionswopayment -->
......
...@@ -114,8 +114,9 @@ ...@@ -114,8 +114,9 @@
###SPECIALS_CHECKBOX### ###SPECIALS_CHECKBOX###
<div class="caddy_cleaner"></div> <div class="caddy_cleaner"></div>
</div> </div>
<div class="small-0 large-4 columns"> <div id="caddy_insurance" class="small-12 large-4 columns">
&nbsp; ###INSURANCE_RADIO###
###RECYCLINGFEE_RADIO###
</div> </div>
</div> </div>
</form> <!-- /caddy-optionswopayment --> </form> <!-- /caddy-optionswopayment -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment