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

// update advanced parameters

Browse Source
This commit is contained in:
Sarah Lorenzini
2013-08-02 15:10:58 +02:00
parent b34acf74f2
commit 142006e69a
17 changed files with 323 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/backup/download/view.tpl
+13 -11
View File
@@ -28,16 +28,20 @@
{block name="override_tpl"}
<fieldset class="width3">
<legend><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /> {l s='Download'}</legend>
<p style="font-size: 13px;">
<a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a>
<b><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
<h3>
<i class="icon-download"></i>
{l s='Download'}
</h3>
<div class="alert alert-block">
<p><a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a></p>
<p><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></p>
<p>{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
</div>
</fieldset><br /><br />
<div class="error width1" style="float: left; margin-right: 10px;">
<div class="row">
<p>{l s='Disclaimer before creating a new backup'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
<ol>
<li>{l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}</li>
<li>{l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should backup your data on a regular basis (both files and database).'}</li>
@@ -50,9 +54,9 @@
</ol>
</div>
<div class="warn width2" style="float: left;">
<div class="row">
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<ol>
<li>{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
<li>{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}</li>
@@ -66,8 +70,6 @@
</ol>
</div>
<div class="clear"></div>
{/block}
admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
+16 -17
View File
@@ -29,17 +29,21 @@
{if isset($backup_url) && isset($backup_weight)}
<fieldset>
<legend><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /> {l s='Download'}</legend>
<p style="font-size: 13px;">
<a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a>
<b><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
</fieldset><br /><br />
<h3>
<i class="icon-download"></i>
{l s='Download'}
</h3>
<div class="alert alert-block">
<p><a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a></p>
<p><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></p>
<p>{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
</div>
</fieldset>
{/if}
<div class="error width1" style="float: left; margin-right: 10px;">
<div class="row">
<p>{l s='Disclaimer before creating a new backup'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
<ol>
<li>{l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}</li>
<li>{l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should backup your data on a regular basis (both files and database).'}</li>
@@ -50,17 +54,14 @@
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a backup on a live site.'}</li>
</ol>
<br />
<form action="{$currentIndex}&add{$table}&token={$token}" method="post" style="text-align:center;">
<input type="submit" class="button" value="{l s='I have read the disclaimer. Please create a new backup.'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
<form action="{$currentIndex}&add{$table}&token={$token}" method="post" class="form-horizontal">
<input type="submit" class="btn btn-primary pull-right" value="{l s='I have read the disclaimer. Please create a new backup.'}" />
</form>
</div>
<div class="warn width2" style="float: left;">
<div class="row">
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<ol>
<li>{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
<li>{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}</li>
@@ -74,6 +75,4 @@
</ol>
</div>
<div class="clear"></div>
{/block}
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+111 -75
View File
@@ -98,23 +98,20 @@
</div>
</div>
<div class="clear">&nbsp;</div>
{**
* Import fieldset
*}
<form id="preview_import"
action="{$current}&token={$token}"
method="post"
style="display:inline"
enctype="multipart/form-data"
class="clear">
<form id="preview_import" action="{$current}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<fieldset style="float: left; margin: 0pt 20px 0pt 0pt; width: 70%;">
<legend><img src="../img/admin/import.gif" />{l s='Import '}</legend>
<label class="clear">{if count($files_to_import) > 1}{l s='Your CSV file (%d files):' sprintf=count($files_to_import)}{else}{l s='Your CSV file (%d file):' sprintf=count($files_to_import)}{/if}</label>
<div class="margin-form">
<fieldset class="col-lg-12">
<h3>
<i class="icon-download"></i>
{l s='Import'}
</h3>
<div class="row">
<label class="control-label col-lg-3">{if count($files_to_import) > 1}{l s='Your CSV file (%d files):' sprintf=count($files_to_import)}{else}{l s='Your CSV file (%d file):' sprintf=count($files_to_import)}{/if}</label>
<div class="col-lg-6">
{if count($files_to_import)}
<select name="csv">
{foreach $files_to_import AS $filename}
@@ -123,27 +120,35 @@
</select>
{/if}
&nbsp;
<a href="#upload_file_import" id="upload_file_import_link" class="button"><img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />{l s='Upload'}</a>
<a href="#upload_file_import" id="upload_file_import_link" class="btn btn-primary">
<i class="icon-plus-sign-alt"></i>
{l s='Upload'}
</a>
</div>
<div style="width:50%; margin: 0 auto;">
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">{l s='Click to view our sample import csv files.'}</a>
<ul id="sample_files_import" style="display:none">
<li><a href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a></li>
<li><a href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a></li>
<li><a href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a></li>
<li><a href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a></li>
<li><a href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a></li>
<li><a href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a></li>
<li><a href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a></li>
{if $PS_ADVANCED_STOCK_MANAGEMENT}
<li><a href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
<li><a href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
{/if}
</ul>
<div class="clear">&nbsp;</div>
</div>
<div class="row">
<p class="alert alert-info col-offset-3">
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">
{l s='Click to view our sample import csv files.'}
</a>
</p>
<div id="sample_files_import" style="display:none" class="list-group">
<a class="list-group-item" href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a>
<a class="list-group-item" href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a>
<a class="list-group-item" href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a>
<a class="list-group-item" href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a>
<a class="list-group-item" href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a>
<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a>
<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a>
{if $PS_ADVANCED_STOCK_MANAGEMENT}
<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a>
<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a>
{/if}
</div>
<label class="clear">{l s='What kind of entity would you like to import?'} </label>
<div class="margin-form">
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='What kind of entity would you like to import?'} </label>
<div class="col-lg-6">
<select name="entity" id="entity">
{foreach $entities AS $entity => $i}
<option value="{$i}" {if $entity == $i}selected="selected"{/if}>
@@ -152,82 +157,113 @@
{/foreach}
</select>
</div>
<label class="clear">{l s='Language of the file'}</label>
<div class="margin-form">
</div>
<div class="row">
<label class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='The locale must be installed'}">
{l s='Language of the file'}
</span>
</label>
<div class="col-lg-6">
<select name="iso_lang">
{foreach $languages AS $lang}
<option value="{$lang.iso_code}" {if $lang.id_lang == $id_language} selected="selected"{/if}>{$lang.name}</option>
{/foreach}
</select>
{l s='The locale must be installed'}
</div>
<label for="convert" class="clear">{l s='ISO-8859-1 encoded file?'} </label>
<div class="margin-form">
<input name="convert" id="convert" type="checkbox" style="margin-top: 6px;"/>
</div>
<div class="row">
<label for="convert" class="control-label col-lg-3">{l s='ISO-8859-1 encoded file?'} </label>
<div class="col-lg-6">
<p class="checkbox">
<input name="convert" id="convert" type="checkbox" />
</p>
</div>
<label class="clear">{l s='Field separator'} </label>
<div class="margin-form">
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Field separator'} </label>
<div class="col-lg-6 input-group">
<input type="text" size="2" value=";" name="separator"/>
{l s='e.g. '}"1<span class="bold" style="color: red">;</span>Ipod<span class="bold" style="color: red">;</span>129.90<span class="bold" style="color: red">;</span>5"
<span class="input-group-addon">{l s='e.g. '}"1; Ipod; 129.90; 5"</span>
</div>
<label class="clear">{l s='Multiple value separator'} </label>
<div class="margin-form">
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Multiple value separator'} </label>
<div class="col-lg-6 input-group">
<input type="text" size="2" value="," name="multiple_value_separator"/>
{l s='e.g. '}"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
<span class="input-group-addon">{l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"</span>
</div>
<label for="truncate" class="clear">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import?'} </label>
<div class="margin-form">
<input name="truncate" id="truncate" type="checkbox"/>
</div>
<div class="row">
<label for="truncate" class="control-label col-lg-3">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import?'} </label>
<div class="col-lg-6">
<p class="checkbox">
<input name="truncate" id="truncate" type="checkbox"/>
</p>
</div>
<label for="match_ref" class="clear" style="display: none">{l s='Use product reference as key?'}</label>
<div class="margin-form">
<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
</div>
<div class="row">
<label for="match_ref" class="control-label col-lg-3" style="display: none">{l s='Use product reference as key?'}</label>
<div class="col-lg-6">
<p class="checkbox">
<input name="match_ref" id="match_ref" type="checkbox" style="display:none"/>
</p>
</div>
<label for="forceIDs" class="clear">{l s='Force all ID\'s during import?'} </label>
<div class="margin-form">
<input name="forceIDs" id="forceIDs" type="checkbox"/> {l s='If you don\'t use this option, all ID\'s will be auto-incremented.'}
</div>
<div class="row">
<label for="forceIDs" class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='If you don\'t use this option, all ID\'s will be auto-incremented.'}">
{l s='Force all ID\'s during import?'}
</span>
</label>
<div class="col-lg-6">
<p class="checkbox">
<input name="forceIDs" id="forceIDs" type="checkbox"/>
</p>
</div>
<div class="space margin-form">
<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button" {if empty($files_to_import)}disabled{/if}/>
{if empty($files_to_import)}<span style="color:red;">{l s='You must upload a file in order to proceed to the next step'}</span>{/if}
</div>
<div class="row">
<div class="col-offset-3">
<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="btn btn-primary" {if empty($files_to_import)}disabled{/if}/>
</div>
<div class="alert alert-block import_products_categories" style="margin-top: 20px;">
{if empty($files_to_import)}
<div class="col-lg-12">
<p class="amert alert-info">{l s='You must upload a file in order to proceed to the next step'}</p>
</div>
{/if}
</div>
<div class="alert alert-block import_products_categories">
<p>{l s='Note that the category import does not support categories of the same name.'}</p>
<p>{l s='Note that you can have several products with the same reference.'}</p>
</div>
<div class="alert alert-block import_supply_orders_details" style="margin-top: 20px; display:none">
<div class="alert alert-block import_supply_orders_details">
<p>{l s='Importing Supply Order Details will reset products ordered, if there are any.'}</p>
</div>
{if !count($files_to_import)}
<div class="alert alert-block" style="margin-top: 20px;">
<div class="alert alert-block">
<p>{l s='There is no CSV file available. Please upload one using the \'Upload\' button above.'}</p>
<ul>
<li>{l s='You can read information on CSV import at:'} <a href="http://doc.prestashop.com/display/PS14/Troubleshooting#Troubleshooting-HowtocorrectlyimportaccentuatedcontentusingaCSVfile%3F" target="_blank">http://doc.prestashop.com/display/PS14/Troubleshooting</a></li>
<li>{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a></li>
<ul class="nav">
<li>{l s='You can read information on CSV import at:'} <a href="http://doc.prestashop.com/display/PS14/Troubleshooting#Troubleshooting-HowtocorrectlyimportaccentuatedcontentusingaCSVfile%3F" target="_blank">http://doc.prestashop.com/display/PS14/Troubleshooting</a>
<li>{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a>
</ul>
</div>
{/if}
</fieldset>
</form>
<fieldset style="display:block;">
<legend>
<img src="../img/admin/import.gif" />{l s='Available fields'}
</legend>
<div id="availableFields">
<fieldset class="col-lg-12">
<h3>
<i class="icon-download"></i>
{l s='Available fields'}
</h3>
<div id="availableFields" class="alert alert-block">
{$available_fields}
</div>
<div class="clear">
<br /><br />{l s='* Required field'}
</div>
<p>{l s='* Required field'}</p>
</fieldset>
<div class="clear">&nbsp;</div>
<script type="text/javascript">
$("select#entity").change( function() {
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+68 -46
View File
@@ -70,71 +70,85 @@
</script>
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" />{l s='Configuration information'}</legend>
<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>
<br />
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration.'}</legend>
<h3>{l s='Server information'}</h3>
<h3>
<i class="icon-info"></i>
{l s='Server information'}
</h3>
{if count($uname)}
<p>
<b>{l s='Server information'}:</b> {$uname|escape:'htmlall':'UTF-8'}
<strong>{l s='Server information'}:</strong> {$uname|escape:'htmlall':'UTF-8'}
</p>
{/if}
<p>
<b>{l s='Server software version'}:</b> {$version.server|escape:'htmlall':'UTF-8'}
<strong>{l s='Server software version'}:</strong> {$version.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='PHP version'}:</b> {$version.php|escape:'htmlall':'UTF-8'}
<strong>{l s='PHP version'}:</strong> {$version.php|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Memory limit'}:</b> {$version.memory_limit|escape:'htmlall':'UTF-8'}
<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Max execution time'}:</b> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
</p>
{if $apache_instaweb}
<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
<p>{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if}
<hr />
<h3>{l s='Database information'}</h3>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Database information'}
</h3>
<p>
<b>{l s='MySQL version'}:</b> {$database.version|escape:'htmlall':'UTF-8'}
<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='MySQL engine'}:</b> {$database.engine|escape:'htmlall':'UTF-8'}
<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Tables prefix'}:</b> {$database.prefix|escape:'htmlall':'UTF-8'}
<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'htmlall':'UTF-8'}
</p>
<hr />
<h3>{l s='Store information'}</h3>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Store information'}
</h3>
<p>
<b>{l s='PrestaShop version'}:</b> {$shop.ps|escape:'htmlall':'UTF-8'}
<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Shop URL'}:</b> {$shop.url|escape:'htmlall':'UTF-8'}
<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Current theme in use'}:</b> {$shop.theme|escape:'htmlall':'UTF-8'}
<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'htmlall':'UTF-8'}
</p>
<hr />
<h3>{l s='Mail configuration'}</h3>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Mail configuration'}
</h3>
<p>
<b>{l s='Mail method'}:</b>
<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>
<b>{l s='SMTP server'}:</b> {$smtp.server|escape:'htmlall':'UTF-8'}
<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='SMTP user'}:</b>
<strong>{l s='SMTP user'}:</strong>
{if $smtp.user neq ''}
{l s='Defined'}
{else}
@@ -142,7 +156,7 @@
{/if}
</p>
<p>
<b>{l s='SMTP password'}:</b>
<strong>{l s='SMTP password'}:</strong>
{if $smtp.password neq ''}
{l s='Defined'}
{else}
@@ -150,30 +164,37 @@
{/if}
</p>
<p>
<b>{l s='Encryption'}:</b> {$smtp.encryption|escape:'htmlall':'UTF-8'}
<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Port'}:</b> {$smtp.port|escape:'htmlall':'UTF-8'}
<strong>{l s='Port'}:</strong> {$smtp.port|escape:'htmlall':'UTF-8'}
</p>
{/if}
<hr />
<h3>{l s='Your information'}</h3>
</fieldset>
<fieldset>
<h3>
<i class="icon-info"></i>
{l s='Your information'}
</h3>
<p>
<b>{l s='Your web browser'}:</b> {$user_agent|escape:'htmlall':'UTF-8'}
<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'htmlall':'UTF-8'}
</p>
</fieldset>
<br />
<fieldset id="checkConfiguration">
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Check your configuration'}</legend>
<h3>
<i class="icon-info"></i>
{l s='Check your configuration'}
</h3>
<p>
<b>{l s='Required parameters'}:</b>
<strong>{l s='Required parameters'}:</strong>
{if !$failRequired}
<span style="color:green;font-weight:bold;">OK</span>
<span class="text-success">OK</span>
</p>
{else}
<span style="color:red">{l s='Please fix the following error(s)'}</span>
<span class="text-danger">{l s='Please fix the following error(s)'}</span>
</p>
<ul>
<ul class="nav">
{foreach from=$testsRequired item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
@@ -183,14 +204,14 @@
{/if}
<p>
<b>{l s='Optional parameters'}:</b>
<strong>{l s='Optional parameters'}:</strong>
{if !$failOptional}
<span style="color:green;font-weight:bold;">OK</span>
<span>OK</span>
</p>
{else}
<span style="color:red">{l s='Please fix the following error(s)'}</span>
<span class="text-success">{l s='Please fix the following error(s)'}</span>
</p>
<ul>
<ul class="nav">
{foreach from=$testsOptional item='value' key='key'}
{if $value eq 'fail'}
<li>{$key}</li>
@@ -198,12 +219,13 @@
{/foreach}
</ul>
{/if}
</fieldset>
<br />
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='List of changed files'}</legend>
<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>
admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
+10 -7
View File
@@ -27,14 +27,17 @@
{block name="override_header"}
<fieldset>
<legend>{l s='Severity levels'}</legend>
<fieldset class="col-lg-12">
<h3>
<i class="icon-level-up"></i>
{l s='Severity levels'}
</h3>
<p>{l s='Meaning of severity levels:'}</p>
<ol style="margin-left: 30px; list-style-type: decimal;">
<li style="color: green;">{l s='Informative only'}</li>
<li style="color: orange;">{l s='Warning'}</li>
<li style="color: orange;">{l s='Error'}</li>
<li style="color: red;">{l s='Major issue (crash)!'}</li>
<ol>
<li class="text-success">{l s='Informative only'}</li>
<li class="text-warning">{l s='Warning'}</li>
<li class="text-warning">{l s='Error'}</li>
<li class="text-danger">{l s='Major issue (crash)!'}</li>
</ol>
</fieldset><br />
admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
+9 -8
View File
@@ -26,20 +26,21 @@
{extends file="helpers/form/form.tpl"}
{block name="after"}
<br />
<fieldset>
<legend>{l s='List of MySQL Tables:'}</legend>
<div id="selectTables" style="float:left;width:200px">
<fieldset class="col-lg-12">
<h3>
<i class="icon-list"></i>
{l s='List of MySQL Tables:'}
</h3>
<div id="selectTables">
<select id="table" size="10">
{foreach $tables as $table}
<option value="{$table}">{$table}</option>
{/foreach}
</select><br />
</select>
<input type="button" id="add_table" value="{l s='Add table'}" />
</div>
<div id="listAttributes" style="width:300px;margin-left:250px"></div>
<div id="listAttributes"></div>
</fieldset>
{/block}
admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl
+3 -1
View File
@@ -23,4 +23,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}">
<img src="../img/admin/export.gif" alt="{$action}" title="{$action}" /></a>
<i class="icon-upload"></i>
{$action}
</a>