diff --git a/admin-dev/themes/default/template/controllers/backup/download/view.tpl b/admin-dev/themes/default/template/controllers/backup/download/view.tpl index f62576ae0..8137754ed 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl +++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl @@ -27,47 +27,60 @@ {block name="override_tpl"} -
-

- - {l s='Download'} -

-
-

-

{l s='Download the backup file'} ({$backup_weight}{l s='MB'})

+
+

+ + {l s='Download'} +

+

+ + + {l s='Download the backup file'} ({$backup_weight}{l s='MB'}) + +

{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}

-
-


+
-

{l s='Disclaimer before creating a new backup'}

-
    -
  1. {l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}
    2. -
  2. {l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}
    3. -
  3. {l s='You should backup your data on a regular basis (both files and database).'}
    4. -
  4. {l s='This function only backs up your database, not your files.'}
    5. -
  5. {l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}
    6. -
  6. {l s='Always verify the quality and integrity of your backup files!'}
    7. -
  7. {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.'}
    8. -
  8. {l s='Always check your data.'}
    9. -
  9. {l s='Never restore a backup on a live site.'}
    10. -
+
+ +

{l s='Disclaimer before creating a new backup'}

+
    +
  1. {l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}
    2. +
  2. {l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}
    3. +
  3. {l s='You should backup your data on a regular basis (both files and database).'}
    4. +
  4. {l s='This function only backs up your database, not your files.'}
    5. +
  5. {l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}
    6. +
  6. {l s='Always verify the quality and integrity of your backup files!'}
    7. +
  7. {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.'}
    8. +
  8. {l s='Always check your data.'}
    9. +
  9. {l s='Never restore a backup on a live site.'}
    10. +
+
+ +
+
-

{l s='How to restore a database backup in 10 easy steps:'}

-
    -
  1. {l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}
    2. -
  2. {l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
    3. -
  3. {l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}
    4. -
  4. {l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}
    5. -
  5. {l s='Connect to "phpMyAdmin" and select your current database.'}
    6. -
  6. {l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}
    7. -
  7. {l s='At the top of the screen, please select the "Import" tab'}
    8. -
  8. {l s='Click on the "Browse" button and select the backup file from your hard drive.'}
    9. -
  9. {l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}
    {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
    10. -
  10. {l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}
    11. -
+
+

{l s='How to restore a database backup in 10 easy steps:'}

+
    +
  1. {l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}
    2. +
  2. {l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
    3. +
  3. {l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}
    4. +
  4. {l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}
    5. +
  5. {l s='Connect to "phpMyAdmin" and select your current database.'}
    6. +
  6. {l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}
    7. +
  7. {l s='At the top of the screen, please select the "Import" tab'}
    8. +
  8. {l s='Click on the "Browse" button and select the backup file from your hard drive.'}
    9. +
  9. {l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}
    {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
    10. +
  10. {l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}
    11. +
+
{/block} diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl index 574de7650..d747abd46 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl @@ -33,46 +33,56 @@ {l s='Download'} -
-

-

{l s='Download the backup file'} ({$backup_weight}{l s='MB'})

-

{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}

-
+

+ + + {l s='Download the backup file'} ({$backup_weight}{l s='MB'}) + +

+

{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}

{/if}
-

{l s='Disclaimer before creating a new backup'}

-
    -
  1. {l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}
    2. -
  2. {l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}
    3. -
  3. {l s='You should backup your data on a regular basis (both files and database).'}
    4. -
  4. {l s='This function only backs up your database, not your files.'}
    5. -
  5. {l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}
    6. -
  6. {l s='Always verify the quality and integrity of your backup files!'}
    7. -
  7. {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.'}
    8. -
  8. {l s='Always check your data.'}
    9. -
  9. {l s='Never restore a backup on a live site.'}
    10. -
-
- -
+
+ +

{l s='Disclaimer before creating a new backup'}

+
    +
  1. {l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}
    2. +
  2. {l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}
    3. +
  3. {l s='You should backup your data on a regular basis (both files and database).'}
    4. +
  4. {l s='This function only backs up your database, not your files.'}
    5. +
  5. {l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}
    6. +
  6. {l s='Always verify the quality and integrity of your backup files!'}
    7. +
  7. {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.'}
    8. +
  8. {l s='Always check your data.'}
    9. +
  9. {l s='Never restore a backup on a live site.'}
    10. +
+
+ +
+
-

{l s='How to restore a database backup in 10 easy steps:'}

-
    -
  1. {l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}
    2. -
  2. {l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
    3. -
  3. {l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}
    4. -
  4. {l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}
    5. -
  5. {l s='Connect to "phpMyAdmin" and select your current database.'}
    6. -
  6. {l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}
    7. -
  7. {l s='At the top of the screen, please select the "Import" tab'}
    8. -
  8. {l s='Click on the "Browse" button and select the backup file from your hard drive.'}
    9. -
  9. {l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}
    {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
    10. -
  10. {l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}
    11. -
+
+

{l s='How to restore a database backup in 10 easy steps:'}

+
    +
  1. {l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}
    2. +
  2. {l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
    3. +
  3. {l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}
    4. +
  4. {l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}
    5. +
  5. {l s='Connect to "phpMyAdmin" and select your current database.'}
    6. +
  6. {l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}
    7. +
  7. {l s='At the top of the screen, please select the "Import" tab'}
    8. +
  8. {l s='Click on the "Browse" button and select the backup file from your hard drive.'}
    9. +
  9. {l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}
    {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
    10. +
  10. {l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}
    11. +
+
{/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index d721641e9..1bd17eca3 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -120,7 +120,7 @@ {/if}   - + {l s='Upload'} @@ -183,15 +183,15 @@
- {l s='e.g. '}"1; Ipod; 129.90; 5" +
- {l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90" +
@@ -224,11 +224,11 @@
- +
{if empty($files_to_import)}
-

{l s='You must upload a file in order to proceed to the next step'}

+

{l s='You must upload a file in order to proceed to the next step'}

{/if}
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl index 99431508b..dfd8a06d4 100644 --- a/admin-dev/themes/default/template/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl @@ -256,7 +256,7 @@ {/if} {/if} -
+
$v}

- - +

{/foreach} diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 7855f851a..3ad43a729 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -708,7 +708,7 @@ class AdminImportControllerCore extends AdminController else { if (isset($field['help'])) - $html = ' '; + $html = ' '; else $html = ''; $fields[] = '
'.$field['label'].$html.'
';