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 3a3fe6fbb..87bc8d10d 100644 --- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl +++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl @@ -28,16 +28,20 @@ {block name="override_tpl"}
- {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'} +

+
+

+

{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. {l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}
    3. {l s='You should backup your data on a regular basis (both files and database).'}
      4. @@ -50,9 +54,9 @@
-
+

{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. {l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
    3. {l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}
      4. @@ -66,8 +70,6 @@
-
- {/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 ac3579c75..6aec04e98 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 @@ -29,17 +29,21 @@ {if isset($backup_url) && isset($backup_weight)}
- {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'} +

+
+

+

{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. {l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}
    3. {l s='You should backup your data on a regular basis (both files and database).'}
      4. @@ -50,17 +54,14 @@
    4. {l s='Always check your data.'}
    5. {l s='Never restore a backup on a live site.'}
    -
    - -
    - + +
    -
-
+

{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. {l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
    3. {l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}
      4. @@ -74,6 +75,4 @@
-
- {/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 5a11f2823..fb3d43182 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 @@ -98,23 +98,20 @@
-
 
{** * Import fieldset *} -
+ -
- {l s='Import '} - - -
+
+

+ + {l s='Import'} +

+
+ +
{if count($files_to_import)} {/if}   - Uplaod{l s='Upload'} + + + {l s='Upload'} +
- +
+

+ + {l s='Click to view our sample import csv files.'} + +

+ - -
+
+
+ +
- - -
+
+
+ +
- {l s='The locale must be installed'}
- -
- +
+
+ +
+

+ +

- -
+
+
+ +
- {l s='e.g. '}"1;Ipod;129.90;5" + {l s='e.g. '}"1; Ipod; 129.90; 5"
- -
+
+
+ +
- {l s='e.g. '}"Ipod;red.jpg,blue.jpg,green.jpg;129.90" + {l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"
- -
- +
+
+ +
+

+ +

- -
- +
+
+ +
+

+ +

- -
- {l s='If you don\'t use this option, all ID\'s will be auto-incremented.'} +
+
+ +
+

+ +

-
- - {if empty($files_to_import)}{l s='You must upload a file in order to proceed to the next step'}{/if} +
+
+
+
-
+ {if empty($files_to_import)} +
+

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

+
+ {/if} +
+

{l s='Note that the category import does not support categories of the same name.'}

{l s='Note that you can have several products with the same reference.'}

-
-
- - - {l s='Available fields'} - - -
+
+

+ + {l s='Available fields'} +

+
{$available_fields}
- -
-

{l s='* Required field'} -
+

{l s='* Required field'}

+
- -
 
+
- {l s='Configuration information'} +

+ + {l s='Configuration information'} +

{l s='This information must be provided when you report an issue on our bug tracker or forum.'}

-
- {l s='Information about your configuration.'} -

{l s='Server information'}

+

+ + {l s='Server information'} +

{if count($uname)}

- {l s='Server information'}: {$uname|escape:'htmlall':'UTF-8'} + {l s='Server information'}: {$uname|escape:'htmlall':'UTF-8'}

{/if}

- {l s='Server software version'}: {$version.server|escape:'htmlall':'UTF-8'} + {l s='Server software version'}: {$version.server|escape:'htmlall':'UTF-8'}

- {l s='PHP version'}: {$version.php|escape:'htmlall':'UTF-8'} + {l s='PHP version'}: {$version.php|escape:'htmlall':'UTF-8'}

- {l s='Memory limit'}: {$version.memory_limit|escape:'htmlall':'UTF-8'} + {l s='Memory limit'}: {$version.memory_limit|escape:'htmlall':'UTF-8'}

- {l s='Max execution time'}: {$version.max_execution_time|escape:'htmlall':'UTF-8'} + {l s='Max execution time'}: {$version.max_execution_time|escape:'htmlall':'UTF-8'}

{if $apache_instaweb} -

{l s='PageSpeed module for Apache installed (mod_instaweb)'}

+

{l s='PageSpeed module for Apache installed (mod_instaweb)'}

{/if} - -
-

{l s='Database information'}

+
+
+

+ + {l s='Database information'} +

- {l s='MySQL version'}: {$database.version|escape:'htmlall':'UTF-8'} + {l s='MySQL version'}: {$database.version|escape:'htmlall':'UTF-8'}

- {l s='MySQL engine'}: {$database.engine|escape:'htmlall':'UTF-8'} + {l s='MySQL engine'}: {$database.engine|escape:'htmlall':'UTF-8'}

- {l s='Tables prefix'}: {$database.prefix|escape:'htmlall':'UTF-8'} + {l s='Tables prefix'}: {$database.prefix|escape:'htmlall':'UTF-8'}

- -
-

{l s='Store information'}

+
+
+

+ + {l s='Store information'} +

- {l s='PrestaShop version'}: {$shop.ps|escape:'htmlall':'UTF-8'} + {l s='PrestaShop version'}: {$shop.ps|escape:'htmlall':'UTF-8'}

- {l s='Shop URL'}: {$shop.url|escape:'htmlall':'UTF-8'} + {l s='Shop URL'}: {$shop.url|escape:'htmlall':'UTF-8'}

- {l s='Current theme in use'}: {$shop.theme|escape:'htmlall':'UTF-8'} + {l s='Current theme in use'}: {$shop.theme|escape:'htmlall':'UTF-8'}

-
-

{l s='Mail configuration'}

+
+
+

+ + {l s='Mail configuration'} +

- {l s='Mail method'}: + {l s='Mail method'}: {if $mail} {l s='You are using the PHP mail function.'}

{else} {l s='You are using your own SMTP parameters.'}

- {l s='SMTP server'}: {$smtp.server|escape:'htmlall':'UTF-8'} + {l s='SMTP server'}: {$smtp.server|escape:'htmlall':'UTF-8'}

- {l s='SMTP user'}: + {l s='SMTP user'}: {if $smtp.user neq ''} {l s='Defined'} {else} @@ -142,7 +156,7 @@ {/if}

- {l s='SMTP password'}: + {l s='SMTP password'}: {if $smtp.password neq ''} {l s='Defined'} {else} @@ -150,30 +164,37 @@ {/if}

- {l s='Encryption'}: {$smtp.encryption|escape:'htmlall':'UTF-8'} + {l s='Encryption'}: {$smtp.encryption|escape:'htmlall':'UTF-8'}

- {l s='Port'}: {$smtp.port|escape:'htmlall':'UTF-8'} + {l s='Port'}: {$smtp.port|escape:'htmlall':'UTF-8'}

{/if} -
-

{l s='Your information'}

+
+
+

+ + {l s='Your information'} +

- {l s='Your web browser'}: {$user_agent|escape:'htmlall':'UTF-8'} + {l s='Your web browser'}: {$user_agent|escape:'htmlall':'UTF-8'}

-
+
- {l s='Check your configuration'} +

+ + {l s='Check your configuration'} +

- {l s='Required parameters'}: + {l s='Required parameters'}: {if !$failRequired} - OK + OK

{else} - {l s='Please fix the following error(s)'} + {l s='Please fix the following error(s)'}

-
    +
      {foreach from=$testsRequired item='value' key='key'} {if $value eq 'fail'}
    • {$testsErrors[$key]}
      • @@ -183,14 +204,14 @@ {/if}

      - {l s='Optional parameters'}: + {l s='Optional parameters'}: {if !$failOptional} - OK + OK

      {else} - {l s='Please fix the following error(s)'} + {l s='Please fix the following error(s)'}

      -
        +
          {foreach from=$testsOptional item='value' key='key'} {if $value eq 'fail'}
        • {$key}
          • @@ -198,12 +219,13 @@ {/foreach}
        {/if} -
-
- {l s='List of changed files'} +

+ + {l s='List of changed files'} +

{l s='Checking files...'}
diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl index 2886a900c..7983a7974 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl @@ -27,14 +27,17 @@ {block name="override_header"} -
- {l s='Severity levels'} +
+

+ + {l s='Severity levels'} +

{l s='Meaning of severity levels:'}

-
    -
  1. {l s='Informative only'}
    2. -
  2. {l s='Warning'}
    3. -
  3. {l s='Error'}
    4. -
  4. {l s='Major issue (crash)!'}
    5. +
      +
    1. {l s='Informative only'}
      2. +
    2. {l s='Warning'}
      3. +
    3. {l s='Error'}
      4. +
    4. {l s='Major issue (crash)!'}

diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl index aaf7da7d1..d32af71c9 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl @@ -26,20 +26,21 @@ {extends file="helpers/form/form.tpl"} {block name="after"} -
-
- {l s='List of MySQL Tables:'} -
+ +
+

+ + {l s='List of MySQL Tables:'} +

+

+
- -
- +
{/block} diff --git a/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl b/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl index 63452b107..875c47dee 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl +++ b/admin-dev/themes/default/template/controllers/request_sql/list_action_export.tpl @@ -23,4 +23,6 @@ * International Registered Trademark & Property of PrestaShop SA *} -{$action} \ No newline at end of file + + {$action} + \ No newline at end of file diff --git a/controllers/admin/AdminBackupController.php b/controllers/admin/AdminBackupController.php index 734b05009..b51fce32f 100644 --- a/controllers/admin/AdminBackupController.php +++ b/controllers/admin/AdminBackupController.php @@ -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.'). - '
(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' ) diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index 1e1394b9f..29c01a1c6 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -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' => '

+ 'bottom' => '

', ) ); diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index e267e3b0f..7855f851a 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -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 .= ' + $html .= '