diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index 069024fe0..ef2c8eb46 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -418,6 +418,13 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
select#show_modules { font-size:12px;}
+label.text { padding:1px 12px 0 0;}
+label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em}
+.listForm {}
+ul.listForm {}
+ul.listForm li {padding-bottom:3px;}
+
+
/*FOOTER*/
#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
#footer .footerLeft { float:left; margin-left:10px;}
diff --git a/admin-dev/themes/default/template/products/features.tpl b/admin-dev/themes/default/template/products/features.tpl
index e04f7a043..84f5c7206 100644
--- a/admin-dev/themes/default/template/products/features.tpl
+++ b/admin-dev/themes/default/template/products/features.tpl
@@ -48,18 +48,28 @@
-
| {l s='Feature'} - | {l s='Pre-defined value'} - | {l s='or'} {l s='Customized value'} + | {l s='Feature'} + | {l s='Pre-defined value'} + | {l s='or'} {l s='Customized value'} |
|---|
| {$available_feature.name} | -+ | {if sizeof($available_feature.featureValues)} {else} - {l s='N/A'} - + {l s='N/A'} - {l s='Add pre-defined values first'} + class="confirm_leave button">{l s='Add pre-defined values first'} {/if} | -+ |
{foreach from=$languages key=k item=language}
-
-
-
- @@ -123,20 +122,30 @@ {* status informations *}
{l s='Create'}
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index 3417f185b..ab54dee48 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -134,15 +134,15 @@ class AdminGroupsControllerCore extends AdminController
$genders[$gender->id] = $gender->name;
}
$customer_fields_display = (array(
- 'id_customer' => array('title' => $this->l('ID'), 'align' => 'center'),
- 'id_gender' => array('title' => $this->l('Gender'), 'align' => 'center', 'icon' => $genders_icon, 'list' => $genders),
+ 'id_customer' => array('title' => $this->l('ID'), 'width' => 15, 'align' => 'center'),
+ 'id_gender' => array('title' => $this->l('Gender'), 'align' => 'center', 'width' => 50,'icon' => $genders_icon, 'list' => $genders),
'firstname' => array('title' => $this->l('Name'), 'align' => 'center'),
'lastname' => array('title' => $this->l('Name'), 'align' => 'center'),
- 'email' => array('title' => $this->l('E-mail address'), 'align' => 'center'),
- 'birthday' => array('title' => $this->l('Birth date'), 'align' => 'center', 'type' => 'date'),
- 'date_add' => array('title' => $this->l('Register date'), 'align' => 'center', 'type' => 'date'),
+ 'email' => array('title' => $this->l('E-mail address'), 'width' => 150, 'align' => 'center'),
+ 'birthday' => array('title' => $this->l('Birth date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
+ 'date_add' => array('title' => $this->l('Register date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
'orders' => array('title' => $this->l('Orders'), 'align' => 'center'),
- 'active' => array('title' => $this->l('Enabled'),'align' => 'center','active' => 'status','type' => 'bool')
+ 'active' => array('title' => $this->l('Enabled'),'align' => 'center','width' => 20, 'active' => 'status','type' => 'bool')
));
$customer_list = $group->getCustomers(false);
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index c558cee79..2acbf9dd5 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3344,7 +3344,7 @@ class AdminProductsControllerCore extends AdminController
$color_by_default = '#BDE5F8';
$this->fieldsDisplay = array(
- 'attributes' => array('title' => $this->l('Attributes'), 'align' => 'left', 'width' => 70),
+ 'attributes' => array('title' => $this->l('Attributes'), 'align' => 'left'),
'price' => array('title' => $this->l('Impact'), 'type' => 'price', 'align' => 'left', 'width' => 70),
'weight' => array('title' => $this->l('Weight'), 'align' => 'left', 'width' => 70),
'reference' => array('title' => $this->l('Reference'), 'align' => 'left', 'width' => 70),
|