From 8f51fee67ad986d2aa6579907ac3904f92c211e0 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Wed, 27 Nov 2013 15:15:30 +0100 Subject: [PATCH] // load jquery-timeago.js --- admin-dev/themes/default/js/admin-theme.js | 3 +++ classes/controller/AdminController.php | 1 + 2 files changed, 4 insertions(+) diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js index 9a2b6738c..90f0f8415 100755 --- a/admin-dev/themes/default/js/admin-theme.js +++ b/admin-dev/themes/default/js/admin-theme.js @@ -215,4 +215,7 @@ $( document ).ready(function() { removeMobileNav(); } }); + + //show time elapsed + $("abbr.timeago").timeago(); }); \ No newline at end of file diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 98f64cc6d..cc2cf8dd7 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1984,6 +1984,7 @@ class AdminControllerCore extends Controller $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/bootstrap.js'); $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/modernizr.js'); $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/modernizr-loads.js'); + $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/jquery-timeago/jquery.timeago.js'); if (!Tools::getValue('submitFormAjax')) {