From 8a62346471b4ddbbba49c1074c3aaf21cd752f1b Mon Sep 17 00:00:00 2001 From: lLefevre Date: Fri, 2 Dec 2011 14:31:08 +0000 Subject: [PATCH] // Adding a button to top git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10857 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/template/footer.tpl | 1 + classes/AdminController.php | 1 + controllers/admin/AdminModulesController.php | 9 --------- controllers/admin/AdminOrdersController.php | 1 - css/admin.css | 16 ++++++++++++++++ img/admin/scroll_top.png | Bin 0 -> 3690 bytes js/admin.js | 17 +++++++++++++++++ 7 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 img/admin/scroll_top.png diff --git a/admin-dev/themes/template/footer.tpl b/admin-dev/themes/template/footer.tpl index c26ec4a93..5a1d77634 100644 --- a/admin-dev/themes/template/footer.tpl +++ b/admin-dev/themes/template/footer.tpl @@ -48,5 +48,6 @@ {* ajaxBox allows*} {/if} +
diff --git a/classes/AdminController.php b/classes/AdminController.php index bd6dcb706..4576a4d55 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -1502,6 +1502,7 @@ class AdminControllerCore extends Controller $this->addJquery(); $this->addjQueryPlugin(array('cluetip', 'hoverIntent')); + $this->addJqueryPlugin('scrollTo'); $this->addJS(array( _PS_JS_DIR_.'admin.js', diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 50e418db0..017c9934b 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -131,15 +131,6 @@ class AdminModulesControllerCore extends AdminController $this->logged_on_addons = true; } - public function setMedia() - { - parent::setMedia(); - $this->addJqueryPlugin('scrollTo'); - } - - - - /* ** Ajax Request Methods ** diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 7e01aba96..d2f502c87 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -139,7 +139,6 @@ class AdminOrdersControllerCore extends AdminController $this->addJS(_PS_JS_DIR_.'admin_order.js'); $this->addJS(_PS_JS_DIR_.'tools.js'); $this->addJqueryPlugin('autocomplete'); - $this->addJqueryPlugin('scrollTo'); } } diff --git a/css/admin.css b/css/admin.css index e0fb6e8d2..9a5d0a12e 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1946,4 +1946,20 @@ ul.connectedSortable li.module_list { right:10px; } +/* ScrollTop */ +div#scrollTop a{ + display:none; + background:url('../img/admin/scroll_top.png'); + width:80px; + height:80px; + position:fixed; + bottom:30px; + right:30px; + border-radius:10px; + opacity:0.2; +} +div#scrollTop a:hover{ + opacity:0.8; +} + diff --git a/img/admin/scroll_top.png b/img/admin/scroll_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c3f937bad73d57229c0c5e6e27dc8ad1130c5b25 GIT binary patch literal 3690 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 IM6N<$f?yxV6aWAK literal 0 HcmV?d00001 diff --git a/js/admin.js b/js/admin.js index 69b4eacff..7ac2e340e 100644 --- a/js/admin.js +++ b/js/admin.js @@ -1000,4 +1000,21 @@ $(document).ready(function(){ if(!isArrowKey(e)) return copyMeta2friendlyURL() }); + + // Adding a button to top + var scroll = $('#scrollTop a'); + var view = $(window); + + scroll.click(function(){ + $.scrollTo('#top_container', 1200, { offset: -100 }); + }); + + view.bind("scroll", function(e) { + var heightView = view.height(); + var btnPlace = scroll.offset().top; + if (heightView < btnPlace) + scroll.show(); + else + scroll.hide(); + }); });