From cdfa0827f692ccffff14b402c1e70e1dfcaf7606 Mon Sep 17 00:00:00 2001 From: rtouzi Date: Tue, 11 Jun 2013 10:44:32 +0100 Subject: [PATCH] PLF-5067 :Use jquery AMD portal module in WhoIsOnLine template --- .../portlet/juzu/whoisonline/templates/users.gtmpl | 14 +------------- .../src/main/webapp/js/whoisonline/whoisonline.js | 12 +++++------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/whoisonline/templates/users.gtmpl b/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/whoisonline/templates/users.gtmpl index b99f216753..c39f6c298a 100644 --- a/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/whoisonline/templates/users.gtmpl +++ b/extension/portlets/homepagePortlets/src/main/java/org/exoplatform/platform/portlet/juzu/whoisonline/templates/users.gtmpl @@ -25,20 +25,8 @@ RequestContext requestContext = Request.getCurrent().getContext(); ResourceBundle bundle= requestContext.getApplicationContext().resolveBundle(requestContext.getUserContext().getLocale()) ; - if(users.empty){ %> - + %> - <%}else{%> - - <%}%> <%users.each { user -> %> <% diff --git a/extension/portlets/homepagePortlets/src/main/webapp/js/whoisonline/whoisonline.js b/extension/portlets/homepagePortlets/src/main/webapp/js/whoisonline/whoisonline.js index 58160822d2..04f188677d 100644 --- a/extension/portlets/homepagePortlets/src/main/webapp/js/whoisonline/whoisonline.js +++ b/extension/portlets/homepagePortlets/src/main/webapp/js/whoisonline/whoisonline.js @@ -1,12 +1,10 @@ (function($) { - - if($('#onlineList li').length == 0) { - $("#OnlinePortlet").hide(); - } else { - $("#OnlinePortlet").show(); - } - var showTooltip = function() { + if($('#onlineList li').length == 0) { + $("#OnlinePortlet").hide(); + } else { + $("#OnlinePortlet").show(); + } $('#onlineList li').each(function() { var activity = $(this).find("input[name=activity]").val(); var connect = $(this).find("input[name=connect]").val();