From 490a5cff46c553b4684e52a4a46edc2ec0651260 Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 28 Dec 2011 14:18:20 +0000 Subject: [PATCH] [+] BO: Add Jquery alerts for nice alert box --- admin-dev/ajax_category_list.php | 2 +- admin-dev/themes/template/access/form.tpl | 4 +- .../template/customer_threads/options.tpl | 8 +- admin-dev/themes/template/groups/form.tpl | 4 +- admin-dev/themes/template/home/content.tpl | 20 +- admin-dev/themes/template/modules/js.tpl | 8 +- admin-dev/themes/template/products/pack.tpl | 4 +- .../themes/template/request_sql/form.tpl | 4 +- .../themes/template/supply_orders/form.tpl | 2 +- classes/AdminController.php | 2 +- js/admin-categories-tree.js | 2 +- js/admin.js | 6 +- js/adminImport.js | 9 +- js/admin_order.js | 18 +- js/attributesBack.js | 6 +- js/jquery/plugins/alerts/images/help.gif | Bin 0 -> 1582 bytes js/jquery/plugins/alerts/images/important.gif | Bin 0 -> 1492 bytes js/jquery/plugins/alerts/images/info.gif | Bin 0 -> 1487 bytes js/jquery/plugins/alerts/images/title.gif | Bin 0 -> 317 bytes js/jquery/plugins/alerts/jquery.alerts.css | 57 +++++ js/jquery/plugins/alerts/jquery.alerts.js | 235 ++++++++++++++++++ 21 files changed, 342 insertions(+), 49 deletions(-) create mode 100644 js/jquery/plugins/alerts/images/help.gif create mode 100644 js/jquery/plugins/alerts/images/important.gif create mode 100644 js/jquery/plugins/alerts/images/info.gif create mode 100644 js/jquery/plugins/alerts/images/title.gif create mode 100644 js/jquery/plugins/alerts/jquery.alerts.css create mode 100644 js/jquery/plugins/alerts/jquery.alerts.js diff --git a/admin-dev/ajax_category_list.php b/admin-dev/ajax_category_list.php index 8d7e4df21..bbda0ee8a 100755 --- a/admin-dev/ajax_category_list.php +++ b/admin-dev/ajax_category_list.php @@ -54,7 +54,7 @@ echo ' $(document).ready(function() { $(\'div#categoryList input.categoryBox\').click(function (){ if ($(this).is(\':not(:checked)\') && $(\'div#categoryList input.id_category_default\').val() == $(this).val()) - alert(\''.utf8_encode(html_entity_decode($adminProducts->getL('Consider changing the default category.'))).'\'); + jAlert(\''.utf8_encode(html_entity_decode($adminProducts->getL('Consider changing the default category.'))).'\'); }); }); diff --git a/admin-dev/themes/template/access/form.tpl b/admin-dev/themes/template/access/form.tpl index 2cd8b54d0..a5f8b106f 100644 --- a/admin-dev/themes/template/access/form.tpl +++ b/admin-dev/themes/template/access/form.tpl @@ -75,7 +75,7 @@ } catch(e) { - alert('oups'); + jAlert('Technical error'); } } }); @@ -123,7 +123,7 @@ } catch(e) { - alert("oups"); + jAlert('Technical error'); } } }); diff --git a/admin-dev/themes/template/customer_threads/options.tpl b/admin-dev/themes/template/customer_threads/options.tpl index 0f08aa98d..2d70cfd00 100644 --- a/admin-dev/themes/template/customer_threads/options.tpl +++ b/admin-dev/themes/template/customer_threads/options.tpl @@ -13,7 +13,8 @@