From 56f27ae2c1e7827a23ae848d28472dd4101311e4 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 25 Sep 2013 19:00:29 +0200 Subject: [PATCH] // Some missing icons and multistore problems --- .../admin/AdminAdminPreferencesController.php | 8 ++++---- .../admin/AdminCustomerPreferencesController.php | 2 +- controllers/admin/AdminEmailsController.php | 11 ++++++++--- controllers/admin/AdminImagesController.php | 2 +- controllers/admin/AdminLogsController.php | 1 + .../admin/AdminOrderPreferencesController.php | 4 ++-- controllers/admin/AdminPreferencesController.php | 2 +- controllers/admin/AdminSearchConfController.php | 12 ++++++------ controllers/admin/AdminStoresController.php | 2 +- controllers/admin/AdminThemesController.php | 2 +- 10 files changed, 26 insertions(+), 20 deletions(-) diff --git a/controllers/admin/AdminAdminPreferencesController.php b/controllers/admin/AdminAdminPreferencesController.php index cbd336a90..52aef50bb 100644 --- a/controllers/admin/AdminAdminPreferencesController.php +++ b/controllers/admin/AdminAdminPreferencesController.php @@ -44,7 +44,7 @@ class AdminAdminPreferencesControllerCore extends AdminController $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-cogs', 'fields' => array( 'PRESTASTORE_LIVE' => array( 'title' => $this->l('Automatically check for module updates'), @@ -86,7 +86,7 @@ class AdminAdminPreferencesControllerCore extends AdminController ), 'upload' => array( 'title' => $this->l('Upload quota'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-cloud-upload', 'fields' => array( 'PS_ATTACHMENT_MAXIMUM_SIZE' => array( 'title' => $this->l('Maximum size for attachment'), @@ -123,7 +123,7 @@ class AdminAdminPreferencesControllerCore extends AdminController ), 'help' => array( 'title' => $this->l('Help'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-question-sign', 'fields' => array( 'PS_HELPBOX' => array( 'title' => $this->l('Back Office help boxes'), @@ -144,7 +144,7 @@ class AdminAdminPreferencesControllerCore extends AdminController ), 'notifications' => array( 'title' => $this->l('Notifications'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-list-alt', 'fields' => array( 'PS_SHOW_NEW_ORDERS' => array( 'title' => $this->l('Show notifications for new orders'), diff --git a/controllers/admin/AdminCustomerPreferencesController.php b/controllers/admin/AdminCustomerPreferencesController.php index 2dc262946..9bf276759 100644 --- a/controllers/admin/AdminCustomerPreferencesController.php +++ b/controllers/admin/AdminCustomerPreferencesController.php @@ -48,7 +48,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-cogs', 'fields' => array( 'PS_REGISTRATION_PROCESS_TYPE' => array( 'title' => $this->l('Registration process type'), diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index 651e11e84..0f3c510ba 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -146,15 +146,20 @@ class AdminEmailsControllerCore extends AdminController ), 'test' => array( 'title' => $this->l('Test your email configuration'), + 'hide_multishop_checkbox' => true, 'fields' => array( 'PS_SHOP_EMAIL' => array( 'title' => $this->l('Send a test email to'), 'type' => 'text', - 'id' => 'testEmail' + 'id' => 'testEmail', + 'no_multishop_checkbox' => true ), ), - 'bottom' => '


-
', + 'bottom' => '
+ +

+ +
', ) ); } diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 476e6cb21..4f2aa9c48 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -68,7 +68,7 @@ class AdminImagesControllerCore extends AdminController $this->fields_options = array( 'images' => array( 'title' => $this->l('images'), - 'icon' => 'tab-orders', + 'icon' => 'icon-picture', 'top' => '', 'bottom' => '', 'description' => $this->l('JPEG images have a small file size and standard quality. PNG images have a larger file size, a higher quality and support transparency. Note that in all cases the image files will have the .jpg extension.').' diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php index eb700cdce..cf6d2bcb6 100644 --- a/controllers/admin/AdminLogsController.php +++ b/controllers/admin/AdminLogsController.php @@ -48,6 +48,7 @@ class AdminLogsControllerCore extends AdminController $this->fields_options = array( 'general' => array( 'title' => $this->l('Logs by email'), + 'icon' => 'icon-envelope', 'fields' => array( 'PS_LOGS_BY_EMAIL' => array( 'title' => $this->l('Minimum severity level'), diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index be31fa1e5..0008a7afd 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -57,7 +57,7 @@ class AdminOrderPreferencesControllerCore extends AdminController $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-cogs', 'fields' => array( 'PS_ORDER_PROCESS_TYPE' => array( 'title' => $this->l('Order process type'), @@ -120,7 +120,7 @@ class AdminOrderPreferencesControllerCore extends AdminController ), 'gift' => array( 'title' => $this->l('Gift options'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-gift', 'fields' => array( 'PS_GIFT_WRAPPING' => array( 'title' => $this->l('Offer gift wrapping'), diff --git a/controllers/admin/AdminPreferencesController.php b/controllers/admin/AdminPreferencesController.php index bfaba03c8..8ae4f26d7 100644 --- a/controllers/admin/AdminPreferencesController.php +++ b/controllers/admin/AdminPreferencesController.php @@ -149,7 +149,7 @@ class AdminPreferencesControllerCore extends AdminController $this->fields_options = array( 'general' => array( 'title' => $this->l('General'), - 'icon' => 'tab-preferences', + 'icon' => 'icon-cogs', 'fields' => $fields, 'submit' => array('title' => $this->l('Save '), 'class' => 'button'), ), diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index 7d9c0f10b..340af6a71 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -62,18 +62,18 @@ class AdminSearchConfControllerCore extends AdminController $this->fields_options = array( 'indexation' => array( 'title' => $this->l('Indexation'), - 'icon' => 'search', + 'icon' => 'icon-cogs', 'info' => $this->l('The "indexed" products have been analyzed by PrestaShop and will appear in the results of a Front Office search.').'
'.$this->l('Indexed products').' '.(int)$indexed.' / '.(int)$total.'.

'.$this->l('Building the product index may take a few minutes.') .$this->l('If your server stops before the process ends, you can resume the indexation by clicking "Add missing products."').'

- -> '. + '. $this->l('Add missing products to the index.').'
- -> '. + '. $this->l('Re-build the entire index.').'

- '.$this->l('You can set a cron job that will rebuild your index using the following URL:').' '.$cron_url.'', + '.$this->l('You can set a cron job that will rebuild your index using the following URL:').' '.$cron_url.'', 'fields' => array( 'PS_SEARCH_INDEXATION' => array( 'title' => $this->l('Indexation'), @@ -86,7 +86,7 @@ class AdminSearchConfControllerCore extends AdminController ), 'search' => array( 'title' => $this->l('Search'), - 'icon' => 'search', + 'icon' => 'icon-search', 'fields' => array( 'PS_SEARCH_AJAX' => array( 'title' => $this->l('Ajax search'), @@ -126,7 +126,7 @@ class AdminSearchConfControllerCore extends AdminController ), 'relevance' => array( 'title' => $this->l('Weight'), - 'icon' => 'weight', + 'icon' => 'icon-cogs', 'info' => $this->l('The "weight" represents its importance and relevance for the ranking of the products when completing a new search.').'
'.$this->l('A word with a weight of eight will have four times more value than a word with a weight of two.').'

diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index adcb0c673..46366f32b 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -505,7 +505,7 @@ class AdminStoresControllerCore extends AdminController $fields = $formFields; $this->fields_options['contact'] = array( 'title' => $this->l('Contact details'), - 'icon' => 'tab-contact', + 'icon' => 'icon-user', 'fields' => $fields, 'submit' => array('title' => $this->l(' Save '), 'class' => 'button') ); diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 93d5b5ed4..86cce5625 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -127,7 +127,7 @@ class AdminThemesControllerCore extends AdminController /* TO DO - DESC à revoir*/ 'appearance' => array( 'title' => $this->l('Appearance'), - 'icon' => 'email', + 'icon' => 'icon-html5', 'fields' => array( 'PS_LOGO' => array( 'title' => $this->l('Header logo'),