Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

controllers/admin/AdminDashboardController.php

@@ -325,6 +325,7 @@ class AdminDashboardControllerCore extends AdminController
 			{
 				if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description))
 					$return['rss'][] = array(
+						'date' => Tools::displayDate(date('Y-m-d', strtotime((string)$item->pubDate))),
 						'title' => (string)$item->title,
 						'short_desc' => substr((string)$item->description, 0, 100).'...',
 						'link' => (string)$item->link,

controllers/admin/AdminGroupsController.php

@@ -246,7 +246,7 @@ class AdminGroupsControllerCore extends AdminController
 			'input' => array(
 				array(
 					'type' => 'text',
-					'label' => $this->l('Name:'),
+					'label' => $this->l('Name'),
 					'name' => 'name',
 					'required' => true,
 					'lang' => true,
@@ -255,14 +255,15 @@ class AdminGroupsControllerCore extends AdminController
 				),
 				array(
 					'type' => 'text',
-					'label' => $this->l('Discount (%):'),
+					'label' => $this->l('Discount'),
 					'name' => 'reduction',
-					'col' => 2,
+					'suffix' => '%',
+					'col' => 1,
 					'hint' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.')
 				),
 				array(
 					'type' => 'select',
-					'label' => $this->l('Price display method:'),
+					'label' => $this->l('Price display method'),
 					'name' => 'price_display_method',
 					'col' => 2,
 					'hint' => $this->l('How prices are displayed in the order summary for this customer group.'),
@@ -283,7 +284,7 @@ class AdminGroupsControllerCore extends AdminController
 				),
 				array(
 					'type' => 'switch',
-					'label' => $this->l('Show prices:'),
+					'label' => $this->l('Show prices'),
 					'name' => 'show_prices',
 					'required' => false,
 					'class' => 't',