From 5fd6b9aac6adf5803aa658a0b6699b7cd72658da Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Tue, 15 Oct 2013 14:53:31 +0200 Subject: [PATCH] // Add overflow-y to module payments --- .../controllers/payment/restrictions.tpl | 170 +++++++++--------- .../template/helpers/list/list_header.tpl | 2 +- 2 files changed, 87 insertions(+), 85 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl index b9208ff4e..7ba0da219 100644 --- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl +++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl @@ -30,97 +30,99 @@ {$list['title']}

{$list['desc']}

- - - - {foreach $payment_modules as $module} - {if $module->active} - - {/if} - {/foreach} - - {foreach $list['items'] as $item} +
+
{$list['title']} - {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'} - - - {/if} -  {$module->name} - {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'} - - {/if} -
- - {foreach $payment_modules as $key_module => $module} + + {foreach $payment_modules as $module} {if $module->active} - + {/if} + {/foreach} + + {foreach $list['items'] as $item} + + + {foreach $payment_modules as $key_module => $module} + {if $module->active} + - {/if} - {/foreach} - - {/foreach} - {if $list['name_id'] === 'currency'} - - - {foreach $payment_modules as $module} - {if $module->active} - - {/if} - {/foreach} - - - - {foreach $payment_modules as $module} - {if $module->active} - - {/if} - {/foreach} - - {/if} -
- {$item['name']} - {$list['title']} - {assign var='type' value='null'} - {if !$item['check_list'][$key_module]} - {* Keep $type to null *} - {elseif $list['name_id'] === 'currency'} - {if $module->currencies && $module->currencies_mode == 'checkbox'} + + {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'} + + + {/if} +  {$module->name} + {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'} + + {/if} +
+ {$item['name']} + + {assign var='type' value='null'} + {if !$item['check_list'][$key_module]} + {* Keep $type to null *} + {elseif $list['name_id'] === 'currency'} + {if $module->currencies && $module->currencies_mode == 'checkbox'} + {$type = 'checkbox'} + {elseif $module->currencies && $module->currencies_mode == 'radio'} + {$type = 'radio'} + {/if} + {else} {$type = 'checkbox'} - {elseif $module->currencies && $module->currencies_mode == 'radio'} - {$type = 'radio'} {/if} - {else} - {$type = 'checkbox'} - {/if} - {if $type != 'null'} - - {else} - -- - {/if} -
- {l s='Customer currency'} - - {if $module->currencies && $module->currencies_mode == 'radio'} - $list['name_id'])} checked="checked" - {/if} /> - {else} - -- - {/if} -
- {l s='Shop default currency'} - - {if $module->currencies && $module->currencies_mode == 'radio'} - $list['name_id'])} checked="checked" - {/if} - /> - {else} - -- - {/if} -
-

+ {if $type != 'null'} + + {else} + -- + {/if} + + {/if} + {/foreach} + + {/foreach} + {if $list['name_id'] === 'currency'} + + + {l s='Customer currency'} + + {foreach $payment_modules as $module} + {if $module->active} + + {if $module->currencies && $module->currencies_mode == 'radio'} + $list['name_id'])} checked="checked" + {/if} /> + {else} + -- + {/if} + + {/if} + {/foreach} + + + + {l s='Shop default currency'} + + {foreach $payment_modules as $module} + {if $module->active} + + {if $module->currencies && $module->currencies_mode == 'radio'} + $list['name_id'])} checked="checked" + {/if} + /> + {else} + -- + {/if} + + {/if} + {/foreach} + + {/if} + + +

-

+
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl index 6b93d21d1..52966c282 100644 --- a/admin-dev/themes/default/template/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl @@ -179,7 +179,7 @@
{if isset($title)}

{if isset($icon)} {/if}{if is_array($title)}{$title|end}{else}{$title}{/if}

{/if} {/if} -
+