Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
Vincent Augagneur
File diff suppressed because one or more lines are too long
@@ -299,7 +299,6 @@ html, body
|
||||
@include transition-duration(0.4s)
|
||||
@include transition-timing-function(ease-out)
|
||||
ul.submenu
|
||||
@include box-shadow(rgba(black,0.3) 2px 2px 4px)
|
||||
a
|
||||
display: block
|
||||
padding: 2px 5px 2px 10px
|
||||
@@ -335,10 +334,11 @@ html, body
|
||||
span.title
|
||||
display: none
|
||||
ul.submenu
|
||||
display: none!important
|
||||
padding-top: 38px
|
||||
position: relative
|
||||
top: 0
|
||||
display: none!important
|
||||
@include box-shadow(rgba(black,0.3) 2px 2px 4px)
|
||||
> ul > li:hover
|
||||
width: 250px!important
|
||||
position: relative
|
||||
|
||||
@@ -34,43 +34,54 @@ $(function() {
|
||||
<div class="leadin">{block name="leadin"}{/block}</div>
|
||||
{/if}
|
||||
|
||||
|
||||
{if isset($features)}
|
||||
<div class="panel">
|
||||
{if !$features}
|
||||
<h3>{l s='No features matching your query'} : {$query}</h3>
|
||||
{else}
|
||||
<h3>{l s='Features matching your query'} : {$query}</h3>
|
||||
<table class="table" cellpadding="0" cellspacing="0">
|
||||
<table class="table">
|
||||
<tbody>
|
||||
{foreach $features key=key item=feature}
|
||||
{foreach $feature key=k item=val name=feature_list}
|
||||
<tr>
|
||||
<th>{if $smarty.foreach.feature_list.first}{$key}{/if}</th>
|
||||
<td><strong>{if $smarty.foreach.feature_list.first}{$key}{/if}</strong></td>
|
||||
|
||||
<td>
|
||||
<a href="{$val.link}">{$val.value}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="clear"> </div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if isset($modules)}
|
||||
<div class="panel">
|
||||
{if !$modules}
|
||||
<h3>{l s='No modules matching your query'} : {$query}</h3>
|
||||
{else}
|
||||
<h3>{l s='Modules matching your query'} : {$query}</h3>
|
||||
<table class="table" cellpadding="0" cellspacing="0">
|
||||
<table class="table">
|
||||
<tbody>
|
||||
{foreach $modules key=key item=module}
|
||||
<tr>
|
||||
<th><a href="{$module->linkto|escape:'htmlall':'UTF-8'}">{$module->displayName}</a></th>
|
||||
<td><strong><a href="{$module->linkto|escape:'htmlall':'UTF-8'}">{$module->displayName}</a></strong></td>
|
||||
<td><a href="{$module->linkto|escape:'htmlall':'UTF-8'}">{$module->description}</a></td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="clear"> </div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if isset($categories)}
|
||||
<div class="panel">
|
||||
{if !$categories}
|
||||
<h3>{l s='No categories matching your query'} : {$query}</h3>
|
||||
{else}
|
||||
@@ -82,30 +93,39 @@ $(function() {
|
||||
</tr>
|
||||
{/foreach}
|
||||
</table>
|
||||
<div class="clear"> </div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if isset($products)}
|
||||
<div class="panel">
|
||||
{if !$products}
|
||||
<h3>{l s='There are no products matching your query'} : {$query}</h3>
|
||||
{else}
|
||||
<h3>{l s='Products matching your query'} : {$query}</h3>
|
||||
{$products}
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if isset($customers)}
|
||||
<div class="panel">
|
||||
{if !$customers}
|
||||
<h3>{l s='There are no customers matching your query'} : {$query}</h3>
|
||||
{else}
|
||||
<h3>{l s='Customers matching your query'} : {$query}</h3>
|
||||
{$customers}
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if isset($orders)}
|
||||
<div class="panel">
|
||||
{if !$orders}
|
||||
<h3>{l s='There are no orders matching your query'} : {$query}</h3>
|
||||
{else}
|
||||
<h3>{l s='Orders matching your query'} : {$query}</h3>
|
||||
{$orders}
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -23,32 +23,54 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
<div id="statsContainer">
|
||||
<div id="calendar">
|
||||
<form action="{$current}&token={$token}{if $action && $table}&{$action|escape}{$table|escape}{/if}{if $identifier && $id}&{$identifier|escape}={$id|escape}{/if}{if isset($smarty.get.module)}&module={$smarty.get.module|escape}{/if}{if isset($smarty.get.id_product)}&id_product={$smarty.get.id_product|escape}{/if}" method="post" id="calendar_form" name="calendar_form">
|
||||
<input type="submit" name="submitDateDay" class="button submitDateDay" value="{$translations.Day}">
|
||||
<input type="submit" name="submitDateMonth" class="button submitDateMonth" value="{$translations.Month}">
|
||||
<input type="submit" name="submitDateYear" class="button submitDateYear" value="{$translations.Year}">
|
||||
<input type="submit" name="submitDateDayPrev" class="button submitDateDayPrev" value="{$translations.Day}-1">
|
||||
<input type="submit" name="submitDateMonthPrev" class="button submitDateMonthPrev" value="{$translations.Month}-1">
|
||||
<input type="submit" name="submitDateYearPrev" class="button submitDateYearPrev" value="{$translations.Year}-1">
|
||||
<p><span>{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</span>
|
||||
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="datepicker">
|
||||
</p>
|
||||
<p><span>{if isset($translations.To)}{$translations.To}{else}<span>{l s='From:'}</span>{/if}</span>
|
||||
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker">
|
||||
</p>
|
||||
<input type="submit" name="submitDatePicker" id="submitDatePicker" class="button" value="{if isset($translations.Save)}{$translations.Save}{else}{l s='Save'}{/if}" />
|
||||
</form>
|
||||
<div id="statsContainer" class="col-lg-9">
|
||||
<div id="calendar" class="panel">
|
||||
<form action="{$current}&token={$token}{if $action && $table}&{$action|escape}{$table|escape}{/if}{if $identifier && $id}&{$identifier|escape}={$id|escape}{/if}{if isset($smarty.get.module)}&module={$smarty.get.module|escape}{/if}{if isset($smarty.get.id_product)}&id_product={$smarty.get.id_product|escape}{/if}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<div class="btn-group">
|
||||
<input type="submit" name="submitDateDay" class="btn btn-default submitDateDay" value="{$translations.Day}">
|
||||
<input type="submit" name="submitDateMonth" class="btn btn-default submitDateMonth" value="{$translations.Month}">
|
||||
<input type="submit" name="submitDateYear" class="btn btn-default submitDateYear" value="{$translations.Year}">
|
||||
<input type="submit" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" value="{$translations.Day}-1">
|
||||
<input type="submit" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" value="{$translations.Month}-1">
|
||||
<input type="submit" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" value="{$translations.Year}-1">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
<div class="row">
|
||||
<div class="col-xs-6">
|
||||
<div class="input-group">
|
||||
<label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label>
|
||||
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control datepicker">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="input-group">
|
||||
<label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label>
|
||||
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<input type="submit" name="submitDatePicker" id="submitDatePicker" class="btn btn-default pull-right" value="{if isset($translations.Save)}{$translations.Save}{else}{l s='Save'}{/if}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
if ($("form#calendar_form .datepicker").length > 0)
|
||||
$("form#calendar_form .datepicker").datepicker({
|
||||
prevText: '',
|
||||
nextText: '',
|
||||
dateFormat: 'yy-mm-dd'
|
||||
});
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
if ($("form#calendar_form .datepicker").length > 0)
|
||||
$("form#calendar_form .datepicker").datepicker({
|
||||
prevText: '',
|
||||
nextText: '',
|
||||
dateFormat: 'yy-mm-dd'
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
@@ -23,48 +23,48 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
<br/>
|
||||
<div class="blocEngine">
|
||||
<form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form">
|
||||
<h3 class="icon-{l s='Settings'}">{l s='Settings'}</h3>
|
||||
<div class="blocEngine panel">
|
||||
<form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form" class="form-horizontal">
|
||||
<h3><i class="icon-cog"></i> {l s='Settings'}</h3>
|
||||
|
||||
<div class="rowForm">
|
||||
<label for="engine_stats_render">{l s='Graph engine'} </label>
|
||||
{if count($array_graph_engines)}
|
||||
<select name="PS_STATS_RENDER" id="engine_stats_render">
|
||||
{foreach $array_graph_engines as $k => $value}
|
||||
<option value="{$k}" {if $k == $graph_engine}selected="selected"{/if}>{$value[0]}</option>
|
||||
<div class="form-group">
|
||||
<label for="engine_stats_render">{l s='Graph engine'} </label>
|
||||
{if count($array_graph_engines)}
|
||||
<select name="PS_STATS_RENDER" id="engine_stats_render">
|
||||
{foreach $array_graph_engines as $k => $value}
|
||||
<option value="{$k}" {if $k == $graph_engine}selected="selected"{/if}>{$value[0]}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{else}
|
||||
{l s='No graph engine module has been installed.'}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="engine_grid_render">{l s='Grid engine'} </label>
|
||||
{if count($array_grid_engines)}
|
||||
<select name="PS_STATS_GRID_RENDER" id="engine_grid_render">
|
||||
{foreach $array_grid_engines as $k => $value}
|
||||
<option value="{$k}" {if $k == $grid_engine}selected="selected"{/if}>{$value[0]}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{else}
|
||||
{l s='No grid engine module has been installed.'}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="engine_auto_clean">{l s='Auto-clean period'}</label>
|
||||
<select name="PS_STATS_OLD_CONNECT_AUTO_CLEAN" id="engine_auto_clean">
|
||||
{foreach $array_auto_clean as $k => $value}
|
||||
<option value="{$k}" {if $k == $auto_clean}selected="selected"{/if}>{$value}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{else}
|
||||
{l s='No graph engine module has been installed.'}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="rowForm">
|
||||
<label for="engine_grid_render">{l s='Grid engine'} </label>
|
||||
{if count($array_grid_engines)}
|
||||
<select name="PS_STATS_GRID_RENDER" id="engine_grid_render">
|
||||
{foreach $array_grid_engines as $k => $value}
|
||||
<option value="{$k}" {if $k == $grid_engine}selected="selected"{/if}>{$value[0]}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{else}
|
||||
{l s='No grid engine module has been installed.'}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="rowForm">
|
||||
<label for="engine_auto_clean">{l s='Auto-clean period'}</label>
|
||||
<select name="PS_STATS_OLD_CONNECT_AUTO_CLEAN" id="engine_auto_clean">
|
||||
{foreach $array_auto_clean as $k => $value}
|
||||
<option value="{$k}" {if $k == $auto_clean}selected="selected"{/if}>{$value}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
<p><input type="submit" value="{l s='Save'}" name="submitSettings" id="submitSettings" class="button" /></p>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<input type="submit" value="{l s='Save'}" name="submitSettings" id="submitSettings" class="btn btn-default" />
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@@ -22,22 +22,16 @@
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
<div id="container">
|
||||
<div class="sidebar navigation">
|
||||
<h3>{l s='Navigation'}</h3>
|
||||
<ul class="categorieList">
|
||||
<div id="container" class="row">
|
||||
<div class="sidebar navigation col-lg-3">
|
||||
<nav class="list-group categorieList">
|
||||
{if count($modules)}
|
||||
{foreach $modules as $module}
|
||||
{if $module_instance[$module.name]}
|
||||
<li>
|
||||
<a href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
|
||||
</li>
|
||||
<a class="list-group-item" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
|
||||
{/if}
|
||||
{/foreach}
|
||||
{else}
|
||||
{l s='No module has been installed.'}
|
||||
{/if}
|
||||
</ul>
|
||||
|
||||
|
||||
|
||||
</nav>
|
||||
@@ -23,18 +23,16 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
<div>
|
||||
{if $module_name}
|
||||
{if $module_instance && $module_instance->active}
|
||||
{$hook}
|
||||
{else}
|
||||
{l s='Module not found'}
|
||||
{/if}
|
||||
{else}
|
||||
<h3 class="space">{l s='Please select a module from the left column.'}</h3>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="panel">
|
||||
{if $module_name}
|
||||
{if $module_instance && $module_instance->active}
|
||||
{$hook}
|
||||
{else}
|
||||
{l s='Module not found'}
|
||||
{/if}
|
||||
{else}
|
||||
<h3 class="space">{l s='Please select a module from the left column.'}</h3>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -61,7 +61,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
'fields' => array(
|
||||
'PS_ORDER_PROCESS_TYPE' => array(
|
||||
'title' => $this->l('Order process type'),
|
||||
'desc' => $this->l('Please choose either the five-step, or one-page, checkout process.'),
|
||||
'hint' => $this->l('Please choose either the five-step, or one-page, checkout process.'),
|
||||
'validation' => 'isInt',
|
||||
'cast' => 'intval',
|
||||
'type' => 'select',
|
||||
@@ -70,35 +70,35 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_GUEST_CHECKOUT_ENABLED' => array(
|
||||
'title' => $this->l('Enable guest checkout'),
|
||||
'desc' => $this->l('Guests can place an order without registering'),
|
||||
'hint' => $this->l('Guests can place an order without registering'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_PURCHASE_MINIMUM' => array(
|
||||
'title' => $this->l('Minimum purchase total required in order to validate the order'),
|
||||
'desc' => $this->l('Set to 0 to disable this feature'),
|
||||
'hint' => $this->l('Set to 0 to disable this feature'),
|
||||
'validation' => 'isFloat',
|
||||
'cast' => 'floatval',
|
||||
'type' => 'price'
|
||||
),
|
||||
'PS_ALLOW_MULTISHIPPING' => array(
|
||||
'title' => $this->l('Allow multishipping'),
|
||||
'desc' => $this->l('Allow the customer to ship orders to multiple addresses. This option will convert the customer\'s cart into one or more orders.'),
|
||||
'hint' => $this->l('Allow the customer to ship orders to multiple addresses. This option will convert the customer\'s cart into one or more orders.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_SHIP_WHEN_AVAILABLE' => array(
|
||||
'title' => $this->l('Delayed shipping'),
|
||||
'desc' => $this->l('This option allows you to delay shipping at your customers\' request. '),
|
||||
'hint' => $this->l('This option allows you to delay shipping at your customers\' request. '),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool'
|
||||
),
|
||||
'PS_CONDITIONS' => array(
|
||||
'title' => $this->l('Terms of service'),
|
||||
'desc' => $this->l('Require customers to accept or decline terms of service before processing an order.'),
|
||||
'hint' => $this->l('Require customers to accept or decline terms of service before processing an order.'),
|
||||
'validation' => 'isBool',
|
||||
'cast' => 'intval',
|
||||
'type' => 'bool',
|
||||
@@ -109,7 +109,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
|
||||
),
|
||||
'PS_CONDITIONS_CMS_ID' => array(
|
||||
'title' => $this->l('Conditions of use for the CMS page'),
|
||||
'desc' => $this->l('Choose the conditions of use for the CMS page.'),
|
||||
'hint' => $this->l('Choose the conditions of use for the CMS page.'),
|
||||
'validation' => 'isInt',
|
||||
'type' => 'select',
|
||||
'list' => $cms_tab,
|
||||
|
||||
@@ -26,6 +26,13 @@
|
||||
|
||||
class AdminSearchControllerCore extends AdminController
|
||||
{
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->bootstrap = true;
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
public function postProcess()
|
||||
{
|
||||
$this->context = Context::getContext();
|
||||
|
||||
Reference in New Issue
Block a user