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

// Preferences - Admin bootstrap fix

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-18 16:22:05 +02:00
parent 0683ed4092
commit 1f3e717eb6
5 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminEmployeesController.php
+6 -6
View File
@@ -72,12 +72,12 @@ class AdminEmployeesControllerCore extends AdminController
$this->profiles_array[$profile['name']] = $profile['name'];
$this->fields_list = array(
'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'lastname' => array('title' => $this->l('Last Name'), 'width' => 'auto'),
'firstname' => array('title' => $this->l('First Name'), 'width' => 130),
'email' => array('title' => $this->l('Email address'), 'width' => 180),
'profile' => array('title' => $this->l('Profile'), 'width' => 90, 'type' => 'select', 'list' => $this->profiles_array, 'filter_key' => 'pl!name'),
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'width' => 30),
'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'lastname' => array('title' => $this->l('Last Name')),
'firstname' => array('title' => $this->l('First Name')),
'email' => array('title' => $this->l('Email address')),
'profile' => array('title' => $this->l('Profile'), 'type' => 'select', 'list' => $this->profiles_array, 'filter_key' => 'pl!name'),
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool'),
);
$this->fields_options = array(
controllers/admin/AdminPreferencesController.php
+1 -1
View File
@@ -142,7 +142,7 @@ class AdminPreferencesControllerCore extends AdminController
if (!Tools::usingSecureMode() && !Configuration::get('PS_SSL_ENABLED'))
{
$fields['PS_SSL_ENABLED']['type'] = 'disabled';
$fields['PS_SSL_ENABLED']['disabled'] = '<a href="https://'.Tools::getShopDomainSsl().Tools::safeOutput($_SERVER['REQUEST_URI']).'">'.
$fields['PS_SSL_ENABLED']['disabled'] = '<a class="btn btn-link" href="https://'.Tools::getShopDomainSsl().Tools::safeOutput($_SERVER['REQUEST_URI']).'">'.
$this->l('Please click here to use HTTPS protocol before enabling SSL.').'</a>';
}
controllers/admin/AdminThemesController.php
+1
View File
@@ -210,6 +210,7 @@ class AdminThemesControllerCore extends AdminController
'id_theme' => array(
'title' => $this->l('ID'),
'align' => 'center',
'class' => 'fixed-width-xs'
),
'name' => array(
'title' => $this->l('Name'),