diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 320224dbf..e715630b1 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -10286,34 +10286,41 @@ li.sortable-placeholder { height: 350px; } /* line 162, admin-theme/_admin-dashboard.sass */ #dashboard #dashaddons { - padding: 20px 20px 0 20px; } -/* line 163, admin-theme/_admin-dashboard.sass */ -#dashboard #dashaddons header a { + background-color: white; + border: 1px dashed #dfdfdf; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + padding: 10px 20px; } +/* line 166, admin-theme/_admin-dashboard.sass */ +#dashboard #dashaddons a { display: block; } -/* line 165, admin-theme/_admin-dashboard.sass */ -#dashboard #dashaddons header a:hover { +/* line 168, admin-theme/_admin-dashboard.sass */ +#dashboard #dashaddons a:hover { text-decoration: none; } -/* line 170, admin-theme/_admin-dashboard.sass */ +/* line 173, admin-theme/_admin-dashboard.sass */ #dashboard #dashactivity svg { height: 150px; } -/* line 177, admin-theme/_admin-dashboard.sass */ +/* line 180, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_value { min-width: 30px; text-align: center; } -/* line 180, admin-theme/_admin-dashboard.sass */ +/* line 183, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_value:before { font-size: 0.7em; font-family: FontAwesome; content: "\f021"; color: #cccccc; } -/* line 186, admin-theme/_admin-dashboard.sass */ +/* line 189, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_value span, #dashboard .loading .data_value small { display: none; } -/* line 188, admin-theme/_admin-dashboard.sass */ +/* line 191, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_trend { display: none; } -/* line 213, admin-theme/_admin-dashboard.sass */ +/* line 216, admin-theme/_admin-dashboard.sass */ .data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend { opacity: 1; -webkit-animation-name: bounceG; @@ -10327,7 +10334,7 @@ li.sortable-placeholder { transform: scale(0.7); } @-webkit-keyframes bounceG { - /* line 221, admin-theme/_admin-dashboard.sass */ + /* line 224, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -10335,7 +10342,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 224, admin-theme/_admin-dashboard.sass */ + /* line 227, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -10344,7 +10351,7 @@ li.sortable-placeholder { transform: scale(1); } } @-moz-keyframes bounceG { - /* line 221, admin-theme/_admin-dashboard.sass */ + /* line 224, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -10352,7 +10359,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 224, admin-theme/_admin-dashboard.sass */ + /* line 227, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -10361,7 +10368,7 @@ li.sortable-placeholder { transform: scale(1); } } @-ms-keyframes bounceG { - /* line 221, admin-theme/_admin-dashboard.sass */ + /* line 224, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -10369,7 +10376,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 224, admin-theme/_admin-dashboard.sass */ + /* line 227, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -10378,7 +10385,7 @@ li.sortable-placeholder { transform: scale(1); } } @-o-keyframes bounceG { - /* line 221, admin-theme/_admin-dashboard.sass */ + /* line 224, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -10386,7 +10393,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 224, admin-theme/_admin-dashboard.sass */ + /* line 227, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -10395,7 +10402,7 @@ li.sortable-placeholder { transform: scale(1); } } @keyframes bounceG { - /* line 221, admin-theme/_admin-dashboard.sass */ + /* line 224, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -10403,7 +10410,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 224, admin-theme/_admin-dashboard.sass */ + /* line 227, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -10411,11 +10418,11 @@ li.sortable-placeholder { -ms-transform: scale(1); transform: scale(1); } } -/* line 228, admin-theme/_admin-dashboard.sass */ +/* line 231, admin-theme/_admin-dashboard.sass */ #dash_version { padding: 0 !important; overflow: hidden; } -/* line 232, admin-theme/_admin-dashboard.sass */ +/* line 235, admin-theme/_admin-dashboard.sass */ #dash_version iframe { height: 80px; width: 100%; } diff --git a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass b/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass index 59d48f828..a303613c7 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass @@ -160,11 +160,14 @@ #dashproducts #dashaddons - header a + background-color: white + border: 1px dashed #DFDFDF + @include border-radius(3px) + a display: block &:hover text-decoration: none - padding: 20px 20px 0 20px + padding: 10px 20px #dashactivity svg diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl index 505633031..19a0b3198 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl @@ -29,9 +29,7 @@ {include file='controllers/cart_rules/actions.tpl'} {include file="footer_toolbar.tpl"} - diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index d85cfd7dd..4fc060f9d 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -361,7 +361,7 @@
- +
diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl index bd2524857..799b50e0d 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -26,9 +26,9 @@
@@ -46,13 +46,11 @@
{$hookDashboardZoneTwo} -
-
- - {l s='Add more graph and data'} - -
-
+
+ + {l s='Add more graph and data'} + +
diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl index 533a059ce..7002d12d1 100644 --- a/admin-dev/themes/default/template/controllers/images/content.tpl +++ b/admin-dev/themes/default/template/controllers/images/content.tpl @@ -123,7 +123,7 @@
- +
@@ -151,7 +151,7 @@
- +
diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl index 9fdc954a3..f42b6cfea 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl @@ -80,7 +80,7 @@ {/if} - + diff --git a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl index 03aeb907a..0bd8a7498 100644 --- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl +++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl @@ -119,7 +119,7 @@
- diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl index b466033ff..cb6c85486 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl @@ -258,7 +258,7 @@ - + {include file="footer_toolbar.tpl"}
diff --git a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl index 9bd8862f9..fb605cff1 100644 --- a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl +++ b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl @@ -37,7 +37,7 @@
- +
{else} @@ -53,7 +53,7 @@ {/if}
- +
{/foreach} diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index dc1badf7a..d73765595 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -350,10 +350,9 @@

{/if} - + {/block}{* end block field *} - {/block}{* end block field *} {/if} {/foreach} {if isset($categoryData['submit'])} diff --git a/admin-dev/themes/default/template/helpers/required_fields.tpl b/admin-dev/themes/default/template/helpers/required_fields.tpl index 3efd767b6..4440b6a5d 100644 --- a/admin-dev/themes/default/template/helpers/required_fields.tpl +++ b/admin-dev/themes/default/template/helpers/required_fields.tpl @@ -57,6 +57,6 @@ {/foreach} - + \ No newline at end of file diff --git a/classes/Tab.php b/classes/Tab.php index 7084a5af0..add391536 100644 --- a/classes/Tab.php +++ b/classes/Tab.php @@ -339,12 +339,13 @@ class TabCore extends ObjectModel * Get Instance from tab class name * * @param $class_name string Name of tab class + * @param $id_lang integer id_lang * @return Tab Tab object (empty if bad id or class name) */ - public static function getInstanceFromClassName($class_name) + public static function getInstanceFromClassName($class_name, $id_lang = null) { $id_tab = (int)Tab::getIdFromClassName($class_name); - return new Tab($id_tab); + return new Tab($id_tab, $id_lang); } public static function getNbTabs($id_parent = null) diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index c28325f9b..ceafdbecb 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -149,7 +149,7 @@ class AdminAddressesControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save '), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); $id_customer = (int)Tools::getValue('id_customer'); diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index e9da5bd26..612febe0b 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -491,7 +491,7 @@ class AdminCategoriesControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn-primary' + 'class' => 'btn-default' ) ); diff --git a/controllers/admin/AdminCmsCategoriesController.php b/controllers/admin/AdminCmsCategoriesController.php index a84a9ab16..d9725536e 100644 --- a/controllers/admin/AdminCmsCategoriesController.php +++ b/controllers/admin/AdminCmsCategoriesController.php @@ -293,7 +293,7 @@ class AdminCmsCategoriesControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); $this->tpl_form_vars['PS_ALLOW_ACCENTED_CHARS_URL'] = (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL'); diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php index 770b2241d..5e7ad50ca 100644 --- a/controllers/admin/AdminCmsController.php +++ b/controllers/admin/AdminCmsController.php @@ -177,7 +177,7 @@ class AdminCmsControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php index 201f00dd7..1d04a93be 100644 --- a/controllers/admin/AdminContactsController.php +++ b/controllers/admin/AdminContactsController.php @@ -101,7 +101,7 @@ class AdminContactsControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save '), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index 1b241aa2a..ed7e727fd 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -226,7 +226,7 @@ class AdminCurrenciesControllerCore extends AdminController $this->fields_form['submit'] = array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ); return parent::renderForm(); diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php index 49f92134d..965f6fc8c 100644 --- a/controllers/admin/AdminDeliverySlipController.php +++ b/controllers/admin/AdminDeliverySlipController.php @@ -83,7 +83,7 @@ class AdminDeliverySlipControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Generate PDF file'), - 'class' => 'btn btn-primary', + 'class' => 'btn btn-default', 'icon' => 'icon-download-alt' ) ); diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index b4c5d573b..229fdde20 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -113,11 +113,15 @@ class AdminEmployeesControllerCore extends AdminController if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css'))) $this->themes[] = $theme; - $home_tab = Tab::getInstanceFromClassName('AdminDashboard'); + $home_tab = Tab::getInstanceFromClassName('AdminDashboard', $this->context->language->id); $this->tabs_list[$home_tab->id] = array( - 'name' => $home_tab->name[$this->context->language->id], + 'name' => $home_tab->name, + 'id_tab' => $home_tab->id, + 'children' => array(array( 'id_tab' => $home_tab->id, - 'children' => array(array('id_tab' =>$home_tab->id, 'name' => $home_tab->name[$this->context->language->id]))); + 'name' => $home_tab->name + )) + ); foreach (Tab::getTabs($this->context->language->id, 0) as $tab) { if (Tab::checkTabRights($tab['id_tab'])) diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 403fcc1ee..b5c346db9 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -158,7 +158,7 @@ class AdminGendersControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index d42a3955b..1d53d7115 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -239,7 +239,7 @@ class AdminGroupsControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save '), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ), 'input' => array( array( diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 640b0a216..10a90b421 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -157,7 +157,7 @@ class AdminImagesControllerCore extends AdminController 'visibility' => Shop::CONTEXT_ALL ) ), - 'submit' => array('title' => $this->l('Save '), 'class' => 'btn btn-primary'), + 'submit' => array('title' => $this->l('Save '), 'class' => 'btn btn-default'), ), ); @@ -326,7 +326,7 @@ class AdminImagesControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 564ceb072..9ad3a3f4d 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -320,7 +320,7 @@ class AdminMetaControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); return parent::renderForm(); diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index 2b5035acc..db8291401 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -115,7 +115,7 @@ class AdminSlipControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Generate PDF file'), - 'class' => 'btn btn-primary', + 'class' => 'btn btn-default', 'id' => 'submitPrint', 'icon' => 'icon-download-alt' ) diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php index 4137959ee..0e40081b3 100755 --- a/controllers/admin/AdminSpecificPriceRuleController.php +++ b/controllers/admin/AdminSpecificPriceRuleController.php @@ -265,7 +265,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ), ); if (($value = $this->getFieldValue($this->object, 'price')) != -1) diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index 52f6ff3c4..db472441d 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -190,7 +190,7 @@ class AdminStockConfigurationControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); } @@ -302,7 +302,7 @@ class AdminStockConfigurationControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); @@ -339,7 +339,7 @@ class AdminStockConfigurationControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); } diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php index 4eac01463..b6c087e6e 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.php @@ -305,7 +305,7 @@ class AdminStockManagementControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Add to stock'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); $this->fields_value['usable'] = 1; @@ -409,7 +409,7 @@ class AdminStockManagementControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Remove from stock'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); break; @@ -531,7 +531,7 @@ class AdminStockManagementControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Transfer'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); break; diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index bd29a8136..ec8f0d251 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -187,7 +187,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save and stay'), - 'class' => 'btn btn-primary', + 'class' => 'btn btn-default', 'stay' => true ) ); @@ -337,7 +337,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save and stay'), - 'class' => 'btn btn-primary', + 'class' => 'btn btn-default', 'stay' => true ) ); diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php index e99020dd7..5bc82ee97 100644 --- a/controllers/admin/AdminTaxesController.php +++ b/controllers/admin/AdminTaxesController.php @@ -215,7 +215,7 @@ class AdminTaxesControllerCore extends AdminController ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ) ); diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php index fd2890773..5c9455bba 100755 --- a/controllers/admin/AdminWebserviceController.php +++ b/controllers/admin/AdminWebserviceController.php @@ -179,7 +179,7 @@ class AdminWebserviceControllerCore extends AdminController $this->fields_form['submit'] = array( 'title' => $this->l('Save '), - 'class' => 'btn btn-primary' + 'class' => 'btn btn-default' ); if (!($obj = $this->loadObject(true)))