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

// update backup BDD, import, and email pages

Browse Source
This commit is contained in:
Sarah Lorenzini
2013-09-05 14:55:07 +02:00
parent 73524c7a4c
commit f09347a8be
6 changed files with 102 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/backup/download/view.tpl
+48 -35
View File
@@ -27,47 +27,60 @@
{block name="override_tpl"}
<fieldset class="width3">
<h3>
<i class="icon-download"></i>
{l s='Download'}
</h3>
<div class="alert alert-warning">
<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>
<fieldset>
<h3>
<i class="icon-download"></i>
{l s='Download'}
</h3>
<p>
<a class="btn btn-default" href="{$backup_url}">
<i class="icon-download"></i>
{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 />
</fieldset>
<div class="row">
<p>{l s='Disclaimer before creating a new backup'}</p>
<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>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your backup files!'}</li>
<li>{l s='Always verify that your backup files are complete, up-to-date and valid, even if you had a success message appear during the backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a backup on a live site.'}</li>
</ol>
<div class="alert alert-warning">
<button data-dismiss="alert" class="close" type="button">×</button>
<p>{l s='Disclaimer before creating a new backup'}</p>
<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>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your backup files!'}</li>
<li>{l s='Always verify that your backup files are complete, up-to-date and valid, even if you had a success message appear during the backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a backup on a live site.'}</li>
</ol>
<form action="{$currentIndex}&add{$table}&token={$token}" method="post" class="form-horizontal">
<button type="submit" class="btn btn-default">
<i class="icon-save"></i>
{l s='I have read the disclaimer. Please create a new backup.'}
</button>
</form>
</div>
</div>
<div class="row">
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<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>
<li>{l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database.'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
<div class="alert alert-info">
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<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>
<li>{l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database.'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
</div>
</div>
{/block}
admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
+43 -33
View File
@@ -33,46 +33,56 @@
<i class="icon-download"></i>
{l s='Download'}
</h3>
<div class="alert alert-warning">
<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>
<p>
<a class="btn btn-default" href="{$backup_url}">
<i class="icon-download"></i>
{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>
</fieldset>
{/if}
<div class="row">
<p>{l s='Disclaimer before creating a new backup'}</p>
<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>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your backup files!'}</li>
<li>{l s='Always verify that your backup files are complete, up-to-date and valid, even if you had a success message appear during the backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a backup on a live site.'}</li>
</ol>
<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 class="alert alert-warning">
<button data-dismiss="alert" class="close" type="button">×</button>
<p>{l s='Disclaimer before creating a new backup'}</p>
<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>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your backup files!'}</li>
<li>{l s='Always verify that your backup files are complete, up-to-date and valid, even if you had a success message appear during the backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a backup on a live site.'}</li>
</ol>
<form action="{$currentIndex}&add{$table}&token={$token}" method="post" class="form-horizontal">
<button type="submit" class="btn btn-default">
<i class="icon-save"></i>
{l s='I have read the disclaimer. Please create a new backup.'}
</button>
</form>
</div>
</div>
<div class="row">
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<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>
<li>{l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database.'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
<div class="alert alert-info">
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<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>
<li>{l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database.'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
</div>
</div>
{/block}
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+5 -5
View File
@@ -120,7 +120,7 @@
</select>
{/if}
&nbsp;
<a href="#upload_file_import" id="upload_file_import_link" class="btn btn-primary">
<a href="#upload_file_import" id="upload_file_import_link" class="btn btn-default">
<i class="icon-plus-sign-alt"></i>
{l s='Upload'}
</a>
@@ -183,15 +183,15 @@
<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"/>
<span class="input-group-addon">{l s='e.g. '}"1; Ipod; 129.90; 5"</span>
<input type="text" size="2" value=";" name="separator"/>
</div>
</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"/>
<span class="input-group-addon">{l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"</span>
<input type="text" size="2" value="," name="multiple_value_separator"/>
</div>
</div>
<div class="row">
@@ -224,11 +224,11 @@
</div>
<div class="row">
<div class="col-lg-offset-3">
<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="btn btn-primary" {if empty($files_to_import)}disabled{/if}/>
<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="btn btn-default" {if empty($files_to_import)}disabled{/if}/>
</div>
{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>
<p class="alert alert-info">{l s='You must upload a file in order to proceed to the next step'}</p>
</div>
{/if}
</div>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -256,7 +256,7 @@
</span>
{/if}
{/if}
<div class="table-responsive">
<div class="table-responsive clearfix">
<table
class="table"
name="list_table"
admin-dev/themes/default/template/helpers/options/options.tpl
+4 -2
View File
@@ -123,8 +123,10 @@
{foreach $field['choices'] AS $k => $v}
<p class="radio">
<input type="radio" name="{$key}" id="{$key}_{$k}" value="{$k}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
<label class="col-lg-6" for="{$key}_{$k}"> {$v}</label>
<label for="{$key}_{$k}">
<input type="radio" name="{$key}" id="{$key}_{$k}" value="{$k}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
{$v}
</label>
</p>
{/foreach}
</div>
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -708,7 +708,7 @@ class AdminImportControllerCore extends AdminController
else
{
if (isset($field['help']))
$html = '&nbsp;<a href="#" class="info_import" title="'.$this->l('Info').'|'.$field['help'].'"><img src="'._PS_ADMIN_IMG_.'information.png"></a>';
$html = '&nbsp;<a href="#" class="info_import" title="'.$this->l('Info').'|'.$field['help'].'"><i class="icon-info-sign"></i></a>';
else
$html = '<span style="margin-left:16px"></span>';
$fields[] = '<div>'.$field['label'].$html.'</div>';