diff --git a/admin-dev/themes/template/helper/list/list_header.tpl b/admin-dev/themes/template/helper/list/list_header.tpl index 7c1c85972..23220aad9 100644 --- a/admin-dev/themes/template/helper/list/list_header.tpl +++ b/admin-dev/themes/template/helper/list/list_header.tpl @@ -103,16 +103,25 @@ cellpadding="0" cellspacing="0" style="width: 100%; margin-bottom:10px;" > + + {foreach $fields_display AS $key => $params} + + {/foreach} + {if $shop_link_type} + + {/if} + {if $has_actions} + + {/if} - + {if $has_bulk_actions} {/if} {foreach $fields_display AS $key => $params} - + {$params.title} {if (!isset($params.orderby) || $params.orderby) && !$simple_header}
@@ -125,9 +134,8 @@ {/if} {/foreach} - {if $shop_link_type} - + {if $shop_link_type == 'shop'} {l s='shop'} {else} @@ -136,7 +144,7 @@ {/if} {if $has_actions} - {l s='Actions'} + {l s='Actions'} {/if} {if !$simple_header} diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index ef3d68c29..397f830b6 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -51,9 +51,9 @@ class AdminAddressesControllerCore extends AdminController $this->fieldsDisplay = array( 'id_address' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), - 'firstname' => array('title' => $this->l('First name'), 'width' => 80, 'filter_key' => 'a!firstname'), - 'lastname' => array('title' => $this->l('Last name'), 'width' => 100, 'filter_key' => 'a!lastname'), - 'address1' => array('title' => $this->l('Address'), 'width' => 200), + 'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'), + 'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'), + 'address1' => array('title' => $this->l('Address')), 'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 50), 'city' => array('title' => $this->l('City'), 'width' => 150), 'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countriesArray, 'filter_key' => 'cl!id_country')); diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php index 1b2141e2f..dda6871dc 100644 --- a/controllers/admin/AdminTaxesController.php +++ b/controllers/admin/AdminTaxesController.php @@ -38,7 +38,7 @@ class AdminTaxesControllerCore extends AdminController $this->fieldsDisplay = array( 'id_tax' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), - 'name' => array('title' => $this->l('Name'), 'width' => 140), + 'name' => array('title' => $this->l('Name'), 'width' => 'auto'), 'rate' => array('title' => $this->l('Rate'), 'align' => 'center', 'suffix' => '%', 'width' => 50), 'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false));