Author: vjrj_ Date: 2012-02-29 16:57:49 +0100 (Wed, 29 Feb 2012) New Revision: 1726 Added: trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java Removed: trunk/src/main/java/cc/kune/gspace/client/actions/InfoContainerBtn.java Modified: trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java Log: NEW - # 193: Add a tool intro tutorial instead of the sample contents http://kune.ourproject.org/issues/ticket/193 Modified: trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -32,6 +32,7 @@ import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; +import cc.kune.gspace.client.actions.TutorialContainerBtn; import com.google.inject.Inject; import com.google.inject.Provider; @@ -50,6 +51,7 @@ final Provider<OpenBartersMenuItem> openContentMenuItem, final Provider<DelBartersMenuItem> delContentMenuItem, final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ParticipateInContentBtn> participateBtn, final Provider<DelFolderMenuItem> delFolderMenuItem, final Provider<RefreshContentMenuItem> refresh) { super(session, stateManager, i18n, registry); @@ -57,6 +59,7 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, newBartersBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); Modified: trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -37,6 +37,7 @@ import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; +import cc.kune.gspace.client.actions.TutorialContainerBtn; import com.google.inject.Inject; import com.google.inject.Provider; @@ -57,7 +58,7 @@ final Provider<NewPostIconBtn> newPostIconBtn, final Provider<NewBlogBtn> newBlogBtn, final Provider<OpenBlogMenuItem> openContentMenuItem, final Provider<DelPostMenuItem> delContentMenuItem, - final Provider<RefreshContentMenuItem> refresh, + final Provider<RefreshContentMenuItem> refresh, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ContentViewerOptionsMenu> optionsMenuContent, final Provider<ParticipateInContentBtn> participateBtn, final BlogsNewMenu blogNewMenu, final PostNewMenu postNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, @@ -73,6 +74,7 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, newBlogBtn, TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -30,6 +30,7 @@ import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; import cc.kune.gspace.client.actions.RefreshContentMenuItem; +import cc.kune.gspace.client.actions.TutorialContainerBtn; import com.google.inject.Inject; import com.google.inject.Provider; @@ -47,13 +48,14 @@ final Provider<RefreshContentMenuItem> refresh, final Provider<NewRoomBtn> newRoomBtn, final Provider<OpenRoomMenuItem> openRoomMenuItem, final Provider<GoParentChatBtn> folderGoUp, final Provider<OpenRoomArchiveMenuItem> openRoomArchiveMenuItem, - final Provider<OpenRoomBtn> openRoomBtn, + final Provider<OpenRoomBtn> openRoomBtn, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ContentViewerOptionsMenu> optionsMenuContent) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, newRoomBtn, TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, openRoomBtn, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openRoomMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openRoomArchiveMenuItem, containersNoRoot); Modified: trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -34,6 +34,7 @@ import cc.kune.gspace.client.actions.AbstractFoldableToolActions; import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.TutorialContainerBtn; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; @@ -60,7 +61,8 @@ final Provider<ContentViewerOptionsMenu> optionsMenuContent, final Provider<ParticipateInContentBtn> participateBtn, final Provider<DelFolderMenuItem> delFolderMenuItem, - final Provider<ChatAboutContentBtn> chatAbout, final Provider<RefreshContentMenuItem> refresh, + final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ChatAboutContentBtn> chatAbout, + final Provider<RefreshContentMenuItem> refresh, final Provider<SetAsHomePageMenuItem> setAsHomePage, final NewMenusForTypeIdsRegistry newMenusRegistry, final DocsFolderNewMenu foldersNewMenu, final DocsNewMenu docsNewMenu) { @@ -74,6 +76,7 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, newDocMenuItem, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderMenuItem, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); Deleted: trunk/src/main/java/cc/kune/gspace/client/actions/InfoContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/InfoContainerBtn.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/gspace/client/actions/InfoContainerBtn.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -1,64 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.gspace.client.actions; - -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.core.client.actions.RolAction; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.AccessRolDTO; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; - -public class InfoContainerBtn extends ButtonDescriptor { - - public static class GoParentContainerAction extends RolAction { - - private final EventBus bus; - private final Session session; - - @Inject - public GoParentContainerAction(final EventBus eventBus, final Session session) { - super(AccessRolDTO.Editor, true); - this.bus = eventBus; - this.session = session; - } - - @Override - public void actionPerformed(final ActionEvent event) { - ShowHelpContainerEvent.fire(bus, session.getCurrentStateToken().getTool()); - } - - } - - public static final String INFO_CONTAINER_ID = "k-container-info-id"; - - public InfoContainerBtn(final I18nTranslationService i18n, final GoParentContainerAction action, - final CoreResources res) { - super(action); - this.withToolTip(i18n.t("New to this tool? Here there is some help")).withIcon(res.infoLight()).withStyles( - "k-btn-min, k-fr"); - this.withId(INFO_CONTAINER_ID); - } - -} Copied: trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java (from rev 1718, trunk/src/main/java/cc/kune/gspace/client/actions/InfoContainerBtn.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -0,0 +1,68 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gspace.client.actions; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.resources.CommonResources; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.AccessRolDTO; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class TutorialContainerBtn extends ButtonDescriptor { + + @Singleton + public static class GoParentContainerAction extends RolAction { + + private final EventBus bus; + private final Session session; + + @Inject + public GoParentContainerAction(final EventBus eventBus, final Session session) { + super(AccessRolDTO.Editor, true); + this.bus = eventBus; + this.session = session; + } + + @Override + public void actionPerformed(final ActionEvent event) { + ShowHelpContainerEvent.fire(bus, session.getCurrentStateToken().getTool()); + } + + } + + public static final String INFO_CONTAINER_ID = "k-container-info-id"; + + @Inject + public TutorialContainerBtn(final I18nTranslationService i18n, final GoParentContainerAction action, + final CommonResources res) { + super(action); + this.withToolTip(i18n.t("New to this tool? Here there is some help")).withIcon(res.info()).withStyles( + "k-btn-min, k-fr"); + this.withId(INFO_CONTAINER_ID); + } + +} Modified: trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -34,6 +34,7 @@ import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; +import cc.kune.gspace.client.actions.TutorialContainerBtn; import com.google.inject.Inject; import com.google.inject.Provider; @@ -56,6 +57,8 @@ final Provider<RefreshListMenuItem> refresh, final Provider<SubscribeToListBtn> subscribeBtn, final Provider<OptionsListMenu> optionsMenuContent, final Provider<ShowSubscribersOfListBtn> subscribersCount, + final Provider<TutorialContainerBtn> tutorialBtn, + final Provider<SetListOpenessMenuItem> listOpenessMenuItem, final Provider<ParticipateInContentBtn> participateBtn, final ListsNewMenu listNewMenu, final PostNewMenu postNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, @@ -75,6 +78,7 @@ // TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribersCount, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); Modified: trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -37,6 +37,7 @@ import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; +import cc.kune.gspace.client.actions.TutorialContainerBtn; import com.google.inject.Inject; import com.google.inject.Provider; @@ -60,6 +61,8 @@ final Provider<RefreshContentMenuItem> refresh, final Provider<ContentViewerOptionsMenu> optionsMenuContent, final Provider<ParticipateInContentBtn> participateBtn, + final Provider<TutorialContainerBtn> tutorialBtn, + final TasksFolderNewMenu taskFolderNewMenu, final TasksNewMenu taskNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, final Provider<ChatAboutContentBtn> chatAbout, final Provider<DelFolderMenuItem> delFolderMenuItem, @@ -75,6 +78,7 @@ // actionsRegistry.addAction(ActionGroups.TOOLBAR, newTaskItem, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); Modified: trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-02-29 12:34:32 UTC (rev 1725) +++ trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-02-29 15:57:49 UTC (rev 1726) @@ -37,6 +37,7 @@ import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; +import cc.kune.gspace.client.actions.TutorialContainerBtn; import com.google.inject.Inject; import com.google.inject.Provider; @@ -58,6 +59,7 @@ final Provider<DelWikiMenuItem> delContentMenuItem, final Provider<ContentViewerOptionsMenu> optionsMenuContent, final Provider<ParticipateInContentBtn> participateBtn, + final Provider<TutorialContainerBtn> tutorialBtn, final Provider<DelFolderMenuItem> delFolderMenuItem, final Provider<NewFolderBtn> newFolderBtn, final Provider<ChatAboutContentBtn> chatAbout, final Provider<RefreshContentMenuItem> refresh, final Provider<SetAsHomePageMenuItem> setAsHomePage, @@ -77,6 +79,7 @@ // containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents);