Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts: admin-dev/themes/default/css/admin-theme.css
This commit is contained in:
Kevin Granger
@@ -66,6 +66,7 @@
|
||||
@include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset)
|
||||
border: solid 1px #ccc
|
||||
background-color: #eee
|
||||
cursor: n-resize
|
||||
.module_col_icon
|
||||
display: table-cell
|
||||
width: 50px
|
||||
|
||||
@@ -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}
|
||||
@@ -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}
|
||||
Reference in New Issue
Block a user