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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-07 16:48:56 +01:00
parent b51b388eaa 75171c77dd
commit 01d8376ee7
729 changed files with 8289 additions and 30730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+1 -1
View File
@@ -61,7 +61,7 @@
$(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); });
</script>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
<div class="leadin">{block name="leadin"}{/block}</div>
{if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if}
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+12
View File
@@ -58,6 +58,18 @@
{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
</p>
</div>
<script>
$(document).ready(function(){
$('#attachement_fileselectbutton').click(function(e){
$('#carrier_logo_input').trigger('click');
});
$('#carrier_logo_input').change(function(e){
var val = $(this).val();
var file = val.split(/[\\/]/);
$('#attachement_filename').val(file[file.length-1]);
});
});
</script>
{/if}
{$smarty.block.parent}
{/block}
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+1 -1
View File
@@ -50,7 +50,7 @@
<span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span>
</td>
<td>
<input type="checkbox" onclick="checkAllZones(this);" >
<input type="checkbox" onclick="checkAllZones(this);" class="form-control">
</td>
{foreach from=$ranges key=r item=range}
<td class="border_top border_bottom {if $range.id_range != 0} validated {/if}" >
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+8 -10
View File
@@ -27,11 +27,11 @@
{block name="label"}
{if $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
<label class="control-label col-lg-3">{l s='Authorized modules:'}</label>
</div>
{elseif $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
{$smarty.block.parent}
</div>
{else}
@@ -39,10 +39,9 @@
{/if}
{/block}
{block name="field"}
{if $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
<script type="text/javascript">
$(document).ready(function() {
$("#group_discount_category").fancybox({
@@ -143,7 +142,7 @@
</tr>
{/foreach}
</table>
</div>
<div style="display:none" id="group_discount_category_fancybox">
<div class="panel form-horizontal">
<div class="col-lg-12">
@@ -168,8 +167,7 @@
</div>
</div>
{elseif $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}">
<div class="margin-form">
<div {if !$form_id}class="hide"{/if}>
<script type="text/javascript">
$(document).ready(function() {
$('#authorized-modules').find('[value="0"]').click(function() {
@@ -185,7 +183,7 @@
<div class="col-lg-9" id="authorized-modules">
{foreach $input['values']['auth_modules'] key=key item=module }
<div class="form-group">
<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1" checked="checked">
@@ -200,7 +198,7 @@
{/foreach}
{foreach $input['values']['unauth_modules'] key=key item=module }
<div class="form-group">
<label class="control-label col-lg-2"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<label class="control-label col-lg-4"><img src="../modules/{$module->name}/logo.gif"> {$module->displayName}</label>
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="{$module->name}" id="{$module->name}_on" value="1">
@@ -218,4 +216,4 @@
{else}
{$smarty.block.parent}
{/if}
{/block}
{/block}
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+52 -48
View File
@@ -26,58 +26,62 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
<div class="form-horizontal">
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Show prices:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
<div class="row">
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
<div class="form-horizontal">
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Show prices:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
{if !$categorieReductions}
<div class="alert alert-warning">{l s='None'}</div>
{else}
<table class="table">
<thead>
<tr>
<th><span class="title_box">{l s='Category'}</span></th>
<th><span class="title_box">{l s='Discount'}</span></th>
</tr>
</thead>
<tbody>
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='%d%%' sprintf=$category.reduction}</td>
</tr>
{/foreach}
<tbody>
</table>
{/if}
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
{if !$categorieReductions}
<div class="alert alert-warning">{l s='None'}</div>
{else}
<table class="table">
<thead>
<tr>
<th><span class="title_box">{l s='Category'}</span></th>
<th><span class="title_box">{l s='Discount'}</span></th>
</tr>
</thead>
<tbody>
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='%d%%' sprintf=$category.reduction}</td>
</tr>
{/foreach}
<tbody>
</table>
{/if}
</div>
</div>
</div>
<div class="col-lg-12">
<h2>{l s='Members of this customer group'}</h2>
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList}
<div class="row">
<div class="col-lg-12">
<h2>{l s='Members of this customer group'}</h2>
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList}
</div>
</div>
{/block}
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+93 -87
View File
@@ -30,95 +30,101 @@
{$list['title']}
</h3>
<p class="help-block">{$list['desc']}</p>
<div class="row table-responsive clearfix overflow-y">
<table class="table">
<tr>
<th width="40%"><span class="title_box">{$list['title']}<span></th>
{foreach $payment_modules as $module}
{if $module->active}
<th class="center">
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')">
{/if}
&nbsp;<img src="{$ps_base_uri}modules/{$module->name}/logo.gif" alt="{$module->name}" title="{$module->displayName}"/>
{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'}
<div class="row table-responsive clearfix ">
<div class="overflow-y">
<table class="table">
<thead>
<tr>
<th width="40%"><span class="title_box">{$list['title']}<span></th>
{foreach $payment_modules as $module}
{if $module->active}
<th class="text-center">
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
<input type="hidden" id="checkedBox_{$list['name_id']}_{$module->name}" value="checked"/>
<a href="javascript:checkPaymentBoxes('{$list['name_id']}', '{$module->name}')">
{/if}
{else}
{$type = 'checkbox'}
{/if}
{if $type != 'null'}
<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
{else}
<input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
{/if}
</td>
{/if}
{/foreach}
</tr>
{/foreach}
{if $list['name_id'] === 'currency'}
<tr>
<td>
<span>{l s='Customer currency'}</span>
</td>
{foreach $payment_modules as $module}
{if $module->active}
<td>
{if $module->currencies && $module->currencies_mode == 'radio'}
<input type="radio" name="{$module->name}_{$list['name_id']}[]" value="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked"
{/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>
{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}
</table>
{$module->displayName}
{if $list['name_id'] != 'currency' || $module->currencies_mode == 'checkbox'}
</a>
{/if}
</th>
{/if}
{/foreach}
</tr>
</thead>
<tbody>
{foreach $list['items'] as $item}
<tr>
<td>
<span>{$item['name']}</span>
</td>
{foreach $payment_modules as $key_module => $module}
{if $module->active}
<td class="text-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}
{else}
{$type = 'checkbox'}
{/if}
{if $type != 'null'}
<input type="{$type}" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}" {if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if}/>
{else}
<input type="hidden" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"/>--
{/if}
</td>
{/if}
{/foreach}
</tr>
{/foreach}
{if $list['name_id'] === 'currency'}
<tr>
<td>
<span>{l s='Customer 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="-1"{if in_array(-1, $module->$list['name_id'])} checked="checked"
{/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 class="row pull-right">
<div class="row">
<button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}">
<i class="icon-save"></i>
{l s='Save restrictions'}
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+2 -2
View File
@@ -25,11 +25,11 @@
<script type="text/javascript">
$(function() {
$('body').highlight('{$query}');
$('#content .panel').highlight('{$query}');
});
</script>
{if !$nb_results}
{if !isset($nb_results) || !$nb_results}
<h2>{l s='There are no results matching your query "%s".' sprintf=$query}</h2>
{else}
<h2>
admin-dev/themes/default/template/helpers/list/list_content.tpl
+4 -2
View File
@@ -27,10 +27,11 @@
{foreach $list AS $index => $tr}
<tr
{if $position_identifier}id="tr_{$id_category}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
class="{if isset($tr.class)} {$tr.class}{/if}"
class="{if isset($tr.class)} {$tr.class}{/if} {if $tr@iteration is odd by 1}odd{/if}"
{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
>
<td class="center">
<td class="text-center">
{if $bulk_actions && $has_bulk_actions}
{if isset($list_skip_actions.delete)}
{if !in_array($tr.$identifier, $list_skip_actions.delete)}
@@ -40,6 +41,7 @@
<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
{/if}
{/if}
</td>
{foreach $fields_display AS $key => $params}
{block name="open_td"}