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>
controllers/admin/AdminBackupController.php
+5 -2
View File
@@ -31,6 +31,7 @@ class AdminBackupControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'backup';
$this->className = 'Backup';
$this->identifier = 'filename';
@@ -59,8 +60,10 @@ class AdminBackupControllerCore extends AdminController
),
'PS_BACKUP_DROP_TABLE' => array(
'title' => $this->l('Drop existing tables during import'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring data.').
'<br />(ie. "DROP TABLE IF EXISTS")',
'hint' => array(
$this->l('If enabled, the backup script will drop your tables prior to restoring data.'),
$this->l('(ie. "DROP TABLE IF EXISTS")'),
),
'cast' => 'intval',
'type' => 'bool'
)
controllers/admin/AdminEmailsController.php
+9 -13
View File
@@ -28,6 +28,7 @@ class AdminEmailsControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->className = 'Configuration';
$this->table = 'configuration';
@@ -83,40 +84,37 @@ class AdminEmailsControllerCore extends AdminController
'fields' => array(
'PS_MAIL_DOMAIN' => array(
'title' => $this->l('Mail domain name:'),
'desc' => $this->l('Fully qualified domain name (keep this field empty if you don\'t know).'),
'hint' => $this->l('Fully qualified domain name (keep this field empty if you don\'t know).'),
'empty' => true, 'validation' =>
'isUrl', 'size' => 30,
'isUrl',
'type' => 'text',
'visibility' => Shop::CONTEXT_ALL
),
'PS_MAIL_SERVER' => array(
'title' => $this->l('SMTP server:'),
'desc' => $this->l('IP address or server name (e.g. smtp.mydomain.com)'),
'hint' => $this->l('IP address or server name (e.g. smtp.mydomain.com)'),
'validation' => 'isGenericName',
'size' => 30,
'type' => 'text',
'visibility' => Shop::CONTEXT_ALL
),
'PS_MAIL_USER' => array(
'title' => $this->l('SMTP user:'),
'desc' => $this->l('Leave blank if not applicable.'),
'hint' => $this->l('Leave blank if not applicable.'),
'validation' => 'isGenericName',
'size' => 30,
'type' => 'text',
'visibility' => Shop::CONTEXT_ALL
),
'PS_MAIL_PASSWD' => array(
'title' => $this->l('SMTP password:'),
'desc' => $this->l('Leave blank if not applicable.'),
'hint' => $this->l('Leave blank if not applicable.'),
'validation' => 'isAnything',
'size' => 30,
'type' => 'password',
'visibility' => Shop::CONTEXT_ALL,
'autocomplete' => false
),
'PS_MAIL_SMTP_ENCRYPTION' => array(
'title' => $this->l('Encryption:'),
'desc' => $this->l('Use an encrypt protocol'),
'hint' => $this->l('Use an encrypt protocol'),
'type' => 'select',
'cast' => 'strval',
'identifier' => 'mode',
@@ -138,9 +136,8 @@ class AdminEmailsControllerCore extends AdminController
),
'PS_MAIL_SMTP_PORT' => array(
'title' => $this->l('Port:'),
'desc' => $this->l('Port number to use'),
'hint' => $this->l('Port number to use'),
'validation' => 'isInt',
'size' => 5,
'type' => 'text',
'cast' => 'intval',
'visibility' => Shop::CONTEXT_ALL
@@ -155,11 +152,10 @@ class AdminEmailsControllerCore extends AdminController
'PS_SHOP_EMAIL' => array(
'title' => $this->l('Send a test email to'),
'type' => 'text',
'size' => 40,
'id' => 'testEmail'
),
),
'bottom' => '<div class="margin-form"><input type="button" class="button" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br />
'bottom' => '<div class="row col-offset-3"><input type="button" class="btn btn-primary" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br />
<p id="mailResultCheck" style="display:none;"></p></div>',
)
);
controllers/admin/AdminImportController.php
+2 -1
View File
@@ -80,6 +80,7 @@ class AdminImportControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->entities = array(
$this->l('Categories'),
$this->l('Products'),
@@ -553,7 +554,7 @@ class AdminImportControllerCore extends AdminController
// Header
for ($i = 0; $i < $nb_column; $i++)
if (MAX_COLUMNS * (int)$current_table <= $i && (int)$i < MAX_COLUMNS * ((int)$current_table + 1))
$html .= '<th style="width: '.(900 / MAX_COLUMNS).'px; vertical-align: top; padding: 4px">
$html .= '<th width:"'.(900 / MAX_COLUMNS).'" valign="top">
<select onchange="askFeatureName(this, '.$i.');"
style="width: '.(900 / MAX_COLUMNS).'px;"
id="type_value['.$i.']"
controllers/admin/AdminInformationController.php
+7
View File
@@ -26,6 +26,13 @@
class AdminInformationControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
public function initContent()
{
$this->display = 'view';
controllers/admin/AdminLogsController.php
+3 -3
View File
@@ -28,6 +28,7 @@ class AdminLogsControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->table = 'log';
$this->className = 'Logger';
$this->lang = false;
@@ -53,10 +54,9 @@ class AdminLogsControllerCore extends AdminController
'fields' => array(
'PS_LOGS_BY_EMAIL' => array(
'title' => $this->l('Minimum severity level'),
'desc' => $this->l('Enter "5" if you do not want to receive any emails.').'<br />'.$this->l('Emails will be sent to the shop owner.'),
'hint' => $this->l('Enter "5" if you do not want to receive any emails.').'<br />'.$this->l('Emails will be sent to the shop owner.'),
'cast' => 'intval',
'type' => 'text',
'size' => 5
'type' => 'text'
)
),
'submit' => array()
controllers/admin/AdminModulesPositionsController.php
+6 -1
View File
@@ -28,9 +28,14 @@ class AdminModulesPositionsControllerCore extends AdminController
{
protected $display_key = 0;
public function postProcess()
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
public function postProcess()
{
// Getting key value for display
if (Tools::getValue('show_modules') && strval(Tools::getValue('show_modules')) != 'all')
$this->display_key = (int)Tools::getValue('show_modules');
controllers/admin/AdminPerformanceController.php
+44 -56
View File
@@ -29,6 +29,7 @@ class AdminPerformanceControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->className = 'Configuration';
parent::__construct();
}
@@ -38,7 +39,7 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[0]['form'] = array(
'legend' => array(
'title' => $this->l('Smarty'),
'image' => '../img/admin/prefs.gif'
'icon' => 'icon-briefcase'
),
'input' => array(
array(
@@ -49,34 +50,32 @@ class AdminPerformanceControllerCore extends AdminController
'type' => 'radio',
'label' => $this->l('Template cache'),
'name' => 'smarty_force_compile',
'class' => 't',
'br' => true,
'values' => array(
array(
'id' => 'smarty_force_compile_'._PS_SMARTY_NO_COMPILE_,
'value' => _PS_SMARTY_NO_COMPILE_,
'label' => $this->l('Never recompile template files'),
'desc' => $this->l('This option should be used in a production environment.')
'hint' => $this->l('This option should be used in a production environment.')
),
array(
'id' => 'smarty_force_compile_'._PS_SMARTY_CHECK_COMPILE_,
'value' => _PS_SMARTY_CHECK_COMPILE_,
'label' => $this->l('Recompile templates if the files have been updated'),
'desc' => $this->l('Templates are recompiled when they are updated. If you experience compilation troubles when you update your template files, you should use Force Compile instead of this option. It should never be used in a production environment.')
'hint' => $this->l('Templates are recompiled when they are updated. If you experience compilation troubles when you update your template files, you should use Force Compile instead of this option. It should never be used in a production environment.')
),
array(
'id' => 'smarty_force_compile_'._PS_SMARTY_FORCE_COMPILE_,
'value' => _PS_SMARTY_FORCE_COMPILE_,
'label' => $this->l('Force compilation'),
'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. Note: This should never be used in a production environment.')
'hint' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. Note: This should never be used in a production environment.')
)
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Cache'),
'name' => 'smarty_cache',
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -90,13 +89,12 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('Should be enabled except for debugging.')
'hint' => $this->l('Should be enabled except for debugging.')
),
array(
'type' => 'radio',
'label' => $this->l('Debug console'),
'name' => 'smarty_console',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -108,13 +106,13 @@ class AdminPerformanceControllerCore extends AdminController
'id' => 'smarty_console_url',
'value' => 1,
'label' => $this->l('Open console with URL parameter (SMARTY_DEBUG)'),
'desc' => $this->l('To open the debug console, you simply pass the SMARTY_DEBUG parameter in the URL.')
'hint' => $this->l('To open the debug console, you simply pass the SMARTY_DEBUG parameter in the URL.')
),
array(
'id' => 'smarty_console_open',
'value' => 2,
'label' => $this->l('Always open console'),
'desc' => $this->l('Choose this option to always force the debug console to open.')
'hint' => $this->l('Choose this option to always force the debug console to open.')
)
)
),
@@ -131,19 +129,18 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[1]['form'] = array(
'legend' => array(
'title' => $this->l('Optional features'),
'image' => '../img/admin/tab-plugins.gif'
'icon' => 'icon-puzzle-piece'
),
'desc' => $this->l('Some features can be disabled in order to improve performance.'),
'hint' => $this->l('Some features can be disabled in order to improve performance.'),
'input' => array(
array(
'type' => 'hidden',
'name' => 'features_detachables_up'
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Combinations'),
'name' => 'combination',
'class' => 't',
'is_bool' => true,
'disabled' => Combination::isCurrentlyUsed(),
'values' => array(
@@ -158,13 +155,12 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('These features will be disabled')
'hint' => $this->l('These features will be disabled')
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Features'),
'name' => 'feature',
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -178,7 +174,7 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('These features will be disabled')
'hint' => $this->l('These features will be disabled')
)
)
);
@@ -192,19 +188,18 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[2]['form'] = array(
'legend' => array(
'title' => $this->l('CCC (Combine, Compress and Cache)'),
'image' => '../img/admin/arrow_in.png'
'icon' => 'icon-fullscreen'
),
'desc' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
'hint' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
'input' => array(
array(
'type' => 'hidden',
'name' => 'ccc_up',
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Smart cache for CSS'),
'name' => 'PS_CSS_THEME_CACHE',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -220,10 +215,9 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Smart cache for JavaScript'),
'name' => 'PS_JS_THEME_CACHE',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -239,10 +233,9 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Minify HTML'),
'name' => 'PS_HTML_THEME_COMPRESSION',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -258,10 +251,9 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Compress inline JavaScript in HTML'),
'name' => 'PS_JS_HTML_THEME_COMPRESSION',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -277,11 +269,10 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Apache optimization'),
'name' => 'PS_HTACCESS_CACHE_CONTROL',
'class' => 't',
'desc' => $this->l('This will add directives to your .htaccess file, which should improve caching and compression.'),
'hint' => $this->l('This will add directives to your .htaccess file, which should improve caching and compression.'),
'is_bool' => true,
'values' => array(
array(
@@ -312,9 +303,9 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[3]['form'] = array(
'legend' => array(
'title' => $this->l('Media servers (use only with CCC)'),
'image' => '../img/admin/subdomain.gif'
'icon' => 'icon-link'
),
'desc' => $this->l('You must enter another domain, or subdomain, in order to use cookieless static content.'),
'hint' => $this->l('You must enter another domain, or subdomain, in order to use cookieless static content.'),
'input' => array(
array(
'type' => 'hidden',
@@ -324,22 +315,19 @@ class AdminPerformanceControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Media server #1'),
'name' => '_MEDIA_SERVER_1_',
'size' => 30,
'desc' => $this->l('Name of the second domain of your shop, (e.g. myshop-media-server-1.com). If you do not have another domain, leave this field blank.')
'hint' => $this->l('Name of the second domain of your shop, (e.g. myshop-media-server-1.com). If you do not have another domain, leave this field blank.')
),
array(
'type' => 'text',
'label' => $this->l('Media server #2'),
'name' => '_MEDIA_SERVER_2_',
'size' => 30,
'desc' => $this->l('Name of the third domain of your shop, (e.g. myshop-media-server-2.com). If you do not have another domain, leave this field blank.')
'hint' => $this->l('Name of the third domain of your shop, (e.g. myshop-media-server-2.com). If you do not have another domain, leave this field blank.')
),
array(
'type' => 'text',
'label' => $this->l('Media server #3'),
'name' => '_MEDIA_SERVER_3_',
'size' => 30,
'desc' => $this->l('Name of the fourth domain of your shop, (e.g. myshop-media-server-3.com). If you do not have another domain, leave this field blank.')
'hint' => $this->l('Name of the fourth domain of your shop, (e.g. myshop-media-server-3.com). If you do not have another domain, leave this field blank.')
),
)
);
@@ -354,7 +342,7 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[4]['form'] = array(
'legend' => array(
'title' => $this->l('Ciphering'),
'image' => '../img/admin/computer_key.png'
'icon' => 'icon-desktop'
),
'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
'input' => array(
@@ -366,7 +354,6 @@ class AdminPerformanceControllerCore extends AdminController
'type' => 'radio',
'label' => $this->l('Algorithm'),
'name' => 'PS_CIPHER_ALGORITHM',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -411,19 +398,18 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[5]['form'] = array(
'legend' => array(
'title' => $this->l('Caching'),
'image' => '../img/admin/computer_key.png'
'icon' => 'icon-desktop'
),
'desc' => $this->l('Caching systems are used to speed up your store by caching data into the server\'s memory, avoiding the exhausting task of querying the database.'),
'hint' => $this->l('Caching systems are used to speed up your store by caching data into the server\'s memory, avoiding the exhausting task of querying the database.'),
'input' => array(
array(
'type' => 'hidden',
'name' => 'cache_up'
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Use cache'),
'name' => 'active',
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -437,7 +423,7 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable or disable caching system.')
'hint' => $this->l('Enable or disable caching system.')
),
array(
'type' => 'select',
@@ -452,13 +438,12 @@ class AdminPerformanceControllerCore extends AdminController
array(
'type' => 'text',
'label' => $this->l('Directory depth'),
'name' => 'ps_cache_fs_directory_depth',
'size' => 30
'name' => 'ps_cache_fs_directory_depth'
),
),
'submit' => array(
'title' => $this->l(' Save '),
'class' => 'button'
'title' => $this->l('Save'),
'class' => 'btn btn-default'
),
'memcachedServers' => true
);
@@ -477,12 +462,15 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[6]['form'] = array(
'legend' => array(
'title' => $this->l('CloudCache'),
'image' => '../img/admin/subdomain.gif'
'icon' => 'icon-cloud'
),
'desc' => $this->l('Performance matters! Improve speed and conversions the easy way.').'<br />'.
$this->l('CloudCache supercharges your site in minutes through its state-of-the-art content delivery network.').'<br /><br />'.
$this->l('Subscribe now using the code "presta25" and get an exclusive 25% monthly discount on every available package.').'<br /><br />
<a style="color: blue" href="index.php?controller=AdminModules&token='.Tools::getAdminTokenLite('AdminModules').'&filtername=cloudcache" id="installCloudCache">&gt; '.$this->l('Click here to install the CloudCache module for PrestaShop').'</a><br />'
'desc' =>
'<div class="alert alert-block">
<p>'.$this->l('Performance matters! Improve speed and conversions the easy way.').'</p>'.
'<p>'.$this->l('CloudCache supercharges your site in minutes through its state-of-the-art content delivery network.').'</p>'.
'<p>'.$this->l('Subscribe now using the code "presta25" and get an exclusive 25% monthly discount on every available package.').'</p>
<p><a href="index.php?controller=AdminModules&token='.Tools::getAdminTokenLite('AdminModules').'&filtername=cloudcache" id="installCloudCache">&gt; '.$this->l('Click here to install the CloudCache module for PrestaShop').'</a></p>
</div>'
);
}
controllers/admin/AdminRequestSqlController.php
+3 -2
View File
@@ -36,6 +36,7 @@ class AdminRequestSqlControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'request_sql';
$this->className = 'RequestSql';
$this->lang = false;
@@ -110,8 +111,8 @@ class AdminRequestSqlControllerCore extends AdminController
<ul>
<li>'.$this->l('Click "Add New".').'</li>
<li>'.$this->l('Fill in the fields and click "Save".').'</li>
<li>'.$this->l('You can then view the query results by clicking on the tab:').' <img src="../img/admin/details.gif" /></li>
<li>'.$this->l('You can also export the query results as CSV file by clicking on the tab:').' <img src="../img/admin/export.gif" /></li>
<li>'.$this->l('You can then view the query results by clicking on the tab:').' <i class="icon-pencil"></i></li>
<li>'.$this->l('You can also export the query results as CSV file by clicking on the tab:').' <i class="icon-upload"></i></li>
</ul>');
$this->addRowAction('export');
controllers/admin/AdminThemesController.php
+7 -1
View File
@@ -26,6 +26,13 @@
class AdminThemesControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
/** This value is used in isThemeCompatible method. only version node with an
* higher version number will be used in [theme]/config.xml
* @since 1.4.0.11, check theme compatibility 1.4
@@ -100,7 +107,6 @@ class AdminThemesControllerCore extends AdminController
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
parent::init();
$this->bootstrap = true;
$this->can_display_themes = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP) ? true : false;
$this->fields_options = array(
controllers/admin/AdminWebserviceController.php
+7 -10
View File
@@ -32,6 +32,7 @@ class AdminWebserviceControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'webservice_account';
$this->className = 'WebserviceKey';
$this->lang = false;
@@ -48,16 +49,14 @@ class AdminWebserviceControllerCore extends AdminController
$this->fields_list = array(
'key' => array(
'title' => $this->l('Key'),
'align' => 'center',
'width' => 32
'align' => 'center'
),
'active' => array(
'title' => $this->l('Enabled'),
'align' => 'center',
'active' => 'status',
'type' => 'bool',
'orderby' => false,
'width' => 32
'orderby' => false
),
'description' => array(
'title' => $this->l('Key description'),
@@ -111,9 +110,8 @@ class AdminWebserviceControllerCore extends AdminController
'label' => $this->l('Key:'),
'name' => 'key',
'id' => 'code',
'size' => 32,
'required' => true,
'desc' => $this->l('Webservice account key.'),
'hint' => $this->l('Webservice account key.'),
),
array(
'type' => 'textarea',
@@ -121,14 +119,13 @@ class AdminWebserviceControllerCore extends AdminController
'name' => 'description',
'rows' => 3,
'cols' => 110,
'desc' => $this->l('Key description'),
'hint' => $this->l('Key description'),
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Status:'),
'name' => 'active',
'required' => false,
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -162,7 +159,7 @@ class AdminWebserviceControllerCore extends AdminController
$this->fields_form['submit'] = array(
'title' => $this->l('Save '),
'class' => 'button'
'class' => 'btn btn-primary'
);
if (!($obj = $this->loadObject(true)))