diff --git a/pom.xml b/pom.xml index 5f07325..9781fc8 100644 --- a/pom.xml +++ b/pom.xml @@ -156,11 +156,11 @@ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided - - org.gcube.portlets.widgets - callout-tour - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - + + + + + org.gcube.common.portal portal-manager diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java index 98031a9..184dee5 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java @@ -12,10 +12,6 @@ import org.gcube.portlet.user.userstatisticsportlet.client.ui.CommentsAndLikesWi import org.gcube.portlet.user.userstatisticsportlet.client.ui.StatisticWidget; import org.gcube.portlet.user.userstatisticsportlet.shared.PostsStatsBean; import org.gcube.portlet.user.userstatisticsportlet.shared.UserInformation; -import org.gcube.portlets.widgets.widgettour.client.extendedclasses.GCubeTour; - -import com.ait.toolkit.hopscotch.client.Placement; -import com.ait.toolkit.hopscotch.client.TourStep; import com.github.gwtbootstrap.client.ui.AlertBlock; import com.github.gwtbootstrap.client.ui.Button; import com.github.gwtbootstrap.client.ui.CheckBox; @@ -198,52 +194,6 @@ public class StatisticsPanel extends Composite { // check which kind of information we have to show isRoot = information.isRoot(); - if(!isRoot){ - - // Build a tour example (please look at WidgetTour.html) - GCubeTour tour = new GCubeTour("tour-example", "user-statistics-portlet", 1, null, "VRE Tour"); - tour.setShowPrevButton(true); - - // add steps - TourStep firstStep = new TourStep(Placement.BOTTOM, "heading"); - firstStep.setContent("Welcome to this VRE. Click next to see what if offers to you"); - firstStep.setTitle("Welcome"); - firstStep.centerXOffset(); - firstStep.centerArrowOffset(); - tour.addStep(firstStep); - - // another - TourStep secondStep = new TourStep(Placement.RIGHT, "statistics-container"); - secondStep.setContent("Here your main statistics are reported"); - secondStep.setTitle("User Statistics"); - tour.addStep(secondStep); - - // another - TourStep thirdStep = new TourStep(Placement.BOTTOM, "shareUpdateDiv"); - thirdStep.setContent("Here you can share your updates puttin text, attaching files (drag and drop can be used)" - + " and much more!"); - thirdStep.setTitle("Share Updates"); - tour.addStep(thirdStep); - - TourStep fourthStep = new TourStep(Placement.TOP, "newsfeedDIV"); - fourthStep.setContent("Here you can see the most recent updates made by VRE's users"); - fourthStep.setTitle("News"); - tour.addStep(fourthStep); - - TourStep fifthStep = new TourStep(Placement.RIGHT, "invite-friends-DIV"); - fifthStep.setContent("Invite your friends that want to share information with us!"); - fifthStep.setTitle("Invite Friends"); - tour.addStep(fifthStep); - - TourStep sixthStep = new TourStep(Placement.LEFT, "LoggedinDiv"); - sixthStep.setContent("Here you can see the current VRE description"); - sixthStep.setTitle("VRE Description"); - tour.addStep(sixthStep); - - // start the tour - tour.startTour(); - } - if(!isRoot && !isProfilePage){ // add the border to the panel and the VRE name (check for VRE name lenght) diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/cache/CacheValueBean.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/cache/CacheValueBean.java index b5b2572..cb44a49 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/cache/CacheValueBean.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/cache/CacheValueBean.java @@ -14,7 +14,7 @@ public class CacheValueBean { /** * @param value - * @param tTL + * @param TTL */ public CacheValueBean(V value, long ttl) { super();