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

// Some missing icons and multistore problems

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-25 19:00:29 +02:00
parent 336e29eb67
commit 56f27ae2c1
10 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAdminPreferencesController.php
+4 -4
View File
@@ -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'),
controllers/admin/AdminCustomerPreferencesController.php
+1 -1
View File
@@ -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'),
controllers/admin/AdminEmailsController.php
+8 -3
View File
@@ -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' => '<div class="row"> <div class="col-lg-9 col-lg-offset-3"><input type="button" class="btn btn-default" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br /><br />
<p class="alert" id="mailResultCheck" style="display:none;"></p></div></div>',
'bottom' => '<div class="row"><div class="col-lg-9 col-lg-offset-3">
<button type="button" class="btn btn-default" name="btEmailTest" id="btEmailTest" onclick="verifyMail();"><i class="icon-envelope"></i> '.$this->l('Send an email test').'</button>
<br/><br/>
<div class="alert" id="mailResultCheck" style="display:none;"></div>
</div></div>',
)
);
}
controllers/admin/AdminImagesController.php
+1 -1
View File
@@ -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.').'
controllers/admin/AdminLogsController.php
+1
View File
@@ -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'),
controllers/admin/AdminOrderPreferencesController.php
+2 -2
View File
@@ -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'),
controllers/admin/AdminPreferencesController.php
+1 -1
View File
@@ -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'),
),
controllers/admin/AdminSearchConfController.php
+6 -6
View File
@@ -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.').'<br />
'.$this->l('Indexed products').' <strong>'.(int)$indexed.' / '.(int)$total.'</strong>.
</p>
<p>'.$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."').'</p>
-&gt; <a href="searchcron.php?token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="bold">'.
<a href="searchcron.php?token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="btn btn-link"><i class="icon-external-link-sign"></i> '.
$this->l('Add missing products to the index.').'</a><br />
-&gt; <a href="searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1">'.
<a href="searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8).'&redirect=1" class="btn btn-link"><i class="icon-external-link-sign"></i> '.
$this->l('Re-build the entire index.').'</a><br /><br />
'.$this->l('You can set a cron job that will rebuild your index using the following URL:').' <a href="'.$cron_url.'">'.$cron_url.'</a>',
'.$this->l('You can set a cron job that will rebuild your index using the following URL:').' <a href="'.$cron_url.'"><i class="icon-external-link-sign"></i> '.$cron_url.'</a>',
'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.').'<br />
'.$this->l('A word with a weight of eight will have four times more value than a word with a weight of two.').'<br /><br />
controllers/admin/AdminStoresController.php
+1 -1
View File
@@ -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')
);
controllers/admin/AdminThemesController.php
+1 -1
View File
@@ -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'),