From 34c05b55bcdd1a0b222db68eade6f57e2f3d5f41 Mon Sep 17 00:00:00 2001 From: bMancone Date: Tue, 14 Feb 2012 10:47:30 +0000 Subject: [PATCH] // Fixed #PSFV-513 --- controllers/admin/AdminEmployeesController.php | 12 ++++++------ translations/fr/admin.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 752cf4226..29e085a67 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -105,7 +105,7 @@ class AdminEmployeesControllerCore extends AdminController 'submit' => array() ) ); - + $path = _PS_ADMIN_DIR_.'/themes/'; foreach (scandir($path) as $theme) if (file_exists($path.$theme.'/css/admin.css')) @@ -136,13 +136,13 @@ class AdminEmployeesControllerCore extends AdminController return; $available_profiles = Profile::getProfiles($this->context->language->id); - + if ($obj->id_profile == _PS_ADMIN_PROFILE_ && $this->context->employee->id_profile != _PS_ADMIN_PROFILE_) { $this->errors[] = Tools::displayError('You cannot edit SuperAdmin profile.'); return parent::renderForm(); } - + $this->fields_form = array( 'legend' => array( 'title' => $this->l('Employees'), @@ -204,7 +204,7 @@ class AdminEmployeesControllerCore extends AdminController 'label' => $this->l('Theme:'), 'name' => 'bo_theme', 'options' => array('query' => $this->themes), - 'desc' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)') + 'desc' => $this->l('Back office theme') ) ) ); @@ -365,13 +365,13 @@ class AdminEmployeesControllerCore extends AdminController return false; } } - + if (!in_array(Tools::getValue('bo_theme'), $this->themes)) { $this->errors[] = Tools::displayError('Invalid theme.'); return false; } - + $assos = AdminEmployeesController::getAssoShop($this->table); if (count($assos[0]) == 0 && $this->table = 'employee') diff --git a/translations/fr/admin.php b/translations/fr/admin.php index eb0268e3b..448e45c08 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -1198,7 +1198,7 @@ $_LANGADM['AdminEmployeesccec78d886c47adb7e5a79567d262c0d'] = 'Couleur du back o $_LANGADM['AdminEmployeesc0008270d1fea195879befd65d85298f'] = 'L\'arrière plan du back office sera affiché de cette couleur. Couleurs HTML uniquement (ex :'; $_LANGADM['AdminEmployees0885f0c211f74834f0109c5abaf4cdc4'] = 'Langue :'; $_LANGADM['AdminEmployeesa9e4402481bd9b8e36752bf731f67eb6'] = 'Thème :'; -$_LANGADM['AdminEmployeesa26f79d46b0719d8baa3a5a7c9abda74'] = 'Le comportement quand la plage est dépassée (par ex. quand un client à un panier plus lourd que la limite de poids la plus haute)'; +$_LANGADM['AdminEmployees5f7b8239f4ee58fec606b25ff3544ae1'] = 'Thème du back office'; $_LANGADM['AdminEmployees79f79257476673a2aea1b2a41adf3384'] = 'Montrer screencast:'; $_LANGADM['AdminEmployees00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; $_LANGADM['AdminEmployeesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';