From 9e58e3edfd031abc506565dd6841cd3c57c734fc Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 27 Sep 2013 12:24:44 +0200 Subject: [PATCH] // Advanced stock bootstrap design --- .../stock_cover/helpers/list/list_header.tpl | 60 +++++++------- .../helpers/list/list_header.tpl | 18 +++-- .../stock_mvt/helpers/list/list_header.tpl | 18 +++-- .../supply_orders/helpers/form/form.tpl | 79 +++++++++---------- .../helpers/list/list_header.tpl | 32 ++++---- .../supply_orders/helpers/view/view.tpl | 60 +++++++------- .../helpers/form/form.tpl | 36 ++++----- .../helpers/list/list_action_details.tpl | 2 +- .../list_action_supply_order_change_state.tpl | 2 +- ...tion_supply_order_create_from_template.tpl | 2 +- .../list/list_action_supply_order_receipt.tpl | 2 +- .../AdminStockConfigurationController.php | 24 +++--- .../admin/AdminSupplyOrdersController.php | 4 +- .../admin/AdminWebserviceController.php | 2 +- 14 files changed, 178 insertions(+), 163 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl index 0adaf33c6..e91f33f10 100644 --- a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl @@ -25,35 +25,39 @@ {extends file="helpers/list/list_header.tpl"} {block name=override_header}
-
+ - {if count($stock_cover_periods) > 1} -
- - -
- {/if} - {if count($stock_cover_warehouses) > 0} -
- - -
- {/if} -
- - - -
+ {if count($stock_cover_periods) > 1} +
+ +
+ +
+
+ {/if} + {if count($stock_cover_warehouses) > 0} +
+ +
+ +
+
+ {/if} +
+ +
+ +
+
-{/block} +{/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl index 6cb2a34d4..b54181ee6 100644 --- a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl @@ -25,17 +25,19 @@ {extends file="helpers/list/list_header.tpl"} {block name=override_header}
-
+ {if count($stock_instant_state_warehouses) > 0} -
- - +
+ +
+ +
{/if} diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl index 9207df831..4c2abf445 100644 --- a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl @@ -26,15 +26,19 @@ {block name=override_header} {if count($list_warehouses) > 0}
-
- + - +
+ +
+ +
+
{/if}
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl index 97f61fa01..74e31f9f5 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl @@ -26,40 +26,34 @@ {block name="other_fieldsets"} {if isset($show_product_management_form)} -

 

-
- - Supply Order Management - {l s='Manage the products you want to order from the supplier.'} - - -

{l s='To add a product to the order, type the first letters of the product name, then select it from the drop-down list.'}

- - {l s='Add a product to the supply order'} - -

 

- - +

{l s='Manage the products you want to order from the supplier.'}

+
{l s='To add a product to the order, type the first letters of the product name, then select it from the drop-down list.'}
+
+
+ +
+
+ +
+
+
- - - - - - - - - - + + + + + + + + + + @@ -88,27 +82,31 @@ {/foreach}
{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Supplier Reference'}{l s='Name'}{l s='Unit Price (tax excl.)'}{l s='Quantity'}{l s='Discount rate'}{l s='Tax rate'}{l s='Delete'}{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Supplier Reference'}{l s='Name'}{l s='Unit Price (tax excl.)'}{l s='Quantity'}{l s='Discount rate'}{l s='Tax rate'} 
- {$currency->prefix}  {$currency->suffix} +
+ {if isset($currency->prefix) && trim($currency->prefix) != ''}{$currency->prefix}{/if}{if isset($currency->suffix) && trim($currency->suffix) != ''}{$currency->suffix}{/if} +
- + - % +
+ % +
- % +
+ % +
- - {l s='Remove this product from the order.'} + {l s='Remove'}
-
- - - -
- -

- {l s='Choose the new status for your order'} -

+{assign var=order_state value=$supply_order_state->name[$employee->id_lang]|regex_replace:"/[^A-Za-z_ \t]/":""} +
{l s='Current order state: %s'|sprintf:$order_state}
+
{l s='Choose the new status for your order'}
+
+ +
+ +
+ +
+
-
@@ -60,14 +62,10 @@ $(document).ready(function() { {/block} {block name="other_fieldsets"} -
{if isset($supply_order_state) && $supply_order_state->editable == false && isset($supply_order)}
- - {l s='Supply Order State'} - {l s='Print the supply order form'} - -{l s='Click here to download the supply order form.'}. +

{l s='Print the supply order form'}

+ {l s='Click here to download the supply order form.'}.
{/if} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl index e9dac3669..79748ec37 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl @@ -23,6 +23,6 @@ * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl index 3b5f02d2e..afa90d014 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl index 66e36e7ca..50fdd3b49 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl index 1e891d92f..d3f078d14 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl @@ -22,6 +22,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - + {$action} \ No newline at end of file diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index 3dd0c4cf4..52f6ff3c4 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -47,6 +47,7 @@ class AdminStockConfigurationControllerCore extends AdminController 'title' => $this->l('ID'), 'align' => 'center', 'search' => false, + 'class' => 'fixed-width-xs' ), 'sign' => array( 'title' => $this->l('Sign'), @@ -61,7 +62,8 @@ class AdminStockConfigurationControllerCore extends AdminController -1 => 'remove_stock.png', 1 => 'add_stock.png' ), - 'orderby' => false + 'orderby' => false, + 'class' => 'fixed-width-sm' ), 'name' => array( 'title' => $this->l('Name'), @@ -438,8 +440,8 @@ class AdminStockConfigurationControllerCore extends AdminController '0' => 'disabled.gif' ), 'type' => 'bool', - 'width' => 170, - 'orderby' => false + 'orderby' => false, + 'class' => 'fixed-width-sm' ), 'delivery_note' => array( 'title' => $this->l('Is there a delivery note available?'), @@ -449,8 +451,8 @@ class AdminStockConfigurationControllerCore extends AdminController '0' => 'disabled.gif' ), 'type' => 'bool', - 'width' => 170, - 'orderby' => false + 'orderby' => false, + 'class' => 'fixed-width-sm' ), 'pending_receipt' => array( 'title' => $this->l('Is there a pending receipt?'), @@ -460,8 +462,8 @@ class AdminStockConfigurationControllerCore extends AdminController '0' => 'disabled.gif' ), 'type' => 'bool', - 'width' => 170, - 'orderby' => false + 'orderby' => false, + 'class' => 'fixed-width-sm' ), 'receipt_state' => array( 'title' => $this->l('Delivery state?'), @@ -471,8 +473,8 @@ class AdminStockConfigurationControllerCore extends AdminController '0' => 'disabled.gif' ), 'type' => 'bool', - 'width' => 170, - 'orderby' => false + 'orderby' => false, + 'class' => 'fixed-width-sm' ), 'enclosed' => array( 'title' => $this->l('Enclosed order state?'), @@ -482,8 +484,8 @@ class AdminStockConfigurationControllerCore extends AdminController '0' => 'disabled.gif' ), 'type' => 'bool', - 'width' => 170, - 'orderby' => false + 'orderby' => false, + 'class' => 'fixed-width-sm' ), ); diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 1d41e14f1..230afe9c0 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -371,12 +371,14 @@ class AdminSupplyOrdersControllerCore extends AdminController 'short' => 'Export Orders', 'href' => $this->context->link->getAdminLink('AdminSupplyOrders').'&csv_orders&id_warehouse='.$this->getCurrentWarehouse(), 'desc' => $this->l('Export Orders (CSV)'), + 'class' => 'process-icon-export' ); $this->toolbar_btn['export-csv-details'] = array( 'short' => 'Export Orders Details', 'href' => $this->context->link->getAdminLink('AdminSupplyOrders').'&csv_orders_details&id_warehouse='.$this->getCurrentWarehouse(), 'desc' => $this->l('Export Orders Details (CSV)'), + 'class' => 'process-icon-export' ); unset($this->toolbar_btn['new']); @@ -592,7 +594,7 @@ class AdminSupplyOrdersControllerCore extends AdminController $this->fields_form[]['form'] = array( 'legend' => array( 'title' => $this->l('Supply order status'), - 'image' => '../img/admin/cms.gif' + 'icon' => 'icon-pencil' ), ); diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php index 476b09d57..4ec04e96b 100755 --- a/controllers/admin/AdminWebserviceController.php +++ b/controllers/admin/AdminWebserviceController.php @@ -103,7 +103,7 @@ class AdminWebserviceControllerCore extends AdminController $this->fields_form = array( 'legend' => array( 'title' => $this->l('Webservice Accounts:'), - 'image' => '../img/admin/access.png' + 'icon' => 'icon-lock' ), 'input' => array( array(