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-08-07 10:44:42 +02:00
parent 816a39fb4f 349c98d567
commit d95aae9a7b
31 changed files with 826 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+2 -2
View File
@@ -157,7 +157,7 @@
{l s='Carrier selection'}
</label>
<div id="carrier_restriction_div">
<table class="col-lg-12">
<table>
<tr>
<td>
<p>{l s='Unselected carriers'}</p>
@@ -190,7 +190,7 @@
{l s='Customer group selection'}
</label>
<div id="group_restriction_div">
<table class="col-lg-12">
<table>
<tr>
<td>
<p>{l s='Unselected groups'}</p>
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+6 -7
View File
@@ -1,10 +1,10 @@
<div class="row-fluid">
<div class="row">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
<div class="row-fluid">
<div class="row">
<div class="productTabs">
<ul class="tab nav nav-tabs">
<li class="tab-row">
@@ -20,23 +20,22 @@
</div>
</div>
<div class="row-fluid">
<div class="row">
<form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" class="form-horizontal" method="post">
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<fieldset id="cart_rule_informations" class="cart_rule_tab">
<legend>{l s='Cart-rule information'}</legend>
<h3>{l s='Cart-rule information'}</h3>
{include file='controllers/cart_rules/informations.tpl'}
</fieldset>
<fieldset id="cart_rule_conditions" class="cart_rule_tab">
<legend>{l s='Cart-rule conditions'}</legend>
<h3>{l s='Cart-rule conditions'}</h3>
{include file='controllers/cart_rules/conditions.tpl'}
</fieldset>
<fieldset id="cart_rule_actions" class="cart_rule_tab">
<legend>{l s='Cart-rule actions'}</legend>
<h3>{l s='Cart-rule actions'}</h3>
{include file='controllers/cart_rules/actions.tpl'}
</fieldset>
<hr/>
<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
</form>
admin-dev/themes/default/template/controllers/images/content.tpl
+2 -2
View File
@@ -28,7 +28,7 @@
{if isset($display_regenerate)}
<form class="form-horizontal" action="{$current}&token={$token}" method="post">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-picture"></i>
{l s='Regenerate thumbnails'}
@@ -103,7 +103,7 @@
</div>
{else}
<form action="{$current}&token={$token}" method="post" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-picture"></i>
{l s='Move images'}
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+2 -2
View File
@@ -104,7 +104,7 @@
*}
<form id="preview_import" action="{$current}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-download"></i>
{l s='Import'}
@@ -251,7 +251,7 @@
</fieldset>
</form>
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-download"></i>
{l s='Available fields'}
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+166 -154
View File
@@ -69,164 +69,176 @@
});
</script>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Configuration information'}
</h3>
<p>{l s='This information must be provided when you report an issue on our bug tracker or forum.'}</p>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Server information'}
</h3>
{if count($uname)}
<p>
<strong>{l s='Server information'}:</strong> {$uname|escape:'htmlall':'UTF-8'}
</p>
{/if}
<p>
<strong>{l s='Server software version'}:</strong> {$version.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='PHP version'}:</strong> {$version.php|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
</p>
{if $apache_instaweb}
<p>{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if}
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Database information'}
</h3>
<p>
<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'htmlall':'UTF-8'}
</p>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Store information'}
</h3>
<p>
<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'htmlall':'UTF-8'}
</p>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Mail configuration'}
</h3>
<p>
<strong>{l s='Mail method'}:</strong>
{if $mail}
{l s='You are using the PHP mail function.'}</p>
{else}
{l s='You are using your own SMTP parameters.'}</p>
<p>
<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='SMTP user'}:</strong>
{if $smtp.user neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='SMTP password'}:</strong>
{if $smtp.password neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Port'}:</strong> {$smtp.port|escape:'htmlall':'UTF-8'}
</p>
{/if}
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Your information'}
</h3>
<p>
<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'htmlall':'UTF-8'}
</p>
</fieldset>
<fieldset id="checkConfiguration">
<h3>
<i class="icon-info"></i>
{l s='Check your configuration'}
</h3>
<p>
<strong>{l s='Required parameters'}:</strong>
{if !$failRequired}
<span class="text-success">OK</span>
</p>
{else}
<span class="text-danger">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsRequired item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
<div class="row">
<div class="col-lg-6">
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Configuration information'}
</h3>
<p>{l s='This information must be provided when you report an issue on our bug tracker or forum.'}</p>
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Server information'}
</h3>
{if count($uname)}
<p>
<strong>{l s='Optional parameters'}:</strong>
{if !$failOptional}
<span>OK</span>
<strong>{l s='Server information'}:</strong> {$uname|escape:'htmlall':'UTF-8'}
</p>
{else}
<span class="text-success">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsOptional item='value' key='key'}
{if $value eq 'fail'}
<li>{$key}</li>
{/if}
{/foreach}
</ul>
{/if}
</fieldset>
<p>
<strong>{l s='Server software version'}:</strong> {$version.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='PHP version'}:</strong> {$version.php|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
</p>
{if $apache_instaweb}
<p>{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if}
</div>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='List of changed files'}
</h3>
<div id="changedFiles"><img src="../img/admin/ajax-loader.gif" /> {l s='Checking files...'}</div>
</fieldset>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Database information'}
</h3>
<p>
<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'htmlall':'UTF-8'}
</p>
</div>
</div>
<div class="col-lg-6">
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Store information'}
</h3>
<p>
<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'htmlall':'UTF-8'}
</p>
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Mail configuration'}
</h3>
<p>
<strong>{l s='Mail method'}:</strong>
{if $mail}
{l s='You are using the PHP mail function.'}</p>
{else}
{l s='You are using your own SMTP parameters.'}</p>
<p>
<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='SMTP user'}:</strong>
{if $smtp.user neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='SMTP password'}:</strong>
{if $smtp.password neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'htmlall':'UTF-8'}
</p>
<p>
<strong>{l s='Port'}:</strong> {$smtp.port|escape:'htmlall':'UTF-8'}
</p>
{/if}
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='Your information'}
</h3>
<p>
<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'htmlall':'UTF-8'}
</p>
</div>
<div class="panel" id="checkConfiguration">
<h3>
<i class="icon-info"></i>
{l s='Check your configuration'}
</h3>
<p>
<strong>{l s='Required parameters'}:</strong>
{if !$failRequired}
<span class="text-success">OK</span>
</p>
{else}
<span class="text-danger">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsRequired item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
<p>
<strong>{l s='Optional parameters'}:</strong>
{if !$failOptional}
<span>OK</span>
</p>
{else}
<span class="text-success">{l s='Please fix the following error(s)'}</span>
</p>
<ul class="nav">
{foreach from=$testsOptional item='value' key='key'}
{if $value eq 'fail'}
<li>{$key}</li>
{/if}
{/foreach}
</ul>
{/if}
</div>
</div>
</div>
<div class="panel">
<h3>
<i class="icon-info"></i>
{l s='List of changed files'}
</h3>
<div id="changedFiles"><img src="../img/admin/ajax-loader.gif" /> {l s='Checking files...'}</div>
</div>
{/block}
admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
+2 -2
View File
@@ -27,7 +27,7 @@
{block name="override_header"}
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-level-up"></i>
{l s='Severity levels'}
@@ -39,6 +39,6 @@
<li class="text-warning">{l s='Error'}</li>
<li class="text-danger">{l s='Major issue (crash)!'}</li>
</ol>
</fieldset><br />
</fieldset>
{/block}
admin-dev/themes/default/template/controllers/modules/favorites.tpl
+86 -88
View File
@@ -11,96 +11,94 @@
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
</fiv>
</div>
</div>
<div class="col-lg-12">&nbsp;</div>
<div id="container" class="col-lg-12">
<div id="moduleContainer">
<table class="table table-striped table-hover" cellspacing="0" cellpadding="0" id="">
<colgroup>
<col width="5%">
<col width="10%">
<col width="20%">
<col width="5%">
<col width="20%">
<col width="5%">
<col width="7%">
<col width="7%">
<col width="7%">
</colgroup>
<thead>
<tr class="nodrag nodrop">
<th>{l s='Logo'}</th>
<th>{l s='Module Name'}</th>
<th>{l s='Description'}</th>
<th>{l s='Status'}</th>
<th>{l s='Tab'}</th>
<th>{l s='Categories'}</th>
<th>{l s='Interest'}</th>
<th>{l s='Favorite'}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{foreach from=$modules key=km item=module}
<tr height="32" {if $km % 2 eq 0} class="alt_row"{/if}>
<td>
<img src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" width="57" height="57" />
</td>
<td class="moduleName">
<h5>{$module->displayName}</h5>
</td>
<td>
<span class="moduleFavDesc">{$module->description|truncate:80:'...'}</span>
</td>
<td class="setup">
{if isset($module->id) && $module->id gt 0}
<span class="label label-success">{l s='Installed'}</span>
{else}
<span class="label label-warning">{l s='Not Installed'}</span>
{/if}
</td>
<td>
{assign var="module_name" value=$module->name}
<select name="t_{$module->name}" multiple="multiple">
{foreach $tabs AS $t}
{if $t.active}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} class="group" value="{$t.id_tab}">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</option>
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
{assign var="id_tab" value=$t.id_tab}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</option>
{/if}
{/foreach}
{/if}
{/foreach}
</select>
</td>
<td>
<span>{$module->categoryName}</span>
</td>
<td>
<select name="i_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td>
<select name="f_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td id="r_{$module->name}">
<span>&nbsp;</span>
</td>
</tr>
{/foreach}
</tbody>
</table>
<div id="moduleContainer">
<table class="table" id="">
<colgroup>
<col width="5%">
<col width="10%">
<col width="20%">
<col width="5%">
<col width="20%">
<col width="5%">
<col width="7%">
<col width="7%">
<col width="7%">
</colgroup>
<thead>
<tr class="nodrag nodrop">
<th>{l s='Logo'}</th>
<th>{l s='Module Name'}</th>
<th>{l s='Description'}</th>
<th>{l s='Status'}</th>
<th>{l s='Tab'}</th>
<th>{l s='Categories'}</th>
<th>{l s='Interest'}</th>
<th>{l s='Favorite'}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{foreach from=$modules key=km item=module}
<tr height="32" {if $km % 2 eq 0} class="alt_row"{/if}>
<td>
<img src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" width="57" height="57" />
</td>
<td class="moduleName">
<h5>{$module->displayName}</h5>
</td>
<td>
<span class="moduleFavDesc">{$module->description|truncate:80:'...'}</span>
</td>
<td class="setup">
{if isset($module->id) && $module->id gt 0}
<span class="label label-success">{l s='Installed'}</span>
{else}
<span class="label label-warning">{l s='Not Installed'}</span>
{/if}
</td>
<td>
{assign var="module_name" value=$module->name}
<select name="t_{$module->name}" multiple="multiple">
{foreach $tabs AS $t}
{if $t.active}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} class="group" value="{$t.id_tab}">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</option>
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
{assign var="id_tab" value=$t.id_tab}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</option>
{/if}
{/foreach}
{/if}
{/foreach}
</select>
</td>
<td>
<span>{$module->categoryName}</span>
</td>
<td>
<select name="i_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td>
<select name="f_{$module->name}" class="moduleFavorite">
<option value="" selected="selected">---</option>
<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
</select>
</td>
<td id="r_{$module->name}">
<span>&nbsp;</span>
</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/modules/header.tpl
+21 -23
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="row-fluid page-head">
<div class="page-head">
<h2 class="page-title">
{l s='List of modules'}
</h2>
@@ -46,28 +46,26 @@
{if $add_permission eq '1'}
<div id="module_install" class="row" style="{if !isset($smarty.post.downloadflag)}display: none;{/if}">
<div class="col-lg-12">
<div class="row-fluid">
<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<legend>{l s='Add a new module'}</legend>
<p>{l s='The module must either be a zip file or a tarball.'}</p>
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-9">
<p>
<input type="file" name="file" />
</p>
<p>
<button class="btn btn-default" type="submit" name="download">
<i class="icon-upload-alt" ></i>
{l s='Upload this module'}
</button>
</p>
</div>
</form>
</div>
<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<legend>{l s='Add a new module'}</legend>
<p>{l s='The module must either be a zip file or a tarball.'}</p>
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-9">
<p>
<input type="file" name="file" />
</p>
<p>
<button class="btn btn-default" type="submit" name="download">
<i class="icon-upload-alt" ></i>
{l s='Upload this module'}
</button>
</p>
</div>
</form>
</div>
</div>
{/if}
admin-dev/themes/default/template/controllers/modules/login_addons.tpl
+1 -1
View File
@@ -68,7 +68,7 @@
</div>
</div>
<div class="row">
<div class="col-lg-10 col-offset-3">
<div class="col-lg-9 col-offset-3">
<button class="btn btn-default" id="addons_login_button" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
+2 -2
View File
@@ -82,14 +82,14 @@
</div>
<div id="modules_list_container_content">
{if count($tab_modules_list.installed)}
<table id="tab_modules_list_installed" class="table table-striped table-hover">
<table id="tab_modules_list_installed" class="table">
{foreach from=$tab_modules_list.installed item=module}
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
{/foreach}
</table>
{/if}
{if count($tab_modules_list.not_installed)}
<table id="tab_modules_list_not_installed" class="table table-striped table-hover">
<table id="tab_modules_list_not_installed" class="table">
{foreach from=$tab_modules_list.not_installed item=module}
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
{/foreach}
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+32 -37
View File
@@ -110,7 +110,7 @@
<!-- Breadcrumb -->
<div class="col-lg-12">
<div class="breadcrumb pull-right">
<div class="breadcrumb">
<span><strong>{l s='Orders'}</strong></span> :
{if $previousOrder}
<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">
@@ -130,10 +130,10 @@
<!-- Change status form -->
<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
<fieldset>
<legend>
<h3>
<i class="icon-table"></i>
{l s='Order status'}
</legend>
</h3>
<label class="control-label col-lg-1 text-right">
{l s='Status:'}
</label>
@@ -197,10 +197,10 @@
<!-- Customer informations -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-user"></i>
{l s='Customer information'}
</legend>
</h3>
<span>
<a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}">
{$customer->firstname} {$customer->lastname}
@@ -228,10 +228,10 @@
<!-- Sources block -->
{if (sizeof($sources))}
<fieldset>
<legend>
<h3>
<i class="icon-signal"></i>
{l s='Sources'}
</legend>
</h3>
<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
{foreach from=$sources item=source}
<li>
@@ -254,10 +254,10 @@
<div class="col-lg-6">
<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
<fieldset>
<legend onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
<h3 onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
<i class="icon-envelope"></i>
{l s='New message'}
</legend>
</h3>
<p id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if};">
<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
<strong>{l s='Click here'}</strong> {l s='to add a comment or send a message to the customer.'}
@@ -302,10 +302,10 @@
{if (sizeof($messages))}
<fieldset>
<legend>
<h3>
<i class="icon-envelope"></i>
{l s='Messages'}
</legend>
</h3>
{foreach from=$messages item=message}
<div {if $message['is_new_for_me']}class="new_message"{/if}>
{if ($message['is_new_for_me'])}
@@ -328,17 +328,15 @@
{/if}
</div>
<div class="col-lg-12"></div>
<!-- Addresses -->
<div class="col-lg-6">
{if !$order->isVirtual()}
<!-- Shipping address -->
<fieldset>
<legend>
<h3>
<i class="icon-truck"></i>
{l s='Shipping address'}
</legend>
</h3>
{if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div class="col-lg-10">
@@ -385,10 +383,10 @@
<!-- Invoice address -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-file"></i>
{l s='Invoice address'}
</legend>
</h3>
{if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div class="col-lg-10">
@@ -417,16 +415,14 @@
</fieldset>
</div>
<div class="col-lg-12"></div>
<!-- linked orders block -->
{if count($order->getBrother()) > 0}
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-shopping-cart"></i>
{l s='Linked orders'}
</legend>
</h3>
<table class="table">
<thead>
<tr>
@@ -469,10 +465,10 @@
<!-- Documents block -->
<div class="col-lg-12">
<fieldset>
<legend>
<h3>
<i class="icon-file-text"></i>
{l s='Documents'}
</legend>
</h3>
{* Include document template *}
{include file='controllers/orders/_documents.tpl'}
</fieldset>
@@ -481,10 +477,10 @@
<!-- Payments block -->
<div class="col-lg-12">
<fieldset>
<legend>
<h3>
<i class="icon-money"></i>
{l s='Payment'}
</legend>
</h3>
{if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
@@ -518,6 +514,7 @@
{/foreach}
</p>
{/if}
<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<table class="table">
<colgroup>
@@ -660,10 +657,10 @@
<!-- Shipping block -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-truck"></i>
{l s='Shipping'}
</legend>
</h3>
{if $order->recyclable}
<p>
<span class="label label-success">
@@ -716,10 +713,10 @@
<!-- Return block -->
<div class="col-lg-6">
<fieldset>
<legend>
<h3>
<i class="icon-suitcase"></i>
{l s='Merchandise returns'}
</legend>
</h3>
{if $order->getReturn()|count > 0}
<table class="table">
@@ -790,10 +787,10 @@
<div style="display: none">
<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
</div>
<legend>
<h3>
<i class="icon-shopping-cart"></i>
{l s='Products:'}
</legend>
</h3>
<div class="col-lg-12">
{if $can_edit}
{if !$order->hasBeenDelivered()}
@@ -992,15 +989,17 @@
<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="btn btn-default" />
</div>
{/if}
</fieldset>
</div>
<!-- Discount block -->
{if (sizeof($discounts) || $can_edit)}
<div class="col-lg-12">
<legend>
<fieldset>
<h3>
<i class="icon-tag"></i>
{l s='Discounts'}
</legend>
</h3>
{*
TO DO - Je voudrais placer le bouton ici mais l'apparition du formulaire ne fonctionne plus....
<a class="btn btn-default" href="#" id="add_voucher">
@@ -1068,8 +1067,4 @@
</form>
</div>
</div>
<a class="btn btn-default" href="{$current_index}&token={$smarty.get.token}">
<i class="icon-arrow-left"></i>
{l s='Back to list'}
</a>
{/block}
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+1 -1
View File
@@ -30,7 +30,7 @@
{$list['title']}
</h3>
<p class="help-block">{$list['desc']}</p>
<table cellpadding="0" cellspacing="0" class="table table-striped table-hover">
<table cellpadding="0" cellspacing="0" class="table">
<tr>
<th width="40%">{$list['title']}</th>
{foreach $payment_modules as $module}
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+5 -7
View File
@@ -232,13 +232,11 @@
<div id="product-tab-content-wait" style="display:none">
<div id="loading">{l s='Loading...'}</div>
</div>
<form id="product_form" class="form-horizontal col-lg-10" action="{$form_action}" method="post" enctype="multipart/form-data" name="product" style="display:none;">
<input type="hidden" name="id_product" value="{$id_product}" />
<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual|escape:html:'UTF-8'}" />
{if !$product->active && $product->isAssociatedToShop()}
<div class="alert draft" >
<p>
@@ -253,11 +251,11 @@
{* all input are here *}
<div class="row">
{foreach $product_tabs key=numStep item=tab}
<fieldset id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content col-lg-12" {if !$tab.selected}style="display:none"{/if}>
{if $tab.selected}
{$custom_form}
{/if}
</fieldset>
<fieldset id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
{if $tab.selected}
{$custom_form}
{/if}
</fieldset>
{/foreach}
</div>
admin-dev/themes/default/template/controllers/products/quantities.tpl
+1 -1
View File
@@ -108,7 +108,7 @@
</div>
{/if}
<table class="table table-hover">
<table class="table">
<colgroup>
<col width="50">
<col>
admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
+1 -1
View File
@@ -27,7 +27,7 @@
{block name="after"}
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-list"></i>
{l s='List of MySQL Tables:'}
admin-dev/themes/default/template/controllers/shipping/content.tpl
+1 -1
View File
@@ -26,7 +26,7 @@
{$content}
<form action="{$action_fees}" id="fees" name="fees" method="post" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
<h3>
<i class="icon-truck"></i>
{l s='Fees by carrier, geographical zone and ranges'}
admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
+15 -28
View File
@@ -25,8 +25,10 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<div class="row">
<fieldset class="col-lg-12">
<div class="row">
<div class="col-lg-6">
<fieldset>
<h3>
<i class="icon-info"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'}
@@ -63,32 +65,17 @@
</table>
</fieldset>
</div>
<div class="row">
<fieldset class="col-lg-12">
<h3>
<i class="icon-dropbox"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'}
</h3>
{$supply_order_detail_content}
</fieldset>
</div>
<div class="row">
<fieldset class="col-lg-12">
<div class="col-lg-6">
<fieldset>
<h3>
<i class="icon-th-list"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'}
</h3>
<table classe="table">
<table class="table">
<tr>
<th>{l s='Designation'}</th>
<th>{l s='Value'}</th>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total (tax excl.)'}</td>
<td>{$supply_order_total_te}</td>
@@ -101,10 +88,6 @@
<td>{l s='Total with discount (tax excl.)'}</td>
<td>{$supply_order_total_with_discount_te}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total Tax'}</td>
<td>{$supply_order_total_tax}</td>
@@ -113,10 +96,6 @@
<td>{l s='Total (tax incl.)'}</td>
<td>{$supply_order_total_ti}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total to pay.'}</td>
<td>{$supply_order_total_ti}</td>
@@ -124,5 +103,13 @@
</table>
</fieldset>
</div>
</div>
<fieldset>
<h3>
<i class="icon-dropbox"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'}
</h3>
{$supply_order_detail_content}
</fieldset>
{/block}
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
+3 -2
View File
@@ -33,7 +33,8 @@
{/if}
<form method="post" action="{$currentIndex}&{$identifier}&token={$token}&id_tax_rules_group={$id_tax_rules_group}&updatetax_rules_group#{$table}" class="form">
<fieldset class="col-lg-12">
<fieldset>
<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
<table {if $table_id} id={$table_id}{/if} class="table {if $table_dnd}tableDnD{/if} {$table}">
<col width="10" />
@@ -47,7 +48,7 @@
<col width="52" />
{/if}
<thead>
<tr class="nodrag nodrop">
<tr>
<th>
{if $has_bulk_actions}
<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$table}Box[]', this.checked)" />
admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
+1 -1
View File
@@ -41,7 +41,7 @@
{/block}
{block name="after"}
<fieldset id="prestastore-content" class="col-lg-12"></fieldset>
<fieldset id="prestastore-content"></fieldset>
<script type="text/javascript">
$.post(
"ajax-tab.php",
admin-dev/themes/default/template/footer.tpl
+8 -13
View File
@@ -22,24 +22,17 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
</div>
</div>
</div>
</div>
{if $display_footer}
{hook h="displayBackOfficeFooter"}
<div id="footer">
<div id="go-top"><i class="icon-arrow-up"></i></div>
<div class="col-lg-4">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
<span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div>
<div class="col-lg-8">
<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
<div class="col-lg-3">
<a class="link-social link-twitter" href="#" title="Twitter">
<i class="icon-twitter"></i>
</a>
@@ -52,17 +45,19 @@
<a class="link-social link-google" href="#" title="Google">
<i class="icon-google-plus"></i>
</a>
</div>
<div class="col-lg-4">
<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
{if $iso_is_fr}
<p>Questions / Renseignements / Formations :
<strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
<p>
{/if}
</div>
<div id="go-top"><i class="icon-arrow-up"></i></div>
</div>
<div id="ajax_confirmation" style="display:none"></div>
{* ajaxBox allows*} <div id="ajaxBox" style="display:none"></div>
admin-dev/themes/default/template/header.tpl
+32 -22
View File
@@ -32,6 +32,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="robots" content="NOFOLLOW, NOINDEX">
@@ -115,17 +116,16 @@
</head>
<body class="fixed-top">
<body class="fixed-top page-sidebar-closed">
{if $display_header}
{* begin HEADER *}
<div class="container-fluid">
<div id="header">
<div id="header_infos" class="navbar navbar-fixed-top">
<a id="header_shopname" class="navbar-brand" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}">{$shop_name}</a>
<ul id="notifs_icon_wrapper" class="nav navbar-nav nav-pills">
{if {$show_new_orders} == 1}
<li id="orders_notif" class="dropdown" >
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -143,6 +143,7 @@
</ul>
</li>
{/if}
{if ($show_new_customers == 1)}
<li id="customers_notif" class="notifs dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -160,6 +161,7 @@
</ul>
</li>
{/if}
{if {$show_new_messages} == 1}
<li id="customer_messages_notif" class="notifs dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -233,31 +235,41 @@
<span id="ajax_running" class="navbar-text">
<i class="icon-refresh icon-spin"></i> {l s='Loading...'}
</span>
{if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
</div>{* end header_infos*}
</div>
</div>{* end header*}
{* end header*}
{/if}
<div id="main" class="page-container row-fluid">
<div id="main">
<div class="page-sidebar">
<div id="sidebar" class="page-sidebar nav-collapse collapse">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}
<span class="menu-collapse">
<i class="icon-align-justify"></i>
</span>
<script type="text/javascript">
$('.menu-collapse').click(function(){
$('body').toggleClass('page-sidebar-closed');
});
</script>
<ul id="menu">
<li class="maintab">
<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
<i class="icon-AdminDashboard"></i> {l s='Dashboard'}
<i class="icon-AdminDashboard"></i>
<span class="title">{l s='Dashboard'}</span>
</a>
</li>
{foreach $tabs as $t}
{if $t.active}
<li class="maintab {if $t.current}active{/if}" id="maintab{$t.id_tab}">
<a href="javascript:adminNav('#maintab{$t.id_tab}');" class="title">
<i class="icon-{$t.class_name}"></i> {if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}
<i class="icon-{$t.class_name}"></i>
<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
</a>
<ul class="submenu">
{foreach from=$t.sub_tabs item=t2}
@@ -278,17 +290,15 @@
</div>
<div id="content" class="page-content">
<div class="container-fluid">
<div class="row-fluid">
{if $display_header && $install_dir_exists}
<div class="alert alert-block">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $display_header && $install_dir_exists}
<div class="alert alert-block">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="multishop_toolbar">
<span class="text_multishop">{l s='Multistore configuration for'}</span> {$shop_list}
</div>
{/if}
{if $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="multishop_toolbar">
<span class="text_multishop">{l s='Multistore configuration for'}</span> {$shop_list}
</div>
{/if}
admin-dev/themes/default/template/helpers/form/form.tpl
+1 -1
View File
@@ -36,7 +36,7 @@
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
{/if}
{foreach $fields as $f => $fieldset}
<fieldset id="fieldset_{$f}" class="col-lg-12">
<fieldset id="fieldset_{$f}">
{foreach $fieldset.form as $key => $field}
{if $key == 'legend'}
<h3>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+4 -4
View File
@@ -74,7 +74,7 @@
{if !$simple_header}
<form method="post" action="{$action}" class="form-horizontal">
<fieldset class="col-lg-12">
<fieldset>
{block name="override_header"}{/block}
{if $show_filters}
@@ -90,13 +90,13 @@
{/if}
{/if}
<table
class="table table-hover"
class="table"
name="list_table"
{if $table_id} id={$table_id}{/if}
class="table {if $table_dnd}tableDnD{/if} {$table}"
>
<thead>
<tr class="nodrag nodrop">
<tr>
<th class="center">
</th>
{foreach $fields_display AS $key => $params}
@@ -150,7 +150,7 @@
{/if}
</tr>
{if !$simple_header && $show_filters}
<tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}">
<tr class="filter {if $row_hover}row_hover{/if}">
<td class="center">
{if $has_bulk_actions}
--
admin-dev/themes/default/template/helpers/modules_list/list.tpl
+2 -3
View File
@@ -41,7 +41,7 @@
{/foreach}
</table>
{else}
<table border="0" cellpadding="0" cellspacing="5" class="table table-striped table-hover">
<table class="table">
<tr>
<td>
<div class="alert alert-block">{l s='No modules available in this section.'}</div>
@@ -51,5 +51,4 @@
{/if}
</div>
</div>
</fieldset>
</fieldset>
admin-dev/themes/default/template/helpers/options/options.tpl
+1 -1
View File
@@ -41,7 +41,7 @@
enctype="multipart/form-data" class="form-horizontal">
{foreach $option_list AS $category => $categoryData}
{if isset($categoryData['top'])}{$categoryData['top']}{/if}
<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if} class="col-lg-12">
<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if}>
{* Options category title *}
<h3>
<i class="icon-cogs"></i>
admin-dev/themes/default/template/layout.tpl
+1 -1
View File
@@ -63,7 +63,7 @@
{foreach $confirmations as $conf}
{$conf}<br />
{/foreach}
</div><br />
</div>
{/if}
{if count($warnings)}
<div class="alert alert-block">
admin-dev/themes/default/template/toolbar.tpl
+1 -1
View File
@@ -24,7 +24,7 @@
*}
<div class="row-fluid page-head">
<div class="page-head">
{block name=pageTitle}
<h2 class="page-title">
{if is_array($title)}{$title|end}{else}{$title}{/if}