diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 553c66408..9fab50409 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -3739,7 +3739,7 @@ a .icon-flip-vertical:before { .icon-ok:before { content: "\f00c"; } -.icon-remove:before { +.icon-remove:before, .process-icon-cancel:before { content: "\f00d"; } .icon-zoom-in:before { @@ -3944,10 +3944,10 @@ a .icon-flip-vertical:before { .icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before, .process-icon-newCombination:before { +.icon-plus-sign:before, .process-icon-newCombination.toolbar-new:before { content: "\f055"; } -.icon-minus-sign:before { +.icon-minus-sign:before, .process-icon-newCombination.toolbar-cancel:before { content: "\f056"; } .icon-remove-sign:before { @@ -4340,7 +4340,7 @@ a .icon-flip-vertical:before { .icon-lightbulb:before { content: "\f0eb"; } -.icon-exchange:before { +.icon-exchange:before, .process-icon-partial_refund:before { content: "\f0ec"; } .icon-cloud-download:before, .process-icon-export:before { diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 8e072872b..9a97c9a8f 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -323,9 +323,18 @@ body.fixed-top @extend .icon-bar-chart .process-icon-duplicate @extend .icon-copy -.process-icon-newCombination + +.process-icon-newCombination.toolbar-new @extend .icon-plus-sign +.process-icon-newCombination.toolbar-cancel + @extend .icon-minus-sign + +.process-icon-partial_refund + @extend .icon-exchange +.process-icon-cancel + @extend .icon-remove + .navbar-inner box-shadow: none!important .input-append diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl index 5c57c58ad..683bb9d5c 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl @@ -27,80 +27,102 @@ {block name="override_tpl"} -

{$manufacturer->name}

+ {$manufacturer->name} -

{l s='Total addresses'} {count($addresses)}

+ {l s='Total addresses'} {count($addresses)}
{if !count($addresses)} {l s='No address has been found for this manufacturer.'} {else} {foreach $addresses AS $addresse} - - - - - - - -
{$addresse.firstname} {$addresse.lastname}
-
- {$addresse.address1}
- {if $addresse.address2}{$addresse.address2}
{/if} - {$addresse.postcode} {$addresse.city}
- {if $addresse.state}{$addresse.state}
{/if} - {$addresse.country}
-
-
- {if $addresse.phone}{$addresse.phone}
{/if} - {if $addresse.phone_mobile}{$addresse.phone_mobile}
{/if} -
- {if $addresse.other}

{$addresse.other}
{/if} -

+ + + + + + + + + + + + + + + + +
{$addresse.firstname} {$addresse.lastname} +
+ {$addresse.address1}
+ {if $addresse.address2}{$addresse.address2}
{/if} + {$addresse.postcode} {$addresse.city}
+ {if $addresse.state}{$addresse.state}
{/if} + {$addresse.country}
+ {if $addresse.phone}{$addresse.phone}
{/if} + {if $addresse.phone_mobile}{$addresse.phone_mobile}
{/if} + {if $addresse.other}

+ {$addresse.other}
+ {/if} +
+ {l s='Edit'}
{/foreach} {/if} -

{l s='Total products'} {count($products)}

+ {l s='Total products'} {count($products)} + {foreach $products AS $product}
{if !$product->hasAttributes()} -
- {l s='Edit'} - {l s='Delete'} +
+ {l s='Edit'} + {l s='Delete'}
-

- - - - {if !empty($product->reference)}{/if} - {if !empty($product->ean13)}{/if} - {if !empty($product->upc)}{/if} - {if $stock_management}{/if} - + +
{$product->name}{l s='Ref:'} {$product->reference}{l s='EAN13:'} {$product->ean13}{l s='UPC:'} {$product->upc}{l s='Qty:'} {$product->quantity}
+ + + + {if !empty($product->reference)}{/if} + {if !empty($product->ean13)}{/if} + {if !empty($product->upc)}{/if} + {if $stock_management}{/if} + +
{$product->name}{l s='Ref:'} {$product->reference}{l s='EAN13:'} {$product->ean13}{l s='UPC:'} {$product->upc}{l s='Qty:'} {$product->quantity}
{else} -
- {l s='Edit'} - {l s='Delete'} +
+ {l s='Edit'} + {l s='Delete'}
-

{$product->name}

- - - - - - - {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} - + + {$product->name} + +
{l s='Attribute name'}{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Available Quantity'}
+ + + + + + + {if $stock_management && $shopContext != Shop::CONTEXT_ALL} + + {/if} + + + {foreach $product->combination AS $id_product_attribute => $product_attribute} - {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} + {if $stock_management && $shopContext != Shop::CONTEXT_ALL} + + {/if} {/foreach} +
{l s='Attribute name'}{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Available Quantity'}
{$product_attribute.attributes} {$product_attribute.reference} {$product_attribute.ean13} {$product_attribute.upc}{$product_attribute.quantity}{$product_attribute.quantity}
{/if} {/foreach} diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 5fed98dcb..327a63d5c 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -156,7 +156,7 @@ {if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} {if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} /> {if isset($input.suffix)}{$input.suffix}{/if} - {if !empty($input.hint)}{$input.hint} {/if} + {if !empty($input.desc)}
{$input.desc}
{/if} {/if} {elseif $input.type == 'select'} {if isset($input.options.query) && !$input.options.query && isset($input.empty_message)} diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 17ac93812..cec7599b8 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -144,34 +144,27 @@ class AdminManufacturersControllerCore extends AdminController $this->fields_list = array( 'id_address' => array( - 'title' => $this->l('ID'), - 'width' => 25 + 'title' => $this->l('ID') ), 'manufacturer_name' => array( - 'title' => $this->l('Manufacturer'), - 'width' => 'auto' + 'title' => $this->l('Manufacturer') ), 'firstname' => array( - 'title' => $this->l('First name'), - 'width' => 80 + 'title' => $this->l('First name') ), 'lastname' => array( 'title' => $this->l('Last name'), - 'width' => 100, 'filter_key' => 'a!name' ), 'postcode' => array( 'title' => $this->l('Zip Code/Postal Code'), - 'align' => 'right', - 'width' => 50 + 'align' => 'right' ), 'city' => array( - 'title' => $this->l('City'), - 'width' => 150 + 'title' => $this->l('City') ), 'country' => array( 'title' => $this->l('Country'), - 'width' => 100, 'type' => 'select', 'list' => $this->countries_array, 'filter_key' => 'cl!id_country' @@ -237,7 +230,6 @@ class AdminManufacturersControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Name:'), 'name' => 'name', - 'size' => 40, 'required' => true, 'hint' => $this->l('Invalid characters:').' <>;=#{}' ), @@ -246,8 +238,6 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Short description:'), 'name' => 'short_description', 'lang' => true, - 'cols' => 60, - 'rows' => 10, 'class' => 'rte', 'hint' => $this->l('Invalid characters:').' <>;=#{}' ), @@ -256,8 +246,6 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Description:'), 'name' => 'description', 'lang' => true, - 'cols' => 60, - 'rows' => 10, 'class' => 'rte', 'hint' => $this->l('Invalid characters:').' <>;=#{}' ), @@ -266,7 +254,7 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Logo:'), 'name' => 'logo', 'display_image' => true, - 'desc' => $this->l('Upload a manufacturer logo from your computer.') + 'hint' => $this->l('Upload a manufacturer logo from your computer.') ), array( 'type' => 'text', @@ -412,7 +400,6 @@ class AdminManufacturersControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Last name:'), 'name' => 'lastname', - 'size' => 33, 'required' => true, 'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:' ); @@ -420,7 +407,6 @@ class AdminManufacturersControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('First name:'), 'name' => 'firstname', - 'size' => 33, 'required' => true, 'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:' ); @@ -428,14 +414,12 @@ class AdminManufacturersControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Address:'), 'name' => 'address1', - 'size' => 33, 'required' => true, ); $form['input'][] = array( 'type' => 'text', 'label' => $this->l('Address (2):'), 'name' => 'address2', - 'size' => 33, 'required' => false, ); $form['input'][] = array( @@ -443,14 +427,12 @@ class AdminManufacturersControllerCore extends AdminController 'label' => $this->l('Zip Code/Postal Code'), 'name' => 'postcode', 'required' => true, - 'size' => 33, 'required' => false, ); $form['input'][] = array( 'type' => 'text', 'label' => $this->l('City:'), 'name' => 'city', - 'size' => 33, 'required' => true, ); $form['input'][] = array( @@ -480,22 +462,18 @@ class AdminManufacturersControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Home phone:'), 'name' => 'phone', - 'size' => 33, 'required' => false, ); $form['input'][] = array( 'type' => 'text', 'label' => $this->l('Mobile phone:'), 'name' => 'phone_mobile', - 'size' => 33, 'required' => false, ); $form['input'][] = array( 'type' => 'textarea', 'label' => $this->l('Other:'), 'name' => 'other', - 'cols' => 36, - 'rows' => 4, 'required' => false, 'hint' => $this->l('Forbidden characters:').' <>;=#{}' );