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:
Vincent Augagneur
2013-09-02 11:44:01 +02:00
parent a6aed9632a 735b20866b
commit b882ecfbbc
9 changed files with 151 additions and 110 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/css/admin-theme.sass
+2 -2
View File
@@ -299,7 +299,6 @@ html, body
@include transition-duration(0.4s) @include transition-duration(0.4s)
@include transition-timing-function(ease-out) @include transition-timing-function(ease-out)
ul.submenu ul.submenu
@include box-shadow(rgba(black,0.3) 2px 2px 4px)
a a
display: block display: block
padding: 2px 5px 2px 10px padding: 2px 5px 2px 10px
@@ -335,10 +334,11 @@ html, body
span.title span.title
display: none display: none
ul.submenu ul.submenu
display: none!important
padding-top: 38px padding-top: 38px
position: relative position: relative
top: 0 top: 0
display: none!important @include box-shadow(rgba(black,0.3) 2px 2px 4px)
> ul > li:hover > ul > li:hover
width: 250px!important width: 250px!important
position: relative position: relative
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+27 -7
View File
@@ -34,43 +34,54 @@ $(function() {
<div class="leadin">{block name="leadin"}{/block}</div> <div class="leadin">{block name="leadin"}{/block}</div>
{/if} {/if}
{if isset($features)} {if isset($features)}
<div class="panel">
{if !$features} {if !$features}
<h3>{l s='No features matching your query'} : {$query}</h3> <h3>{l s='No features matching your query'} : {$query}</h3>
{else} {else}
<h3>{l s='Features matching your query'} : {$query}</h3> <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 $features key=key item=feature}
{foreach $feature key=k item=val name=feature_list} {foreach $feature key=k item=val name=feature_list}
<tr> <tr>
<th>{if $smarty.foreach.feature_list.first}{$key}{/if}</th> <td><strong>{if $smarty.foreach.feature_list.first}{$key}{/if}</strong></td>
<td> <td>
<a href="{$val.link}">{$val.value}</a> <a href="{$val.link}">{$val.value}</a>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
{/foreach} {/foreach}
</tbody>
</table> </table>
<div class="clear">&nbsp;</div>
{/if} {/if}
</div>
{/if} {/if}
{if isset($modules)} {if isset($modules)}
<div class="panel">
{if !$modules} {if !$modules}
<h3>{l s='No modules matching your query'} : {$query}</h3> <h3>{l s='No modules matching your query'} : {$query}</h3>
{else} {else}
<h3>{l s='Modules matching your query'} : {$query}</h3> <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} {foreach $modules key=key item=module}
<tr> <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> <td><a href="{$module->linkto|escape:'htmlall':'UTF-8'}">{$module->description}</a></td>
</tr> </tr>
{/foreach} {/foreach}
</tbody>
</table> </table>
<div class="clear">&nbsp;</div>
{/if} {/if}
</div>
{/if} {/if}
{if isset($categories)} {if isset($categories)}
<div class="panel">
{if !$categories} {if !$categories}
<h3>{l s='No categories matching your query'} : {$query}</h3> <h3>{l s='No categories matching your query'} : {$query}</h3>
{else} {else}
@@ -82,30 +93,39 @@ $(function() {
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
<div class="clear">&nbsp;</div>
{/if} {/if}
</div>
{/if} {/if}
{if isset($products)} {if isset($products)}
<div class="panel">
{if !$products} {if !$products}
<h3>{l s='There are no products matching your query'} : {$query}</h3> <h3>{l s='There are no products matching your query'} : {$query}</h3>
{else} {else}
<h3>{l s='Products matching your query'} : {$query}</h3> <h3>{l s='Products matching your query'} : {$query}</h3>
{$products} {$products}
{/if} {/if}
</div>
{/if} {/if}
{if isset($customers)} {if isset($customers)}
<div class="panel">
{if !$customers} {if !$customers}
<h3>{l s='There are no customers matching your query'} : {$query}</h3> <h3>{l s='There are no customers matching your query'} : {$query}</h3>
{else} {else}
<h3>{l s='Customers matching your query'} : {$query}</h3> <h3>{l s='Customers matching your query'} : {$query}</h3>
{$customers} {$customers}
{/if} {/if}
</div>
{/if} {/if}
{if isset($orders)} {if isset($orders)}
<div class="panel">
{if !$orders} {if !$orders}
<h3>{l s='There are no orders matching your query'} : {$query}</h3> <h3>{l s='There are no orders matching your query'} : {$query}</h3>
{else} {else}
<h3>{l s='Orders matching your query'} : {$query}</h3> <h3>{l s='Orders matching your query'} : {$query}</h3>
{$orders} {$orders}
{/if} {/if}
</div>
{/if} {/if}
admin-dev/themes/default/template/controllers/stats/calendar.tpl
+49 -27
View File
@@ -23,32 +23,54 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div id="statsContainer"> <div id="statsContainer" class="col-lg-9">
<div id="calendar"> <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"> <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">
<input type="submit" name="submitDateDay" class="button submitDateDay" value="{$translations.Day}"> <div class="row">
<input type="submit" name="submitDateMonth" class="button submitDateMonth" value="{$translations.Month}"> <div class="col-lg-6">
<input type="submit" name="submitDateYear" class="button submitDateYear" value="{$translations.Year}"> <div class="btn-group">
<input type="submit" name="submitDateDayPrev" class="button submitDateDayPrev" value="{$translations.Day}-1"> <input type="submit" name="submitDateDay" class="btn btn-default submitDateDay" value="{$translations.Day}">
<input type="submit" name="submitDateMonthPrev" class="button submitDateMonthPrev" value="{$translations.Month}-1"> <input type="submit" name="submitDateMonth" class="btn btn-default submitDateMonth" value="{$translations.Month}">
<input type="submit" name="submitDateYearPrev" class="button submitDateYearPrev" value="{$translations.Year}-1"> <input type="submit" name="submitDateYear" class="btn btn-default submitDateYear" value="{$translations.Year}">
<p><span>{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</span> <input type="submit" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" value="{$translations.Day}-1">
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="datepicker"> <input type="submit" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" value="{$translations.Month}-1">
</p> <input type="submit" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" value="{$translations.Year}-1">
<p><span>{if isset($translations.To)}{$translations.To}{else}<span>{l s='From:'}</span>{/if}</span> </div>
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker"> </div>
</p> <div class="col-lg-6">
<input type="submit" name="submitDatePicker" id="submitDatePicker" class="button" value="{if isset($translations.Save)}{$translations.Save}{else}{l s='Save'}{/if}" /> <div class="row">
</form> <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"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
if ($("form#calendar_form .datepicker").length > 0) if ($("form#calendar_form .datepicker").length > 0)
$("form#calendar_form .datepicker").datepicker({ $("form#calendar_form .datepicker").datepicker({
prevText: '', prevText: '',
nextText: '', nextText: '',
dateFormat: 'yy-mm-dd' dateFormat: 'yy-mm-dd'
});
}); });
</script> });
</div> </script>
</div>
admin-dev/themes/default/template/controllers/stats/engines.tpl
+40 -40
View File
@@ -23,48 +23,48 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<br/> <div class="blocEngine panel">
<div class="blocEngine"> <form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form" class="form-horizontal">
<form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form"> <h3><i class="icon-cog"></i> {l s='Settings'}</h3>
<h3 class="icon-{l s='Settings'}">{l s='Settings'}</h3>
<div class="rowForm"> <div class="form-group">
<label for="engine_stats_render">{l s='Graph engine'} </label> <label for="engine_stats_render">{l s='Graph engine'} </label>
{if count($array_graph_engines)} {if count($array_graph_engines)}
<select name="PS_STATS_RENDER" id="engine_stats_render"> <select name="PS_STATS_RENDER" id="engine_stats_render">
{foreach $array_graph_engines as $k => $value} {foreach $array_graph_engines as $k => $value}
<option value="{$k}" {if $k == $graph_engine}selected="selected"{/if}>{$value[0]}</option> <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} {/foreach}
</select> </select>
</div>
{else} <p>
{l s='No graph engine module has been installed.'} <input type="submit" value="{l s='Save'}" name="submitSettings" id="submitSettings" class="btn btn-default" />
{/if} </p>
</div> </form>
</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>
</div> </div>
admin-dev/themes/default/template/controllers/stats/menu.tpl
+5 -11
View File
@@ -22,22 +22,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div id="container"> <div id="container" class="row">
<div class="sidebar navigation"> <div class="sidebar navigation col-lg-3">
<h3>{l s='Navigation'}</h3> <nav class="list-group categorieList">
<ul class="categorieList">
{if count($modules)} {if count($modules)}
{foreach $modules as $module} {foreach $modules as $module}
{if $module_instance[$module.name]} {if $module_instance[$module.name]}
<li> <a class="list-group-item" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
<a href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
</li>
{/if} {/if}
{/foreach} {/foreach}
{else} {else}
{l s='No module has been installed.'} {l s='No module has been installed.'}
{/if} {/if}
</ul> </nav>
admin-dev/themes/default/template/controllers/stats/stats.tpl
+13 -15
View File
@@ -23,18 +23,16 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div> <div class="panel">
{if $module_name} {if $module_name}
{if $module_instance && $module_instance->active} {if $module_instance && $module_instance->active}
{$hook} {$hook}
{else} {else}
{l s='Module not found'} {l s='Module not found'}
{/if} {/if}
{else} {else}
<h3 class="space">{l s='Please select a module from the left column.'}</h3> <h3 class="space">{l s='Please select a module from the left column.'}</h3>
{/if} {/if}
</div> </div>
</div> </div>
</div> </div>
controllers/admin/AdminOrderPreferencesController.php
+7 -7
View File
@@ -61,7 +61,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
'fields' => array( 'fields' => array(
'PS_ORDER_PROCESS_TYPE' => array( 'PS_ORDER_PROCESS_TYPE' => array(
'title' => $this->l('Order process type'), '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', 'validation' => 'isInt',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'select', 'type' => 'select',
@@ -70,35 +70,35 @@ class AdminOrderPreferencesControllerCore extends AdminController
), ),
'PS_GUEST_CHECKOUT_ENABLED' => array( 'PS_GUEST_CHECKOUT_ENABLED' => array(
'title' => $this->l('Enable guest checkout'), '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', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool' 'type' => 'bool'
), ),
'PS_PURCHASE_MINIMUM' => array( 'PS_PURCHASE_MINIMUM' => array(
'title' => $this->l('Minimum purchase total required in order to validate the order'), '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', 'validation' => 'isFloat',
'cast' => 'floatval', 'cast' => 'floatval',
'type' => 'price' 'type' => 'price'
), ),
'PS_ALLOW_MULTISHIPPING' => array( 'PS_ALLOW_MULTISHIPPING' => array(
'title' => $this->l('Allow multishipping'), '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', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool' 'type' => 'bool'
), ),
'PS_SHIP_WHEN_AVAILABLE' => array( 'PS_SHIP_WHEN_AVAILABLE' => array(
'title' => $this->l('Delayed shipping'), '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', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool' 'type' => 'bool'
), ),
'PS_CONDITIONS' => array( 'PS_CONDITIONS' => array(
'title' => $this->l('Terms of service'), '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', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool', 'type' => 'bool',
@@ -109,7 +109,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
), ),
'PS_CONDITIONS_CMS_ID' => array( 'PS_CONDITIONS_CMS_ID' => array(
'title' => $this->l('Conditions of use for the CMS page'), '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', 'validation' => 'isInt',
'type' => 'select', 'type' => 'select',
'list' => $cms_tab, 'list' => $cms_tab,
controllers/admin/AdminSearchController.php
+7
View File
@@ -26,6 +26,13 @@
class AdminSearchControllerCore extends AdminController class AdminSearchControllerCore extends AdminController
{ {
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
public function postProcess() public function postProcess()
{ {
$this->context = Context::getContext(); $this->context = Context::getContext();