dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// UI modules fixs

Browse Source
This commit is contained in:
Kevin Granger
2013-11-05 18:17:39 +01:00
parent 37e0556c36
commit 5ec5215919
4 changed files with 97 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/scss/admin-theme/_admin-commons.sass
+2 -1
View File
@@ -97,5 +97,6 @@
.overflow-y .overflow-y
height: 200px max-height: 200px
margin-bottom: 15px
overflow-y: auto overflow-y: auto
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+93 -87
View File
@@ -30,95 +30,101 @@
{$list['title']} {$list['title']}
</h3> </h3>
<p class="help-block">{$list['desc']}</p> <p class="help-block">{$list['desc']}</p>
<div class="row table-responsive clearfix overflow-y"> <div class="row table-responsive clearfix ">
<table class="table"> <div class="overflow-y">
<tr> <table class="table">
<th width="40%"><span class="title_box">{$list['title']}<span></th> <thead>
{foreach $payment_modules as $module} <tr>
{if $module->active} <th width="40%"><span class="title_box">{$list['title']}<span></th>
<th class="center"> {foreach $payment_modules as $module}
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'} {if $module->active}
<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/> <th class="text-center">
<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')"> {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
{/if} <input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
&nbsp;<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}"/> <a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')">
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
</a>
{/if}
</th>
{/if}
{/foreach}
</tr>
{foreach $list['items'] as $item}
<tr>
<td>
<span>{$item['name']}</span>
</td>
{foreach $payment_modules as $key_module => $module}
{if $module->active}
<td class="center">
{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} {/if}
{else} {$module->displayName}
{$type = 'checkbox'} {if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
{/if} </a>
{if $type != 'null'} {/if}
<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/> </th>
{else} {/if}
<input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>-- {/foreach}
{/if} </tr>
</td> </thead>
{/if} <tbody>
{/foreach} {foreach $list['items'] as $item}
</tr> <tr>
{/foreach} <td>
{if $list['name_id'] === 'currency'} <span>{$item['name']}</span>
<tr> </td>
<td> {foreach $payment_modules as $key_module => $module}
<span>{l s='Customer currency'}</span> {if $module->active}
</td> <td class="text-center">
{foreach $payment_modules as $module} {assign var='type' value='null'}
{if $module->active} {if !$item['check_list'][$key_module]}
<td> {* Keep $type to null *}
{if $module->currencies && $module->currencies_mode == 'radio'} {elseif $list['name_id'] === 'currency'}
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked" {if $module->currencies && $module->currencies_mode == 'checkbox'}
{/if} /> {$type = 'checkbox'}
{else} {elseif $module->currencies && $module->currencies_mode == 'radio'}
-- {$type = 'radio'}
{/if} {/if}
</td> {else}
{/if} {$type = 'checkbox'}
{/foreach} {/if}
</tr> {if $type != 'null'}
<tr> <input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
<td> {else}
<span>{l s='Shop default currency'}</span> <input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
</td> {/if}
{foreach $payment_modules as $module} </td>
{if $module->active} {/if}
<td> {/foreach}
{if $module->currencies && $module->currencies_mode == 'radio'} </tr>
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-2"{if in_array(-2, $module->$list['name_id'])} checked="checked" {/foreach}
{/if} {if $list['name_id'] === 'currency'}
/> <tr>
{else} <td>
-- <span>{l s='Customer currency'}</span>
{/if} </td>
</td> {foreach $payment_modules as $module}
{/if} {if $module->active}
{/foreach} <td class="text-center">
</tr> {if $module->currencies && $module->currencies_mode == 'radio'}
{/if} <input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked"
</table> {/if} />
{else}
--
{/if}
</td>
{/if}
{/foreach}
</tr>
<tr>
<td>
<span>{l s='Shop default currency'}</span>
</td>
{foreach $payment_modules as $module}
{if $module->active}
<td class="text-center">
{if $module->currencies && $module->currencies_mode == 'radio'}
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-2"{if in_array(-2, $module->$list['name_id'])} checked="checked"
{/if}
/>
{else}
--
{/if}
</td>
{/if}
{/foreach}
</tr>
{/if}
</tbody>
</table>
</div>
</div> </div>
<div class="row pull-right"> <div class="row">
<button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}"> <button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}">
<i class="icon-save"></i> <i class="icon-save"></i>
{l s='Save restrictions'} {l s='Save restrictions'}
classes/controller/AdminController.php
+1 -1
View File
@@ -1950,7 +1950,7 @@ class AdminControllerCore extends Controller
_PS_JS_DIR_.'toggle.js', _PS_JS_DIR_.'toggle.js',
_PS_JS_DIR_.'tools.js', _PS_JS_DIR_.'tools.js',
_PS_JS_DIR_.'ajax.js', _PS_JS_DIR_.'ajax.js',
//_PS_JS_DIR_.'toolbar.js', _PS_JS_DIR_.'toolbar.js',
)); ));
//loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory //loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory