- kune-commits - lists.ourproject.org

12 Feb '11

Author: vjrj_ Date: 2011-02-12 03:18:52 +0100 (Sat, 12 Feb 2011) New Revision: 1249 Added: branches/wave-jetty-embed-guice/ branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/ChatGinModule.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/client/KuneGinjector.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/common/KuneCommon.gwt.xml branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreGinModule.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreParts.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/ws/entheader/ branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/public/ws.css branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/app/public/css/kune-new.css branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java branches/wave-jetty-embed-guice/src/test/java/cc/kune/core/client/ws/ branches/wave-jetty-embed-guice/src/test/java/testsuites/OthersTestSuite.java Removed: branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/ChatGinModule.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/client/KuneGinjector.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/common/KuneCommon.gwt.xml branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreGinModule.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreParts.java branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/public/ws.css branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/app/public/css/kune-new.css branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java branches/wave-jetty-embed-guice/src/test/java/org/ourproject/kune/workspace/client/entityheader/ branches/wave-jetty-embed-guice/src/test/java/testsuites/OthersTestSuite.java Modified: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/rack/RackServletFilter.java Log: some wave startup testing Copied: branches/wave-jetty-embed-guice (from rev 1247, trunk) Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java (from rev 1248, trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,117 @@ +/* + * + * 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.chat.client; + +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.PropertyChangeEvent; +import cc.kune.common.client.actions.PropertyChangeListener; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.im.client.roster.XmppRoster; +import com.calclab.emite.im.client.roster.events.RosterGroupChangedEvent; +import com.calclab.emite.im.client.roster.events.RosterGroupChangedHandler; +import com.calclab.suco.client.Suco; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class AddAsBuddieHeaderButton { + + public static class AddAsBuddieAction extends AbstractExtendedAction { + private final Provider<ChatClientDefault> chatEngine; + private final Session session; + + @Inject + public AddAsBuddieAction(final Provider<ChatClientDefault> chatEngine, final Session session, + final StateManager stateManager, final I18nTranslationService i18n, final IconResources img) { + super(); + this.chatEngine = chatEngine; + this.session = session; + stateManager.onStateChanged(new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); + } + }); + Suco.get(XmppRoster.class).addRosterGroupChangedHandler(new RosterGroupChangedHandler() { + + @Override + public void onGroupChanged(final RosterGroupChangedEvent event) { + setState(session.getCurrentState()); + } + }); + putValue(Action.NAME, i18n.t("Add as a buddie")); + putValue(Action.SMALL_ICON, IconConstants.toPath(img.addGreen())); + } + + @Override + public void actionPerformed(final ActionEvent event) { + chatEngine.get().addNewBuddie(session.getCurrentState().getGroup().getShortName()); + NotifyUser.info("Added as buddie. Waiting buddie response"); + setEnabled(false); + } + + private boolean currentGroupsIsAsPerson(final StateAbstractDTO state) { + return state.getGroup().isPersonal(); + } + + private boolean isNotMe(final String groupName) { + return !session.getCurrentUser().getShortName().equals(groupName); + } + + private void setState(final StateAbstractDTO state) { + final String groupName = state.getGroup().getShortName(); + final boolean imLogged = session.isLogged(); + final boolean isNotBuddie = !chatEngine.get().isBuddie(groupName); + if (imLogged && currentGroupsIsAsPerson(state) && isNotBuddie && isNotMe(groupName)) { + setEnabled(true); + } else { + setEnabled(false); + } + } + } + + @Inject + public AddAsBuddieHeaderButton(final AddAsBuddieAction buddieAction, final EntityHeader entityHeader) { + final ButtonDescriptor button = new ButtonDescriptor(buddieAction); + button.setVisible(false); + buddieAction.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(AbstractAction.ENABLED)) { + button.setVisible((Boolean) event.getNewValue()); + } + } + }); + entityHeader.addAction(button); + } +} \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/ChatGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,36 +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.chat.client; - -import com.google.inject.Singleton; -import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; - -public class ChatGinModule extends AbstractPresenterModule { - /* - * (non-Javadoc) - * - * @see com.google.gwt.inject.client.AbstractGinModule#configure() - */ - @Override - protected void configure() { - bind(ChatClient.class).to(ChatClientDefault.class).in(Singleton.class); - bind(ChatOptions.class).in(Singleton.class); - } -} \ No newline at end of file Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/ChatGinModule.java (from rev 1248, trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/ChatGinModule.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,37 @@ +/* + * + * 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.chat.client; + +import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; + +public class ChatGinModule extends AbstractPresenterModule { + /* + * (non-Javadoc) + * + * @see com.google.gwt.inject.client.AbstractGinModule#configure() + */ + @Override + protected void configure() { + bind(ChatClient.class).to(ChatClientDefault.class).in(Singleton.class); + bind(ChatOptions.class).in(Singleton.class); + bind(AddAsBuddieHeaderButton.class).in(Singleton.class); + } +} \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,119 +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.client; - -import cc.kune.chat.client.ChatClient; -import cc.kune.chat.client.ChatGinModule; -import cc.kune.common.client.actions.gwtui.GwtGuiProvider; -import cc.kune.common.client.actions.gxtui.GxtGuiProvider; -import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.common.client.shortcuts.GlobalShortcutRegister; -import cc.kune.core.client.CoreGinModule; -import cc.kune.core.client.CoreParts; -import cc.kune.core.client.auth.RegisterPresenter; -import cc.kune.core.client.auth.SignInPresenter; -import cc.kune.core.client.cookies.CookiesManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.groups.newgroup.NewGroupPresenter; -import cc.kune.core.client.logs.EventBusWithLogging; -import cc.kune.core.client.notify.confirm.UserConfirmPresenter; -import cc.kune.core.client.notify.msgs.UserNotifierPresenter; -import cc.kune.core.client.notify.spiner.SpinerPresenter; -import cc.kune.core.client.sitebar.SitebarActionsPresenter; -import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; -import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; -import cc.kune.core.client.sn.GroupMembersPresenter; -import cc.kune.core.client.state.SiteTokenListeners; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; -import cc.kune.core.client.ws.CorePresenter; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.pspace.client.PSpaceGinModule; -import cc.kune.pspace.client.PSpacePresenter; - -import com.google.gwt.event.shared.EventBus; -import com.google.gwt.inject.client.AsyncProvider; -import com.google.gwt.inject.client.GinModules; -import com.google.gwt.inject.client.Ginjector; -import com.google.inject.Provider; -import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; - -@GinModules({ CoreGinModule.class, ChatGinModule.class, PSpaceGinModule.class }) -public interface KuneGinjector extends Ginjector { - - /* - * You have to add here all the GWTPresenters (as Provider or AsyncProvider) - * see the GWTPlatform doc - */ - - ChatClient getChatClient(); - - AsyncProvider<CookiesManager> getCookiesManager(); - - CoreParts getCoreParts(); - - Provider<CorePresenter> getCorePresenter(); - - AsyncProvider<EntityLicensePresenter> getEntityLicensePresenter(); - - ErrorHandler getErrorHandler(); - - EventBus getEventBus(); - - EventBusWithLogging getEventLogger(); - - GlobalShortcutRegister getGlobalShortcutRegister(); - - AsyncProvider<GroupMembersPresenter> getGroupMembersPresenter(); - - GuiProvider getGuiProvider(); - - GwtGuiProvider getGwtGuiProvider(); - - GxtGuiProvider getGxtGuiProvider(); - - I18nTranslationService getI18n(); - - AsyncProvider<NewGroupPresenter> getNewGroupPresenter(); - - ProxyFailureHandler getProxyFailureHandler(); - - AsyncProvider<PSpacePresenter> getPSpacePresenter(); - - AsyncProvider<RegisterPresenter> getRegisterPresenter(); - - AsyncProvider<SignInPresenter> getSignInPresenter(); - - AsyncProvider<SitebarActionsPresenter> getSitebarActionsPresenter(); - - AsyncProvider<SiteLogoPresenter> getSiteLogoPresenter(); - - SiteTokenListeners getSiteTokenListeners(); - - AsyncProvider<SpaceSelectorPresenter> getSpacesTabPresenter(); - - AsyncProvider<SpinerPresenter> getSpinerPresenter(); - - StateManager getStateManager(); - - AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); - - AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); -} \ No newline at end of file Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/client/KuneGinjector.java (from rev 1248, trunk/src/main/java/cc/kune/client/KuneGinjector.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/cc/kune/client/KuneGinjector.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,122 @@ +/* + * + * 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.client; + +import cc.kune.chat.client.ChatClient; +import cc.kune.chat.client.ChatGinModule; +import cc.kune.common.client.actions.gwtui.GwtGuiProvider; +import cc.kune.common.client.actions.gxtui.GxtGuiProvider; +import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.core.client.CoreGinModule; +import cc.kune.core.client.CoreParts; +import cc.kune.core.client.auth.RegisterPresenter; +import cc.kune.core.client.auth.SignInPresenter; +import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.groups.newgroup.NewGroupPresenter; +import cc.kune.core.client.logs.EventBusWithLogging; +import cc.kune.core.client.notify.confirm.UserConfirmPresenter; +import cc.kune.core.client.notify.msgs.UserNotifierPresenter; +import cc.kune.core.client.notify.spiner.SpinerPresenter; +import cc.kune.core.client.sitebar.SitebarActionsPresenter; +import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; +import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; +import cc.kune.core.client.sn.GroupMembersPresenter; +import cc.kune.core.client.state.SiteTokenListeners; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; +import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.pspace.client.PSpaceGinModule; +import cc.kune.pspace.client.PSpacePresenter; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.inject.client.AsyncProvider; +import com.google.gwt.inject.client.GinModules; +import com.google.gwt.inject.client.Ginjector; +import com.google.inject.Provider; +import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; + +@GinModules({ CoreGinModule.class, ChatGinModule.class, PSpaceGinModule.class }) +public interface KuneGinjector extends Ginjector { + + /* + * You have to add here all the GWTPresenters (as Provider or AsyncProvider) + * see the GWTPlatform doc + */ + + ChatClient getChatClient(); + + AsyncProvider<CookiesManager> getCookiesManager(); + + CoreParts getCoreParts(); + + Provider<CorePresenter> getCorePresenter(); + + AsyncProvider<EntityHeaderPresenter> getEntityHeaderPresenter(); + + AsyncProvider<EntityLicensePresenter> getEntityLicensePresenter(); + + ErrorHandler getErrorHandler(); + + EventBus getEventBus(); + + EventBusWithLogging getEventLogger(); + + GlobalShortcutRegister getGlobalShortcutRegister(); + + AsyncProvider<GroupMembersPresenter> getGroupMembersPresenter(); + + GuiProvider getGuiProvider(); + + GwtGuiProvider getGwtGuiProvider(); + + GxtGuiProvider getGxtGuiProvider(); + + I18nTranslationService getI18n(); + + AsyncProvider<NewGroupPresenter> getNewGroupPresenter(); + + ProxyFailureHandler getProxyFailureHandler(); + + AsyncProvider<PSpacePresenter> getPSpacePresenter(); + + AsyncProvider<RegisterPresenter> getRegisterPresenter(); + + AsyncProvider<SignInPresenter> getSignInPresenter(); + + AsyncProvider<SitebarActionsPresenter> getSitebarActionsPresenter(); + + AsyncProvider<SiteLogoPresenter> getSiteLogoPresenter(); + + SiteTokenListeners getSiteTokenListeners(); + + AsyncProvider<SpaceSelectorPresenter> getSpacesTabPresenter(); + + AsyncProvider<SpinerPresenter> getSpinerPresenter(); + + StateManager getStateManager(); + + AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); + + AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); +} \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/cc/kune/common/KuneCommon.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module> -  - <inherits name='com.google.gwt.user.User' /> -  -  -  -  -  -  -  -  - -  - <source path='client' /> - <public path="public" /> - <inherits name='org.cobogw.gwt.user.User' /> - <inherits name='com.google.gwt.inject.Inject' /> - <inherits name="com.extjs.gxt.ui.GXT" /> - <stylesheet src="kune-common.css" /> -</module> \ No newline at end of file Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/common/KuneCommon.gwt.xml (from rev 1248, trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/cc/kune/common/KuneCommon.gwt.xml (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module> +  + <inherits name='com.google.gwt.user.User' /> +  +  +  +  +  +  +  +  +  +  + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + <public path="public" /> + <inherits name='org.cobogw.gwt.user.User' /> + <inherits name='com.google.gwt.inject.Inject' /> + <inherits name="com.extjs.gxt.ui.GXT" /> + <stylesheet src="kune-common.css" /> +</module> \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,194 +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.core.client; - -import cc.kune.common.client.actions.gwtui.GwtGuiProvider; -import cc.kune.common.client.actions.gxtui.GxtGuiProvider; -import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider; -import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.common.client.shortcuts.DefaultGlobalShortcutRegister; -import cc.kune.common.client.shortcuts.GlobalShortcutRegister; -import cc.kune.common.client.ui.MaskWidget; -import cc.kune.common.client.ui.MaskWidgetView; -import cc.kune.core.client.auth.Register; -import cc.kune.core.client.auth.RegisterPanel; -import cc.kune.core.client.auth.RegisterPresenter; -import cc.kune.core.client.auth.RegisterView; -import cc.kune.core.client.auth.SignIn; -import cc.kune.core.client.auth.SignInPanel; -import cc.kune.core.client.auth.SignInPresenter; -import cc.kune.core.client.auth.SignInView; -import cc.kune.core.client.auth.UserPassAutocompleteManager; -import cc.kune.core.client.auth.UserPassAutocompleteManagerImpl; -import cc.kune.core.client.cookies.CookiesManager; -import cc.kune.core.client.cookies.CookiesManagerImpl; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.groups.newgroup.NewGroup; -import cc.kune.core.client.groups.newgroup.NewGroupPanel; -import cc.kune.core.client.groups.newgroup.NewGroupPresenter; -import cc.kune.core.client.groups.newgroup.NewGroupView; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.init.AppStarter; -import cc.kune.core.client.init.AppStarterDefault; -import cc.kune.core.client.init.PrefetchUtilities; -import cc.kune.core.client.logs.EventBusWithLogging; -import cc.kune.core.client.notify.confirm.UserConfirmPanel; -import cc.kune.core.client.notify.confirm.UserConfirmPresenter; -import cc.kune.core.client.notify.msgs.UserNotifierPresenter; -import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierProxy; -import cc.kune.core.client.notify.msgs.UserNotifierViewImpl; -import cc.kune.core.client.notify.spiner.SpinerPresenter; -import cc.kune.core.client.notify.spiner.SpinerViewImpl; -import cc.kune.core.client.sitebar.SiteUserOptions; -import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; -import cc.kune.core.client.sitebar.SitebarActionsPanel; -import cc.kune.core.client.sitebar.SitebarActionsPresenter; -import cc.kune.core.client.sitebar.SitebarNewGroupLink; -import cc.kune.core.client.sitebar.SitebarSignInLink; -import cc.kune.core.client.sitebar.SitebarSignOutLink; -import cc.kune.core.client.sitebar.SitebarSignOutLink.BeforeSignOut; -import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; -import cc.kune.core.client.sitebar.logo.SiteLogoViewImpl; -import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; -import cc.kune.core.client.sitebar.spaces.SpaceSelectorViewImpl; -import cc.kune.core.client.sn.GroupMembersPanel; -import cc.kune.core.client.sn.GroupMembersPresenter; -import cc.kune.core.client.sn.actions.registry.GroupMembersActionsRegistry; -import cc.kune.core.client.sn.actions.registry.SNAdminsMenuItemsRegistry; -import cc.kune.core.client.sn.actions.registry.SNCollabsMenuItemsRegistry; -import cc.kune.core.client.sn.actions.registry.SNPendingsMenuItemsRegistry; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.ContentProvider; -import cc.kune.core.client.state.ContentProviderDefault; -import cc.kune.core.client.state.HistoryWrapper; -import cc.kune.core.client.state.HistoryWrapperDefault; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SessionDefault; -import cc.kune.core.client.state.SiteTokenListeners; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.state.StateManagerDefault; -import cc.kune.core.client.ui.footer.license.EntityLicensePanel; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; -import cc.kune.core.client.ws.CorePresenter; -import cc.kune.core.client.ws.CoreViewImpl; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.WsArmor; -import cc.kune.gspace.client.WsArmorImpl; -import cc.kune.msgs.client.UserMessagesPanel; -import cc.kune.msgs.client.UserMessagesPresenter; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Singleton; -import com.gwtplatform.mvp.client.DefaultProxyFailureHandler; -import com.gwtplatform.mvp.client.RootPresenter; -import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; -import com.gwtplatform.mvp.client.proxy.ParameterTokenFormatter; -import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; -import com.gwtplatform.mvp.client.proxy.TokenFormatter; - -public class CoreGinModule extends AbstractPresenterModule { - - /* - * (non-Javadoc) - * - * @see com.google.gwt.inject.client.AbstractGinModule#configure() - */ - @Override - protected void configure() { - bind(EventBus.class).to(EventBusWithLogging.class).in(Singleton.class); - bind(TokenFormatter.class).to(ParameterTokenFormatter.class).in(Singleton.class); - bind(RootPresenter.class).asEagerSingleton(); - bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class); - bind(I18nUITranslationService.class).in(Singleton.class); - bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); - - // Presenters - bindPresenter(CorePresenter.class, CorePresenter.CoreView.class, CoreViewImpl.class, - CorePresenter.CoreProxy.class); - bindPresenter(SpinerPresenter.class, SpinerPresenter.SpinerView.class, SpinerViewImpl.class, - SpinerPresenter.SpinerProxy.class); - bindPresenter(UserNotifierPresenter.class, UserNotifierPresenter.UserNotifierView.class, - UserNotifierViewImpl.class, UserNotifierProxy.class); - - bindPresenter(SpaceSelectorPresenter.class, SpaceSelectorPresenter.SpaceSelectorView.class, - SpaceSelectorViewImpl.class, SpaceSelectorPresenter.SpaceSelectorProxy.class); - bindPresenter(SiteLogoPresenter.class, SiteLogoPresenter.SiteLogoView.class, SiteLogoViewImpl.class, - SiteLogoPresenter.SiteLogoProxy.class); - bindPresenter(SitebarActionsPresenter.class, SitebarActionsPresenter.SitebarActionsView.class, - SitebarActionsPanel.class, SitebarActionsPresenter.SitebarActionsProxy.class); - bindPresenter(NewGroupPresenter.class, NewGroupView.class, NewGroupPanel.class, - NewGroupPresenter.NewGroupProxy.class); - bindPresenter(GroupMembersPresenter.class, GroupMembersPresenter.GroupMembersView.class, - GroupMembersPanel.class, GroupMembersPresenter.GroupMembersProxy.class); - bindPresenter(EntityLicensePresenter.class, EntityLicensePresenter.EntityLicenseView.class, - EntityLicensePanel.class, EntityLicensePresenter.EntityLicenseProxy.class); - - bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); - bindPresenter(SignInPresenter.class, SignInView.class, SignInPanel.class, SignInPresenter.SignInProxy.class); - bindPresenter(RegisterPresenter.class, RegisterView.class, RegisterPanel.class, - RegisterPresenter.RegisterProxy.class); - bind(SignIn.class).to(SignInPresenter.class).in(Singleton.class); - bind(Register.class).to(RegisterPresenter.class).in(Singleton.class); - bind(NewGroup.class).to(NewGroupPresenter.class).in(Singleton.class); - - bind(UserMessagesPresenter.class).in(Singleton.class); - bind(UserMessagesPanel.class).in(Singleton.class); - bindPresenter(UserConfirmPresenter.class, UserConfirmPresenter.UserConfirmView.class, UserConfirmPanel.class, - UserConfirmPresenter.UserConfirmProxy.class); - - // bind(MessagePanelView.class).to(MessagePanel.class); - - // UI - bind(WsArmorImpl.class).in(Singleton.class); - bind(WsArmor.class).to(WsArmorImpl.class).in(Singleton.class); - bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class); - bind(GxtGuiProvider.class).in(Singleton.class); - bind(GwtGuiProvider.class).in(Singleton.class); - bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class); - bind(MaskWidgetView.class).to(MaskWidget.class).in(Singleton.class); - - // Core App - bind(Session.class).to(SessionDefault.class).in(Singleton.class); - bind(ErrorHandler.class).in(Singleton.class); - bind(StateManagerDefault.class).in(Singleton.class); - bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); - bind(AccessRightsClientManager.class).in(Singleton.class); - bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); - bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); - bind(PrefetchUtilities.class).in(Singleton.class); - bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class); - bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class); - bind(BeforeSignOut.class).in(Singleton.class); - bind(SiteTokenListeners.class).asEagerSingleton(); - bind(CoreParts.class).asEagerSingleton(); - - // SN - bind(SNAdminsMenuItemsRegistry.class).in(Singleton.class); - bind(SNCollabsMenuItemsRegistry.class).in(Singleton.class); - bind(SNPendingsMenuItemsRegistry.class).in(Singleton.class); - bind(GroupMembersActionsRegistry.class).in(Singleton.class); - - bind(SiteUserOptions.class).to(SiteUserOptionsPresenter.class).in(Singleton.class); - bind(SitebarNewGroupLink.class).in(Singleton.class); - bind(SitebarSignInLink.class).in(Singleton.class); - bind(SitebarSignOutLink.class).in(Singleton.class); - - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreGinModule.java (from rev 1248, trunk/src/main/java/cc/kune/core/client/CoreGinModule.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreGinModule.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,200 @@ +/* + * + * 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.core.client; + +import cc.kune.common.client.actions.gwtui.GwtGuiProvider; +import cc.kune.common.client.actions.gxtui.GxtGuiProvider; +import cc.kune.common.client.actions.ui.bind.DefaultGuiProvider; +import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.shortcuts.DefaultGlobalShortcutRegister; +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.client.ui.MaskWidget; +import cc.kune.common.client.ui.MaskWidgetView; +import cc.kune.core.client.auth.Register; +import cc.kune.core.client.auth.RegisterPanel; +import cc.kune.core.client.auth.RegisterPresenter; +import cc.kune.core.client.auth.RegisterView; +import cc.kune.core.client.auth.SignIn; +import cc.kune.core.client.auth.SignInPanel; +import cc.kune.core.client.auth.SignInPresenter; +import cc.kune.core.client.auth.SignInView; +import cc.kune.core.client.auth.UserPassAutocompleteManager; +import cc.kune.core.client.auth.UserPassAutocompleteManagerImpl; +import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.cookies.CookiesManagerImpl; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.groups.newgroup.NewGroup; +import cc.kune.core.client.groups.newgroup.NewGroupPanel; +import cc.kune.core.client.groups.newgroup.NewGroupPresenter; +import cc.kune.core.client.groups.newgroup.NewGroupView; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.init.AppStarter; +import cc.kune.core.client.init.AppStarterDefault; +import cc.kune.core.client.init.PrefetchUtilities; +import cc.kune.core.client.logs.EventBusWithLogging; +import cc.kune.core.client.notify.confirm.UserConfirmPanel; +import cc.kune.core.client.notify.confirm.UserConfirmPresenter; +import cc.kune.core.client.notify.msgs.UserNotifierPresenter; +import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierProxy; +import cc.kune.core.client.notify.msgs.UserNotifierViewImpl; +import cc.kune.core.client.notify.spiner.SpinerPresenter; +import cc.kune.core.client.notify.spiner.SpinerViewImpl; +import cc.kune.core.client.sitebar.SiteUserOptions; +import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; +import cc.kune.core.client.sitebar.SitebarActionsPanel; +import cc.kune.core.client.sitebar.SitebarActionsPresenter; +import cc.kune.core.client.sitebar.SitebarNewGroupLink; +import cc.kune.core.client.sitebar.SitebarSignInLink; +import cc.kune.core.client.sitebar.SitebarSignOutLink; +import cc.kune.core.client.sitebar.SitebarSignOutLink.BeforeSignOut; +import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; +import cc.kune.core.client.sitebar.logo.SiteLogoViewImpl; +import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; +import cc.kune.core.client.sitebar.spaces.SpaceSelectorViewImpl; +import cc.kune.core.client.sn.GroupMembersPanel; +import cc.kune.core.client.sn.GroupMembersPresenter; +import cc.kune.core.client.sn.actions.registry.GroupMembersActionsRegistry; +import cc.kune.core.client.sn.actions.registry.SNAdminsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNCollabsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNPendingsMenuItemsRegistry; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.ContentProvider; +import cc.kune.core.client.state.ContentProviderDefault; +import cc.kune.core.client.state.HistoryWrapper; +import cc.kune.core.client.state.HistoryWrapperDefault; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SessionDefault; +import cc.kune.core.client.state.SiteTokenListeners; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.StateManagerDefault; +import cc.kune.core.client.ui.footer.license.EntityLicensePanel; +import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; +import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.client.ws.CoreViewImpl; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.client.ws.entheader.EntityHeaderPanel; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import cc.kune.gspace.client.WsArmorImpl; +import cc.kune.msgs.client.UserMessagesPanel; +import cc.kune.msgs.client.UserMessagesPresenter; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.DefaultProxyFailureHandler; +import com.gwtplatform.mvp.client.RootPresenter; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; +import com.gwtplatform.mvp.client.proxy.ParameterTokenFormatter; +import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; +import com.gwtplatform.mvp.client.proxy.TokenFormatter; + +public class CoreGinModule extends AbstractPresenterModule { + + /* + * (non-Javadoc) + * + * @see com.google.gwt.inject.client.AbstractGinModule#configure() + */ + @Override + protected void configure() { + bind(EventBus.class).to(EventBusWithLogging.class).in(Singleton.class); + bind(TokenFormatter.class).to(ParameterTokenFormatter.class).in(Singleton.class); + bind(RootPresenter.class).asEagerSingleton(); + bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class); + bind(I18nUITranslationService.class).in(Singleton.class); + bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); + + // Presenters + bindPresenter(CorePresenter.class, CorePresenter.CoreView.class, CoreViewImpl.class, + CorePresenter.CoreProxy.class); + bindPresenter(SpinerPresenter.class, SpinerPresenter.SpinerView.class, SpinerViewImpl.class, + SpinerPresenter.SpinerProxy.class); + bindPresenter(UserNotifierPresenter.class, UserNotifierPresenter.UserNotifierView.class, + UserNotifierViewImpl.class, UserNotifierProxy.class); + + bindPresenter(SpaceSelectorPresenter.class, SpaceSelectorPresenter.SpaceSelectorView.class, + SpaceSelectorViewImpl.class, SpaceSelectorPresenter.SpaceSelectorProxy.class); + bindPresenter(SiteLogoPresenter.class, SiteLogoPresenter.SiteLogoView.class, SiteLogoViewImpl.class, + SiteLogoPresenter.SiteLogoProxy.class); + bindPresenter(SitebarActionsPresenter.class, SitebarActionsPresenter.SitebarActionsView.class, + SitebarActionsPanel.class, SitebarActionsPresenter.SitebarActionsProxy.class); + bindPresenter(NewGroupPresenter.class, NewGroupView.class, NewGroupPanel.class, + NewGroupPresenter.NewGroupProxy.class); + bindPresenter(GroupMembersPresenter.class, GroupMembersPresenter.GroupMembersView.class, + GroupMembersPanel.class, GroupMembersPresenter.GroupMembersProxy.class); + bindPresenter(EntityLicensePresenter.class, EntityLicensePresenter.EntityLicenseView.class, + EntityLicensePanel.class, EntityLicensePresenter.EntityLicenseProxy.class); + bindPresenter(EntityHeaderPresenter.class, EntityHeaderPresenter.EntityHeaderView.class, + EntityHeaderPanel.class, EntityHeaderPresenter.EntityHeaderProxy.class); + + bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); + bindPresenter(SignInPresenter.class, SignInView.class, SignInPanel.class, SignInPresenter.SignInProxy.class); + bindPresenter(RegisterPresenter.class, RegisterView.class, RegisterPanel.class, + RegisterPresenter.RegisterProxy.class); + bind(SignIn.class).to(SignInPresenter.class).in(Singleton.class); + bind(Register.class).to(RegisterPresenter.class).in(Singleton.class); + bind(NewGroup.class).to(NewGroupPresenter.class).in(Singleton.class); + bind(EntityHeader.class).to(EntityHeaderPresenter.class).in(Singleton.class); + + bind(UserMessagesPresenter.class).in(Singleton.class); + bind(UserMessagesPanel.class).in(Singleton.class); + bindPresenter(UserConfirmPresenter.class, UserConfirmPresenter.UserConfirmView.class, UserConfirmPanel.class, + UserConfirmPresenter.UserConfirmProxy.class); + + // bind(MessagePanelView.class).to(MessagePanel.class); + + // UI + bind(WsArmorImpl.class).in(Singleton.class); + bind(WsArmor.class).to(WsArmorImpl.class).in(Singleton.class); + bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class); + bind(GxtGuiProvider.class).in(Singleton.class); + bind(GwtGuiProvider.class).in(Singleton.class); + bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class); + bind(MaskWidgetView.class).to(MaskWidget.class).in(Singleton.class); + + // Core App + bind(Session.class).to(SessionDefault.class).in(Singleton.class); + bind(ErrorHandler.class).in(Singleton.class); + bind(StateManagerDefault.class).in(Singleton.class); + bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); + bind(AccessRightsClientManager.class).in(Singleton.class); + bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); + bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); + bind(PrefetchUtilities.class).in(Singleton.class); + bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class); + bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class); + bind(BeforeSignOut.class).in(Singleton.class); + bind(SiteTokenListeners.class).asEagerSingleton(); + bind(CoreParts.class).asEagerSingleton(); + + // SN + bind(SNAdminsMenuItemsRegistry.class).in(Singleton.class); + bind(SNCollabsMenuItemsRegistry.class).in(Singleton.class); + bind(SNPendingsMenuItemsRegistry.class).in(Singleton.class); + bind(GroupMembersActionsRegistry.class).in(Singleton.class); + + bind(SiteUserOptions.class).to(SiteUserOptionsPresenter.class).in(Singleton.class); + bind(SitebarNewGroupLink.class).in(Singleton.class); + bind(SitebarSignInLink.class).in(Singleton.class); + bind(SitebarSignOutLink.class).in(Singleton.class); + + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,27 +0,0 @@ -package cc.kune.core.client; - -import cc.kune.core.client.init.AppStartEvent; -import cc.kune.core.client.init.AppStartEvent.AppStartHandler; -import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; -import cc.kune.core.client.sn.GroupMembersPresenter; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class CoreParts { - - @Inject - public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter, - final Provider<SiteUserOptionsPresenter> userOptions, final Provider<EntityLicensePresenter> licenseFooter) { - session.onInitDataReceived(new AppStartHandler() { - @Override - public void onAppStart(final AppStartEvent event) { - grouMembersPresenter.get(); - userOptions.get(); - licenseFooter.get(); - } - }); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreParts.java (from rev 1248, trunk/src/main/java/cc/kune/core/client/CoreParts.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreParts.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,30 @@ +package cc.kune.core.client; + +import cc.kune.chat.client.AddAsBuddieHeaderButton; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; +import cc.kune.core.client.sn.GroupMembersPresenter; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class CoreParts { + + @Inject + public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter, + final Provider<SiteUserOptionsPresenter> userOptions, final Provider<EntityLicensePresenter> licenseFooter, + final Provider<AddAsBuddieHeaderButton> buddieButton) { + session.onInitDataReceived(new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + grouMembersPresenter.get(); + userOptions.get(); + licenseFooter.get(); + buddieButton.get(); + } + }); + } +} Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/client/ws/entheader (from rev 1248, trunk/src/main/java/cc/kune/core/client/ws/entheader) Deleted: branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/public/ws.css 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,935 +0,0 @@ -@CHARSET "UTF-8"; - -body { - background-color: white; - color: black; - font-family: 'Ubuntu', Arial; - font-size: small; - margin: 5px; - overflow: hidden; -} - -* { - font-family: 'Ubuntu', Arial; -} - -body.fontface { - font: 'Ubuntu', Arial; -} - -/* -a { - color: darkblue; -} - -a:visited { - color: darkblue; -} -*/ -.gwt-DialogBox { - border: 2px solid #AAAAAA; - background-color: white; -} - -.gwt-DialogBox .Caption { - background-image: url(gray_gradient.gif); - background-repeat: repeat-x; - padding: 4px; - padding-bottom: 8px; - font-weight: bold; - cursor: default; -} - -.gwt-MenuBar { - background-color: #C3D9FF; - cursor: default; -} - -.gwt-MenuItem { - font-size: 80%; - margin: 1px; - cursor: default; -} - -.gwt-MenuItem-selected { - background-color: #E8EEF7; -} - -.gwt-Tree { - -} - -.gwt-Tree .gwt-TreeItem { - font-size: 80%; - cursor: default; -} - -.gwt-Tree .gwt-TreeItem-selected { - background-color: #C3D9FF; -} - -.gwt-StackPanel { - background-color: white; - border: 1px solid #AAAAAA; - width: 15em; -} - -.gwt-StackPanel .gwt-StackPanelItem { - background-image: url(blue_gradient.gif); - background-repeat: repeat-x; - background-color: #EEEEEE; - cursor: pointer; - cursor: hand; -} - -.gwt-StackPanel .gwt-StackPanelItem-selected { - -} - -.gwt-TabPanel { - -} - -.gwt-TabPanelBottom { - border-left: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; -} - -.gwt-TabBar { - font-size: smaller; -} - -.gwt-TabBar .gwt-TabBarFirst { - height: 100%; - border-bottom: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - padding-left: 3px; -} - -.gwt-TabBar .gwt-TabBarRest { - border-bottom: 1px solid #87b3ff; - padding-right: 3px; -} - -.gwt-TabBar .gwt-TabBarItem { - border-top: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; - padding: 2px; - cursor: hand; - white-space: nowrap; - border-right: 1px solid #87b3ff; -} - -.gwt-TabBar .gwt-TabBarItem-selected { - font-weight: bold; - background-color: #e8eef7; - border-top: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #e8eef7; - padding: 2px; - cursor: default; - white-space: nowrap; -} - -.gwt-PushButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-down { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-down { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-RichTextArea { - border: 1px solid black; - background-color: white; -} - -.gwt-RichTextToolbar { - background-color: #C3D9FF; - padding: 2px; -} - -.gwt-RichTextToolbar .gwt-PushButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; -} - -.gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); -} - -.gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); -} - -.gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); -} - -.gwt-HorizontalSplitPanel { - border: 8px solid #C3D9FF; -} - -.gwt-HorizontalSplitPanel .splitter { - background-color: #C3D9FF; - cursor: move; -} - -.gwt-HorizontalSplitPanel .left { - background-color: #E8EEF7; -} - -.gwt-VerticalSplitPanel { - border: 8px solid #C3D9FF; -} - -.gwt-VerticalSplitPanel .splitter { - background-color: #C3D9FF; - height: 8px; - cursor: move; -} - -.gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; -} - -.gwt-SuggestBoxPopup .item { - padding: 2px; -} - -.gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; -} - -.gwt-DisclosurePanel { - border: 2px solid #C3D9FF; -} - -.gwt-DisclosurePanel .header { - background-color: #e8eef7; - cursor: hand; -} - -.gwt-SplitLayoutPanel { - -} - -.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { - background-color: white; - background: none; - cursor: col-resize; -} - -.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { - background-color: white; - background: none; - cursor: row-resize; -} - -.kLoadingPanel { - background-color: #FF9999; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; - padding: 0 1px 0 3px; - border-collapse: separate; - border-spacing: 2px; -} - -.kLoadingLabel { - font-size: 14px; - color: white; - font-weight: bold; - padding: 0 5px 0 5px; -} - -.k-space-sel { - margin-right: 10px; - background-color: #F2F2F2; -} - -.k-space-sel-btn { - padding: 0 1px 0 1px; - margin: 0 0 -2px; -} - -.k-sitebar-logo { - margin-top: 2px; -} - -.x-btn button { - font: 18px/27px 'Ubuntu', arial; -} - -.k-btn-sitebar,.k-btn-sitebar button { - font: 13px 'Ubuntu', arial; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; - white-space: nowrap; -} - -.k-btn-sitebar button { - margin-top: -5px; -} - -.k-sitebar { /* margin-top: -30px; */ - -} - -.k-link { - text-decoration: underline; - color: green; - cursor: pointer; -} - -/* Margins */ -.kune-Margin-40-trbl { - margin: 40px; -} - -.kune-Margin-40-lr { - margin-left: 40px; - margin-right: 40px; -} - -.kune-Margin-40-tl { - margin-top: 40px; - margin-left: 40px; -} - -.kune-Margin-40-tb { - margin-top: 40px; - margin-bottom: 40px; -} - -.kune-Margin-40-t { - margin-top: 40px; -} - -.kune-Margin-40-r { - margin-right: 40px; -} - -.kune-Margin-40-l { - margin-left: 40px; -} - -.kune-Margin-20-trbl { - margin: 20px; -} - -.kune-Margin-20-lr { - margin-left: 20px; - margin-right: 20px; -} - -.kune-Margin-20-tl { - margin-top: 20px; - margin-left: 20px; -} - -.kune-Margin-20-tb { - margin-top: 20px; - margin-bottom: 20px; -} - -.kune-Margin-20-t { - margin-top: 20px; -} - -.kune-Margin-20-r { - margin-right: 20px; -} - -.kune-Margin-20-l { - margin-left: 20px; -} - -.kune-Margin-Large-trbl { - margin: 10px; -} - -.kune-Margin-Large-lr { - margin-left: 10px; - margin-right: 10px; -} - -.kune-Margin-Large-tl { - margin-top: 10px; - margin-left: 10px; -} - -.kune-Margin-Large-tb { - margin-top: 10px; - margin-bottom: 10px; -} - -.kune-Margin-Large-t { - margin-top: 10px; -} - -.kune-Margin-Large-r { - margin-right: 10px; -} - -.kune-Margin-Large-l { - margin-left: 10px; -} - -.kune-Margin-7-trbl { - margin: 7px; -} - -.kune-Margin-7-lr { - margin-left: 7px; - margin-right: 7px; -} - -.kune-Margin-7-tl { - margin-top: 7px; - margin-left: 7px; -} - -.kune-Margin-7-tb { - margin-top: 7px; - margin-bottom: 7px; -} - -.kune-Margin-7-t { - margin-top: 7px; -} - -.kune-Margin-7-r { - margin-right: 7px; -} - -.kune-Margin-7-b { - margin-bottom: 7px; -} - -.kune-Margin-7-l { - margin-left: 7px; -} - -.kune-Margin-Medium-trbl { - margin: 5px; -} - -.kune-Margin-Medium-lr { - margin-left: 5px; - margin-right: 5px; -} - -.kune-Margin-Medium-tl { - margin-top: 5px; - margin-left: 5px; -} - -.kune-Margin-Medium-tb { - margin-top: 5px; - margin-bottom: 5px; -} - -.kune-Margin-Medium-t { - margin-top: 5px; -} - -.kune-Margin-Medium-r { - margin-right: 5px; -} - -.kune-Margin-Medium-b { - margin-bottom: 5px; -} - -.kune-Margin-Medium-l { - margin-left: 5px; -} - -.kune-Margin-Small-trbl { - margin: 3px; -} - -.kune-Margin-Small-lr { - margin-left: 3px; - margin-right: 3px; -} - -.kune-Margin-Small-tl { - margin-top: 3px; - margin-left: 3px; -} - -.kune-Margin-Small-tb { - margin-top: 3px; - margin-bottom: 3px; -} - -.kune-Margin-Small-t { - margin-top: 3px; -} - -.kune-Margin-Small-l { - margin-left: 3px; -} - -.kune-Margin-Small-r { - margin-right: 3px; -} - -.kune-Margin-Small-b { - margin-bottom: 3px; -} - -.kune-Margin-Mini-trbl { - margin: 1px; -} - -.kune-Margin-Mini-lr { - margin-left: 1px; - margin-right: 1px; -} - -.kune-Margin-Mini-tl { - margin-top: 1px; - margin-left: 1px; -} - -.kune-Margin-Mini-tb { - margin-top: 1px; - margin-bottom: 1px; -} - -.kune-Margin-Mini-t { - margin-top: 1px; -} - -.kune-Margin-Mini-r { - margin-right: 1px; -} - -.kune-Margin-Mini-b { - margin-bottom: 1px; -} - -.kune-Margin-Mini-l { - margin-left: 1px; -} - -.k-publicspace-msg { - background-color: #E0E0E0; -} - -.k-publicspace-mask { /* background-color: #fff !important; - kfilter: alpha(opacity = 68) !important; - -moz-opacity: 0.68 !important; - -khtml-opacity: 0.68 !important; - opacity: 0.68 !important;*/ - -} - -.k-publicspace-panel { - margin: 5px; - display: table-row; -} - -.k-publicspace-icon { - margin: 3px 3px 3px 0; - float: left; -} - -.k-publicspace-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; -} - -.k-publicspace-description { - font-size: 14px; - display: table-cell; -} - -.k-publicspace-actions { - display: inline; -} - -.k-message-panel { - margin: 5px; - display: table-row; -} - -.k-message-icon { - margin: 3px 3px 3px 0; - float: left; -} - -.k-message-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; -} - -.k-message-description { - font-size: 14px; - display: table-cell; -} - -.k-error-tb { - background: #FFB380 none repeat scroll 0% 50%; - /* color: #250; */ - padding: 10px; -} - -.k-error-tb img { - margin: 0 10px; - float: left; -} - -.k-error-tb div { - font-size: 14px; - display: table-cell; -} - -.k-mask { - background-color: #F2F2F2 !important; - /* kfilter: alpha(opacity = 78) !important; */ - -moz-opacity: 0.78 !important; - -khtml-opacity: 0.78 !important; - opacity: 0.78 !important; -} - -.x-form-item-label { - font-size: 14px; - font-weight: bold; - color: brown; -} - -.x-form-text { - font-size: 14px; -} - -.x-fieldset-header-text,.x-form-group-label,.x-form-cb-label { - font-size: 14px; - font-family: 'Ubuntu', Arial; -} - -.k-form-intro { - font-size: 14px; - margin-bottom: 10px; -} - -.k-form-fieldset { - font-size: 16px; - margin-left: 105px; -} - -.k-basic-thumb { - background-color: #F2F2F2; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; -} - -.k-basic-thumb img { - margin: 2px 2px 0px 2px; -} - -.k-basic-thumb div { - margin: -3px 0px 0px 0px; - font-weight: normal; - font-size: 12px; -} - -.k-sn-mainpanel { - font-size: 16px; - font-weight: bold; -} - -.k-sn-maintitle { - margin: 5px; -} - -.k-sn-maintitle { - color: #a05a2c; - font-size: 20px; -} - -.k-sn-adminslabel,.k-sn-collabslabel,.k-sn-pendingslabel { - color: #FFF; - text-transform: lowercase; - padding-left: 10px; - float: left; -} - -.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel - { - float: left; - padding-left: 5px; - color: #e0e0e0; -} - -.k-sn-adminslabel { - -} - -.k-sn-mainpanel .k-basic-thumb { - float: left; -} - -/* -.k-sn-mainpanel .x-btn button { - text-decoration: underline; - white-space: nowrap; -} -*/ -.k-sn-mainpanel .x-btn button { - font: 13px 'Ubuntu', arial; - border: 2px solid #CCCCCC; - cursor: pointer; - margin: 0; - padding: 3px 0; - text-decoration: none; - background-color: #F2F2F2; - color: #855585; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - vertical-align: middle; - line-height: 2em !important; - height: 26px !important; - /* -font-size:small; - cursor: pointer; - border: 2px gray solid; - padding-left: 25px !important; */ -} - -.k-sn-mainpanel .x-btn button:hover { - border: 2px orange solid; - background: #f0f0f0; - color: #855585; -} - -.k-sn-mainpanel .x-btn button:active { - border-top-color: #ffffff; - background: #ffffff; -} - -.k-sn-collabslabel { - -} - -.k-sn-pendingslabel { - -} - -.k-sn-orphan-label { - padding: 10px; -} - -.k-sn-novisible-label { - padding: 10px; -} - -.k-sn-adminspanel { - background-color: #a05a2c; -} - -.k-sn-collabspanel { - -} - -.k-sn-pendingspanel { /* background-color: #a05a2c; */ - -} - -.k-sn-adminsscroll,.k-sn-collabsscroll,.k-sn-pendingsscroll { - -} - -.k-sn-adminsflow,.k-sn-collabsflow,.k-sn-pendingsflow { - margin-left: 10px; -} - -.k-sn-adminsscroll { - -} - -.k-sn-collabsscroll { - -} - -.k-sn-pendingsscroll { - -} - -.k-userconfirm-label { - width: 300px; - margin: 10px; -} - -.k-sn-deck { - -} - -.k-sn-bottomPanel { - padding: 0 10px; - float: right; -} - -.k-sn-bottomPanel-actions { - width: 100%; -} - -.k-sn-novisible-label,.k-sn-orphan-label { - color: #FFF; - font-size: 16px; - font-weight: bold; -} - -.k-frame-def { - margin: 0px; - border: 0px; -} - -.k-maxsize { - width: 100%; - height: 100%; -} - -.k-footer-license-label { - float: right; - margin-top: 8px; - cursor: pointer; - font-weight: bold; - font-size: 16px; - color: #784421; -} -.k-footer-license-label-title { - margin-right: 5px; - color: #280b0b; -} - -.k-footer-license-img { - float: right; - margin: 10px 15px 0px 5px; - cursor: pointer; -} \ No newline at end of file Copied: branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/public/ws.css (from rev 1248, trunk/src/main/java/cc/kune/core/public/ws.css) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/public/ws.css (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/cc/kune/core/public/ws.css 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,1011 @@ +@CHARSET "UTF-8"; + +body { + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + margin: 5px; + overflow: hidden; +} + +* { + font-family: 'Ubuntu', Arial; +} + +body.fontface { + font: 'Ubuntu', Arial; +} + +/* +a { + color: darkblue; +} + +a:visited { + color: darkblue; +} +*/ +.gwt-DialogBox { + border: 2px solid #AAAAAA; + background-color: white; +} + +.gwt-DialogBox .Caption { + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; +} + +.gwt-MenuBar { + background-color: #C3D9FF; + cursor: default; +} + +.gwt-MenuItem { + font-size: 80%; + margin: 1px; + cursor: default; +} + +.gwt-MenuItem-selected { + background-color: #E8EEF7; +} + +.gwt-Tree { + +} + +.gwt-Tree .gwt-TreeItem { + font-size: 80%; + cursor: default; +} + +.gwt-Tree .gwt-TreeItem-selected { + background-color: #C3D9FF; +} + +.gwt-StackPanel { + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; +} + +.gwt-StackPanel .gwt-StackPanelItem { + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; +} + +.gwt-StackPanel .gwt-StackPanelItem-selected { + +} + +.gwt-TabPanel { + +} + +.gwt-TabPanelBottom { + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; +} + +.gwt-TabBar { + font-size: smaller; +} + +.gwt-TabBar .gwt-TabBarFirst { + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; +} + +.gwt-TabBar .gwt-TabBarRest { + border-bottom: 1px solid #87b3ff; + padding-right: 3px; +} + +.gwt-TabBar .gwt-TabBarItem { + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; +} + +.gwt-TabBar .gwt-TabBarItem-selected { + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; +} + +.gwt-PushButton-up { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-up-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-down { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-down-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-up { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-up-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-down { + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-down-hovering { + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-RichTextArea { + border: 1px solid black; + background-color: white; +} + +.gwt-RichTextToolbar { + background-color: #C3D9FF; + padding: 2px; +} + +.gwt-RichTextToolbar .gwt-PushButton-up { + margin-right: 2px; + border: 1px solid #C3D9FF; +} + +.gwt-RichTextToolbar .gwt-PushButton-up-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); +} + +.gwt-RichTextToolbar .gwt-PushButton-down { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-PushButton-down-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-up { + margin-right: 2px; + border: 1px solid #C3D9FF; +} + +.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-down { + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); +} + +.gwt-HorizontalSplitPanel { + border: 8px solid #C3D9FF; +} + +.gwt-HorizontalSplitPanel .splitter { + background-color: #C3D9FF; + cursor: move; +} + +.gwt-HorizontalSplitPanel .left { + background-color: #E8EEF7; +} + +.gwt-VerticalSplitPanel { + border: 8px solid #C3D9FF; +} + +.gwt-VerticalSplitPanel .splitter { + background-color: #C3D9FF; + height: 8px; + cursor: move; +} + +.gwt-SuggestBoxPopup { + border: 2px solid #C3D9FF; +} + +.gwt-SuggestBoxPopup .item { + padding: 2px; +} + +.gwt-SuggestBoxPopup .item-selected { + background-color: #C3D9FF; + padding: 2px; +} + +.gwt-DisclosurePanel { + border: 2px solid #C3D9FF; +} + +.gwt-DisclosurePanel .header { + background-color: #e8eef7; + cursor: hand; +} + +.gwt-SplitLayoutPanel { + +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { + background-color: white; + background: none; + cursor: col-resize; +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { + background-color: white; + background: none; + cursor: row-resize; +} + +.kLoadingPanel { + background-color: #FF9999; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + padding: 0 1px 0 3px; + border-collapse: separate; + border-spacing: 2px; +} + +.kLoadingLabel { + font-size: 14px; + color: white; + font-weight: bold; + padding: 0 5px 0 5px; +} + +.k-space-sel { + margin-right: 10px; + background-color: #F2F2F2; +} + +.k-space-sel-btn { + padding: 0 1px 0 1px; + margin: 0 0 -2px; +} + +.k-sitebar-logo { + margin-top: 2px; +} + +.x-btn button { + font: 18px/27px 'Ubuntu', arial; +} + +.k-btn-sitebar,.k-btn-sitebar button { + font: 13px 'Ubuntu', arial; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; + white-space: nowrap; +} + +.k-btn-sitebar button { + margin-top: -5px; +} + +.k-sitebar { /* margin-top: -30px; */ + +} + +.k-link { + text-decoration: underline; + color: green; + cursor: pointer; +} + +/* Margins */ +.kune-Margin-40-trbl { + margin: 40px; +} + +.kune-Margin-40-lr { + margin-left: 40px; + margin-right: 40px; +} + +.kune-Margin-40-tl { + margin-top: 40px; + margin-left: 40px; +} + +.kune-Margin-40-tb { + margin-top: 40px; + margin-bottom: 40px; +} + +.kune-Margin-40-t { + margin-top: 40px; +} + +.kune-Margin-40-r { + margin-right: 40px; +} + +.kune-Margin-40-l { + margin-left: 40px; +} + +.kune-Margin-20-trbl { + margin: 20px; +} + +.kune-Margin-20-lr { + margin-left: 20px; + margin-right: 20px; +} + +.kune-Margin-20-tl { + margin-top: 20px; + margin-left: 20px; +} + +.kune-Margin-20-tb { + margin-top: 20px; + margin-bottom: 20px; +} + +.kune-Margin-20-t { + margin-top: 20px; +} + +.kune-Margin-20-r { + margin-right: 20px; +} + +.kune-Margin-20-l { + margin-left: 20px; +} + +.kune-Margin-Large-trbl { + margin: 10px; +} + +.kune-Margin-Large-lr { + margin-left: 10px; + margin-right: 10px; +} + +.kune-Margin-Large-tl { + margin-top: 10px; + margin-left: 10px; +} + +.kune-Margin-Large-tb { + margin-top: 10px; + margin-bottom: 10px; +} + +.kune-Margin-Large-t { + margin-top: 10px; +} + +.kune-Margin-Large-r { + margin-right: 10px; +} + +.kune-Margin-Large-l { + margin-left: 10px; +} + +.kune-Margin-7-trbl { + margin: 7px; +} + +.kune-Margin-7-lr { + margin-left: 7px; + margin-right: 7px; +} + +.kune-Margin-7-tl { + margin-top: 7px; + margin-left: 7px; +} + +.kune-Margin-7-tb { + margin-top: 7px; + margin-bottom: 7px; +} + +.kune-Margin-7-t { + margin-top: 7px; +} + +.kune-Margin-7-r { + margin-right: 7px; +} + +.kune-Margin-7-b { + margin-bottom: 7px; +} + +.kune-Margin-7-l { + margin-left: 7px; +} + +.kune-Margin-Medium-trbl { + margin: 5px; +} + +.kune-Margin-Medium-lr { + margin-left: 5px; + margin-right: 5px; +} + +.kune-Margin-Medium-tl { + margin-top: 5px; + margin-left: 5px; +} + +.kune-Margin-Medium-tb { + margin-top: 5px; + margin-bottom: 5px; +} + +.kune-Margin-Medium-t { + margin-top: 5px; +} + +.kune-Margin-Medium-r { + margin-right: 5px; +} + +.kune-Margin-Medium-b { + margin-bottom: 5px; +} + +.kune-Margin-Medium-l { + margin-left: 5px; +} + +.kune-Margin-Small-trbl { + margin: 3px; +} + +.kune-Margin-Small-lr { + margin-left: 3px; + margin-right: 3px; +} + +.kune-Margin-Small-tl { + margin-top: 3px; + margin-left: 3px; +} + +.kune-Margin-Small-tb { + margin-top: 3px; + margin-bottom: 3px; +} + +.kune-Margin-Small-t { + margin-top: 3px; +} + +.kune-Margin-Small-l { + margin-left: 3px; +} + +.kune-Margin-Small-r { + margin-right: 3px; +} + +.kune-Margin-Small-b { + margin-bottom: 3px; +} + +.kune-Margin-Mini-trbl { + margin: 1px; +} + +.kune-Margin-Mini-lr { + margin-left: 1px; + margin-right: 1px; +} + +.kune-Margin-Mini-tl { + margin-top: 1px; + margin-left: 1px; +} + +.kune-Margin-Mini-tb { + margin-top: 1px; + margin-bottom: 1px; +} + +.kune-Margin-Mini-t { + margin-top: 1px; +} + +.kune-Margin-Mini-r { + margin-right: 1px; +} + +.kune-Margin-Mini-b { + margin-bottom: 1px; +} + +.kune-Margin-Mini-l { + margin-left: 1px; +} + +.k-publicspace-msg { + background-color: #E0E0E0; +} + +.k-publicspace-mask { /* background-color: #fff !important; + kfilter: alpha(opacity = 68) !important; + -moz-opacity: 0.68 !important; + -khtml-opacity: 0.68 !important; + opacity: 0.68 !important;*/ + +} + +.k-publicspace-panel { + margin: 5px; + display: table-row; +} + +.k-publicspace-icon { + margin: 3px 3px 3px 0; + float: left; +} + +.k-publicspace-title { + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; +} + +.k-publicspace-description { + font-size: 14px; + display: table-cell; +} + +.k-publicspace-actions { + display: inline; +} + +.k-message-panel { + margin: 5px; + display: table-row; +} + +.k-message-icon { + margin: 3px 3px 3px 0; + float: left; +} + +.k-message-title { + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; +} + +.k-message-description { + font-size: 14px; + display: table-cell; +} + +.k-error-tb { + background: #FFB380 none repeat scroll 0% 50%; + /* color: #250; */ + padding: 10px; +} + +.k-error-tb img { + margin: 0 10px; + float: left; +} + +.k-error-tb div { + font-size: 14px; + display: table-cell; +} + +.k-mask { + background-color: #F2F2F2 !important; + /* kfilter: alpha(opacity = 78) !important; */ + -moz-opacity: 0.78 !important; + -khtml-opacity: 0.78 !important; + opacity: 0.78 !important; +} + +.x-form-item-label { + font-size: 14px; + font-weight: bold; + color: brown; +} + +.x-form-text { + font-size: 14px; +} + +.x-fieldset-header-text,.x-form-group-label,.x-form-cb-label { + font-size: 14px; + font-family: 'Ubuntu', Arial; +} + +.k-form-intro { + font-size: 14px; + margin-bottom: 10px; +} + +.k-form-fieldset { + font-size: 16px; + margin-left: 105px; +} + +.k-basic-thumb { + background-color: #F2F2F2; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + +.k-basic-thumb img { + margin: 2px 2px 0px 2px; +} + +.k-basic-thumb div { + margin: -3px 0px 0px 0px; + font-weight: normal; + font-size: 12px; +} + +.k-sn-mainpanel { + font-size: 16px; + font-weight: bold; +} + +.k-sn-maintitle { + margin: 5px; +} + +.k-sn-maintitle { + color: #a05a2c; + font-size: 20px; +} + +.k-sn-adminslabel,.k-sn-collabslabel,.k-sn-pendingslabel { + color: #FFF; + text-transform: lowercase; + padding-left: 10px; + float: left; +} + +.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel + { + float: left; + padding-left: 5px; + color: #e0e0e0; +} + +.k-sn-adminslabel { + +} + +.k-sn-mainpanel .k-basic-thumb { + float: left; +} + +/* +.k-sn-mainpanel .x-btn button { + text-decoration: underline; + white-space: nowrap; +} +*/ +.k-sn-mainpanel .x-btn button { + font: 13px 'Ubuntu', arial; + border: 2px solid #CCCCCC; + cursor: pointer; + margin: 0; + padding: 3px 0; + text-decoration: none; + background-color: #F2F2F2; + color: #855585; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + vertical-align: middle; + line-height: 2em !important; + height: 26px !important; + /* +font-size:small; + cursor: pointer; + border: 2px gray solid; + padding-left: 25px !important; */ +} + +.k-sn-mainpanel .x-btn button:hover { + border: 2px orange solid; + background: #f0f0f0; + color: #855585; +} + +.k-sn-mainpanel .x-btn button:active { + border-top-color: #ffffff; + background: #ffffff; +} + +.k-sn-collabslabel { + +} + +.k-sn-pendingslabel { + +} + +.k-sn-orphan-label { + padding: 10px; +} + +.k-sn-novisible-label { + padding: 10px; +} + +.k-sn-adminspanel { + background-color: #a05a2c; +} + +.k-sn-collabspanel { + +} + +.k-sn-pendingspanel { /* background-color: #a05a2c; */ + +} + +.k-sn-adminsscroll,.k-sn-collabsscroll,.k-sn-pendingsscroll { + +} + +.k-sn-adminsflow,.k-sn-collabsflow,.k-sn-pendingsflow { + margin-left: 10px; +} + +.k-sn-adminsscroll { + +} + +.k-sn-collabsscroll { + +} + +.k-sn-pendingsscroll { + +} + +.k-userconfirm-label { + width: 300px; + margin: 10px; +} + +.k-sn-deck { + +} + +.k-sn-bottomPanel { + padding: 0 10px; + float: right; +} + +.k-sn-bottomPanel-actions { + width: 100%; +} + +.k-sn-novisible-label,.k-sn-orphan-label { + color: #FFF; + font-size: 16px; + font-weight: bold; +} + +.k-frame-def { + margin: 0px; + border: 0px; +} + +.k-maxsize { + width: 100%; + height: 100%; +} + +.k-footer-license-label { + float: right; + margin-top: 8px; + cursor: pointer; + font-weight: bold; + font-size: 16px; + color: #784421; +} + +.k-footer-license-label-title { + margin-right: 5px; + color: #280b0b; +} + +.k-footer-license-img { + float: right; + margin: 10px 15px 0px 5px; + cursor: pointer; +} + + +.k-entitytextlogo-border { + border: 2px solid #F2F2F2; +} + +.k-entitytextlogo-no-border { + border: none; +} + +.k-entitytextlogo { + height: 60px; + margin: 5px; + overflow: hidden; + width: 468px; +} + +.k-entitytextlogo table { + vertical-align: middle; +} + +.k-elogo-l-l { + font-size: 46px; +} + +.k-elogo-l-m { + font-size: 167%; +} + +.k-elogo-l-s { + font-size: 108%; +} + +.k-entitytextlogo .gwt-Label { + font-weight: 700; + margin: 5px; + height: 27px; +} + +.k-entitytextlogo-default .gwt-Label { + color: #69312F; +} + +.k-entitytextlogo-green .gwt-Label { + color: #250; +} + +.k-entitytextlogo-blue .gwt-Label { + color: #000080; +} + +.k-entitytextlogo-grey .gwt-Label { + color: #1A1A1A; +} + +.k-entitytextlogo-purple .gwt-Label { + color: #440055; +} + +.k-entitytextlogo-red .gwt-Label { + color: #800000; +} + +.k-elogo-plink { + color: #CCC; + font-size: 85%; + margin: 5px; + text-decoration: underline; + white-space: nowrap; + background-color: #FFF; +} + +.k-elogop-expand { + background-color: transparent; +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,1097 +0,0 @@ -.k-site-traybar { - background: transparent none repeat scroll 0% 50%; -} - -.k-blank-toolbar { - background: #FFF none repeat scroll 0% 50%; -} - -.k-sitebar .kune-IconHyperlink { - white-space: nowrap; -} - -.k-sitebar .kune-IconHyperlink a:link { - cursor: pointer; - text-decoration: underline; - color: #B3B3B3; -} - -.k-sitebar .kune-IconHyperlink a:hover { - text-decoration: underline; -} - -.k-sitebar .kune-IconHyperlink a:visited { - color: #B3B3B3; -} - -.k-sitebar-labellink { - white-space: nowrap; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; -} - -.k-sitebar { - margin-right: 10px; - height: 16px; -} - -.k-sitebar .gwt-TextBox { - border: 1px solid #E4A374; - margin: 0 15px 0 3px; - padding-left: 1px; - color: #B3B3B3; - background: transparent; -} - -.k-sitebar .gwt-Hyperlink a { - white-space: nowrap; - color: #B3B3B3; - text-decoration: underline; - cursor: pointer; -} - -.k-sitebar .gwt-PushButton { - cursor: pointer; -} - -.k-sitebar-LabelLink { - white-space: nowrap; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; -} - -.k-entity-summary { - border-left-color: transparent; - border-left-width: 5px; - border-bottom-color: transparent; - border-bottom-width: 5px; -} - -.k-entitytextlogo-border { - border: 2px solid #F2F2F2; -} - -.k-entitytextlogo-no-border { - border: none; -} - -.k-entitytextlogo { - height: 60px; - margin: 0 0 4px 0; - overflow: hidden; - width: 468px; -} - -.k-entitytextlogo table { - vertical-align: middle; -} - -.k-elogo-l-l { - font-size: 272%; -} - -.k-elogo-l-m { - font-size: 167%; -} - -.k-elogo-l-s { - font-size: 108%; -} - -.k-entitytextlogo .gwt-Label { - font-weight: 700; - margin: 5px; - height: 27px; -} - -.k-entitytextlogo-default .gwt-Label { - color: #69312F; -} - -.k-entitytextlogo-green .gwt-Label { - color: #250; -} - -.k-entitytextlogo-blue .gwt-Label { - color: #000080; -} - -.k-entitytextlogo-grey .gwt-Label { - color: #1A1A1A; -} - -.k-entitytextlogo-purple .gwt-Label { - color: #440055; -} - -.k-entitytextlogo-red .gwt-Label { - color: #800000; -} - -.k-elogo-plink { - color: #CCC; - font-size: 85%; - margin: 5px; - text-decoration: underline; - white-space: nowrap; - background-color: #FFF; -} - -.k-elogop-expand { - background-color: transparent; -} - -.k-entity-default .x-layout-split,.k-entity-default .x-layout-collapsed - { - background: #DD8A3D none repeat scroll 0% 50%; -} - -.k-entity-green .x-layout-split,.k-entity-green .x-layout-collapsed { - background: #5FD35F none repeat scroll 0% 50%; -} - -.k-entity-blue .x-layout-split,.k-entity-blue .x-layout-collapsed { - background: #0066FF none repeat scroll 0% 50%; -} - -.k-entity-grey .x-layout-split,.k-entity-grey .x-layout-collapsed { - background: #4D4D4D none repeat scroll 0% 50%; -} - -.k-entity-purple .x-layout-split,.k-entity-purple .x-layout-collapsed { - background: #660080 none repeat scroll 0% 50%; -} - -.k-entity-red .x-layout-split,.k-entity-red .x-layout-collapsed { - background: #D40000 none repeat scroll 0% 50%; -} - -.k-entityworkspace .x-layout-split,.k-entityworkspace .x-layout-collapsed - { - background: transparent none repeat scroll 0% 50%; -} - -.k-entityworkspace-default .x-layout-split,.k-entityworkspace-default .x-layout-collapsed - { - background: #DEAA87 none repeat scroll 0% 50%; -} - -.k-entityworkspace-green .x-layout-split,.k-entityworkspace-green .x-layout-collapsed - { - background: #DCE8AB none repeat scroll 0% 50%; -} - -.k-entityworkspace-blue .x-layout-split,.k-entityworkspace-blue .x-layout-collapsed - { - background: #D5D5FF none repeat scroll 0% 50%; -} - -.k-entityworkspace-grey .x-layout-split,.k-entityworkspace-grey .x-layout-collapsed - { - background: #999999 none repeat scroll 0% 50%; -} - -.k-entityworkspace-purple .x-layout-split,.k-entityworkspace-purple .x-layout-collapsed - { - background: #A793AC none repeat scroll 0% 50%; -} - -.k-entityworkspace-red .x-layout-split,.k-entityworkspace-red .x-layout-collapsed - { - background: #FF5555 none repeat scroll 0% 50%; -} - -.k-entity-title { - border-left-style: solid; - border-left-width: 5px; -} - -.k-entity-title div { - line-height: 22px; - white-space: nowrap; -} - -.k-entity-subtitle { - -} - -.k-entity-subtitle div { - line-height: 22px; - white-space: nowrap; -} - -.k-entity-title-rd-default { - background: #DD8A3D; -} - -.k-entity-title-rd-green { - background: #5FD35F; -} - -.k-entity-title-rd-blue { - background: #0066FF; -} - -.k-entity-title-rd-grey { - background: #4D4D4D; -} - -.k-entity-title-rd-purple { - background: #660080; -} - -.k-entity-title-rd-red { - background: #D40000; -} - -.k-entity-title-default { - background: #F1BB59 none repeat scroll 0% 50%; - border-left-color: #DD8A3D; -} - -.k-entity-title-green { - background: #AFA none repeat scroll 0% 50%; - border-left-color: #5FD35F; -} - -.k-entity-title-blue { - background: #AFDDE9 none repeat scroll 0% 50%; - border-left-color: #0066FF; -} - -.k-entity-title-grey { - background: #CCCCCC none repeat scroll 0% 50%; - border-left-color: #4D4D4D; -} - -.k-entity-title-purple { - background: #DDAFE9 none repeat scroll 0% 50%; - border-left-color: #660080; -} - -.k-entity-title-red { - background: #FF8080 none repeat scroll 0% 50%; - border-left-color: #D40000; -} - -.k-entity-title-default div { - color: #69312F; -} - -.k-entity-title-green div { - color: #250; -} - -.k-entity-title-blue div { - color: #000080; -} - -.k-entity-title-grey div { - color: #1A1A1A; -} - -.k-entity-title-purple div { - color: #440055; -} - -.k-entity-title-red div { - color: #800000; -} - -.k-entity-subtitle-default { - background: #DD8A3D none repeat scroll 0% 50%; -} - -.k-entity-subtitle-green { - background: #5FD35F none repeat scroll 0% 50%; -} - -.k-entity-subtitle-blue { - background: #0066FF none repeat scroll 0% 50%; -} - -.k-entity-subtitle-grey { - background: #4D4D4D none repeat scroll 0% 50%; -} - -.k-entity-subtitle-purple { - background: #660080 none repeat scroll 0% 50%; -} - -.k-entity-subtitle-red { - background: #D40000 none repeat scroll 0% 50%; -} - -.k-entity-subtitle-default div { - color: #FFF; -} - -.k-entity-subtitle-green div { - color: #FFF; -} - -.k-entity-subtitle-blue div { - color: #FFF; -} - -.k-entity-subtitle-grey div { - color: #FFF; -} - -.k-entity-subtitle-purple div { - color: #FFF; -} - -.k-entity-subtitle-red div { - color: #FFF; -} - -.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default - { - background: #DD8A3D; -} - -.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green - { - background: #5FD35F; -} - -.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue - { - background: #0066FF; -} - -.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey - { - background: #4D4D4D; -} - -.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple - { - background: #660080; -} - -.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red - { - background: #D40000; -} - -.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body - { - background: #FFD09D none repeat scroll 0% 50%; -} - -.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body - { - background: #CFA none repeat scroll 0% 50%; -} - -.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body - { - background: #AACCFF none repeat scroll 0% 50%; -} - -.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body - { - background: #B3B3B3 none repeat scroll 0% 50%; -} - -.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body - { - background: #DDAFE9 none repeat scroll 0% 50%; -} - -.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body { - background: #FFAAAA none repeat scroll 0% 50%; -} - -.k-entity-context-purple .x-tree .x-panel-body { - background: #DDAFE9 none repeat scroll 0% 50%; -} - -.k-entity-content { - background: #FFF; -} - -.k-entity-bottom div { /* line-height: 24px; */ - color: #FFF; -} - -.k-toolbar-top-line { - border-top-color: rgb(208, 208, 208); - border-top-style: solid; - border-top-width: 1px; -} - -.k-toolbar-bottom-line { - border-bottom-color: rgb(208, 208, 208); - border-bottom-style: solid; - border-bottom-width: 1px; -} - -.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label - { - white-space: nowrap; - font: normal 100% arial, sans; - line-height: 19px; -} - -.k-toolbar-sep { - padding-top: 4px; - padding-left: 5px; -} - -/* Custom gwt-ext styles */ -.ytb-sep { - background-image: - url(../js/ext/resources/images/default/grid/grid-split.gif); - background-position: center; - background-repeat: no-repeat; - display: block; - font-size: 1px; - height: 16px; - width: 4px; - overflow: hidden; - cursor: default; - margin: 0 2px 0; - border: 0; -} - -.ytb-spacer { - width: 2px; -} - -.x-grid-group-hd { - border-bottom: 2px solid grey; - cursor: pointer; - padding-top: 3px; -} - -/* Drop down */ -.k-dropdownouter { - background-color: grey; -} - -.k-dropdownouter-members { - -} - -.k-dropdownouter-members-default { - background-color: #DF5244; -} - -.k-dropdownouter-members-green { - background-color: #008000; -} - -.k-dropdownouter-members-blue { - background-color: #5500D4; -} - -.k-dropdownouter-members-grey { - background-color: #4D4D4D; -} - -.k-dropdownouter-members-purple { - background-color: #672178; -} - -.k-dropdownouter-members-red { - background-color: #A02C2C; -} - -.k-dropdownouter-part { - -} - -.k-dropdownouter-part-default { - background-color: #CA5842; -} - -.k-dropdownouter-part-green { - background-color: #00AA00; -} - -.k-dropdownouter-part-blue { - background-color: #6600FF; -} - -.k-dropdownouter-part-grey { - background-color: #666666; -} - -.k-dropdownouter-part-purple { - background-color: #892CA0; -} - -.k-dropdownouter-part-red { - background-color: #C83737; -} - -.k-dropdownouter-tags { - -} - -.k-dropdownouter-tags-default { - background-color: #87501E; -} - -.k-dropdownouter-tags-green { - background-color: #00D400; -} - -.k-dropdownouter-tags-blue { - background-color: #9955FF; -} - -.k-dropdownouter-tags-grey { - background-color: #808080; -} - -.k-dropdownouter-tags-purple { - background-color: #AB37C8; -} - -.k-dropdownouter-tags-red { - background-color: #D35F5F; -} - -.k-dropdownouter-summary { - -} - -.k-dropdownouter-summary-default { - background-color: #9F734B; -} - -.k-dropdownouter-summary-green { - background-color: #4CE14C; -} - -.k-dropdownouter-summary-blue { - background-color: #69A5FF; -} - -.k-dropdownouter-summary-grey { - background-color: #A6A6A6; -} - -.k-dropdownouter-summary-purple { - background-color: #C473D8; -} - -.k-dropdownouter-summary-red { - background-color: #E08F8F; -} - -.k-dropdowninner { - margin: 0 3px 1px 3px; - background: green; - background-color: #FFF; - /* padding: 3px; */ -} - -.k-dropdownlabel { - color: #FFF; - cursor: pointer; -} - -.k-dropdownlabel .gwt-Label { - margin: 0 5px 0 0; - width: 100%; -} - -.k-dropdownlabel img { - margin: 0 3px 0 1px; -} - -/* WsTheme */ -.k-wstheme-icon-default { - background: #FF8C00; -} - -.k-wstheme-icon-green { - background: green; -} - -.k-wstheme-icon-blue { - background: blue; -} - -.k-wstheme-icon-grey { - background: grey; -} - -.k-wstheme-icon-purple { - background: purple; -} - -.k-wstheme-icon-red { - background: red; -} - -/* Tool selector items */ -.k-toolselectoritem { - width: auto; - margin-bottom: 5px; - cursor: pointer; -} - -.k-toolselectoritem-sel { - -} - -.k-toolselectoritem-notsel-default { - background: #FFE9A5; -} - -.k-toolselectoritem-notsel-green { - background: #D6F4D6; -} - -.k-toolselectoritem-notsel-blue { - background: #D7D7F4; -} - -.k-toolselectoritem-notsel-grey { - background: #E6E6E6; -} - -.k-toolselectoritem-notsel-purple { - background: #EED7F4; -} - -.k-toolselectoritem-notsel-red { - background: #FFD5D5; -} - -.k-toolselectoritem-sel a { - color: #FFF; - padding: 0 9px; - text-decoration: none; -} - -.k-toolselectoritem-sel a:hover { - text-decoration: none; -} - -.k-toolselectoritem-notsel { - -} - -.k-toolselectoritem-notsel a { - color: #0000FF; - padding: 0 9px; - text-decoration: none; -} - -.k-toolselectoritem-notsel a:hover { - text-decoration: underline; -} - -/* others */ /* -.x-tree-node a span, .x-dd-drag-ghost a span { - color:#000000; - padding: 1px 0px 1px 1px; - text-decoration:none; -} -*/ -.x-tree-node .k-ctn-status-normal a span { - -} - -.x-tree-node .k-ctn-status-deleted a span { - text-decoration: line-through; - color: gray; -} - -.x-tree-node .k-ctn-status-rejected a span { - text-decoration: line-through; - /* color: #FF6633; */ - color: #FF3300; -} - -.x-tree-node .k-ctn-status-editing a span { - font-style: italic; - color: gray; -} - -.x-tree-node .k-ctn-status-submitted a span { - color: green; -} - -.k-info-links { - text-decoration: underline; - color: gray; - cursor: pointer; -} - -.x-tool-kmenu { - background-position: 0 -75px; -} - -.x-tool-kmenu-over { - background-position: -15px -75px; -} - -.k-border-openbox { - border-bottom: 1px #D0D0D0 solid; - border-right: 1px #D0D0D0 solid; - border-left: 1px #D0D0D0 solid; -} - -/* SiteToastMessages */ -.k-stm-info-icon { - background-image: url(img/info.gif) !important; -} - -.k-stm-imp-icon { - background-image: url(img/alert.gif) !important; -} - -.k-stm-verimp-icon { - background-image: url(img/important.gif) !important; -} - -.k-stm-error-icon { - background-image: url(img/error.gif) !important; -} - -.k-infod-head { - font-size: 108%; - margin-bottom: 10px; -} - -.gwt-DisclosurePanel { - -} - -.gwt-DisclosurePanel-open { - -} - -.gwt-DisclosurePanel-closed { - -} - -.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td - { - text-decoration: none; /* Remove underline from header */ - color: black; - cursor: pointer; - cursor: hand; -} - -.gwt-DisclosurePanel .content { - border-left: 3px solid #e8eef7; - padding: 4px 0px 4px 8px; - margin-left: 6px; -} - -.k-basic-thumb { - background: #FAFAFA none repeat scroll 0% 50%; - border: 1px solid #EBEBEB; - padding: 3px; - margin: 3px; -} - -.k-basic-thumb td { - padding: 2px 3px 2px 3px; - border: none; -} - -.k-text-gray { - color: gray; -} - -.k-elp-limg { - margin-top: 4px; - margin-left: 5px; - cursor: pointer; - overflow: hidden; -} - -.k-tsp-tag { - float: left; - padding: 3px; - cursor: pointer; - color: #0000FF; -} - -.k-tsp-cloud { - line-height: 1.5em; - text-align: center; -} - -.k-link-icon { - background-image: url(img/link.gif) !important; -} - -.k-options-icon { - background-image: url(img/emblem-system.gif) !important; -} - -.k-copyleft-icon { - background-image: url(img/copyleft.png) !important; -} - -.k-picture-icon { - background-image: url(img/picture.png) !important; -} - -.k-film-icon { - background-image: url(img/film.png) !important; -} - -.k-specialchars-icon { - background-image: url(img/specialchars.png) !important; -} - -.k-info-icon { - background-image: url(img/info.gif) !important; -} - -.k-newgroup-icon { - background-image: url(img/kune-icon16.png) !important; -} - -.k-colors-icon { - background-image: url(img/colors.gif) !important; -} - -.x-toolbar-body table { /* width: 100%; */ - -} - -.k-preview-msg { - background: #FFCCAA; -} - -.k-preview-msg-lab { - background: #FFCCAA; - padding: 0 5px; -} - -.k-eil-edit { - border: thin solid black; -} - -/* duplicated in rte.css */ -.k-rte-comment { - border: 1px dashed #C0C0C0; - line-height: 1.4; - padding: 1px; - background-color: #D7FFD7; -} - -.k-specialchar-grid { - border: 1px solid #ACA899; -} - -.k-specialchar-grid table { - -} - -.k-specialchar-grid div { - line-height: 22px; -} - -.k-specialchar-grid td { - padding: 1px; -} - -.k-specialchar-pb { - border: 1px solid #EBE8D7; - cursor: pointer; - font-size: 108% !important; - text-align: center; - vertical-align: middle; - width: 18px; - height: 18px; -} - -.k-specialchar-pb-up { - -} - -.k-specialchar-big { - padding: 3px; - line-height: 22px; - font-size: 197% !important; -} - -.k-specialchar-adv-label { - margin-left: -10px; -} - -.k-specialchar-popup -, -{ -border - - - - - - -: - - - - - - - -1 -px - - - - - - - -solid - - - - - - - -#C0C0C0 - - - - - - -; -z-index - - - - - - -: - - - - - - - -9999 -! -important - - - - - - -; -background-color - - - - - - -: - - - - - - - -#FFF - - - - - - -; -} -.k-specialchar-pb-down { - color: #161616; -} - -.k-specialchar-pb-up-hovering { - border: thin solid #ACA899; -} - -.k-specialchar-pb-down-hovering { - color: #161616; -} - -.k-preview-panel { - border: dashed 1px gray; - padding: 5px; -} - -.k-rte-changelink { - white-space: nowrap; - color: navy; - cursor: pointer; - text-decoration: underline; - margin: 5px; -} - -.k-rte-changelink-popup { - border: 1px solid #C0C0C0; - z-index: 9999 !important; - background-color: #ECECEC; -} - -.e-ui-room { - height: 27px; - line-height: 22px; -} - -.e-ui-room input { - font-size: 100%; - margin-left: 0px; - margin-top: 0px; -} - -.k-def-popup { - z-index: 9999 !important; - background-color: #FFF; - border: 1px solid gray; -} - -#k-mshortcut { - position: absolute; - right: 10px; -} - -#k-mshortcut-hidden { - visibility: hidden; -} - -#k-mshortcut a { - text-decoration: none; - color: black; -} - -.k-plain-iframe iframe { - border: 1px solid gray; -} - -.k-transp .x-panel-body { - background: transparent; -} - -.k-transp { - background: transparent; -} - -.k-blank { - background: #FFF; -} \ No newline at end of file Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/app/public/css/kune-new.css (from rev 1248, trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/app/public/css/kune-new.css (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,1023 @@ +.k-site-traybar { + background: transparent none repeat scroll 0% 50%; +} + +.k-blank-toolbar { + background: #FFF none repeat scroll 0% 50%; +} + +.k-sitebar .kune-IconHyperlink { + white-space: nowrap; +} + +.k-sitebar .kune-IconHyperlink a:link { + cursor: pointer; + text-decoration: underline; + color: #B3B3B3; +} + +.k-sitebar .kune-IconHyperlink a:hover { + text-decoration: underline; +} + +.k-sitebar .kune-IconHyperlink a:visited { + color: #B3B3B3; +} + +.k-sitebar-labellink { + white-space: nowrap; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; +} + +.k-sitebar { + margin-right: 10px; + height: 16px; +} + +.k-sitebar .gwt-TextBox { + border: 1px solid #E4A374; + margin: 0 15px 0 3px; + padding-left: 1px; + color: #B3B3B3; + background: transparent; +} + +.k-sitebar .gwt-Hyperlink a { + white-space: nowrap; + color: #B3B3B3; + text-decoration: underline; + cursor: pointer; +} + +.k-sitebar .gwt-PushButton { + cursor: pointer; +} + +.k-sitebar-LabelLink { + white-space: nowrap; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; +} + +.k-entity-summary { + border-left-color: transparent; + border-left-width: 5px; + border-bottom-color: transparent; + border-bottom-width: 5px; +} + +.k-entity-default .x-layout-split,.k-entity-default .x-layout-collapsed + { + background: #DD8A3D none repeat scroll 0% 50%; +} + +.k-entity-green .x-layout-split,.k-entity-green .x-layout-collapsed { + background: #5FD35F none repeat scroll 0% 50%; +} + +.k-entity-blue .x-layout-split,.k-entity-blue .x-layout-collapsed { + background: #0066FF none repeat scroll 0% 50%; +} + +.k-entity-grey .x-layout-split,.k-entity-grey .x-layout-collapsed { + background: #4D4D4D none repeat scroll 0% 50%; +} + +.k-entity-purple .x-layout-split,.k-entity-purple .x-layout-collapsed { + background: #660080 none repeat scroll 0% 50%; +} + +.k-entity-red .x-layout-split,.k-entity-red .x-layout-collapsed { + background: #D40000 none repeat scroll 0% 50%; +} + +.k-entityworkspace .x-layout-split,.k-entityworkspace .x-layout-collapsed + { + background: transparent none repeat scroll 0% 50%; +} + +.k-entityworkspace-default .x-layout-split,.k-entityworkspace-default .x-layout-collapsed + { + background: #DEAA87 none repeat scroll 0% 50%; +} + +.k-entityworkspace-green .x-layout-split,.k-entityworkspace-green .x-layout-collapsed + { + background: #DCE8AB none repeat scroll 0% 50%; +} + +.k-entityworkspace-blue .x-layout-split,.k-entityworkspace-blue .x-layout-collapsed + { + background: #D5D5FF none repeat scroll 0% 50%; +} + +.k-entityworkspace-grey .x-layout-split,.k-entityworkspace-grey .x-layout-collapsed + { + background: #999999 none repeat scroll 0% 50%; +} + +.k-entityworkspace-purple .x-layout-split,.k-entityworkspace-purple .x-layout-collapsed + { + background: #A793AC none repeat scroll 0% 50%; +} + +.k-entityworkspace-red .x-layout-split,.k-entityworkspace-red .x-layout-collapsed + { + background: #FF5555 none repeat scroll 0% 50%; +} + +.k-entity-title { + border-left-style: solid; + border-left-width: 5px; +} + +.k-entity-title div { + line-height: 22px; + white-space: nowrap; +} + +.k-entity-subtitle { + +} + +.k-entity-subtitle div { + line-height: 22px; + white-space: nowrap; +} + +.k-entity-title-rd-default { + background: #DD8A3D; +} + +.k-entity-title-rd-green { + background: #5FD35F; +} + +.k-entity-title-rd-blue { + background: #0066FF; +} + +.k-entity-title-rd-grey { + background: #4D4D4D; +} + +.k-entity-title-rd-purple { + background: #660080; +} + +.k-entity-title-rd-red { + background: #D40000; +} + +.k-entity-title-default { + background: #F1BB59 none repeat scroll 0% 50%; + border-left-color: #DD8A3D; +} + +.k-entity-title-green { + background: #AFA none repeat scroll 0% 50%; + border-left-color: #5FD35F; +} + +.k-entity-title-blue { + background: #AFDDE9 none repeat scroll 0% 50%; + border-left-color: #0066FF; +} + +.k-entity-title-grey { + background: #CCCCCC none repeat scroll 0% 50%; + border-left-color: #4D4D4D; +} + +.k-entity-title-purple { + background: #DDAFE9 none repeat scroll 0% 50%; + border-left-color: #660080; +} + +.k-entity-title-red { + background: #FF8080 none repeat scroll 0% 50%; + border-left-color: #D40000; +} + +.k-entity-title-default div { + color: #69312F; +} + +.k-entity-title-green div { + color: #250; +} + +.k-entity-title-blue div { + color: #000080; +} + +.k-entity-title-grey div { + color: #1A1A1A; +} + +.k-entity-title-purple div { + color: #440055; +} + +.k-entity-title-red div { + color: #800000; +} + +.k-entity-subtitle-default { + background: #DD8A3D none repeat scroll 0% 50%; +} + +.k-entity-subtitle-green { + background: #5FD35F none repeat scroll 0% 50%; +} + +.k-entity-subtitle-blue { + background: #0066FF none repeat scroll 0% 50%; +} + +.k-entity-subtitle-grey { + background: #4D4D4D none repeat scroll 0% 50%; +} + +.k-entity-subtitle-purple { + background: #660080 none repeat scroll 0% 50%; +} + +.k-entity-subtitle-red { + background: #D40000 none repeat scroll 0% 50%; +} + +.k-entity-subtitle-default div { + color: #FFF; +} + +.k-entity-subtitle-green div { + color: #FFF; +} + +.k-entity-subtitle-blue div { + color: #FFF; +} + +.k-entity-subtitle-grey div { + color: #FFF; +} + +.k-entity-subtitle-purple div { + color: #FFF; +} + +.k-entity-subtitle-red div { + color: #FFF; +} + +.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default + { + background: #DD8A3D; +} + +.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green + { + background: #5FD35F; +} + +.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue + { + background: #0066FF; +} + +.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey + { + background: #4D4D4D; +} + +.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple + { + background: #660080; +} + +.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red + { + background: #D40000; +} + +.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body + { + background: #FFD09D none repeat scroll 0% 50%; +} + +.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body + { + background: #CFA none repeat scroll 0% 50%; +} + +.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body + { + background: #AACCFF none repeat scroll 0% 50%; +} + +.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body + { + background: #B3B3B3 none repeat scroll 0% 50%; +} + +.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body + { + background: #DDAFE9 none repeat scroll 0% 50%; +} + +.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body { + background: #FFAAAA none repeat scroll 0% 50%; +} + +.k-entity-context-purple .x-tree .x-panel-body { + background: #DDAFE9 none repeat scroll 0% 50%; +} + +.k-entity-content { + background: #FFF; +} + +.k-entity-bottom div { /* line-height: 24px; */ + color: #FFF; +} + +.k-toolbar-top-line { + border-top-color: rgb(208, 208, 208); + border-top-style: solid; + border-top-width: 1px; +} + +.k-toolbar-bottom-line { + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; +} + +.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label + { + white-space: nowrap; + font: normal 100% arial, sans; + line-height: 19px; +} + +.k-toolbar-sep { + padding-top: 4px; + padding-left: 5px; +} + +/* Custom gwt-ext styles */ +.ytb-sep { + background-image: + url(../js/ext/resources/images/default/grid/grid-split.gif); + background-position: center; + background-repeat: no-repeat; + display: block; + font-size: 1px; + height: 16px; + width: 4px; + overflow: hidden; + cursor: default; + margin: 0 2px 0; + border: 0; +} + +.ytb-spacer { + width: 2px; +} + +.x-grid-group-hd { + border-bottom: 2px solid grey; + cursor: pointer; + padding-top: 3px; +} + +/* Drop down */ +.k-dropdownouter { + background-color: grey; +} + +.k-dropdownouter-members { + +} + +.k-dropdownouter-members-default { + background-color: #DF5244; +} + +.k-dropdownouter-members-green { + background-color: #008000; +} + +.k-dropdownouter-members-blue { + background-color: #5500D4; +} + +.k-dropdownouter-members-grey { + background-color: #4D4D4D; +} + +.k-dropdownouter-members-purple { + background-color: #672178; +} + +.k-dropdownouter-members-red { + background-color: #A02C2C; +} + +.k-dropdownouter-part { + +} + +.k-dropdownouter-part-default { + background-color: #CA5842; +} + +.k-dropdownouter-part-green { + background-color: #00AA00; +} + +.k-dropdownouter-part-blue { + background-color: #6600FF; +} + +.k-dropdownouter-part-grey { + background-color: #666666; +} + +.k-dropdownouter-part-purple { + background-color: #892CA0; +} + +.k-dropdownouter-part-red { + background-color: #C83737; +} + +.k-dropdownouter-tags { + +} + +.k-dropdownouter-tags-default { + background-color: #87501E; +} + +.k-dropdownouter-tags-green { + background-color: #00D400; +} + +.k-dropdownouter-tags-blue { + background-color: #9955FF; +} + +.k-dropdownouter-tags-grey { + background-color: #808080; +} + +.k-dropdownouter-tags-purple { + background-color: #AB37C8; +} + +.k-dropdownouter-tags-red { + background-color: #D35F5F; +} + +.k-dropdownouter-summary { + +} + +.k-dropdownouter-summary-default { + background-color: #9F734B; +} + +.k-dropdownouter-summary-green { + background-color: #4CE14C; +} + +.k-dropdownouter-summary-blue { + background-color: #69A5FF; +} + +.k-dropdownouter-summary-grey { + background-color: #A6A6A6; +} + +.k-dropdownouter-summary-purple { + background-color: #C473D8; +} + +.k-dropdownouter-summary-red { + background-color: #E08F8F; +} + +.k-dropdowninner { + margin: 0 3px 1px 3px; + background: green; + background-color: #FFF; + /* padding: 3px; */ +} + +.k-dropdownlabel { + color: #FFF; + cursor: pointer; +} + +.k-dropdownlabel .gwt-Label { + margin: 0 5px 0 0; + width: 100%; +} + +.k-dropdownlabel img { + margin: 0 3px 0 1px; +} + +/* WsTheme */ +.k-wstheme-icon-default { + background: #FF8C00; +} + +.k-wstheme-icon-green { + background: green; +} + +.k-wstheme-icon-blue { + background: blue; +} + +.k-wstheme-icon-grey { + background: grey; +} + +.k-wstheme-icon-purple { + background: purple; +} + +.k-wstheme-icon-red { + background: red; +} + +/* Tool selector items */ +.k-toolselectoritem { + width: auto; + margin-bottom: 5px; + cursor: pointer; +} + +.k-toolselectoritem-sel { + +} + +.k-toolselectoritem-notsel-default { + background: #FFE9A5; +} + +.k-toolselectoritem-notsel-green { + background: #D6F4D6; +} + +.k-toolselectoritem-notsel-blue { + background: #D7D7F4; +} + +.k-toolselectoritem-notsel-grey { + background: #E6E6E6; +} + +.k-toolselectoritem-notsel-purple { + background: #EED7F4; +} + +.k-toolselectoritem-notsel-red { + background: #FFD5D5; +} + +.k-toolselectoritem-sel a { + color: #FFF; + padding: 0 9px; + text-decoration: none; +} + +.k-toolselectoritem-sel a:hover { + text-decoration: none; +} + +.k-toolselectoritem-notsel { + +} + +.k-toolselectoritem-notsel a { + color: #0000FF; + padding: 0 9px; + text-decoration: none; +} + +.k-toolselectoritem-notsel a:hover { + text-decoration: underline; +} + +/* others */ /* +.x-tree-node a span, .x-dd-drag-ghost a span { + color:#000000; + padding: 1px 0px 1px 1px; + text-decoration:none; +} +*/ +.x-tree-node .k-ctn-status-normal a span { + +} + +.x-tree-node .k-ctn-status-deleted a span { + text-decoration: line-through; + color: gray; +} + +.x-tree-node .k-ctn-status-rejected a span { + text-decoration: line-through; + /* color: #FF6633; */ + color: #FF3300; +} + +.x-tree-node .k-ctn-status-editing a span { + font-style: italic; + color: gray; +} + +.x-tree-node .k-ctn-status-submitted a span { + color: green; +} + +.k-info-links { + text-decoration: underline; + color: gray; + cursor: pointer; +} + +.x-tool-kmenu { + background-position: 0 -75px; +} + +.x-tool-kmenu-over { + background-position: -15px -75px; +} + +.k-border-openbox { + border-bottom: 1px #D0D0D0 solid; + border-right: 1px #D0D0D0 solid; + border-left: 1px #D0D0D0 solid; +} + +/* SiteToastMessages */ +.k-stm-info-icon { + background-image: url(img/info.gif) !important; +} + +.k-stm-imp-icon { + background-image: url(img/alert.gif) !important; +} + +.k-stm-verimp-icon { + background-image: url(img/important.gif) !important; +} + +.k-stm-error-icon { + background-image: url(img/error.gif) !important; +} + +.k-infod-head { + font-size: 108%; + margin-bottom: 10px; +} + +.gwt-DisclosurePanel { + +} + +.gwt-DisclosurePanel-open { + +} + +.gwt-DisclosurePanel-closed { + +} + +.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td + { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; +} + +.gwt-DisclosurePanel .content { + border-left: 3px solid #e8eef7; + padding: 4px 0px 4px 8px; + margin-left: 6px; +} + +.k-basic-thumb { + background: #FAFAFA none repeat scroll 0% 50%; + border: 1px solid #EBEBEB; + padding: 3px; + margin: 3px; +} + +.k-basic-thumb td { + padding: 2px 3px 2px 3px; + border: none; +} + +.k-text-gray { + color: gray; +} + +.k-elp-limg { + margin-top: 4px; + margin-left: 5px; + cursor: pointer; + overflow: hidden; +} + +.k-tsp-tag { + float: left; + padding: 3px; + cursor: pointer; + color: #0000FF; +} + +.k-tsp-cloud { + line-height: 1.5em; + text-align: center; +} + +.k-link-icon { + background-image: url(img/link.gif) !important; +} + +.k-options-icon { + background-image: url(img/emblem-system.gif) !important; +} + +.k-copyleft-icon { + background-image: url(img/copyleft.png) !important; +} + +.k-picture-icon { + background-image: url(img/picture.png) !important; +} + +.k-film-icon { + background-image: url(img/film.png) !important; +} + +.k-specialchars-icon { + background-image: url(img/specialchars.png) !important; +} + +.k-info-icon { + background-image: url(img/info.gif) !important; +} + +.k-newgroup-icon { + background-image: url(img/kune-icon16.png) !important; +} + +.k-colors-icon { + background-image: url(img/colors.gif) !important; +} + +.x-toolbar-body table { /* width: 100%; */ + +} + +.k-preview-msg { + background: #FFCCAA; +} + +.k-preview-msg-lab { + background: #FFCCAA; + padding: 0 5px; +} + +.k-eil-edit { + border: thin solid black; +} + +/* duplicated in rte.css */ +.k-rte-comment { + border: 1px dashed #C0C0C0; + line-height: 1.4; + padding: 1px; + background-color: #D7FFD7; +} + +.k-specialchar-grid { + border: 1px solid #ACA899; +} + +.k-specialchar-grid table { + +} + +.k-specialchar-grid div { + line-height: 22px; +} + +.k-specialchar-grid td { + padding: 1px; +} + +.k-specialchar-pb { + border: 1px solid #EBE8D7; + cursor: pointer; + font-size: 108% !important; + text-align: center; + vertical-align: middle; + width: 18px; + height: 18px; +} + +.k-specialchar-pb-up { + +} + +.k-specialchar-big { + padding: 3px; + line-height: 22px; + font-size: 197% !important; +} + +.k-specialchar-adv-label { + margin-left: -10px; +} + +.k-specialchar-popup +, +{ +border + + + + + + +: + + + + + + + +1 +px + + + + + + + +solid + + + + + + + +#C0C0C0 + + + + + + +; +z-index + + + + + + +: + + + + + + + +9999 +! +important + + + + + + +; +background-color + + + + + + +: + + + + + + + +#FFF + + + + + + +; +} +.k-specialchar-pb-down { + color: #161616; +} + +.k-specialchar-pb-up-hovering { + border: thin solid #ACA899; +} + +.k-specialchar-pb-down-hovering { + color: #161616; +} + +.k-preview-panel { + border: dashed 1px gray; + padding: 5px; +} + +.k-rte-changelink { + white-space: nowrap; + color: navy; + cursor: pointer; + text-decoration: underline; + margin: 5px; +} + +.k-rte-changelink-popup { + border: 1px solid #C0C0C0; + z-index: 9999 !important; + background-color: #ECECEC; +} + +.e-ui-room { + height: 27px; + line-height: 22px; +} + +.e-ui-room input { + font-size: 100%; + margin-left: 0px; + margin-top: 0px; +} + +.k-def-popup { + z-index: 9999 !important; + background-color: #FFF; + border: 1px solid gray; +} + +#k-mshortcut { + position: absolute; + right: 10px; +} + +#k-mshortcut-hidden { + visibility: hidden; +} + +#k-mshortcut a { + text-decoration: none; + color: black; +} + +.k-plain-iframe iframe { + border: 1px solid gray; +} + +.k-transp .x-panel-body { + background: transparent; +} + +.k-transp { + background: transparent; +} + +.k-blank { + background: #FFF; +} \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,113 +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 org.ourproject.kune.blogs.client; - -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_BLOG; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_POST; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_ROOT; -import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE; - -import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.ioc.Provider; - -public class BlogClientActions extends AbstractFoldableContentActions { - public BlogClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, - final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final BlogViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { - super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, - contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager); - } - - @Override - protected void createActions() { - final String[] all = { TYPE_ROOT, TYPE_BLOG, TYPE_POST, TYPE_UPLOADEDFILE }; - final String[] contentsModerated = { TYPE_POST, TYPE_UPLOADEDFILE }; - final String[] containers = { TYPE_ROOT, TYPE_BLOG }; - final String[] containersNoRoot = { TYPE_BLOG }; - final String[] contents = { TYPE_POST, TYPE_UPLOADEDFILE }; - - final String parentMenuTitle = i18n.t("Post"); - final String parentMenuTitleCtx = i18n.t("Blog"); - - createNewContainerAction(TYPE_BLOG, "images/nav/blog_add.png", i18n.t("New blog"), parentMenuTitleCtx, - i18n.t("New"), i18n.t("New blog"), Position.ctx, TYPE_ROOT); - createNewContentAction(TYPE_POST, "images/nav/post_add.png", i18n.t("New post"), parentMenuTitleCtx, - Position.ctx, TYPE_BLOG); - - createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); - createEditAction(parentMenuTitle, TYPE_POST); - createContentModeratedActions(parentMenuTitle, contentsModerated); - createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); - - // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = - // createSetAsDefContent(parentMenuTitleCtx); - - createRefreshCntAction(parentMenuTitle, contents); - createRefreshCxtAction(parentMenuTitleCtx, containers); - - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), - null, containersNoRoot); - - createSetAsDefContent(parentMenuTitle, contents); - createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); - - createGoAction(all); - createGoHomeAction(containers); - - // ContentRPC Authorized must permit folders - // contentActionRegistry.addAction(setAsDefGroupCxt, TYPE_BLOG); - - createDelContainerAction("Delete blog", parentMenuTitleCtx, containersNoRoot); - createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); - createShowDeletedItems(parentMenuTitleCtx, all); - } - - @Override - protected void createPostSessionInitActions() { - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,113 @@ +/* + * + * 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 org.ourproject.kune.blogs.client; + +import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_BLOG; +import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_POST; +import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_ROOT; +import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE; + +import org.ourproject.kune.blogs.client.cnt.BlogViewer; +import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; + +import com.calclab.suco.client.ioc.Provider; + +public class BlogClientActions extends AbstractFoldableContentActions { + public BlogClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, + final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, + final BlogViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { + super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, + contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, + contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, + documentViewer, entityLogo, publicLink, wsBackManager); + } + + @Override + protected void createActions() { + final String[] all = { TYPE_ROOT, TYPE_BLOG, TYPE_POST, TYPE_UPLOADEDFILE }; + final String[] contentsModerated = { TYPE_POST, TYPE_UPLOADEDFILE }; + final String[] containers = { TYPE_ROOT, TYPE_BLOG }; + final String[] containersNoRoot = { TYPE_BLOG }; + final String[] contents = { TYPE_POST, TYPE_UPLOADEDFILE }; + + final String parentMenuTitle = i18n.t("Post"); + final String parentMenuTitleCtx = i18n.t("Blog"); + + createNewContainerAction(TYPE_BLOG, "images/nav/blog_add.png", i18n.t("New blog"), parentMenuTitleCtx, + i18n.t("New"), i18n.t("New blog"), Position.ctx, TYPE_ROOT); + createNewContentAction(TYPE_POST, "images/nav/post_add.png", i18n.t("New post"), parentMenuTitleCtx, + Position.ctx, TYPE_BLOG); + + createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); + createEditAction(parentMenuTitle, TYPE_POST); + createContentModeratedActions(parentMenuTitle, contentsModerated); + createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); + + // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = + // createSetAsDefContent(parentMenuTitleCtx); + + createRefreshCntAction(parentMenuTitle, contents); + createRefreshCxtAction(parentMenuTitleCtx, containers); + + createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), + null, containersNoRoot); + + createSetAsDefContent(parentMenuTitle, contents); + createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); + + createGoAction(all); + createGoHomeAction(containers); + + // ContentRPC Authorized must permit folders + // contentActionRegistry.addAction(setAsDefGroupCxt, TYPE_BLOG); + + createDelContainerAction("Delete blog", parentMenuTitleCtx, containersNoRoot); + createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); + } + + @Override + protected void createPostSessionInitActions() { + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,124 +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 org.ourproject.kune.blogs.client; - -import org.ourproject.kune.blogs.client.cnt.BlogFolderContent; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPanel; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPresenter; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentView; -import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.blogs.client.cnt.BlogViewerPanel; -import org.ourproject.kune.blogs.client.cnt.BlogViewerPresenter; -import org.ourproject.kune.blogs.client.cnt.BlogViewerView; -import org.ourproject.kune.blogs.client.ctx.BlogContext; -import org.ourproject.kune.blogs.client.ctx.BlogContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.tool.ToolSelector; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class BlogClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<BlogClientTool>(BlogClientTool.class) { - @Override - public BlogClientTool create() { - i(BlogClientActions.class); - return new BlogClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<BlogClientActions>(BlogClientActions.class) { - @Override - public BlogClientActions create() { - return new BlogClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(BlogViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<BlogContext>(BlogContext.class) { - @Override - public BlogContext create() { - final BlogContextPresenter presenter = new BlogContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<BlogViewer>(BlogViewer.class) { - @Override - public BlogViewer create() { - final BlogViewerPresenter presenter = new BlogViewerPresenter(i(StateManager.class), i(Session.class), - i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final BlogViewerView view = new BlogViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<BlogFolderContent>(BlogFolderContent.class) { - @Override - public BlogFolderContent create() { - final BlogFolderContentPresenter presenter = new BlogFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final BlogFolderContentView view = new BlogFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,124 @@ +/* + * + * 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 org.ourproject.kune.blogs.client; + +import org.ourproject.kune.blogs.client.cnt.BlogFolderContent; +import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPanel; +import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPresenter; +import org.ourproject.kune.blogs.client.cnt.BlogFolderContentView; +import org.ourproject.kune.blogs.client.cnt.BlogViewer; +import org.ourproject.kune.blogs.client.cnt.BlogViewerPanel; +import org.ourproject.kune.blogs.client.cnt.BlogViewerPresenter; +import org.ourproject.kune.blogs.client.cnt.BlogViewerView; +import org.ourproject.kune.blogs.client.ctx.BlogContext; +import org.ourproject.kune.blogs.client.ctx.BlogContextPresenter; +import org.ourproject.kune.platf.client.app.ToolGroup; +import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; +import org.ourproject.kune.platf.client.services.AbstractExtendedModule; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import org.ourproject.kune.workspace.client.tool.ToolSelector; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.ioc.decorator.Singleton; +import com.calclab.suco.client.ioc.module.Factory; + +public class BlogClientModule extends AbstractExtendedModule { + + @Override + public void onInstall() { + + register(ToolGroup.class, new Factory<BlogClientTool>(BlogClientTool.class) { + @Override + public BlogClientTool create() { + i(BlogClientActions.class); + return new BlogClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), + i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); + } + }); + + register(ToolGroup.class, new Factory<BlogClientActions>(BlogClientActions.class) { + @Override + public BlogClientActions create() { + return new BlogClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), + i(Session.class), i(StateManager.class), i(SchedulerManager.class), + p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), + i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), + i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(BlogViewer.class), + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); + } + }); + + register(ToolGroup.class, new Factory<BlogContext>(BlogContext.class) { + @Override + public BlogContext create() { + final BlogContextPresenter presenter = new BlogContextPresenter(i(StateManager.class), + p(ContextNavigator.class), p(ContextPropEditor.class)); + return presenter; + } + }); + + register(Singleton.class, new Factory<BlogViewer>(BlogViewer.class) { + @Override + public BlogViewer create() { + final BlogViewerPresenter presenter = new BlogViewerPresenter(i(StateManager.class), i(Session.class), + i(I18nUITranslationService.class), i(ActionContentToolbar.class), + i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); + final BlogViewerView view = new BlogViewerPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + + register(ToolGroup.class, new Factory<BlogFolderContent>(BlogFolderContent.class) { + @Override + public BlogFolderContent create() { + final BlogFolderContentPresenter presenter = new BlogFolderContentPresenter(i(StateManager.class), + i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), + i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); + final BlogFolderContentView view = new BlogFolderContentPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,117 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 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 org.ourproject.kune.docs.client; - -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_DOCUMENT; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_FOLDER; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_ROOT; -import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_UPLOADEDFILE; - -import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.ioc.Provider; - -public class DocumentClientActions extends AbstractFoldableContentActions { - public DocumentClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, - final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final DocumentViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { - super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, - contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager); - } - - @Override - protected void createActions() { - final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; - final String[] containers = { TYPE_ROOT, TYPE_FOLDER, }; - final String[] contentsModerated = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; - final String[] containersNoRoot = { TYPE_FOLDER }; - final String[] contents = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; - - final String parentMenuTitle = i18n.t("File"); - final String parentMenuTitleCtx = i18n.t("Folder"); - - createNewContainerAction(TYPE_FOLDER, "images/nav/folder_add.png", i18n.t("New folder"), parentMenuTitleCtx, - i18n.t("New"), i18n.t("New folder"), Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - createNewContentAction(TYPE_DOCUMENT, "images/nav/page_add.png", i18n.t("New document"), parentMenuTitleCtx, - Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - createTranslateAction(parentMenuTitle, TYPE_DOCUMENT, TYPE_FOLDER); - createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); - createEditAction(parentMenuTitle, TYPE_DOCUMENT); - createContentModeratedActions(parentMenuTitle, contentsModerated); - createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); - - // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = - // createSetAsDefContent(parentMenuTitleCtx); - - createRefreshCntAction(parentMenuTitle, contents); - createRefreshCxtAction(parentMenuTitleCtx, containers); - - createSetAsDefContent(parentMenuTitle, contents); - - createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); - - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), - null, containers); - - createDownloadActions(TYPE_UPLOADEDFILE); - - createGoAction(all); - - createGoHomeAction(containers); - - createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); - createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); - createShowDeletedItems(parentMenuTitleCtx, all); - } - - @Override - protected void createPostSessionInitActions() { - // super.createUploadMediaAction(TYPE_GALLERY); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,117 @@ +/* + * + * Copyright (C) 2007-2009 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 org.ourproject.kune.docs.client; + +import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_DOCUMENT; +import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_FOLDER; +import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_ROOT; +import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_UPLOADEDFILE; + +import org.ourproject.kune.docs.client.cnt.DocumentViewer; +import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; + +import com.calclab.suco.client.ioc.Provider; + +public class DocumentClientActions extends AbstractFoldableContentActions { + public DocumentClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, + final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, + final DocumentViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { + super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, + contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, + contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, + documentViewer, entityLogo, publicLink, wsBackManager); + } + + @Override + protected void createActions() { + final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; + final String[] containers = { TYPE_ROOT, TYPE_FOLDER, }; + final String[] contentsModerated = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; + final String[] containersNoRoot = { TYPE_FOLDER }; + final String[] contents = { TYPE_DOCUMENT, TYPE_UPLOADEDFILE }; + + final String parentMenuTitle = i18n.t("File"); + final String parentMenuTitleCtx = i18n.t("Folder"); + + createNewContainerAction(TYPE_FOLDER, "images/nav/folder_add.png", i18n.t("New folder"), parentMenuTitleCtx, + i18n.t("New"), i18n.t("New folder"), Position.ctx, TYPE_ROOT, TYPE_FOLDER); + + createNewContentAction(TYPE_DOCUMENT, "images/nav/page_add.png", i18n.t("New document"), parentMenuTitleCtx, + Position.ctx, TYPE_ROOT, TYPE_FOLDER); + + createTranslateAction(parentMenuTitle, TYPE_DOCUMENT, TYPE_FOLDER); + createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); + createEditAction(parentMenuTitle, TYPE_DOCUMENT); + createContentModeratedActions(parentMenuTitle, contentsModerated); + createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); + + // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = + // createSetAsDefContent(parentMenuTitleCtx); + + createRefreshCntAction(parentMenuTitle, contents); + createRefreshCxtAction(parentMenuTitleCtx, containers); + + createSetAsDefContent(parentMenuTitle, contents); + + createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); + + createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), + null, containers); + + createDownloadActions(TYPE_UPLOADEDFILE); + + createGoAction(all); + + createGoHomeAction(containers); + + createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); + createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); + } + + @Override + protected void createPostSessionInitActions() { + // super.createUploadMediaAction(TYPE_GALLERY); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,124 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 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 org.ourproject.kune.docs.client; - -import org.ourproject.kune.docs.client.cnt.DocFolderContent; -import org.ourproject.kune.docs.client.cnt.DocFolderContentPanel; -import org.ourproject.kune.docs.client.cnt.DocFolderContentPresenter; -import org.ourproject.kune.docs.client.cnt.DocFolderContentView; -import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.docs.client.cnt.DocumentViewerPanel; -import org.ourproject.kune.docs.client.cnt.DocumentViewerPresenter; -import org.ourproject.kune.docs.client.cnt.DocumentViewerView; -import org.ourproject.kune.docs.client.ctx.DocumentContext; -import org.ourproject.kune.docs.client.ctx.DocumentContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.tool.ToolSelector; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class DocumentClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<DocumentClientTool>(DocumentClientTool.class) { - @Override - public DocumentClientTool create() { - i(DocumentClientActions.class); - return new DocumentClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<DocumentClientActions>(DocumentClientActions.class) { - @Override - public DocumentClientActions create() { - return new DocumentClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(DocumentViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<DocumentContext>(DocumentContext.class) { - @Override - public DocumentContext create() { - final DocumentContextPresenter presenter = new DocumentContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<DocumentViewer>(DocumentViewer.class) { - @Override - public DocumentViewer create() { - final DocumentViewerPresenter presenter = new DocumentViewerPresenter(i(StateManager.class), - i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final DocumentViewerView view = new DocumentViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<DocFolderContent>(DocFolderContent.class) { - @Override - public DocFolderContent create() { - final DocFolderContentPresenter presenter = new DocFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - p(FileDownloadUtils.class), i(I18nTranslationService.class), p(MediaUtils.class)); - final DocFolderContentView view = new DocFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,124 @@ +/* + * + * Copyright (C) 2007-2009 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 org.ourproject.kune.docs.client; + +import org.ourproject.kune.docs.client.cnt.DocFolderContent; +import org.ourproject.kune.docs.client.cnt.DocFolderContentPanel; +import org.ourproject.kune.docs.client.cnt.DocFolderContentPresenter; +import org.ourproject.kune.docs.client.cnt.DocFolderContentView; +import org.ourproject.kune.docs.client.cnt.DocumentViewer; +import org.ourproject.kune.docs.client.cnt.DocumentViewerPanel; +import org.ourproject.kune.docs.client.cnt.DocumentViewerPresenter; +import org.ourproject.kune.docs.client.cnt.DocumentViewerView; +import org.ourproject.kune.docs.client.ctx.DocumentContext; +import org.ourproject.kune.docs.client.ctx.DocumentContextPresenter; +import org.ourproject.kune.platf.client.app.ToolGroup; +import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; +import org.ourproject.kune.platf.client.services.AbstractExtendedModule; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import org.ourproject.kune.workspace.client.tool.ToolSelector; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.ioc.decorator.Singleton; +import com.calclab.suco.client.ioc.module.Factory; + +public class DocumentClientModule extends AbstractExtendedModule { + + @Override + public void onInstall() { + + register(ToolGroup.class, new Factory<DocumentClientTool>(DocumentClientTool.class) { + @Override + public DocumentClientTool create() { + i(DocumentClientActions.class); + return new DocumentClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), + i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); + } + }); + + register(ToolGroup.class, new Factory<DocumentClientActions>(DocumentClientActions.class) { + @Override + public DocumentClientActions create() { + return new DocumentClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), + i(Session.class), i(StateManager.class), i(SchedulerManager.class), + p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), + i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), + i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(DocumentViewer.class), + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); + } + }); + + register(ToolGroup.class, new Factory<DocumentContext>(DocumentContext.class) { + @Override + public DocumentContext create() { + final DocumentContextPresenter presenter = new DocumentContextPresenter(i(StateManager.class), + p(ContextNavigator.class), p(ContextPropEditor.class)); + return presenter; + } + }); + + register(Singleton.class, new Factory<DocumentViewer>(DocumentViewer.class) { + @Override + public DocumentViewer create() { + final DocumentViewerPresenter presenter = new DocumentViewerPresenter(i(StateManager.class), + i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), + i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); + final DocumentViewerView view = new DocumentViewerPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + + register(ToolGroup.class, new Factory<DocFolderContent>(DocFolderContent.class) { + @Override + public DocFolderContent create() { + final DocFolderContentPresenter presenter = new DocFolderContentPresenter(i(StateManager.class), + i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), + p(FileDownloadUtils.class), i(I18nTranslationService.class), p(MediaUtils.class)); + final DocFolderContentView view = new DocFolderContentPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,114 +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 org.ourproject.kune.gallery.client; - -import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_ALBUM; -import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_ROOT; -import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_UPLOADEDFILE; - -import org.ourproject.kune.gallery.client.cnt.GalleryViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.ioc.Provider; - -public class GalleryClientActions extends AbstractFoldableContentActions { - public GalleryClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, - final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final GalleryViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { - super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, - contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager); - } - - @Override - protected void createActions() { - final String[] all = { TYPE_ROOT, TYPE_ALBUM, TYPE_UPLOADEDFILE }; - final String[] containers = { TYPE_ROOT, TYPE_ALBUM }; - final String[] contentsModerated = { TYPE_UPLOADEDFILE }; - final String[] containersNoRoot = { TYPE_ALBUM }; - final String[] contents = { TYPE_UPLOADEDFILE }; - - final String parentMenuTitle = i18n.t("File"); - final String parentMenuTitleCtx = i18n.t("Album"); - - createNewContainerAction(TYPE_ALBUM, "images/nav/gallery_add.png", i18n.t("New sub-album"), parentMenuTitleCtx, - i18n.t("New"), i18n.t("New sub-album"), Position.ctx, TYPE_ALBUM); - createNewContainerAction(TYPE_ALBUM, "images/nav/gallery_add.png", i18n.t("New album"), parentMenuTitleCtx, - i18n.t("New"), i18n.t("New album"), Position.ctx, TYPE_ROOT); - - createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); - createContentModeratedActions(parentMenuTitle, contentsModerated); - createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); - - // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = - // createSetAsDefContent(parentMenuTitleCtx); - - createRefreshCntAction(parentMenuTitle, contents); - createRefreshCxtAction(parentMenuTitleCtx, containers); - - createSetAsDefContent(parentMenuTitle, contents); - createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); - - // createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", - // i18n.t("Upload some files (images, PDFs, ...)"), null, containers); - - createDownloadActions(TYPE_UPLOADEDFILE); - - createGoAction(all); - - createGoHomeAction(containers); - - // createTranslateAction(TYPE_ALBUM, TYPE_UPLOADEDFILE); - - createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); - createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); - createShowDeletedItems(parentMenuTitleCtx, all); - } - - @Override - protected void createPostSessionInitActions() { - super.createUploadMediaAction(TYPE_ALBUM); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,114 @@ +/* + * + * 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 org.ourproject.kune.gallery.client; + +import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_ALBUM; +import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_ROOT; +import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_UPLOADEDFILE; + +import org.ourproject.kune.gallery.client.cnt.GalleryViewer; +import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; + +import com.calclab.suco.client.ioc.Provider; + +public class GalleryClientActions extends AbstractFoldableContentActions { + public GalleryClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, + final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, + final GalleryViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { + super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, + contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, + contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, + documentViewer, entityLogo, publicLink, wsBackManager); + } + + @Override + protected void createActions() { + final String[] all = { TYPE_ROOT, TYPE_ALBUM, TYPE_UPLOADEDFILE }; + final String[] containers = { TYPE_ROOT, TYPE_ALBUM }; + final String[] contentsModerated = { TYPE_UPLOADEDFILE }; + final String[] containersNoRoot = { TYPE_ALBUM }; + final String[] contents = { TYPE_UPLOADEDFILE }; + + final String parentMenuTitle = i18n.t("File"); + final String parentMenuTitleCtx = i18n.t("Album"); + + createNewContainerAction(TYPE_ALBUM, "images/nav/gallery_add.png", i18n.t("New sub-album"), parentMenuTitleCtx, + i18n.t("New"), i18n.t("New sub-album"), Position.ctx, TYPE_ALBUM); + createNewContainerAction(TYPE_ALBUM, "images/nav/gallery_add.png", i18n.t("New album"), parentMenuTitleCtx, + i18n.t("New"), i18n.t("New album"), Position.ctx, TYPE_ROOT); + + createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); + createContentModeratedActions(parentMenuTitle, contentsModerated); + createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); + + // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = + // createSetAsDefContent(parentMenuTitleCtx); + + createRefreshCntAction(parentMenuTitle, contents); + createRefreshCxtAction(parentMenuTitleCtx, containers); + + createSetAsDefContent(parentMenuTitle, contents); + createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); + + // createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", + // i18n.t("Upload some files (images, PDFs, ...)"), null, containers); + + createDownloadActions(TYPE_UPLOADEDFILE); + + createGoAction(all); + + createGoHomeAction(containers); + + // createTranslateAction(TYPE_ALBUM, TYPE_UPLOADEDFILE); + + createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); + createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); + } + + @Override + protected void createPostSessionInitActions() { + super.createUploadMediaAction(TYPE_ALBUM); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,125 +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 org.ourproject.kune.gallery.client; - -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContent; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPanel; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPresenter; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentView; -import org.ourproject.kune.gallery.client.cnt.GalleryViewer; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerPanel; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerPresenter; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerView; -import org.ourproject.kune.gallery.client.ctx.GalleryContext; -import org.ourproject.kune.gallery.client.ctx.GalleryContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.tool.ToolSelector; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class GalleryClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<GalleryClientTool>(GalleryClientTool.class) { - @Override - public GalleryClientTool create() { - i(GalleryClientActions.class); - return new GalleryClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<GalleryClientActions>(GalleryClientActions.class) { - @Override - public GalleryClientActions create() { - return new GalleryClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(GalleryViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<GalleryContext>(GalleryContext.class) { - @Override - public GalleryContext create() { - final GalleryContextPresenter presenter = new GalleryContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<GalleryViewer>(GalleryViewer.class) { - @Override - public GalleryViewer create() { - final GalleryViewerPresenter presenter = new GalleryViewerPresenter(i(StateManager.class), - i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final GalleryViewerView view = new GalleryViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<GalleryFolderContent>(GalleryFolderContent.class) { - @Override - public GalleryFolderContent create() { - final GalleryFolderContentPresenter presenter = new GalleryFolderContentPresenter( - i(StateManager.class), i(Session.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), i(I18nTranslationService.class), p(FileDownloadUtils.class), - p(FileDownloadUtils.class), p(MediaUtils.class)); - final GalleryFolderContentView view = new GalleryFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class), i(StateManager.class), i(Session.class)); - presenter.init(view); - return presenter; - } - }); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,125 @@ +/* + * + * 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 org.ourproject.kune.gallery.client; + +import org.ourproject.kune.gallery.client.cnt.GalleryFolderContent; +import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPanel; +import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPresenter; +import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentView; +import org.ourproject.kune.gallery.client.cnt.GalleryViewer; +import org.ourproject.kune.gallery.client.cnt.GalleryViewerPanel; +import org.ourproject.kune.gallery.client.cnt.GalleryViewerPresenter; +import org.ourproject.kune.gallery.client.cnt.GalleryViewerView; +import org.ourproject.kune.gallery.client.ctx.GalleryContext; +import org.ourproject.kune.gallery.client.ctx.GalleryContextPresenter; +import org.ourproject.kune.platf.client.app.ToolGroup; +import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; +import org.ourproject.kune.platf.client.services.AbstractExtendedModule; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import org.ourproject.kune.workspace.client.tool.ToolSelector; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.ioc.decorator.Singleton; +import com.calclab.suco.client.ioc.module.Factory; + +public class GalleryClientModule extends AbstractExtendedModule { + + @Override + public void onInstall() { + + register(ToolGroup.class, new Factory<GalleryClientTool>(GalleryClientTool.class) { + @Override + public GalleryClientTool create() { + i(GalleryClientActions.class); + return new GalleryClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), + i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); + } + }); + + register(ToolGroup.class, new Factory<GalleryClientActions>(GalleryClientActions.class) { + @Override + public GalleryClientActions create() { + return new GalleryClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), + i(Session.class), i(StateManager.class), i(SchedulerManager.class), + p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), + i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), + i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(GalleryViewer.class), + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); + } + }); + + register(ToolGroup.class, new Factory<GalleryContext>(GalleryContext.class) { + @Override + public GalleryContext create() { + final GalleryContextPresenter presenter = new GalleryContextPresenter(i(StateManager.class), + p(ContextNavigator.class), p(ContextPropEditor.class)); + return presenter; + } + }); + + register(Singleton.class, new Factory<GalleryViewer>(GalleryViewer.class) { + @Override + public GalleryViewer create() { + final GalleryViewerPresenter presenter = new GalleryViewerPresenter(i(StateManager.class), + i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), + i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); + final GalleryViewerView view = new GalleryViewerPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + + register(ToolGroup.class, new Factory<GalleryFolderContent>(GalleryFolderContent.class) { + @Override + public GalleryFolderContent create() { + final GalleryFolderContentPresenter presenter = new GalleryFolderContentPresenter( + i(StateManager.class), i(Session.class), i(ActionContentToolbar.class), + i(ContentActionRegistry.class), i(I18nTranslationService.class), p(FileDownloadUtils.class), + p(FileDownloadUtils.class), p(MediaUtils.class)); + final GalleryFolderContentView view = new GalleryFolderContentPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class), i(StateManager.class), i(Session.class)); + presenter.init(view); + return presenter; + } + }); + } +} Modified: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/rack/RackServletFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -36,8 +36,6 @@ import org.ourproject.kune.rack.dock.Dock; import org.ourproject.kune.rack.dock.RequestMatcher; -import cc.kune.wave.server.WaveStarter; - import com.google.inject.Injector; public class RackServletFilter implements Filter { @@ -72,6 +70,7 @@ } public static final String INJECTOR_ATTRIBUTE = Injector.class.getName(); + public static final String INJECTOR_PARENT_ATTRIBUTE = Injector.class.getName() + "Parent"; private static final Log LOG = LogFactory.getLog(RackServletFilter.class); private static final String MODULE_PARAMETER = RackModule.class.getName(); private List<Dock> docks; @@ -128,8 +127,11 @@ final RackBuilder builder = new RackBuilder(); module.configure(builder); final Rack rack = builder.getRack(); - final WaveStarter waveStarter = new WaveStarter(); - final Injector waveChildInjector = waveStarter.runMain(); + // final WaveStarter waveStarter = new WaveStarter(); + // final Injector waveChildInjector = waveStarter.runMain(); + final Injector waveChildInjector = (Injector) filterConfig.getServletContext().getAttribute( + INJECTOR_PARENT_ATTRIBUTE); + // final Injector waveChildInjector = Guice.createInjector(); final Injector kuneChildInjector = installInjector(filterConfig, rack, waveChildInjector); startContainerListeners(rack.getListeners(), kuneChildInjector); docks = rack.getDocks(); Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,116 +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 org.ourproject.kune.wiki.client; - -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_FOLDER; -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_ROOT; -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_UPLOADEDFILE; -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_WIKIPAGE; - -import org.ourproject.kune.wiki.client.cnt.WikiViewer; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.ioc.Provider; - -public class WikiClientActions extends AbstractFoldableContentActions { - public WikiClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, - final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final WikiViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { - super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, - contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, publicLink, wsBackManager); - } - - @Override - protected void createActions() { - final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; - final String[] containers = { TYPE_ROOT, TYPE_FOLDER }; - // final String[] contentsModerated = { }; - final String[] containersNoRoot = { TYPE_FOLDER }; - final String[] contents = { TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; - - final String parentMenuTitle = i18n.t("Wikipage"); - final String parentMenuTitleCtx = i18n.t("Wiki"); - - createNewContainerAction(TYPE_FOLDER, "images/nav/folder_add.png", i18n.t("New folder"), parentMenuTitleCtx, - i18n.t("New"), i18n.t("New folder"), Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - createNewContentAction(TYPE_WIKIPAGE, "images/nav/wikipage_add.png", i18n.t("New wikipage"), - parentMenuTitleCtx, Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - // createContentModeratedActions(parentMenuTitle, contentsModerated); - createTranslateAction(parentMenuTitle, TYPE_FOLDER, TYPE_WIKIPAGE); - createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); - createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); - createEditAction(parentMenuTitle, TYPE_WIKIPAGE); - - // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = - // createSetAsDefContent(parentMenuTitleCtx); - - createRefreshCntAction(parentMenuTitle, contents); - createRefreshCxtAction(parentMenuTitleCtx, containers); - - createSetAsDefContent(parentMenuTitle, contents); - createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); - - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", - i18n.t("Upload some files (images, PDFs, ...)"), null, containers); - - createDownloadActions(TYPE_UPLOADEDFILE); - - createGoAction(all); - - createGoHomeAction(containers); - - createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); - createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); - createShowDeletedItems(parentMenuTitleCtx, all); - } - - @Override - protected void createPostSessionInitActions() { - // super.createUploadMediaAction(); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,116 @@ +/* + * + * 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 org.ourproject.kune.wiki.client; + +import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_FOLDER; +import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_ROOT; +import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_UPLOADEDFILE; +import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_WIKIPAGE; + +import org.ourproject.kune.wiki.client.cnt.WikiViewer; +import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; + +import com.calclab.suco.client.ioc.Provider; + +public class WikiClientActions extends AbstractFoldableContentActions { + public WikiClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, + final Session session, final StateManager stateManager, final SchedulerManager deferredCommandWrapper, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, + final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, + final WikiViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { + super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, + contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, + contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, + documentViewer, entityLogo, publicLink, wsBackManager); + } + + @Override + protected void createActions() { + final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; + final String[] containers = { TYPE_ROOT, TYPE_FOLDER }; + // final String[] contentsModerated = { }; + final String[] containersNoRoot = { TYPE_FOLDER }; + final String[] contents = { TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; + + final String parentMenuTitle = i18n.t("Wikipage"); + final String parentMenuTitleCtx = i18n.t("Wiki"); + + createNewContainerAction(TYPE_FOLDER, "images/nav/folder_add.png", i18n.t("New folder"), parentMenuTitleCtx, + i18n.t("New"), i18n.t("New folder"), Position.ctx, TYPE_ROOT, TYPE_FOLDER); + + createNewContentAction(TYPE_WIKIPAGE, "images/nav/wikipage_add.png", i18n.t("New wikipage"), + parentMenuTitleCtx, Position.ctx, TYPE_ROOT, TYPE_FOLDER); + + // createContentModeratedActions(parentMenuTitle, contentsModerated); + createTranslateAction(parentMenuTitle, TYPE_FOLDER, TYPE_WIKIPAGE); + createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); + createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); + createEditAction(parentMenuTitle, TYPE_WIKIPAGE); + + // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = + // createSetAsDefContent(parentMenuTitleCtx); + + createRefreshCntAction(parentMenuTitle, contents); + createRefreshCxtAction(parentMenuTitleCtx, containers); + + createSetAsDefContent(parentMenuTitle, contents); + createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); + + createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", + i18n.t("Upload some files (images, PDFs, ...)"), null, containers); + + createDownloadActions(TYPE_UPLOADEDFILE); + + createGoAction(all); + + createGoHomeAction(containers); + + createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); + createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); + } + + @Override + protected void createPostSessionInitActions() { + // super.createUploadMediaAction(); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,124 +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 org.ourproject.kune.wiki.client; - -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContent; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPanel; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPresenter; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentView; -import org.ourproject.kune.wiki.client.cnt.WikiViewer; -import org.ourproject.kune.wiki.client.cnt.WikiViewerPanel; -import org.ourproject.kune.wiki.client.cnt.WikiViewerPresenter; -import org.ourproject.kune.wiki.client.cnt.WikiViewerView; -import org.ourproject.kune.wiki.client.ctx.WikiContext; -import org.ourproject.kune.wiki.client.ctx.WikiContextPresenter; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.tool.ToolSelector; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class WikiClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<WikiClientTool>(WikiClientTool.class) { - @Override - public WikiClientTool create() { - i(WikiClientActions.class); - return new WikiClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<WikiClientActions>(WikiClientActions.class) { - @Override - public WikiClientActions create() { - return new WikiClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(WikiViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<WikiContext>(WikiContext.class) { - @Override - public WikiContext create() { - final WikiContextPresenter presenter = new WikiContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<WikiViewer>(WikiViewer.class) { - @Override - public WikiViewer create() { - final WikiViewerPresenter presenter = new WikiViewerPresenter(i(StateManager.class), i(Session.class), - i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final WikiViewerView view = new WikiViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<WikiFolderContent>(WikiFolderContent.class) { - @Override - public WikiFolderContent create() { - final WikiFolderContentPresenter presenter = new WikiFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final WikiFolderContentView view = new WikiFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,124 @@ +/* + * + * 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 org.ourproject.kune.wiki.client; + +import org.ourproject.kune.platf.client.app.ToolGroup; +import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; +import org.ourproject.kune.platf.client.services.AbstractExtendedModule; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import org.ourproject.kune.wiki.client.cnt.WikiFolderContent; +import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPanel; +import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPresenter; +import org.ourproject.kune.wiki.client.cnt.WikiFolderContentView; +import org.ourproject.kune.wiki.client.cnt.WikiViewer; +import org.ourproject.kune.wiki.client.cnt.WikiViewerPanel; +import org.ourproject.kune.wiki.client.cnt.WikiViewerPresenter; +import org.ourproject.kune.wiki.client.cnt.WikiViewerView; +import org.ourproject.kune.wiki.client.ctx.WikiContext; +import org.ourproject.kune.wiki.client.ctx.WikiContextPresenter; +import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import org.ourproject.kune.workspace.client.tool.ToolSelector; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.ioc.decorator.Singleton; +import com.calclab.suco.client.ioc.module.Factory; + +public class WikiClientModule extends AbstractExtendedModule { + + @Override + public void onInstall() { + + register(ToolGroup.class, new Factory<WikiClientTool>(WikiClientTool.class) { + @Override + public WikiClientTool create() { + i(WikiClientActions.class); + return new WikiClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), + i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); + } + }); + + register(ToolGroup.class, new Factory<WikiClientActions>(WikiClientActions.class) { + @Override + public WikiClientActions create() { + return new WikiClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), + i(Session.class), i(StateManager.class), i(SchedulerManager.class), + p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), + i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), + i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(WikiViewer.class), + p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); + } + }); + + register(ToolGroup.class, new Factory<WikiContext>(WikiContext.class) { + @Override + public WikiContext create() { + final WikiContextPresenter presenter = new WikiContextPresenter(i(StateManager.class), + p(ContextNavigator.class), p(ContextPropEditor.class)); + return presenter; + } + }); + + register(Singleton.class, new Factory<WikiViewer>(WikiViewer.class) { + @Override + public WikiViewer create() { + final WikiViewerPresenter presenter = new WikiViewerPresenter(i(StateManager.class), i(Session.class), + i(I18nUITranslationService.class), i(ActionContentToolbar.class), + i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); + final WikiViewerView view = new WikiViewerPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + + register(ToolGroup.class, new Factory<WikiFolderContent>(WikiFolderContent.class) { + @Override + public WikiFolderContent create() { + final WikiFolderContentPresenter presenter = new WikiFolderContentPresenter(i(StateManager.class), + i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), + i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); + final WikiFolderContentView view = new WikiFolderContentPanel(i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,674 +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 org.ourproject.kune.workspace.client; - -import org.ourproject.kune.platf.client.actions.ActionCheckedCondition; -import org.ourproject.kune.platf.client.actions.ActionEnableCondition; -import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuCheckItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; -import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.errors.SessionExpiredException; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.InitDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.StateContentDTO; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public abstract class AbstractFoldableContentActions { - - protected enum Position { - cnt, ctx - } - - public static final ActionToolbarPosition CONTENT_BOTTOMBAR = new ActionToolbarPosition("afca-ctn-bottom"); - - public static final ActionToolbarPosition CONTENT_TOPBAR = new ActionToolbarPosition("afca-ctn-top"); - public static final ActionToolbarPosition CONTEXT_BOTTOMBAR = new ActionToolbarPosition("afca-ctx-bottom"); - public static final ActionToolbarPosition CONTEXT_TOPBAR = new ActionToolbarPosition("afca-ctx-top"); - private static final String PUBLICATION_MENU = "Publication"; - - protected final ContentActionRegistry contentActionRegistry; - protected final Provider<ContentServiceAsync> contentServiceProvider; - protected final ContextActionRegistry contextActionRegistry; - protected final ContextNavigator contextNavigator; - protected final Provider<ContextPropEditor> contextPropEditorProvider; - protected final SchedulerManager deferredCommandWrapper; - protected final EntityHeader entityLogo; - protected final ErrorHandler errorHandler; - protected final Provider<FileDownloadUtils> fileDownloadProvider; - protected final Provider<FileUploader> fileUploaderProvider; - protected final FoldableContent foldableContent; - protected final Provider<GroupServiceAsync> groupServiceProvider; - protected final I18nUITranslationService i18n; - private final SitePublicSpaceLink publicLink; - protected final Session session; - protected final StateManager stateManager; - protected final Provider<ContentEditor> textEditorProvider; - - private final WsBackManager wsBackManager; - - public AbstractFoldableContentActions(final Session session, final StateManager stateManager, - final I18nUITranslationService i18n, final ErrorHandler errorHandler, - final SchedulerManager deferredCommandWrapper, final Provider<GroupServiceAsync> groupServiceProvider, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<FileUploader> fileUploaderProvider, final ContextNavigator contextNavigator, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final Provider<ContentEditor> textEditorProvider, - final Provider<ContextPropEditor> contextPropEditorProvider, final FoldableContent foldableContent, - final EntityHeader entityLogo, final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.errorHandler = errorHandler; - this.deferredCommandWrapper = deferredCommandWrapper; - this.groupServiceProvider = groupServiceProvider; - this.contentServiceProvider = contentServiceProvider; - this.fileUploaderProvider = fileUploaderProvider; - this.contextNavigator = contextNavigator; - this.contentActionRegistry = contentActionRegistry; - this.contextActionRegistry = contextActionRegistry; - this.fileDownloadProvider = fileDownloadProvider; - this.textEditorProvider = textEditorProvider; - this.contextPropEditorProvider = contextPropEditorProvider; - this.foldableContent = foldableContent; - this.entityLogo = entityLogo; - this.publicLink = publicLink; - this.wsBackManager = wsBackManager; - createActions(); - session.onInitDataReceived(new Listener<InitDataDTO>() { - @Override - public void onEvent(final InitDataDTO parameter) { - createPostSessionInitActions(); - } - }); - } - - protected abstract void createActions(); - - protected void createContentModeratedActions(final String parentMenuTitle, final String... contentsModerated) { - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatus.publishedOnline, - contentsModerated); - createSetStatusAction(AccessRolDTO.Editor, i18n.t("Editing in progress"), ContentStatus.editingInProgress, - contentsModerated); - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatus.rejected, contentsModerated); - createSetStatusAction(AccessRolDTO.Editor, i18n.t("Submitted for publish"), - ContentStatus.submittedForEvaluation, contentsModerated); - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), ContentStatus.inTheDustbin, - contentsModerated); - } - - protected void createContentRenameAction(final String parentMenuTitle, final String textDescription, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtn = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - contextNavigator.editItem(stateToken); - } - }); - renameCtn.setTextDescription(textDescription); - renameCtn.setParentMenuTitle(parentMenuTitle); - renameCtn.setEnableCondition(notDeleted()); - // renameCtn.setShortcut(new ShortcutDescriptor(false, Keyboard.KEY_F2, - // i18n.tWithNT("F2", "The F2 Function key"))); - contentActionRegistry.addAction(renameCtn, registerInTypes); - } - - protected void createDelContainerAction(final String text, final String parentMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> delContainer = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - NotifyUser.info("Sorry, in development"); - } - }); - delContainer.setParentMenuTitle(parentMenuTitle); - delContainer.setTextDescription(i18n.t(text)); - delContainer.setMustBeConfirmed(true); - delContainer.setConfirmationTitle(i18n.t("Please confirm")); - delContainer.setConfirmationText(i18n.t("You will delete it with all its contents. Are you sure?")); - contextActionRegistry.addAction(delContainer, registerInTypes); - } - - protected void createDelContentAction(final String parentMenuTitle, final String textDescription, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> delContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - contentServiceProvider.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<StateContentDTO>() { - @Override - public void onSuccess(final StateContentDTO state) { - session.setCurrentState(state); - final StateToken parent = token.copy().clearDocument(); - stateManager.gotoToken(parent); - contextNavigator.clear(); - contextNavigator.refreshState(); - } - }); - } - }); - delContent.setParentMenuTitle(parentMenuTitle); - delContent.setTextDescription(textDescription); - delContent.setMustBeConfirmed(true); - delContent.setConfirmationTitle(i18n.t("Please confirm")); - delContent.setConfirmationText(i18n.t("Are you sure?")); - delContent.setEnableCondition(notDefAndNotDeleted()); - contentActionRegistry.addAction(delContent, registerInTypes); - } - - protected void createDownloadActions(final String typeUploadedfile) { - final ActionToolbarButtonDescriptor<StateToken> download = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - downloadContent(token); - } - }); - download.setMustBeAuthenticated(false); - download.setTextDescription(i18n.t("Download")); - download.setToolTip(i18n.t("Download this file")); - download.setIconUrl("images/nav/download.png"); - - final ActionMenuItemDescriptor<StateToken> downloadCtx = new ActionMenuItemDescriptor<StateToken>( - AccessRolDTO.Viewer, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - downloadContent(token); - } - }); - downloadCtx.setMustBeAuthenticated(false); - downloadCtx.setTextDescription(i18n.t("Download")); - downloadCtx.setIconUrl("images/nav/download.png"); - - contentActionRegistry.addAction(download, typeUploadedfile); - contextActionRegistry.addAction(downloadCtx, typeUploadedfile); - } - - protected ActionToolbarButtonDescriptor<StateToken> createEditAction(final String fileMenuTitle, - final String... registerInTypes) { - final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - NotifyUser.showProgressProcessing(); - session.check(new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - final ContentEditor editor = textEditorProvider.get(); - foldableContent.detach(); - contextNavigator.detach(); - contextPropEditorProvider.get().attach(); - editor.edit(session.getContentState().getContent(), new Listener<String>() { - @Override - public void onEvent(final String html) { - NotifyUser.showProgressSaving(); - contentServiceProvider.get().save(session.getUserHash(), stateToken, html, - new AsyncCallback<Void>() { - @Override - public void onFailure(final Throwable caught) { - NotifyUser.hideProgress(); - if (caught instanceof SessionExpiredException) { - errorHandler.doSessionExpired(); - } else { - NotifyUser.error(i18n.t("Error saving document. Retrying...")); - errorHandler.process(caught); - editor.onSaveFailed(); - } - } - - @Override - public void onSuccess(final Void param) { - NotifyUser.hideProgress(); - session.getContentState().setContent(html); - editor.onSavedSuccessful(); - } - }); - } - }, new Listener0() { - @Override - public void onEvent() { - // onClose - deferredCommandWrapper.addCommand(new ScheduledCommand() { - @Override - public void execute() { - foldableContent.attach(); - contextPropEditorProvider.get().detach(); - contextNavigator.attach(); - if (session.inSameToken(stateToken)) { - contextNavigator.refreshState(); - foldableContent.refreshState(); - } - } - }); - } - }); - editor.setFileMenuTitle(fileMenuTitle); - NotifyUser.hideProgress(); - } - }); - } - }); - editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); - editContent.setIconUrl("images/content_edit.png"); - editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); - editContent.setEnableCondition(notDeleted()); - contentActionRegistry.addAction(editContent, registerInTypes); - return editContent; - } - - protected ActionMenuItemDescriptor<StateToken> createGoAction(final String... registerInTypes) { - final ActionMenuItemDescriptor<StateToken> go = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, - new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - stateManager.gotoToken(token); - } - }); - go.setMustBeAuthenticated(false); - go.setTextDescription(i18n.t("Open")); - go.setIconUrl("images/nav/go.png"); - contextActionRegistry.addAction(go, registerInTypes); - return go; - } - - protected ActionToolbarButtonDescriptor<StateToken> createGoHomeAction(final String... registerInTypes) { - final ActionToolbarButtonDescriptor<StateToken> goGroupHome = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - stateManager.gotoToken(token.getGroup()); - } - }); - goGroupHome.setMustBeAuthenticated(false); - goGroupHome.setIconUrl("images/group-home.png"); - goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); - return !session.getCurrentStateToken().equals(defContentToken); - } - }); - goGroupHome.setLeftSeparator(ActionToolbarButtonSeparator.fill); - contextActionRegistry.addAction(goGroupHome, registerInTypes); - return goGroupHome; - } - - protected void createNewContainerAction(final String contentTypeId, final String iconUrl, - final String textDescription, final String parentMenuTitle, final String parentMenuSubtitle, - final String defaultName, final Position position, final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder; - addFolder = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_TOPBAR, - new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - NotifyUser.showProgressProcessing(); - contentServiceProvider.get().addFolder(session.getUserHash(), stateToken, defaultName, - contentTypeId, new AsyncCallbackSimple<StateContainerDTO>() { - @Override - public void onSuccess(final StateContainerDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); - } - }); - addFolder.setTextDescription(textDescription); - addFolder.setParentMenuTitle(parentMenuTitle); - addFolder.setParentSubMenuTitle(parentMenuSubtitle); - addFolder.setIconUrl(iconUrl); - register(addFolder, position, registerInTypes); - } - - protected ActionToolbarMenuAndItemDescriptor<StateToken> createNewContentAction(final String typeId, - final String iconUrl, final String description, final String parentMenuTitle, final Position position, - final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> addContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { - @Override - public void onEvent() { - NotifyUser.showProgressProcessing(); - contentServiceProvider.get().addContent(session.getUserHash(), - session.getCurrentState().getStateToken(), description, typeId, - new AsyncCallbackSimple<StateContentDTO>() { - @Override - public void onSuccess(final StateContentDTO state) { - contextNavigator.setEditOnNextStateChange(true); - stateManager.setRetrievedState(state); - } - }); - } - }); - addContent.setTextDescription(description); - addContent.setParentMenuTitle(parentMenuTitle); - addContent.setParentSubMenuTitle(i18n.t("New")); - addContent.setIconUrl(iconUrl); - register(addContent, position, registerInTypes); - return addContent; - } - - protected abstract void createPostSessionInitActions(); - - protected ActionToolbarMenuDescriptor<StateToken> createRefreshCntAction(final String parentMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> refreshCnt = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - stateManager.reload(); - contextNavigator.selectItem(stateToken); - } - }); - refreshCnt.setMustBeAuthenticated(false); - refreshCnt.setParentMenuTitle(parentMenuTitle); - refreshCnt.setTextDescription(i18n.t("Refresh")); - refreshCnt.setIconUrl("images/nav/refresh.png"); - contentActionRegistry.addAction(refreshCnt, registerInTypes); - return refreshCnt; - } - - protected ActionToolbarMenuDescriptor<StateToken> createRefreshCxtAction(final String parentMenuTitleCtx, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> refreshCtx = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - stateManager.reload(); - contextNavigator.selectItem(stateToken); - } - }); - refreshCtx.setMustBeAuthenticated(false); - refreshCtx.setParentMenuTitle(parentMenuTitleCtx); - refreshCtx.setTextDescription(i18n.t("Refresh")); - refreshCtx.setIconUrl("images/nav/refresh.png"); - contextActionRegistry.addAction(refreshCtx, registerInTypes); - return refreshCtx; - } - - protected ActionToolbarMenuAndItemDescriptor<StateToken> createRenameContentInCtxAction( - final String parentMenuTitleCtx, final String textDescription, final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtx = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - contextNavigator.editItem(stateToken); - } - }); - renameCtx.setTextDescription(textDescription); - renameCtx.setParentMenuTitle(parentMenuTitleCtx); - contextActionRegistry.addAction(renameCtx, registerInTypes); - return renameCtx; - } - - protected ActionToolbarMenuDescriptor<StateToken> createSetAsDefContent(final String parentMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupContent; - setAsDefGroupContent = new ActionToolbarMenuDescriptor<StateToken>(AccessRolDTO.Administrator, CONTENT_TOPBAR, - new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - NotifyUser.showProgressProcessing(); - contentServiceProvider.get().setAsDefaultContent(session.getUserHash(), token, - new AsyncCallbackSimple<ContentSimpleDTO>() { - @Override - public void onSuccess(final ContentSimpleDTO defContent) { - session.getCurrentState().getGroup().setDefaultContent(defContent); - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Content selected as the group homepage")); - } - }); - } - }); - setAsDefGroupContent.setTextDescription(i18n.t("Set this as the default group page")); - setAsDefGroupContent.setIconUrl("images/group-home.png"); - setAsDefGroupContent.setEnableCondition(notDefAndNotDeleted()); - setAsDefGroupContent.setParentMenuTitle(parentMenuTitle); - contentActionRegistry.addAction(setAsDefGroupContent, registerInTypes); - return setAsDefGroupContent; - } - - protected void createSetGroupBackImageAction(final String parentMenuTitle, final String... registerInTypes) { - final ActionToolbarMenuAndItemDescriptor<StateToken> setGroupBackImage = new ActionToolbarMenuAndItemDescriptor<StateToken>( - AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - groupServiceProvider.get().setGroupBackImage(session.getUserHash(), token, - new AsyncCallbackSimple<GroupDTO>() { - @Override - public void onSuccess(final GroupDTO newGroup) { - if (session.getCurrentState().getGroup().getShortName().equals( - newGroup.getShortName())) { - session.getCurrentState().setGroup(newGroup); - wsBackManager.clearBackImage(); - wsBackManager.setBackImage(newGroup.getGroupBackImage().getStateToken()); - } - } - }); - } - }); - setGroupBackImage.setParentMenuTitle(parentMenuTitle); - setGroupBackImage.setTextDescription(i18n.t("Set this as the group background image")); - setGroupBackImage.setIconUrl("images/nav/picture.png"); - setGroupBackImage.setEnableCondition(new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - return session.getContentState().getMimeType().isImage(); - } - }); - contentActionRegistry.addAction(setGroupBackImage, registerInTypes); - } - - protected void createSetStatusAction(final AccessRolDTO rol, final String textDescription, - final ContentStatus status, final String[] contentsModerated) { - final ActionToolbarMenuRadioDescriptor<StateToken> action = new ActionToolbarMenuRadioDescriptor<StateToken>( - rol, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - setContentStatus(status, stateToken); - } - }, "ContentRadioStatus", new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - if (session.getContainerState() instanceof StateContentDTO) { - final ContentStatus currentStatus = session.getContentState().getStatus(); - return status.equals(currentStatus); - } - return false; - } - }); - action.setTextDescription(textDescription); - action.setParentMenuTitle(PUBLICATION_MENU); - action.setParentMenuIconUrl("images/anybody.png"); - contentActionRegistry.addAction(action, contentsModerated); - } - - protected void createShowDeletedItems(final String parentMenuTitle, final String... registerInTypes) { - final ActionToolbarMenuCheckItemDescriptor<StateToken> showDeletedItems = new ActionToolbarMenuCheckItemDescriptor<StateToken>( - AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { - @Override - public void onEvent() { - final boolean mustShow = !session.getCurrentUserInfo().getShowDeletedContent(); - session.getCurrentUserInfo().setShowDeletedContent(mustShow); - if (!mustShow && session.isCurrentStateAContent() - && session.getContentState().getStatus().equals(ContentStatus.inTheDustbin)) { - stateManager.gotoToken(session.getCurrentStateToken().getGroup()); - } - contextNavigator.clear(); - contextNavigator.refreshState(); - } - }, new ActionCheckedCondition() { - @Override - public boolean mustBeChecked() { - return session.getShowDeletedContent(); - } - }); - showDeletedItems.setParentMenuTitle(parentMenuTitle); - showDeletedItems.setTextDescription("Show deleted items"); - showDeletedItems.setMustBeAuthenticated(true); - contextActionRegistry.addAction(showDeletedItems, registerInTypes); - } - - protected ActionToolbarMenuDescriptor<StateToken> createTranslateAction(final String fileMenuTitle, - final String... registerInTypes) { - final ActionToolbarMenuDescriptor<StateToken> translateContent = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken stateToken) { - NotifyUser.important(i18n.t("Sorry, this functionality is currently in development")); - } - }); - translateContent.setParentMenuTitle(fileMenuTitle); - translateContent.setTextDescription(i18n.tWithNT("Translate", "used in button")); - translateContent.setToolTip(i18n.t("Translate this document to other languages")); - translateContent.setIconUrl("images/language.gif"); - translateContent.setEnableCondition(notDeleted()); - contentActionRegistry.addAction(translateContent, registerInTypes); - return translateContent; - } - - protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadAction(final String textDescription, - final String iconUrl, final String toolTip, final String permitedExtensions, - final String... registerInTypes) { - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile; - uploadFile = new ActionToolbarButtonAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_BOTTOMBAR, - new Listener0() { - @Override - public void onEvent() { - if (permitedExtensions != null) { - // FIXME: can't be reset ... - // fileUploaderProvider.get().setPermittedExtensions(permitedExtensions); - } else { - // FIXME: can't be reset ... - // fileUploaderProvider.get().resetPermittedExtensions(); - } - fileUploaderProvider.get().show(); - } - }); - uploadFile.setTextDescription(textDescription); - uploadFile.setIconUrl(iconUrl); - uploadFile.setToolTip(toolTip); - contextActionRegistry.addAction(uploadFile, registerInTypes); - return uploadFile; - } - - protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadMediaAction(final String... registerInTypes) { - final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction(i18n.t("Upload media"), - "images/nav/upload.png", i18n.t("Upload some media (images, videos...)"), - session.getGalleryPermittedExtensions()); - contextActionRegistry.addAction(uploadMedia, registerInTypes); - return uploadMedia; - } - - protected void downloadContent(final StateToken token) { - fileDownloadProvider.get().downloadFile(token); - } - - private ActionEnableCondition<StateToken> notDefAndNotDeleted() { - return new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - final boolean isNotDefContentToken = !session.getCurrentState().getGroup().getDefaultContent().getStateToken().equals( - session.getCurrentStateToken()); - return isNotDefContentToken && notDeleted().mustBeEnabled(token); - } - }; - } - - private ActionEnableCondition<StateToken> notDeleted() { - return new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( - ContentStatus.inTheDustbin)); - return isNotDeleted; - } - }; - } - - private void register(final ActionToolbarMenuAndItemDescriptor<StateToken> action, final Position position, - final String... registerInTypes) { - if (position.equals(Position.ctx)) { - contextActionRegistry.addAction(action, registerInTypes); - } else if (position.equals(Position.cnt)) { - contentActionRegistry.addAction(action, registerInTypes); - } - } - - private void setContentStatus(final ContentStatus status, final StateToken stateToken) { - final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { - @Override - public void onSuccess(final StateAbstractDTO state) { - if (session.inSameToken(stateToken)) { - session.setCurrentState(state); - publicLink.setState(state); - foldableContent.refreshState(); - } - contextNavigator.setItemStatus(stateToken, status); - } - }; - if (status.equals(ContentStatus.publishedOnline) || status.equals(ContentStatus.rejected) - || status.equals(ContentStatus.inTheDustbin)) { - contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, callback); - } else { - contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); - } - } - -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,674 @@ +/* + * + * 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 org.ourproject.kune.workspace.client; + +import org.ourproject.kune.platf.client.actions.ActionCheckedCondition; +import org.ourproject.kune.platf.client.actions.ActionEnableCondition; +import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuCheckItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; +import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; +import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; +import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.upload.FileUploader; + +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.user.client.rpc.AsyncCallback; + +public abstract class AbstractFoldableContentActions { + + protected enum Position { + cnt, ctx + } + + public static final ActionToolbarPosition CONTENT_BOTTOMBAR = new ActionToolbarPosition("afca-ctn-bottom"); + + public static final ActionToolbarPosition CONTENT_TOPBAR = new ActionToolbarPosition("afca-ctn-top"); + public static final ActionToolbarPosition CONTEXT_BOTTOMBAR = new ActionToolbarPosition("afca-ctx-bottom"); + public static final ActionToolbarPosition CONTEXT_TOPBAR = new ActionToolbarPosition("afca-ctx-top"); + private static final String PUBLICATION_MENU = "Publication"; + + protected final ContentActionRegistry contentActionRegistry; + protected final Provider<ContentServiceAsync> contentServiceProvider; + protected final ContextActionRegistry contextActionRegistry; + protected final ContextNavigator contextNavigator; + protected final Provider<ContextPropEditor> contextPropEditorProvider; + protected final SchedulerManager deferredCommandWrapper; + protected final EntityHeader entityLogo; + protected final ErrorHandler errorHandler; + protected final Provider<FileDownloadUtils> fileDownloadProvider; + protected final Provider<FileUploader> fileUploaderProvider; + protected final FoldableContent foldableContent; + protected final Provider<GroupServiceAsync> groupServiceProvider; + protected final I18nUITranslationService i18n; + private final SitePublicSpaceLink publicLink; + protected final Session session; + protected final StateManager stateManager; + protected final Provider<ContentEditor> textEditorProvider; + + private final WsBackManager wsBackManager; + + public AbstractFoldableContentActions(final Session session, final StateManager stateManager, + final I18nUITranslationService i18n, final ErrorHandler errorHandler, + final SchedulerManager deferredCommandWrapper, final Provider<GroupServiceAsync> groupServiceProvider, + final Provider<ContentServiceAsync> contentServiceProvider, + final Provider<FileUploader> fileUploaderProvider, final ContextNavigator contextNavigator, + final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, + final Provider<FileDownloadUtils> fileDownloadProvider, final Provider<ContentEditor> textEditorProvider, + final Provider<ContextPropEditor> contextPropEditorProvider, final FoldableContent foldableContent, + final EntityHeader entityLogo, final SitePublicSpaceLink publicLink, final WsBackManager wsBackManager) { + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.errorHandler = errorHandler; + this.deferredCommandWrapper = deferredCommandWrapper; + this.groupServiceProvider = groupServiceProvider; + this.contentServiceProvider = contentServiceProvider; + this.fileUploaderProvider = fileUploaderProvider; + this.contextNavigator = contextNavigator; + this.contentActionRegistry = contentActionRegistry; + this.contextActionRegistry = contextActionRegistry; + this.fileDownloadProvider = fileDownloadProvider; + this.textEditorProvider = textEditorProvider; + this.contextPropEditorProvider = contextPropEditorProvider; + this.foldableContent = foldableContent; + this.entityLogo = entityLogo; + this.publicLink = publicLink; + this.wsBackManager = wsBackManager; + createActions(); + session.onInitDataReceived(new Listener<InitDataDTO>() { + @Override + public void onEvent(final InitDataDTO parameter) { + createPostSessionInitActions(); + } + }); + } + + protected abstract void createActions(); + + protected void createContentModeratedActions(final String parentMenuTitle, final String... contentsModerated) { + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatus.publishedOnline, + contentsModerated); + createSetStatusAction(AccessRolDTO.Editor, i18n.t("Editing in progress"), ContentStatus.editingInProgress, + contentsModerated); + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatus.rejected, contentsModerated); + createSetStatusAction(AccessRolDTO.Editor, i18n.t("Submitted for publish"), + ContentStatus.submittedForEvaluation, contentsModerated); + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), ContentStatus.inTheDustbin, + contentsModerated); + } + + protected void createContentRenameAction(final String parentMenuTitle, final String textDescription, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtn = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + contextNavigator.editItem(stateToken); + } + }); + renameCtn.setTextDescription(textDescription); + renameCtn.setParentMenuTitle(parentMenuTitle); + renameCtn.setEnableCondition(notDeleted()); + // renameCtn.setShortcut(new ShortcutDescriptor(false, Keyboard.KEY_F2, + // i18n.tWithNT("F2", "The F2 Function key"))); + contentActionRegistry.addAction(renameCtn, registerInTypes); + } + + protected void createDelContainerAction(final String text, final String parentMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> delContainer = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + NotifyUser.info("Sorry, in development"); + } + }); + delContainer.setParentMenuTitle(parentMenuTitle); + delContainer.setTextDescription(i18n.t(text)); + delContainer.setMustBeConfirmed(true); + delContainer.setConfirmationTitle(i18n.t("Please confirm")); + delContainer.setConfirmationText(i18n.t("You will delete it with all its contents. Are you sure?")); + contextActionRegistry.addAction(delContainer, registerInTypes); + } + + protected void createDelContentAction(final String parentMenuTitle, final String textDescription, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> delContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + contentServiceProvider.get().delContent(session.getUserHash(), token, + new AsyncCallbackSimple<StateContentDTO>() { + @Override + public void onSuccess(final StateContentDTO state) { + session.setCurrentState(state); + final StateToken parent = token.copy().clearDocument(); + stateManager.gotoToken(parent); + contextNavigator.clear(); + contextNavigator.refreshState(); + } + }); + } + }); + delContent.setParentMenuTitle(parentMenuTitle); + delContent.setTextDescription(textDescription); + delContent.setMustBeConfirmed(true); + delContent.setConfirmationTitle(i18n.t("Please confirm")); + delContent.setConfirmationText(i18n.t("Are you sure?")); + delContent.setEnableCondition(notDefAndNotDeleted()); + contentActionRegistry.addAction(delContent, registerInTypes); + } + + protected void createDownloadActions(final String typeUploadedfile) { + final ActionToolbarButtonDescriptor<StateToken> download = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Viewer, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + downloadContent(token); + } + }); + download.setMustBeAuthenticated(false); + download.setTextDescription(i18n.t("Download")); + download.setToolTip(i18n.t("Download this file")); + download.setIconUrl("images/nav/download.png"); + + final ActionMenuItemDescriptor<StateToken> downloadCtx = new ActionMenuItemDescriptor<StateToken>( + AccessRolDTO.Viewer, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + downloadContent(token); + } + }); + downloadCtx.setMustBeAuthenticated(false); + downloadCtx.setTextDescription(i18n.t("Download")); + downloadCtx.setIconUrl("images/nav/download.png"); + + contentActionRegistry.addAction(download, typeUploadedfile); + contextActionRegistry.addAction(downloadCtx, typeUploadedfile); + } + + protected ActionToolbarButtonDescriptor<StateToken> createEditAction(final String fileMenuTitle, + final String... registerInTypes) { + final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + NotifyUser.showProgressProcessing(); + session.check(new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + final ContentEditor editor = textEditorProvider.get(); + foldableContent.detach(); + contextNavigator.detach(); + contextPropEditorProvider.get().attach(); + editor.edit(session.getContentState().getContent(), new Listener<String>() { + @Override + public void onEvent(final String html) { + NotifyUser.showProgressSaving(); + contentServiceProvider.get().save(session.getUserHash(), stateToken, html, + new AsyncCallback<Void>() { + @Override + public void onFailure(final Throwable caught) { + NotifyUser.hideProgress(); + if (caught instanceof SessionExpiredException) { + errorHandler.doSessionExpired(); + } else { + NotifyUser.error(i18n.t("Error saving document. Retrying...")); + errorHandler.process(caught); + editor.onSaveFailed(); + } + } + + @Override + public void onSuccess(final Void param) { + NotifyUser.hideProgress(); + session.getContentState().setContent(html); + editor.onSavedSuccessful(); + } + }); + } + }, new Listener0() { + @Override + public void onEvent() { + // onClose + deferredCommandWrapper.addCommand(new ScheduledCommand() { + @Override + public void execute() { + foldableContent.attach(); + contextPropEditorProvider.get().detach(); + contextNavigator.attach(); + if (session.inSameToken(stateToken)) { + contextNavigator.refreshState(); + foldableContent.refreshState(); + } + } + }); + } + }); + editor.setFileMenuTitle(fileMenuTitle); + NotifyUser.hideProgress(); + } + }); + } + }); + editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); + editContent.setIconUrl("images/content_edit.png"); + editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); + editContent.setEnableCondition(notDeleted()); + contentActionRegistry.addAction(editContent, registerInTypes); + return editContent; + } + + protected ActionMenuItemDescriptor<StateToken> createGoAction(final String... registerInTypes) { + final ActionMenuItemDescriptor<StateToken> go = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, + new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + stateManager.gotoToken(token); + } + }); + go.setMustBeAuthenticated(false); + go.setTextDescription(i18n.t("Open")); + go.setIconUrl("images/nav/go.png"); + contextActionRegistry.addAction(go, registerInTypes); + return go; + } + + protected ActionToolbarButtonDescriptor<StateToken> createGoHomeAction(final String... registerInTypes) { + final ActionToolbarButtonDescriptor<StateToken> goGroupHome = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Viewer, CONTEXT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + stateManager.gotoToken(token.getGroup()); + } + }); + goGroupHome.setMustBeAuthenticated(false); + goGroupHome.setIconUrl("images/group-home.png"); + goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); + return !session.getCurrentStateToken().equals(defContentToken); + } + }); + goGroupHome.setLeftSeparator(ActionToolbarButtonSeparator.fill); + contextActionRegistry.addAction(goGroupHome, registerInTypes); + return goGroupHome; + } + + protected void createNewContainerAction(final String contentTypeId, final String iconUrl, + final String textDescription, final String parentMenuTitle, final String parentMenuSubtitle, + final String defaultName, final Position position, final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> addFolder; + addFolder = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_TOPBAR, + new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + NotifyUser.showProgressProcessing(); + contentServiceProvider.get().addFolder(session.getUserHash(), stateToken, defaultName, + contentTypeId, new AsyncCallbackSimple<StateContainerDTO>() { + @Override + public void onSuccess(final StateContainerDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); + } + }); + addFolder.setTextDescription(textDescription); + addFolder.setParentMenuTitle(parentMenuTitle); + addFolder.setParentSubMenuTitle(parentMenuSubtitle); + addFolder.setIconUrl(iconUrl); + register(addFolder, position, registerInTypes); + } + + protected ActionToolbarMenuAndItemDescriptor<StateToken> createNewContentAction(final String typeId, + final String iconUrl, final String description, final String parentMenuTitle, final Position position, + final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> addContent = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { + @Override + public void onEvent() { + NotifyUser.showProgressProcessing(); + contentServiceProvider.get().addContent(session.getUserHash(), + session.getCurrentState().getStateToken(), description, typeId, + new AsyncCallbackSimple<StateContentDTO>() { + @Override + public void onSuccess(final StateContentDTO state) { + contextNavigator.setEditOnNextStateChange(true); + stateManager.setRetrievedState(state); + } + }); + } + }); + addContent.setTextDescription(description); + addContent.setParentMenuTitle(parentMenuTitle); + addContent.setParentSubMenuTitle(i18n.t("New")); + addContent.setIconUrl(iconUrl); + register(addContent, position, registerInTypes); + return addContent; + } + + protected abstract void createPostSessionInitActions(); + + protected ActionToolbarMenuDescriptor<StateToken> createRefreshCntAction(final String parentMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> refreshCnt = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + stateManager.reload(); + contextNavigator.selectItem(stateToken); + } + }); + refreshCnt.setMustBeAuthenticated(false); + refreshCnt.setParentMenuTitle(parentMenuTitle); + refreshCnt.setTextDescription(i18n.t("Refresh")); + refreshCnt.setIconUrl("images/nav/refresh.png"); + contentActionRegistry.addAction(refreshCnt, registerInTypes); + return refreshCnt; + } + + protected ActionToolbarMenuDescriptor<StateToken> createRefreshCxtAction(final String parentMenuTitleCtx, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> refreshCtx = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + stateManager.reload(); + contextNavigator.selectItem(stateToken); + } + }); + refreshCtx.setMustBeAuthenticated(false); + refreshCtx.setParentMenuTitle(parentMenuTitleCtx); + refreshCtx.setTextDescription(i18n.t("Refresh")); + refreshCtx.setIconUrl("images/nav/refresh.png"); + contextActionRegistry.addAction(refreshCtx, registerInTypes); + return refreshCtx; + } + + protected ActionToolbarMenuAndItemDescriptor<StateToken> createRenameContentInCtxAction( + final String parentMenuTitleCtx, final String textDescription, final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> renameCtx = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + contextNavigator.editItem(stateToken); + } + }); + renameCtx.setTextDescription(textDescription); + renameCtx.setParentMenuTitle(parentMenuTitleCtx); + contextActionRegistry.addAction(renameCtx, registerInTypes); + return renameCtx; + } + + protected ActionToolbarMenuDescriptor<StateToken> createSetAsDefContent(final String parentMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupContent; + setAsDefGroupContent = new ActionToolbarMenuDescriptor<StateToken>(AccessRolDTO.Administrator, CONTENT_TOPBAR, + new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + NotifyUser.showProgressProcessing(); + contentServiceProvider.get().setAsDefaultContent(session.getUserHash(), token, + new AsyncCallbackSimple<ContentSimpleDTO>() { + @Override + public void onSuccess(final ContentSimpleDTO defContent) { + session.getCurrentState().getGroup().setDefaultContent(defContent); + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Content selected as the group homepage")); + } + }); + } + }); + setAsDefGroupContent.setTextDescription(i18n.t("Set this as the default group page")); + setAsDefGroupContent.setIconUrl("images/group-home.png"); + setAsDefGroupContent.setEnableCondition(notDefAndNotDeleted()); + setAsDefGroupContent.setParentMenuTitle(parentMenuTitle); + contentActionRegistry.addAction(setAsDefGroupContent, registerInTypes); + return setAsDefGroupContent; + } + + protected void createSetGroupBackImageAction(final String parentMenuTitle, final String... registerInTypes) { + final ActionToolbarMenuAndItemDescriptor<StateToken> setGroupBackImage = new ActionToolbarMenuAndItemDescriptor<StateToken>( + AccessRolDTO.Administrator, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken token) { + groupServiceProvider.get().setGroupBackImage(session.getUserHash(), token, + new AsyncCallbackSimple<GroupDTO>() { + @Override + public void onSuccess(final GroupDTO newGroup) { + if (session.getCurrentState().getGroup().getShortName().equals( + newGroup.getShortName())) { + session.getCurrentState().setGroup(newGroup); + wsBackManager.clearBackImage(); + wsBackManager.setBackImage(newGroup.getGroupBackImage().getStateToken()); + } + } + }); + } + }); + setGroupBackImage.setParentMenuTitle(parentMenuTitle); + setGroupBackImage.setTextDescription(i18n.t("Set this as the group background image")); + setGroupBackImage.setIconUrl("images/nav/picture.png"); + setGroupBackImage.setEnableCondition(new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + return session.getContentState().getMimeType().isImage(); + } + }); + contentActionRegistry.addAction(setGroupBackImage, registerInTypes); + } + + protected void createSetStatusAction(final AccessRolDTO rol, final String textDescription, + final ContentStatus status, final String[] contentsModerated) { + final ActionToolbarMenuRadioDescriptor<StateToken> action = new ActionToolbarMenuRadioDescriptor<StateToken>( + rol, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + setContentStatus(status, stateToken); + } + }, "ContentRadioStatus", new RadioMustBeChecked() { + @Override + public boolean mustBeChecked() { + if (session.getContainerState() instanceof StateContentDTO) { + final ContentStatus currentStatus = session.getContentState().getStatus(); + return status.equals(currentStatus); + } + return false; + } + }); + action.setTextDescription(textDescription); + action.setParentMenuTitle(PUBLICATION_MENU); + action.setParentMenuIconUrl("images/anybody.png"); + contentActionRegistry.addAction(action, contentsModerated); + } + + protected void createShowDeletedItems(final String parentMenuTitle, final String... registerInTypes) { + final ActionToolbarMenuCheckItemDescriptor<StateToken> showDeletedItems = new ActionToolbarMenuCheckItemDescriptor<StateToken>( + AccessRolDTO.Editor, CONTEXT_TOPBAR, new Listener0() { + @Override + public void onEvent() { + final boolean mustShow = !session.getCurrentUserInfo().getShowDeletedContent(); + session.getCurrentUserInfo().setShowDeletedContent(mustShow); + if (!mustShow && session.isCurrentStateAContent() + && session.getContentState().getStatus().equals(ContentStatus.inTheDustbin)) { + stateManager.gotoToken(session.getCurrentStateToken().getGroup()); + } + contextNavigator.clear(); + contextNavigator.refreshState(); + } + }, new ActionCheckedCondition() { + @Override + public boolean mustBeChecked() { + return session.getShowDeletedContent(); + } + }); + showDeletedItems.setParentMenuTitle(parentMenuTitle); + showDeletedItems.setTextDescription("Show deleted items"); + showDeletedItems.setMustBeAuthenticated(true); + contextActionRegistry.addAction(showDeletedItems, registerInTypes); + } + + protected ActionToolbarMenuDescriptor<StateToken> createTranslateAction(final String fileMenuTitle, + final String... registerInTypes) { + final ActionToolbarMenuDescriptor<StateToken> translateContent = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Editor, CONTENT_TOPBAR, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken stateToken) { + NotifyUser.important(i18n.t("Sorry, this functionality is currently in development")); + } + }); + translateContent.setParentMenuTitle(fileMenuTitle); + translateContent.setTextDescription(i18n.tWithNT("Translate", "used in button")); + translateContent.setToolTip(i18n.t("Translate this document to other languages")); + translateContent.setIconUrl("images/language.gif"); + translateContent.setEnableCondition(notDeleted()); + contentActionRegistry.addAction(translateContent, registerInTypes); + return translateContent; + } + + protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadAction(final String textDescription, + final String iconUrl, final String toolTip, final String permitedExtensions, + final String... registerInTypes) { + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadFile; + uploadFile = new ActionToolbarButtonAndItemDescriptor<StateToken>(AccessRolDTO.Editor, CONTEXT_BOTTOMBAR, + new Listener0() { + @Override + public void onEvent() { + if (permitedExtensions != null) { + // FIXME: can't be reset ... + // fileUploaderProvider.get().setPermittedExtensions(permitedExtensions); + } else { + // FIXME: can't be reset ... + // fileUploaderProvider.get().resetPermittedExtensions(); + } + fileUploaderProvider.get().show(); + } + }); + uploadFile.setTextDescription(textDescription); + uploadFile.setIconUrl(iconUrl); + uploadFile.setToolTip(toolTip); + contextActionRegistry.addAction(uploadFile, registerInTypes); + return uploadFile; + } + + protected ActionToolbarButtonAndItemDescriptor<StateToken> createUploadMediaAction(final String... registerInTypes) { + final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction(i18n.t("Upload media"), + "images/nav/upload.png", i18n.t("Upload some media (images, videos...)"), + session.getGalleryPermittedExtensions()); + contextActionRegistry.addAction(uploadMedia, registerInTypes); + return uploadMedia; + } + + protected void downloadContent(final StateToken token) { + fileDownloadProvider.get().downloadFile(token); + } + + private ActionEnableCondition<StateToken> notDefAndNotDeleted() { + return new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + final boolean isNotDefContentToken = !session.getCurrentState().getGroup().getDefaultContent().getStateToken().equals( + session.getCurrentStateToken()); + return isNotDefContentToken && notDeleted().mustBeEnabled(token); + } + }; + } + + private ActionEnableCondition<StateToken> notDeleted() { + return new ActionEnableCondition<StateToken>() { + @Override + public boolean mustBeEnabled(final StateToken token) { + final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( + ContentStatus.inTheDustbin)); + return isNotDeleted; + } + }; + } + + private void register(final ActionToolbarMenuAndItemDescriptor<StateToken> action, final Position position, + final String... registerInTypes) { + if (position.equals(Position.ctx)) { + contextActionRegistry.addAction(action, registerInTypes); + } else if (position.equals(Position.cnt)) { + contentActionRegistry.addAction(action, registerInTypes); + } + } + + private void setContentStatus(final ContentStatus status, final StateToken stateToken) { + final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { + @Override + public void onSuccess(final StateAbstractDTO state) { + if (session.inSameToken(stateToken)) { + session.setCurrentState(state); + publicLink.setState(state); + foldableContent.refreshState(); + } + contextNavigator.setItemStatus(stateToken, status); + } + }; + if (status.equals(ContentStatus.publishedOnline) || status.equals(ContentStatus.rejected) + || status.equals(ContentStatus.inTheDustbin)) { + contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, callback); + } else { + contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); + } + } + +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,1114 +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 org.ourproject.kune.workspace.client; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.actions.ActionManager; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.actions.ui.SimpleGuiItem; -import org.ourproject.kune.platf.client.app.ApplicationComponentGroup; -import org.ourproject.kune.platf.client.app.GroupOptionsCollection; -import org.ourproject.kune.platf.client.app.UserOptionsCollection; -import org.ourproject.kune.platf.client.registry.AuthorableRegistry; -import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.registry.RenamableRegistry; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; -import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; -import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; -import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; -import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; -import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbarPresenter; -import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPanel; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPresenter; -import org.ourproject.kune.workspace.client.cxt.ActionContextBottomToolbar; -import org.ourproject.kune.workspace.client.cxt.ActionContextTopToolbar; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditorPanel; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditorPresenter; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditorView; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditorPanel; -import org.ourproject.kune.workspace.client.editor.ContentEditorPresenter; -import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocal; -import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocalPanel; -import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocalPresenter; -import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocal; -import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPanel; -import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPresenter; -import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocal; -import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPanel; -import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPresenter; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter; -import org.ourproject.kune.workspace.client.i18n.I18nTranslator; -import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPanel; -import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPresenter; -import org.ourproject.kune.workspace.client.i18n.I18nTranslatorView; -import org.ourproject.kune.workspace.client.i18n.LanguageSelector; -import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPanel; -import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPresenter; -import org.ourproject.kune.workspace.client.i18n.LanguageSelectorView; -import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPanel; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenter; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstForm; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdForm; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndForm; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdForm; -import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView; -import org.ourproject.kune.workspace.client.nohomepage.NoHomePage; -import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePanel; -import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePresenter; -import org.ourproject.kune.workspace.client.oldsn.other.AddAsBuddieHeaderButton; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbar; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbarPresenter; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbar; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbarPresenter; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationSummaryToolbarPresenter; -import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationToolbar; -import org.ourproject.kune.workspace.client.options.GroupOptions; -import org.ourproject.kune.workspace.client.options.GroupOptionsPanel; -import org.ourproject.kune.workspace.client.options.GroupOptionsPresenter; -import org.ourproject.kune.workspace.client.options.UserOptions; -import org.ourproject.kune.workspace.client.options.license.EntityOptionsDefLicensePanel; -import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicense; -import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicensePresenter; -import org.ourproject.kune.workspace.client.options.license.UserOptionsDefLicense; -import org.ourproject.kune.workspace.client.options.license.UserOptionsDefLicensePresenter; -import org.ourproject.kune.workspace.client.options.logo.EntityOptionsLogoPresenter; -import org.ourproject.kune.workspace.client.options.logo.GroupOptionsLogo; -import org.ourproject.kune.workspace.client.options.logo.GroupOptionsLogoPanel; -import org.ourproject.kune.workspace.client.options.logo.GroupOptionsLogoPresenter; -import org.ourproject.kune.workspace.client.options.logo.UserOptionsLogo; -import org.ourproject.kune.workspace.client.options.logo.UserOptionsLogoPanel; -import org.ourproject.kune.workspace.client.options.logo.UserOptionsLogoPresenter; -import org.ourproject.kune.workspace.client.options.pscape.EntityOptionsPublicSpaceConfPanel; -import org.ourproject.kune.workspace.client.options.pscape.GroupOptionsPublicSpaceConf; -import org.ourproject.kune.workspace.client.options.pscape.GroupOptionsPublicSpaceConfPresenter; -import org.ourproject.kune.workspace.client.options.pscape.UserOptionsPublicSpaceConf; -import org.ourproject.kune.workspace.client.options.pscape.UserOptionsPublicSpaceConfPresenter; -import org.ourproject.kune.workspace.client.options.tools.EntityOptionsToolsConf; -import org.ourproject.kune.workspace.client.options.tools.EntityOptionsToolsConfPanel; -import org.ourproject.kune.workspace.client.options.tools.GroupOptionsToolsConfPresenter; -import org.ourproject.kune.workspace.client.options.tools.UserOptionsToolsConf; -import org.ourproject.kune.workspace.client.options.tools.UserOptionsToolsConfPresenter; -import org.ourproject.kune.workspace.client.rate.RateIt; -import org.ourproject.kune.workspace.client.rate.RateItPanel; -import org.ourproject.kune.workspace.client.rate.RateItPresenter; -import org.ourproject.kune.workspace.client.rate.RatePanel; -import org.ourproject.kune.workspace.client.rate.RatePresenter; -import org.ourproject.kune.workspace.client.search.EntityLiveSearcherView; -import org.ourproject.kune.workspace.client.search.GroupLiveSearchPanel; -import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; -import org.ourproject.kune.workspace.client.search.GroupLiveSearcherPresenter; -import org.ourproject.kune.workspace.client.search.SiteSearcher; -import org.ourproject.kune.workspace.client.search.SiteSearcherPanel; -import org.ourproject.kune.workspace.client.search.SiteSearcherPresenter; -import org.ourproject.kune.workspace.client.search.SiteSearcherView; -import org.ourproject.kune.workspace.client.search.UserLiveSearcher; -import org.ourproject.kune.workspace.client.search.UserLiveSearcherPanel; -import org.ourproject.kune.workspace.client.search.UserLiveSearcherPresenter; -import org.ourproject.kune.workspace.client.site.WorkspaceNotifyUser; -import org.ourproject.kune.workspace.client.site.msg.ToastMessage; -import org.ourproject.kune.workspace.client.site.msg.ToastMessagePanel; -import org.ourproject.kune.workspace.client.site.msg.ToastMessagePresenter; -import org.ourproject.kune.workspace.client.sitebar.sitelogo.SiteLogo; -import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgress; -import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPanel; -import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPresenter; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLinkPanel; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLinkPresenter; -import org.ourproject.kune.workspace.client.sitebar.sitesearch.SiteSearch; -import org.ourproject.kune.workspace.client.sitebar.sitesearch.SiteSearchPanel; -import org.ourproject.kune.workspace.client.sitebar.sitesearch.SiteSearchPresenter; -import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignInLink; -import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignInLinkPanel; -import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignInLinkPresenter; -import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink; -import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPanel; -import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPresenter; -import org.ourproject.kune.workspace.client.skel.ActionCntCtxToolbarPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.tags.TagsSummary; -import org.ourproject.kune.workspace.client.tags.TagsSummaryPanel; -import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenter; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsBackManagerImpl; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManagerPanel; -import org.ourproject.kune.workspace.client.themes.WsThemeSelector; -import org.ourproject.kune.workspace.client.themes.WsThemeSelectorPresenter; -import org.ourproject.kune.workspace.client.title.EntitySubTitle; -import org.ourproject.kune.workspace.client.title.EntitySubTitlePanel; -import org.ourproject.kune.workspace.client.title.EntitySubTitlePresenter; -import org.ourproject.kune.workspace.client.title.EntityTitle; -import org.ourproject.kune.workspace.client.title.EntityTitlePanel; -import org.ourproject.kune.workspace.client.title.EntityTitlePresenter; -import org.ourproject.kune.workspace.client.title.RenameAction; -import org.ourproject.kune.workspace.client.tool.ToolSelector; -import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenter; -import org.ourproject.kune.workspace.client.upload.FileUploader; -import org.ourproject.kune.workspace.client.upload.FileUploaderDialog; -import org.ourproject.kune.workspace.client.upload.FileUploaderPresenter; - -import cc.kune.common.client.noti.NotifyLevelImages; -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.common.client.utils.TimerWrapper; -import cc.kune.core.client.auth.Register; -import cc.kune.core.client.auth.SignIn; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.groups.newgroup.NewGroup; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.ContentService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupService; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.rpcservices.I18nServiceAsync; -import cc.kune.core.client.rpcservices.SocialNetworkService; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.HistoryTokenCallback; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteCommonTokens; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.StateTokenUtils; -import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.NoDecoration; -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.rpc.ServiceDefTarget; - -public class WorkspaceModule extends AbstractExtendedModule { - @Override - protected void onInstall() { - - register(Singleton.class, new Factory<SocialNetworkServiceAsync>(SocialNetworkServiceAsync.class) { - @Override - public SocialNetworkServiceAsync create() { - final SocialNetworkServiceAsync snServiceAsync = (SocialNetworkServiceAsync) GWT.create(SocialNetworkService.class); - ((ServiceDefTarget) snServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() - + "SocialNetworkService"); - return snServiceAsync; - } - }, new Factory<GroupServiceAsync>(GroupServiceAsync.class) { - @Override - public GroupServiceAsync create() { - final GroupServiceAsync groupServiceAsync = (GroupServiceAsync) GWT.create(GroupService.class); - ((ServiceDefTarget) groupServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "GroupService"); - return groupServiceAsync; - } - }, new Factory<ContentServiceAsync>(ContentServiceAsync.class) { - @Override - public ContentServiceAsync create() { - final ContentServiceAsync contentServiceAsync = (ContentServiceAsync) GWT.create(ContentService.class); - ((ServiceDefTarget) contentServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "ContentService"); - return contentServiceAsync; - } - }); - - register(ApplicationComponentGroup.class, new Factory<WorkspaceSkeleton>(WorkspaceSkeleton.class) { - @Override - public WorkspaceSkeleton create() { - return new WorkspaceSkeleton(); - } - }); - - register(ApplicationComponentGroup.class, new Factory<SiteProgress>(SiteProgress.class) { - @Override - public SiteProgress create() { - final SiteProgressPresenter presenter = new SiteProgressPresenter(); - final SiteProgressPanel panel = new SiteProgressPanel(presenter, p(SitePublicSpaceLink.class)); - presenter.init(panel); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<WorkspaceNotifyUser>(WorkspaceNotifyUser.class) { - @Override - public WorkspaceNotifyUser create() { - return new WorkspaceNotifyUser(i(NotifyUser.class), i(I18nUITranslationService.class), - i(SiteProgress.class), p(ToastMessage.class), p(WorkspaceSkeleton.class)); - } - }); - - register(ApplicationComponentGroup.class, new Factory<SitePublicSpaceLink>(SitePublicSpaceLink.class) { - @Override - public SitePublicSpaceLink create() { - final SitePublicSpaceLinkPresenter presenter = new SitePublicSpaceLinkPresenter(i(StateManager.class), - i(StateTokenUtils.class)); - final SitePublicSpaceLinkPanel panel = new SitePublicSpaceLinkPanel(presenter, - i(WorkspaceSkeleton.class), i(I18nUITranslationService.class), i(Images.class)); - presenter.init(panel); - return presenter; - } - }); - - register(Singleton.class, new Factory<StateTokenUtils>(StateTokenUtils.class) { - @Override - public StateTokenUtils create() { - return new StateTokenUtils(i(Session.class)); - } - }); - - register(NoDecoration.class, new Factory<ToastMessage>(ToastMessage.class) { - @Override - public ToastMessage create() { - final ToastMessagePresenter presenter = new ToastMessagePresenter(); - final ToastMessagePanel panel = new ToastMessagePanel(); - presenter.init(panel); - return presenter; - } - }); - - // register(ApplicationComponentGroup.class, new - // Factory<SiteUserOptions>(SiteUserOptions.class) { - // @Override - // public SiteUserOptions create() { - // final SiteUserOptionsPresenter presenter = new - // SiteUserOptionsPresenter(i(Session.class), - // i(StateManager.class), p(FileDownloadUtils.class), - // $(I18nTranslationService.class), - // $(IconResources.class)); - // final SiteUserOptionsPanel panel = new - // SiteUserOptionsPanel(presenter, i(WorkspaceSkeleton.class), - // $(GuiBindingsRegister.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) { - @Override - public SiteSignInLink create() { - final SiteSignInLinkPresenter presenter = new SiteSignInLinkPresenter(i(Session.class)); - final SiteSignInLinkPanel panel = new SiteSignInLinkPanel(presenter, i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<SiteSignOutLink>(SiteSignOutLink.class) { - @Override - public SiteSignOutLink create() { - final SiteSignOutLinkPresenter presenter = new SiteSignOutLinkPresenter(i(Session.class), - p(UserServiceAsync.class), p(ErrorHandler.class)); - final SiteSignOutLinkPanel panel = new SiteSignOutLinkPanel(presenter, - i(I18nUITranslationService.class), i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); - // - // register(ApplicationComponentGroup.class, new - // Factory<SiteOptions>(SiteOptions.class) { - // @Override - // public SiteOptions create() { - // final SiteOptionsPresenter presenter = new - // SiteOptionsPresenter(i(I18nUITranslationService.class), - // i(IconResources.class)); - // final SiteOptionsPanel panel = new - // SiteOptionsPanel(i(WorkspaceSkeleton.class), - // i(I18nUITranslationService.class), i(GuiBindingsRegister.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) { - @Override - public SiteSearch create() { - final SiteSearchPresenter presenter = new SiteSearchPresenter(p(SiteSearcher.class), - i(I18nTranslationService.class)); - final SiteSearchPanel panel = new SiteSearchPanel(presenter, i(WorkspaceSkeleton.class), - i(Images.class)); - presenter.init(panel); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<SiteLogo>(SiteLogo.class) { - @Override - public SiteLogo create() { - // final SiteLogoPresenter presenter = new - // SiteLogoPresenter(i(Session.class)); - // final SiteLogoPanel panel = new SiteLogoPanel(presenter, - // i(WorkspaceSkeleton.class)); - // presenter.init(panel); - return null; - } - }); - - register(ApplicationComponentGroup.class, new Factory<EntityHeader>(EntityHeader.class) { - @Override - public EntityHeader create() { - final EntityHeaderPresenter presenter = new EntityHeaderPresenter(i(StateManager.class), - i(WsThemeManager.class), i(Session.class)); - final EntityHeaderPanel panel = new EntityHeaderPanel(i(WorkspaceSkeleton.class), - p(FileDownloadUtils.class), i(Images.class), i(GuiBindingsRegister.class)); - presenter.init(panel); - return presenter; - } - }); - - register(Singleton.class, new Factory<WsBackManager>(WsBackManager.class) { - @Override - public WsBackManager create() { - return new WsBackManagerImpl(i(FileDownloadUtils.class)); - } - }); - - register(ApplicationComponentGroup.class, new Factory<WsThemeManager>(WsThemeManager.class) { - @Override - public WsThemeManager create() { - final WsThemeManager presenter = new WsThemeManager(i(Session.class), p(GroupServiceAsync.class), - i(StateManager.class), i(WsBackManager.class)); - new WsThemeManagerPanel(presenter, i(WorkspaceSkeleton.class)); - return presenter; - } - }); - - register(NoDecoration.class, new Factory<WsThemeSelector>(WsThemeSelector.class) { - @Override - public WsThemeSelector create() { - final WsThemeSelectorPresenter presenter = new WsThemeSelectorPresenter(i(Session.class), - i(I18nTranslationService.class)); - presenter.init(new SimpleGuiItem(i(GuiBindingsRegister.class))); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<EntityTitle>(EntityTitle.class) { - @Override - public EntityTitle create() { - final EntityTitlePresenter presenter = new EntityTitlePresenter(i(StateManager.class), - i(Session.class), i(ContentIconsRegistry.class), i(RenamableRegistry.class), - i(RenameAction.class)); - final EntityTitlePanel panel = new EntityTitlePanel(i(WorkspaceSkeleton.class), presenter); - presenter.init(panel); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<EntitySubTitle>(EntitySubTitle.class) { - @Override - public EntitySubTitle create() { - final EntitySubTitlePresenter presenter = new EntitySubTitlePresenter( - i(I18nUITranslationService.class), i(StateManager.class), false, i(AuthorableRegistry.class)); - final EntitySubTitlePanel panel = new EntitySubTitlePanel(presenter, i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); - - // register(ApplicationComponentGroup.class, new - // Factory<EntityLicensePresenter>(EntityLicensePresenter.class) { - // @Override - // public EntityLicensePresenter create() { - // final EntityLicensePresenter presenter = new - // EntityLicensePresenter(i(StateManager.class)); - // final EntityLicensePanel panel = new EntityLicensePanel(presenter, - // i(I18nUITranslationService.class), - // i(WorkspaceSkeleton.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - register(ApplicationComponentGroup.class, new Factory<RateIt>(RateIt.class) { - @Override - public RateIt create() { - final RateItPresenter presenter = new RateItPresenter(i(I18nUITranslationService.class), - i(Session.class), p(ContentServiceAsync.class), i(StateManager.class), p(RatePresenter.class), - i(ContentCapabilitiesRegistry.class)); - final RateItPanel panel = new RateItPanel(presenter, i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class), i(Images.class)); - presenter.init(panel); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<RatePresenter>(RatePresenter.class) { - @Override - public RatePresenter create() { - final RatePresenter presenter = new RatePresenter(i(StateManager.class), - i(ContentCapabilitiesRegistry.class)); - final RatePanel panel = new RatePanel(null, null, i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); - - register(Singleton.class, new Factory<ActionManager>(ActionManager.class) { - @Override - public ActionManager create() { - return new ActionManager(); - } - }); - - register(Singleton.class, new Factory<ActionGroupSummaryToolbar>(ActionGroupSummaryToolbar.class) { - @Override - public ActionGroupSummaryToolbar create() { - final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>(p(ActionManager.class)); - final ActionGroupSummaryToolbarPresenter toolbar = new ActionGroupSummaryToolbarPresenter(panel); - return toolbar; - } - }, new Factory<ActionParticipationToolbar>(ActionParticipationToolbar.class) { - @Override - public ActionParticipationToolbar create() { - final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>(p(ActionManager.class)); - final ActionParticipationSummaryToolbarPresenter toolbar = new ActionParticipationSummaryToolbarPresenter( - panel); - return toolbar; - } - }, new Factory<ActionBuddiesSummaryToolbar>(ActionBuddiesSummaryToolbar.class) { - @Override - public ActionBuddiesSummaryToolbar create() { - final ActionToolbarPanel<UserSimpleDTO> panel = new ActionToolbarPanel<UserSimpleDTO>( - p(ActionManager.class)); - final ActionBuddiesSummaryToolbarPresenter toolbar = new ActionBuddiesSummaryToolbarPresenter(panel); - return toolbar; - } - }); - - // register(ApplicationComponentGroup.class, new - // Factory<GroupMembersSummary>(GroupMembersSummary.class) { - // @Override - // public GroupMembersSummary create() { - // final GroupMembersSummaryPresenter presenter = new - // GroupMembersSummaryPresenter( - // i(I18nUITranslationService.class), i(StateManager.class), - // i(ImageUtils.class), - // i(Session.class), p(SocialNetworkServiceAsync.class), - // p(GroupServiceAsync.class), - // p(GroupLiveSearcher.class), p(ChatEngine.class), - // i(GroupActionRegistry.class), - // i(ActionGroupSummaryToolbar.class), p(FileDownloadUtils.class), - // i(AccessRightsClientManager.class), i(IconResources.class)); - // final GroupMembersSummaryView view = new - // GroupMembersSummaryPanel(presenter, - // i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( - // ActionGroupSummaryToolbar.class).getView()); - // presenter.init(view); - // return presenter; - // } - // }); - - register(ApplicationComponentGroup.class, new Factory<AddAsBuddieHeaderButton>(AddAsBuddieHeaderButton.class) { - @Override - public AddAsBuddieHeaderButton create() { - return new AddAsBuddieHeaderButton(p(ChatEngine.class), i(Session.class), i(StateManager.class), - i(I18nTranslationService.class), i(IconResources.class), i(EntityHeader.class)); - } - }); - - // register(ApplicationComponentGroup.class, new - // Factory<BuddiesSummary>(BuddiesSummary.class) { - // @Override - // public BuddiesSummary create() { - // final BuddiesSummaryPresenter presenter = new - // BuddiesSummaryPresenter(i(StateManager.class), - // i(Session.class), p(UserServiceAsync.class), - // i(UserActionRegistry.class), - // i(I18nTranslationService.class), p(ChatEngine.class), - // i(ActionBuddiesSummaryToolbar.class), - // p(FileDownloadUtils.class), i(ImageUtils.class), - // p(SocialNetworkServiceAsync.class), - // i(GroupActionRegistry.class), i(AccessRightsClientManager.class), - // i(IconResources.class)); - // final BuddiesSummaryPanel panel = new BuddiesSummaryPanel(presenter, - // i(WorkspaceSkeleton.class), - // i(I18nTranslationService.class), i(ActionManager.class), - // i(ActionBuddiesSummaryToolbar.class).getView()); - // presenter.init(panel); - // return presenter; - // } - // }); - - // register(ApplicationComponentGroup.class, new - // Factory<ParticipationSummary>(ParticipationSummary.class) { - // @Override - // public ParticipationSummary create() { - // final ParticipationSummaryPresenter presenter = new - // ParticipationSummaryPresenter( - // i(I18nUITranslationService.class), i(StateManager.class), - // i(ImageUtils.class), - // i(Session.class), p(SocialNetworkServiceAsync.class), - // i(GroupActionRegistry.class), - // i(ActionParticipationToolbar.class), p(FileDownloadUtils.class), - // i(AccessRightsClientManager.class), i(IconResources.class)); - // final ParticipationSummaryView view = new - // ParticipationSummaryPanel(presenter, - // i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( - // ActionParticipationToolbar.class).getView()); - // presenter.init(view); - // return presenter; - // } - // }); - - register(ApplicationComponentGroup.class, new Factory<TagsSummary>(TagsSummary.class) { - @Override - public TagsSummary create() { - final TagsSummaryPresenter presenter = new TagsSummaryPresenter(i(Session.class), - p(SiteSearcher.class), i(StateManager.class)); - final TagsSummaryPanel panel = new TagsSummaryPanel(presenter, i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<NoHomePage>(NoHomePage.class) { - @Override - public NoHomePage create() { - final NoHomePagePresenter presenter = new NoHomePagePresenter(i(StateManager.class), - p(EntityHeader.class)); - final NoHomePagePanel panel = new NoHomePagePanel(presenter, i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(ApplicationComponentGroup.class, new Factory<GroupOptions>(GroupOptions.class) { - @Override - public GroupOptions create() { - final GroupOptionsPresenter presenter = new GroupOptionsPresenter(i(StateManager.class), - i(I18nTranslationService.class), i(IconResources.class)); - final GroupOptionsPanel panel = new GroupOptionsPanel(presenter, i(EntityHeader.class), - i(I18nTranslationService.class), i(NotifyLevelImages.class), i(GroupOptionsCollection.class)); - presenter.init(panel); - return presenter; - } - }); - // - // register(ApplicationComponentGroup.class, new - // Factory<UserOptions>(UserOptions.class) { - // @Override - // public UserOptions create() { - // final UserOptionsPresenter presenter = new - // UserOptionsPresenter(i(Session.class), - // i(StateManager.class), i(I18nTranslationService.class), - // i(IconResources.class), - // i(SiteUserOptions.class)); - // final UserOptionsPanel panel = new UserOptionsPanel(presenter, - // i(EntityHeader.class), - // i(I18nTranslationService.class), i(NotifyLevelImages.class), - // i(UserOptionsCollection.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - register(GroupOptionsCollection.class, new Factory<EntityOptionsToolsConf>(EntityOptionsToolsConf.class) { - @Override - public EntityOptionsToolsConf create() { - final GroupOptionsToolsConfPresenter presenter = new GroupOptionsToolsConfPresenter( - i(StateManager.class), i(Session.class), i(I18nTranslationService.class), - i(GroupOptions.class), p(GroupServiceAsync.class)); - final EntityOptionsToolsConfPanel panel = new EntityOptionsToolsConfPanel(presenter, - i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(UserOptionsCollection.class, new Factory<UserOptionsToolsConf>(UserOptionsToolsConf.class) { - @Override - public UserOptionsToolsConf create() { - final UserOptionsToolsConfPresenter presenter = new UserOptionsToolsConfPresenter(i(Session.class), - i(StateManager.class), i(I18nTranslationService.class), i(UserOptions.class), - p(GroupServiceAsync.class)); - final EntityOptionsToolsConfPanel panel = new EntityOptionsToolsConfPanel(presenter, - i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(GroupOptionsCollection.class, new Factory<GroupOptionsLogo>(GroupOptionsLogo.class) { - @Override - public GroupOptionsLogo create() { - final EntityOptionsLogoPresenter presenter = new GroupOptionsLogoPresenter(i(Session.class), - i(EntityHeader.class), i(GroupOptions.class), i(StateManager.class), p(UserServiceAsync.class), - p(ChatEngine.class)); - final GroupOptionsLogoPanel panel = new GroupOptionsLogoPanel(presenter, i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(UserOptionsCollection.class, new Factory<UserOptionsLogo>(UserOptionsLogo.class) { - @Override - public UserOptionsLogo create() { - final EntityOptionsLogoPresenter presenter = new UserOptionsLogoPresenter(i(Session.class), - i(EntityHeader.class), i(UserOptions.class), i(StateManager.class), p(UserServiceAsync.class), - p(ChatEngine.class)); - final UserOptionsLogoPanel panel = new UserOptionsLogoPanel(presenter, i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(GroupOptionsCollection.class, new Factory<GroupOptionsDefLicense>(GroupOptionsDefLicense.class) { - @Override - public GroupOptionsDefLicense create() { - final GroupOptionsDefLicensePresenter presenter = new GroupOptionsDefLicensePresenter( - i(GroupOptions.class), i(StateManager.class), i(Session.class), p(LicenseWizard.class), - p(LicenseChangeAction.class)); - final EntityOptionsDefLicensePanel panel = new EntityOptionsDefLicensePanel(presenter, - i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(UserOptionsCollection.class, new Factory<UserOptionsDefLicense>(UserOptionsDefLicense.class) { - @Override - public UserOptionsDefLicense create() { - final UserOptionsDefLicensePresenter presenter = new UserOptionsDefLicensePresenter( - i(UserOptions.class), i(Session.class), p(LicenseWizard.class), p(LicenseChangeAction.class)); - final EntityOptionsDefLicensePanel panel = new EntityOptionsDefLicensePanel(presenter, - i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(GroupOptionsCollection.class, new Factory<GroupOptionsPublicSpaceConf>( - GroupOptionsPublicSpaceConf.class) { - @Override - public GroupOptionsPublicSpaceConf create() { - final WsThemeSelector themeSelector = i(WsThemeSelector.class); - final GroupOptionsPublicSpaceConfPresenter presenter = new GroupOptionsPublicSpaceConfPresenter( - i(Session.class), i(StateManager.class), i(GroupOptions.class), i(WsThemeManager.class), - themeSelector, p(GroupServiceAsync.class), i(WsBackManager.class)); - final EntityOptionsPublicSpaceConfPanel panel = new EntityOptionsPublicSpaceConfPanel(presenter, - i(WorkspaceSkeleton.class), i(I18nTranslationService.class), themeSelector, - i(FileDownloadUtils.class)); - presenter.init(panel); - return presenter; - } - }); - - register(UserOptionsCollection.class, - new Factory<UserOptionsPublicSpaceConf>(UserOptionsPublicSpaceConf.class) { - @Override - public UserOptionsPublicSpaceConf create() { - final WsThemeSelector themeSelector = i(WsThemeSelector.class); - final UserOptionsPublicSpaceConfPresenter presenter = new UserOptionsPublicSpaceConfPresenter( - i(Session.class), i(StateManager.class), i(UserOptions.class), i(WsThemeManager.class), - themeSelector, p(GroupServiceAsync.class), i(WsBackManager.class)); - final EntityOptionsPublicSpaceConfPanel panel = new EntityOptionsPublicSpaceConfPanel( - presenter, i(WorkspaceSkeleton.class), i(I18nTranslationService.class), themeSelector, - i(FileDownloadUtils.class)); - presenter.init(panel); - return presenter; - } - }); - - register(Singleton.class, new Factory<LicenseChangeAction>(LicenseChangeAction.class) { - @Override - public LicenseChangeAction create() { - return new LicenseChangeAction(p(GroupServiceAsync.class), i(Session.class), - i(I18nTranslationService.class), i(StateManager.class)); - } - }); - - register(Singleton.class, new Factory<RenameAction>(RenameAction.class) { - @Override - public RenameAction create() { - return new RenameAction(i(I18nTranslationService.class), i(Session.class), p(ContentServiceAsync.class)); - } - }); - - register(Singleton.class, new Factory<LicenseWizard>(LicenseWizard.class) { - @Override - public LicenseWizard create() { - final LicenseWizardPresenter presenter = new LicenseWizardPresenter( - i(LicenseWizardFirstFormView.class), i(LicenseWizardSndFormView.class), - i(LicenseWizardTrdFormView.class), i(LicenseWizardFrdFormView.class), i(Session.class)); - final LicenseWizardPanel panel = new LicenseWizardPanel(presenter, i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(panel); - return presenter; - } - }); - - register(Singleton.class, new Factory<LicenseWizardFirstFormView>(LicenseWizardFirstFormView.class) { - @Override - public LicenseWizardFirstFormView create() { - return new LicenseWizardFirstForm(i(I18nTranslationService.class)); - } - }); - - register(Singleton.class, new Factory<LicenseWizardSndFormView>(LicenseWizardSndFormView.class) { - @Override - public LicenseWizardSndFormView create() { - return new LicenseWizardSndForm(i(I18nTranslationService.class)); - } - }); - - register(Singleton.class, new Factory<LicenseWizardTrdFormView>(LicenseWizardTrdFormView.class) { - @Override - public LicenseWizardTrdFormView create() { - return new LicenseWizardTrdForm(i(Images.class), i(I18nTranslationService.class)); - } - }); - - register(Singleton.class, new Factory<LicenseWizardFrdFormView>(LicenseWizardFrdFormView.class) { - @Override - public LicenseWizardFrdFormView create() { - return new LicenseWizardFrdForm(i(I18nTranslationService.class), i(Session.class)); - } - }); - - register(Singleton.class, new Factory<FileUploader>(FileUploader.class) { - @Override - public FileUploader create() { - final FileUploaderPresenter presenter = new FileUploaderPresenter(i(Session.class)); - final FileUploaderDialog panel = new FileUploaderDialog(presenter, i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - - @Override - public void onAfterCreated(final FileUploader uploader) { - i(ContextNavigator.class).addFileUploaderListener(uploader); - } - }); - - register(Singleton.class, new Factory<SiteSearcher>(SiteSearcher.class) { - @Override - public SiteSearcher create() { - final SiteSearcherPresenter presenter = new SiteSearcherPresenter(p(StateManager.class)); - final SiteSearcherView view = new SiteSearcherPanel(presenter, i(I18nTranslationService.class), - i(WorkspaceSkeleton.class)); - presenter.init(view); - return presenter; - } - }); - - register(Singleton.class, new Factory<I18nTranslator>(I18nTranslator.class) { - @Override - public I18nTranslator create() { - final I18nTranslatorPresenter presenter = new I18nTranslatorPresenter(i(Session.class), - i(I18nServiceAsync.class), i(I18nUITranslationService.class)); - final I18nTranslatorView view = new I18nTranslatorPanel(presenter, i(I18nTranslationService.class), - i(LanguageSelector.class), i(WorkspaceSkeleton.class), i(Images.class)); - presenter.init(view); - return presenter; - } - }); - - // register(ApplicationComponentGroup.class, new - // Factory<SiteOptionsI18nTranslatorAction>( - // SiteOptionsI18nTranslatorAction.class) { - // @Override - // public SiteOptionsI18nTranslatorAction create() { - // return new SiteOptionsI18nTranslatorAction(i(SiteOptions.class), - // i(I18nTranslationService.class), - // i(IconResources.class), p(I18nTranslator.class)); - // } - // }); - - // register(Singleton.class, new Factory<SignIn>(SignIn.class) { - // @Override - // public SignIn create() { - // final SignInPresenter presenter = new - // SignInPresenter(i(Session.class), i(StateManager.class), - // i(I18nUITranslationService.class), p(UserServiceAsync.class), - // p(Register.class)); - // final SignInView panel = new SignInPanel(presenter, - // i(I18nTranslationService.class), - // i(WorkspaceSkeleton.class), i(NotifyLevelImages.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - // - // register(Singleton.class, new Factory<Register>(Register.class) { - // @Override - // public Register create() { - // final RegisterPresenter presenter = new - // RegisterPresenter(i(Session.class), i(StateManager.class), - // i(I18nUITranslationService.class), p(UserServiceAsync.class), - // p(SignIn.class)); - // final RegisterView panel = new RegisterPanel(presenter, - // i(I18nTranslationService.class), - // i(WorkspaceSkeleton.class), i(Session.class), - // i(NotifyLevelImages.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - // register(Singleton.class, new Factory<NewGroup>(NewGroup.class) { - // @Override - // public NewGroup create() { - // final NewGroupPresenter presenter = new - // NewGroupPresenter(i(I18nTranslationService.class), - // i(Session.class), i(StateManager.class), - // p(GroupServiceAsync.class)); - // final NewGroupPanel view = new NewGroupPanel(presenter, - // i(I18nTranslationService.class), - // p(LicenseWizard.class), i(NotifyLevelImages.class)); - // presenter.init(view); - // return presenter; - // } - // }); - - register(Singleton.class, new Factory<UserLiveSearcher>(UserLiveSearcher.class) { - @Override - public UserLiveSearcher create() { - final UserLiveSearcherPresenter presenter = new UserLiveSearcherPresenter(); - final EntityLiveSearcherView view = new UserLiveSearcherPanel(presenter, - i(I18nTranslationService.class), i(FileDownloadUtils.class)); - presenter.init(view); - return presenter; - } - }); - - register(Singleton.class, new Factory<GroupLiveSearcher>(GroupLiveSearcher.class) { - @Override - public GroupLiveSearcher create() { - final GroupLiveSearcherPresenter presenter = new GroupLiveSearcherPresenter(); - final EntityLiveSearcherView view = new GroupLiveSearchPanel(presenter, - i(I18nTranslationService.class), i(FileDownloadUtils.class)); - presenter.init(view); - return presenter; - } - }); - - register(Singleton.class, new Factory<ToolSelector>(ToolSelector.class) { - @Override - public ToolSelector create() { - final ToolSelectorPresenter presenter = new ToolSelectorPresenter(i(StateManager.class), - i(WsThemeManager.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<LanguageSelector>(LanguageSelector.class) { - @Override - public LanguageSelector create() { - final LanguageSelectorPresenter presenter = new LanguageSelectorPresenter(i(Session.class)); - final LanguageSelectorView view = new LanguageSelectorPanel(presenter, i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - // Register of tokens like "signin", "newgroup", "translate" etcetera - i(StateManager.class).addSiteToken(SiteCommonTokens.SIGNIN, new HistoryTokenCallback() { - - @Override - public void onHistoryToken() { - i(SignIn.class).doSignIn(); - } - }); - - i(StateManager.class).addSiteToken(SiteCommonTokens.REGISTER, new HistoryTokenCallback() { - - @Override - public void onHistoryToken() { - i(Register.class).doRegister(); - } - }); - - i(StateManager.class).addSiteToken(SiteCommonTokens.NEWGROUP, new HistoryTokenCallback() { - - @Override - public void onHistoryToken() { - i(NewGroup.class).doNewGroup(); - } - }); - - i(StateManager.class).addSiteToken(SiteCommonTokens.TRANSLATE, new HistoryTokenCallback() { - - @Override - public void onHistoryToken() { - i(I18nTranslator.class).doShowTranslator(); - } - }); - - register(NoDecoration.class, new Factory<ActionContentToolbar>(ActionContentToolbar.class) { - @Override - public ActionContentToolbar create() { - final ActionCntCtxToolbarPanel<StateToken> tbar = new ActionCntCtxToolbarPanel<StateToken>( - AbstractFoldableContentActions.CONTENT_TOPBAR, p(ActionManager.class), - i(WorkspaceSkeleton.class)); - final ActionContentToolbar toolbar = new ActionContentToolbarPresenter(tbar); - return toolbar; - } - }); - - register(Singleton.class, new Factory<ContentEditor>(ContentEditor.class) { - @Override - public ContentEditor create() { - final ContentEditorPresenter presenter = new ContentEditorPresenter(i(I18nTranslationService.class), - i(Session.class), i(RTEImgResources.class), p(InsertLinkDialog.class), - p(ColorWebSafePalette.class), p(EditHtmlDialog.class), p(InsertImageDialog.class), - p(InsertMediaDialog.class), p(InsertTableDialog.class), p(InsertSpecialCharDialog.class), - i(SchedulerManager.class), true, i(StateManager.class), i(SiteSignOutLink.class), - i(WorkspaceSkeleton.class), i(TimerWrapper.class), i(EntityTitle.class)); - final ContentEditorPanel panel = new ContentEditorPanel(presenter, i(I18nUITranslationService.class), - i(GlobalShortcutRegister.class), i(GuiBindingsRegister.class)); - presenter.init(panel); - return presenter; - } - }); - register(NoDecoration.class, new Factory<ActionContextTopToolbar>(ActionContextTopToolbar.class) { - @Override - public ActionContextTopToolbar create() { - final ActionCntCtxToolbarPanel<StateToken> panel = new ActionCntCtxToolbarPanel<StateToken>( - AbstractFoldableContentActions.CONTEXT_TOPBAR, p(ActionManager.class), - i(WorkspaceSkeleton.class)); - final ActionContextTopToolbar toolbar = new ActionContextTopToolbar(panel); - return toolbar; - } - }); - - register(NoDecoration.class, new Factory<ActionContextBottomToolbar>(ActionContextBottomToolbar.class) { - @Override - public ActionContextBottomToolbar create() { - final ActionCntCtxToolbarPanel<StateToken> panel = new ActionCntCtxToolbarPanel<StateToken>( - AbstractFoldableContentActions.CONTEXT_BOTTOMBAR, p(ActionManager.class), - i(WorkspaceSkeleton.class)); - final ActionContextBottomToolbar toolbar = new ActionContextBottomToolbar(panel); - return toolbar; - } - }); - - register(Singleton.class, new Factory<ContextNavigator>(ContextNavigator.class) { - @Override - public ContextNavigator create() { - final ContextNavigatorPresenter presenter = new ContextNavigatorPresenter(i(StateManager.class), - i(Session.class), i(I18nTranslationService.class), i(ContentIconsRegistry.class), - i(ContentCapabilitiesRegistry.class), i(ActionContextTopToolbar.class), - i(ActionContextBottomToolbar.class), i(ContextActionRegistry.class), - p(FileDownloadUtils.class), true, i(RenameAction.class)); - final ContextNavigatorPanel panel = new ContextNavigatorPanel(presenter, - i(I18nTranslationService.class), i(WorkspaceSkeleton.class), i(ActionManager.class)); - presenter.init(panel); - return presenter; - } - }); - - register(Singleton.class, new Factory<ContextPropEditor>(ContextPropEditor.class) { - @Override - public ContextPropEditor create() { - final ContextPropEditorPresenter presenter = new ContextPropEditorPresenter(i(Session.class), - i(StateManager.class), i(ContentCapabilitiesRegistry.class), p(TagsSummary.class), - p(ContentServiceAsync.class), i(EntitySubTitle.class)); - final ContextPropEditorView view = new ContextPropEditorPanel(presenter, - i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), p(LanguageSelector.class), - i(Images.class)); - presenter.init(view); - return presenter; - } - }); - - register(InsertImageGroup.class, new Factory<InsertImageLocal>(InsertImageLocal.class) { - @Override - public InsertImageLocal create() { - final InsertImageLocalPresenter presenter = new InsertImageLocalPresenter(i(InsertImageDialog.class), - i(Session.class)); - final InsertImageLocalPanel panel = new InsertImageLocalPanel(presenter, - i(I18nTranslationService.class), i(FileDownloadUtils.class), i(Session.class)); - presenter.init(panel); - return presenter; - } - }); - - // register(ApplicationComponentGroup.class, new - // Factory<MaxMinWorkspace>(MaxMinWorkspace.class) { - // @Override - // public MaxMinWorkspace create() { - // final MaxMinWorkspacePresenter presenter = new - // MaxMinWorkspacePresenter( - // i(GlobalShortcutRegister.class), i(IconResources.class), - // i(I18nTranslationService.class), - // i(SiteOptions.class)); - // final MaxMinWorkspacePanel panel = new - // MaxMinWorkspacePanel(i(WorkspaceSkeleton.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - register(InsertLinkGroup.class, new Factory<InsertLinkLocal>(InsertLinkLocal.class) { - @Override - public InsertLinkLocal create() { - final InsertLinkLocalPresenter presenter = new InsertLinkLocalPresenter(i(InsertLinkDialog.class)); - final InsertLinkLocalPanel panel = new InsertLinkLocalPanel(presenter, i(WorkspaceSkeleton.class), - i(I18nTranslationService.class), i(FileDownloadUtils.class), i(StateTokenUtils.class)); - presenter.init(panel); - return presenter; - } - }); - - register(InsertMediaGroup.class, new Factory<InsertMediaLocal>(InsertMediaLocal.class) { - @Override - public InsertMediaLocal create() { - final InsertMediaLocalPresenter presenter = new InsertMediaLocalPresenter(i(InsertMediaDialog.class), - i(Session.class), p(MediaUtils.class)); - final InsertMediaLocalPanel panel = new InsertMediaLocalPanel(presenter, - i(I18nTranslationService.class), i(FileDownloadUtils.class)); - presenter.init(panel); - return presenter; - } - }); - i(GlobalShortcutRegister.class).enable(); - } - -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,1118 @@ +/* + * + * 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 org.ourproject.kune.workspace.client; + +import org.ourproject.kune.chat.client.ChatEngine; +import org.ourproject.kune.platf.client.actions.ActionManager; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; +import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; +import org.ourproject.kune.platf.client.actions.ui.SimpleGuiItem; +import org.ourproject.kune.platf.client.app.ApplicationComponentGroup; +import org.ourproject.kune.platf.client.app.GroupOptionsCollection; +import org.ourproject.kune.platf.client.app.UserOptionsCollection; +import org.ourproject.kune.platf.client.registry.AuthorableRegistry; +import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; +import org.ourproject.kune.platf.client.registry.RenamableRegistry; +import org.ourproject.kune.platf.client.services.AbstractExtendedModule; +import org.ourproject.kune.platf.client.services.Images; +import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; +import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; +import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; +import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; +import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; +import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; +import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog; +import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; +import org.ourproject.kune.workspace.client.cnt.ActionContentToolbarPresenter; +import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPanel; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPresenter; +import org.ourproject.kune.workspace.client.cxt.ActionContextBottomToolbar; +import org.ourproject.kune.workspace.client.cxt.ActionContextTopToolbar; +import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditorPanel; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditorPresenter; +import org.ourproject.kune.workspace.client.cxt.ContextPropEditorView; +import org.ourproject.kune.workspace.client.editor.ContentEditor; +import org.ourproject.kune.workspace.client.editor.ContentEditorPanel; +import org.ourproject.kune.workspace.client.editor.ContentEditorPresenter; +import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocal; +import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocalPanel; +import org.ourproject.kune.workspace.client.editor.insertlocalimg.InsertImageLocalPresenter; +import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocal; +import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPanel; +import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPresenter; +import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocal; +import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPanel; +import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPresenter; +import org.ourproject.kune.workspace.client.i18n.I18nTranslator; +import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPanel; +import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPresenter; +import org.ourproject.kune.workspace.client.i18n.I18nTranslatorView; +import org.ourproject.kune.workspace.client.i18n.LanguageSelector; +import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPanel; +import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPresenter; +import org.ourproject.kune.workspace.client.i18n.LanguageSelectorView; +import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; +import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; +import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPanel; +import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenter; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstForm; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdForm; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndForm; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdForm; +import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView; +import org.ourproject.kune.workspace.client.nohomepage.NoHomePage; +import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePanel; +import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePresenter; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbar; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbarPresenter; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbar; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbarPresenter; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationSummaryToolbarPresenter; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationToolbar; +import org.ourproject.kune.workspace.client.options.GroupOptions; +import org.ourproject.kune.workspace.client.options.GroupOptionsPanel; +import org.ourproject.kune.workspace.client.options.GroupOptionsPresenter; +import org.ourproject.kune.workspace.client.options.UserOptions; +import org.ourproject.kune.workspace.client.options.license.EntityOptionsDefLicensePanel; +import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicense; +import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicensePresenter; +import org.ourproject.kune.workspace.client.options.license.UserOptionsDefLicense; +import org.ourproject.kune.workspace.client.options.license.UserOptionsDefLicensePresenter; +import org.ourproject.kune.workspace.client.options.logo.EntityOptionsLogoPresenter; +import org.ourproject.kune.workspace.client.options.logo.GroupOptionsLogo; +import org.ourproject.kune.workspace.client.options.logo.GroupOptionsLogoPanel; +import org.ourproject.kune.workspace.client.options.logo.GroupOptionsLogoPresenter; +import org.ourproject.kune.workspace.client.options.logo.UserOptionsLogo; +import org.ourproject.kune.workspace.client.options.logo.UserOptionsLogoPanel; +import org.ourproject.kune.workspace.client.options.logo.UserOptionsLogoPresenter; +import org.ourproject.kune.workspace.client.options.pscape.EntityOptionsPublicSpaceConfPanel; +import org.ourproject.kune.workspace.client.options.pscape.GroupOptionsPublicSpaceConf; +import org.ourproject.kune.workspace.client.options.pscape.GroupOptionsPublicSpaceConfPresenter; +import org.ourproject.kune.workspace.client.options.pscape.UserOptionsPublicSpaceConf; +import org.ourproject.kune.workspace.client.options.pscape.UserOptionsPublicSpaceConfPresenter; +import org.ourproject.kune.workspace.client.options.tools.EntityOptionsToolsConf; +import org.ourproject.kune.workspace.client.options.tools.EntityOptionsToolsConfPanel; +import org.ourproject.kune.workspace.client.options.tools.GroupOptionsToolsConfPresenter; +import org.ourproject.kune.workspace.client.options.tools.UserOptionsToolsConf; +import org.ourproject.kune.workspace.client.options.tools.UserOptionsToolsConfPresenter; +import org.ourproject.kune.workspace.client.rate.RateIt; +import org.ourproject.kune.workspace.client.rate.RateItPanel; +import org.ourproject.kune.workspace.client.rate.RateItPresenter; +import org.ourproject.kune.workspace.client.rate.RatePanel; +import org.ourproject.kune.workspace.client.rate.RatePresenter; +import org.ourproject.kune.workspace.client.search.EntityLiveSearcherView; +import org.ourproject.kune.workspace.client.search.GroupLiveSearchPanel; +import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; +import org.ourproject.kune.workspace.client.search.GroupLiveSearcherPresenter; +import org.ourproject.kune.workspace.client.search.SiteSearcher; +import org.ourproject.kune.workspace.client.search.SiteSearcherPanel; +import org.ourproject.kune.workspace.client.search.SiteSearcherPresenter; +import org.ourproject.kune.workspace.client.search.SiteSearcherView; +import org.ourproject.kune.workspace.client.search.UserLiveSearcher; +import org.ourproject.kune.workspace.client.search.UserLiveSearcherPanel; +import org.ourproject.kune.workspace.client.search.UserLiveSearcherPresenter; +import org.ourproject.kune.workspace.client.site.WorkspaceNotifyUser; +import org.ourproject.kune.workspace.client.site.msg.ToastMessage; +import org.ourproject.kune.workspace.client.site.msg.ToastMessagePanel; +import org.ourproject.kune.workspace.client.site.msg.ToastMessagePresenter; +import org.ourproject.kune.workspace.client.sitebar.sitelogo.SiteLogo; +import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgress; +import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPanel; +import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPresenter; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLinkPanel; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLinkPresenter; +import org.ourproject.kune.workspace.client.sitebar.sitesearch.SiteSearch; +import org.ourproject.kune.workspace.client.sitebar.sitesearch.SiteSearchPanel; +import org.ourproject.kune.workspace.client.sitebar.sitesearch.SiteSearchPresenter; +import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignInLink; +import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignInLinkPanel; +import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignInLinkPresenter; +import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink; +import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPanel; +import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPresenter; +import org.ourproject.kune.workspace.client.skel.ActionCntCtxToolbarPanel; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.tags.TagsSummary; +import org.ourproject.kune.workspace.client.tags.TagsSummaryPanel; +import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenter; +import org.ourproject.kune.workspace.client.themes.WsBackManager; +import org.ourproject.kune.workspace.client.themes.WsBackManagerImpl; +import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import org.ourproject.kune.workspace.client.themes.WsThemeManagerPanel; +import org.ourproject.kune.workspace.client.themes.WsThemeSelector; +import org.ourproject.kune.workspace.client.themes.WsThemeSelectorPresenter; +import org.ourproject.kune.workspace.client.title.EntitySubTitle; +import org.ourproject.kune.workspace.client.title.EntitySubTitlePanel; +import org.ourproject.kune.workspace.client.title.EntitySubTitlePresenter; +import org.ourproject.kune.workspace.client.title.EntityTitle; +import org.ourproject.kune.workspace.client.title.EntityTitlePanel; +import org.ourproject.kune.workspace.client.title.EntityTitlePresenter; +import org.ourproject.kune.workspace.client.title.RenameAction; +import org.ourproject.kune.workspace.client.tool.ToolSelector; +import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenter; +import org.ourproject.kune.workspace.client.upload.FileUploader; +import org.ourproject.kune.workspace.client.upload.FileUploaderDialog; +import org.ourproject.kune.workspace.client.upload.FileUploaderPresenter; + +import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.common.client.utils.TimerWrapper; +import cc.kune.core.client.auth.Register; +import cc.kune.core.client.auth.SignIn; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.groups.newgroup.NewGroup; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.rpcservices.I18nServiceAsync; +import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.HistoryTokenCallback; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SiteCommonTokens; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.StateTokenUtils; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.ioc.decorator.NoDecoration; +import com.calclab.suco.client.ioc.decorator.Singleton; +import com.calclab.suco.client.ioc.module.Factory; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.ServiceDefTarget; + +public class WorkspaceModule extends AbstractExtendedModule { + @Override + protected void onInstall() { + + register(Singleton.class, new Factory<SocialNetworkServiceAsync>(SocialNetworkServiceAsync.class) { + @Override + public SocialNetworkServiceAsync create() { + final SocialNetworkServiceAsync snServiceAsync = (SocialNetworkServiceAsync) GWT.create(SocialNetworkService.class); + ((ServiceDefTarget) snServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + + "SocialNetworkService"); + return snServiceAsync; + } + }, new Factory<GroupServiceAsync>(GroupServiceAsync.class) { + @Override + public GroupServiceAsync create() { + final GroupServiceAsync groupServiceAsync = (GroupServiceAsync) GWT.create(GroupService.class); + ((ServiceDefTarget) groupServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "GroupService"); + return groupServiceAsync; + } + }, new Factory<ContentServiceAsync>(ContentServiceAsync.class) { + @Override + public ContentServiceAsync create() { + final ContentServiceAsync contentServiceAsync = (ContentServiceAsync) GWT.create(ContentService.class); + ((ServiceDefTarget) contentServiceAsync).setServiceEntryPoint(GWT.getModuleBaseURL() + "ContentService"); + return contentServiceAsync; + } + }); + + register(ApplicationComponentGroup.class, new Factory<WorkspaceSkeleton>(WorkspaceSkeleton.class) { + @Override + public WorkspaceSkeleton create() { + return new WorkspaceSkeleton(); + } + }); + + register(ApplicationComponentGroup.class, new Factory<SiteProgress>(SiteProgress.class) { + @Override + public SiteProgress create() { + final SiteProgressPresenter presenter = new SiteProgressPresenter(); + final SiteProgressPanel panel = new SiteProgressPanel(presenter, p(SitePublicSpaceLink.class)); + presenter.init(panel); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<WorkspaceNotifyUser>(WorkspaceNotifyUser.class) { + @Override + public WorkspaceNotifyUser create() { + return new WorkspaceNotifyUser(i(NotifyUser.class), i(I18nUITranslationService.class), + i(SiteProgress.class), p(ToastMessage.class), p(WorkspaceSkeleton.class)); + } + }); + + register(ApplicationComponentGroup.class, new Factory<SitePublicSpaceLink>(SitePublicSpaceLink.class) { + @Override + public SitePublicSpaceLink create() { + final SitePublicSpaceLinkPresenter presenter = new SitePublicSpaceLinkPresenter(i(StateManager.class), + i(StateTokenUtils.class)); + final SitePublicSpaceLinkPanel panel = new SitePublicSpaceLinkPanel(presenter, + i(WorkspaceSkeleton.class), i(I18nUITranslationService.class), i(Images.class)); + presenter.init(panel); + return presenter; + } + }); + + register(Singleton.class, new Factory<StateTokenUtils>(StateTokenUtils.class) { + @Override + public StateTokenUtils create() { + return new StateTokenUtils(i(Session.class)); + } + }); + + register(NoDecoration.class, new Factory<ToastMessage>(ToastMessage.class) { + @Override + public ToastMessage create() { + final ToastMessagePresenter presenter = new ToastMessagePresenter(); + final ToastMessagePanel panel = new ToastMessagePanel(); + presenter.init(panel); + return presenter; + } + }); + + // register(ApplicationComponentGroup.class, new + // Factory<SiteUserOptions>(SiteUserOptions.class) { + // @Override + // public SiteUserOptions create() { + // final SiteUserOptionsPresenter presenter = new + // SiteUserOptionsPresenter(i(Session.class), + // i(StateManager.class), p(FileDownloadUtils.class), + // $(I18nTranslationService.class), + // $(IconResources.class)); + // final SiteUserOptionsPanel panel = new + // SiteUserOptionsPanel(presenter, i(WorkspaceSkeleton.class), + // $(GuiBindingsRegister.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + + register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) { + @Override + public SiteSignInLink create() { + final SiteSignInLinkPresenter presenter = new SiteSignInLinkPresenter(i(Session.class)); + final SiteSignInLinkPanel panel = new SiteSignInLinkPanel(presenter, i(I18nUITranslationService.class), + i(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<SiteSignOutLink>(SiteSignOutLink.class) { + @Override + public SiteSignOutLink create() { + final SiteSignOutLinkPresenter presenter = new SiteSignOutLinkPresenter(i(Session.class), + p(UserServiceAsync.class), p(ErrorHandler.class)); + final SiteSignOutLinkPanel panel = new SiteSignOutLinkPanel(presenter, + i(I18nUITranslationService.class), i(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); + // + // register(ApplicationComponentGroup.class, new + // Factory<SiteOptions>(SiteOptions.class) { + // @Override + // public SiteOptions create() { + // final SiteOptionsPresenter presenter = new + // SiteOptionsPresenter(i(I18nUITranslationService.class), + // i(IconResources.class)); + // final SiteOptionsPanel panel = new + // SiteOptionsPanel(i(WorkspaceSkeleton.class), + // i(I18nUITranslationService.class), i(GuiBindingsRegister.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + + register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) { + @Override + public SiteSearch create() { + final SiteSearchPresenter presenter = new SiteSearchPresenter(p(SiteSearcher.class), + i(I18nTranslationService.class)); + final SiteSearchPanel panel = new SiteSearchPanel(presenter, i(WorkspaceSkeleton.class), + i(Images.class)); + presenter.init(panel); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<SiteLogo>(SiteLogo.class) { + @Override + public SiteLogo create() { + // final SiteLogoPresenter presenter = new + // SiteLogoPresenter(i(Session.class)); + // final SiteLogoPanel panel = new SiteLogoPanel(presenter, + // i(WorkspaceSkeleton.class)); + // presenter.init(panel); + return null; + } + }); + + // register(ApplicationComponentGroup.class, new + // Factory<EntityHeader>(EntityHeader.class) { + // @Override + // public EntityHeader create() { + // final EntityHeaderPresenter presenter = new + // EntityHeaderPresenter(i(StateManager.class), + // i(WsThemeManager.class), i(Session.class)); + // final EntityHeaderPanel panel = new + // EntityHeaderPanel(i(WorkspaceSkeleton.class), + // p(FileDownloadUtils.class), i(Images.class), + // i(GuiBindingsRegister.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + + register(Singleton.class, new Factory<WsBackManager>(WsBackManager.class) { + @Override + public WsBackManager create() { + return new WsBackManagerImpl(i(FileDownloadUtils.class)); + } + }); + + register(ApplicationComponentGroup.class, new Factory<WsThemeManager>(WsThemeManager.class) { + @Override + public WsThemeManager create() { + final WsThemeManager presenter = new WsThemeManager(i(Session.class), p(GroupServiceAsync.class), + i(StateManager.class), i(WsBackManager.class)); + new WsThemeManagerPanel(presenter, i(WorkspaceSkeleton.class)); + return presenter; + } + }); + + register(NoDecoration.class, new Factory<WsThemeSelector>(WsThemeSelector.class) { + @Override + public WsThemeSelector create() { + final WsThemeSelectorPresenter presenter = new WsThemeSelectorPresenter(i(Session.class), + i(I18nTranslationService.class)); + presenter.init(new SimpleGuiItem(i(GuiBindingsRegister.class))); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<EntityTitle>(EntityTitle.class) { + @Override + public EntityTitle create() { + final EntityTitlePresenter presenter = new EntityTitlePresenter(i(StateManager.class), + i(Session.class), i(ContentIconsRegistry.class), i(RenamableRegistry.class), + i(RenameAction.class)); + final EntityTitlePanel panel = new EntityTitlePanel(i(WorkspaceSkeleton.class), presenter); + presenter.init(panel); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<EntitySubTitle>(EntitySubTitle.class) { + @Override + public EntitySubTitle create() { + final EntitySubTitlePresenter presenter = new EntitySubTitlePresenter( + i(I18nUITranslationService.class), i(StateManager.class), false, i(AuthorableRegistry.class)); + final EntitySubTitlePanel panel = new EntitySubTitlePanel(presenter, i(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); + + // register(ApplicationComponentGroup.class, new + // Factory<EntityLicensePresenter>(EntityLicensePresenter.class) { + // @Override + // public EntityLicensePresenter create() { + // final EntityLicensePresenter presenter = new + // EntityLicensePresenter(i(StateManager.class)); + // final EntityLicensePanel panel = new EntityLicensePanel(presenter, + // i(I18nUITranslationService.class), + // i(WorkspaceSkeleton.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + + register(ApplicationComponentGroup.class, new Factory<RateIt>(RateIt.class) { + @Override + public RateIt create() { + final RateItPresenter presenter = new RateItPresenter(i(I18nUITranslationService.class), + i(Session.class), p(ContentServiceAsync.class), i(StateManager.class), p(RatePresenter.class), + i(ContentCapabilitiesRegistry.class)); + final RateItPanel panel = new RateItPanel(presenter, i(I18nUITranslationService.class), + i(WorkspaceSkeleton.class), i(Images.class)); + presenter.init(panel); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<RatePresenter>(RatePresenter.class) { + @Override + public RatePresenter create() { + final RatePresenter presenter = new RatePresenter(i(StateManager.class), + i(ContentCapabilitiesRegistry.class)); + final RatePanel panel = new RatePanel(null, null, i(I18nUITranslationService.class), + i(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); + + register(Singleton.class, new Factory<ActionManager>(ActionManager.class) { + @Override + public ActionManager create() { + return new ActionManager(); + } + }); + + register(Singleton.class, new Factory<ActionGroupSummaryToolbar>(ActionGroupSummaryToolbar.class) { + @Override + public ActionGroupSummaryToolbar create() { + final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>(p(ActionManager.class)); + final ActionGroupSummaryToolbarPresenter toolbar = new ActionGroupSummaryToolbarPresenter(panel); + return toolbar; + } + }, new Factory<ActionParticipationToolbar>(ActionParticipationToolbar.class) { + @Override + public ActionParticipationToolbar create() { + final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>(p(ActionManager.class)); + final ActionParticipationSummaryToolbarPresenter toolbar = new ActionParticipationSummaryToolbarPresenter( + panel); + return toolbar; + } + }, new Factory<ActionBuddiesSummaryToolbar>(ActionBuddiesSummaryToolbar.class) { + @Override + public ActionBuddiesSummaryToolbar create() { + final ActionToolbarPanel<UserSimpleDTO> panel = new ActionToolbarPanel<UserSimpleDTO>( + p(ActionManager.class)); + final ActionBuddiesSummaryToolbarPresenter toolbar = new ActionBuddiesSummaryToolbarPresenter(panel); + return toolbar; + } + }); + + // register(ApplicationComponentGroup.class, new + // Factory<GroupMembersSummary>(GroupMembersSummary.class) { + // @Override + // public GroupMembersSummary create() { + // final GroupMembersSummaryPresenter presenter = new + // GroupMembersSummaryPresenter( + // i(I18nUITranslationService.class), i(StateManager.class), + // i(ImageUtils.class), + // i(Session.class), p(SocialNetworkServiceAsync.class), + // p(GroupServiceAsync.class), + // p(GroupLiveSearcher.class), p(ChatEngine.class), + // i(GroupActionRegistry.class), + // i(ActionGroupSummaryToolbar.class), p(FileDownloadUtils.class), + // i(AccessRightsClientManager.class), i(IconResources.class)); + // final GroupMembersSummaryView view = new + // GroupMembersSummaryPanel(presenter, + // i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( + // ActionGroupSummaryToolbar.class).getView()); + // presenter.init(view); + // return presenter; + // } + // }); + + // register(ApplicationComponentGroup.class, new + // Factory<AddAsBuddieHeaderButton>(AddAsBuddieHeaderButton.class) { + // @Override + // public AddAsBuddieHeaderButton create() { + // return new AddAsBuddieHeaderButton(p(ChatEngine.class), + // i(Session.class), i(StateManager.class), + // i(I18nTranslationService.class), i(IconResources.class), + // i(EntityHeader.class)); + // } + // }); + + // register(ApplicationComponentGroup.class, new + // Factory<BuddiesSummary>(BuddiesSummary.class) { + // @Override + // public BuddiesSummary create() { + // final BuddiesSummaryPresenter presenter = new + // BuddiesSummaryPresenter(i(StateManager.class), + // i(Session.class), p(UserServiceAsync.class), + // i(UserActionRegistry.class), + // i(I18nTranslationService.class), p(ChatEngine.class), + // i(ActionBuddiesSummaryToolbar.class), + // p(FileDownloadUtils.class), i(ImageUtils.class), + // p(SocialNetworkServiceAsync.class), + // i(GroupActionRegistry.class), i(AccessRightsClientManager.class), + // i(IconResources.class)); + // final BuddiesSummaryPanel panel = new BuddiesSummaryPanel(presenter, + // i(WorkspaceSkeleton.class), + // i(I18nTranslationService.class), i(ActionManager.class), + // i(ActionBuddiesSummaryToolbar.class).getView()); + // presenter.init(panel); + // return presenter; + // } + // }); + + // register(ApplicationComponentGroup.class, new + // Factory<ParticipationSummary>(ParticipationSummary.class) { + // @Override + // public ParticipationSummary create() { + // final ParticipationSummaryPresenter presenter = new + // ParticipationSummaryPresenter( + // i(I18nUITranslationService.class), i(StateManager.class), + // i(ImageUtils.class), + // i(Session.class), p(SocialNetworkServiceAsync.class), + // i(GroupActionRegistry.class), + // i(ActionParticipationToolbar.class), p(FileDownloadUtils.class), + // i(AccessRightsClientManager.class), i(IconResources.class)); + // final ParticipationSummaryView view = new + // ParticipationSummaryPanel(presenter, + // i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( + // ActionParticipationToolbar.class).getView()); + // presenter.init(view); + // return presenter; + // } + // }); + + register(ApplicationComponentGroup.class, new Factory<TagsSummary>(TagsSummary.class) { + @Override + public TagsSummary create() { + final TagsSummaryPresenter presenter = new TagsSummaryPresenter(i(Session.class), + p(SiteSearcher.class), i(StateManager.class)); + final TagsSummaryPanel panel = new TagsSummaryPanel(presenter, i(I18nUITranslationService.class), + i(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<NoHomePage>(NoHomePage.class) { + @Override + public NoHomePage create() { + final NoHomePagePresenter presenter = new NoHomePagePresenter(i(StateManager.class), + p(EntityHeader.class)); + final NoHomePagePanel panel = new NoHomePagePanel(presenter, i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(ApplicationComponentGroup.class, new Factory<GroupOptions>(GroupOptions.class) { + @Override + public GroupOptions create() { + final GroupOptionsPresenter presenter = new GroupOptionsPresenter(i(StateManager.class), + i(I18nTranslationService.class), i(IconResources.class)); + final GroupOptionsPanel panel = new GroupOptionsPanel(presenter, i(EntityHeader.class), + i(I18nTranslationService.class), i(NotifyLevelImages.class), i(GroupOptionsCollection.class)); + presenter.init(panel); + return presenter; + } + }); + // + // register(ApplicationComponentGroup.class, new + // Factory<UserOptions>(UserOptions.class) { + // @Override + // public UserOptions create() { + // final UserOptionsPresenter presenter = new + // UserOptionsPresenter(i(Session.class), + // i(StateManager.class), i(I18nTranslationService.class), + // i(IconResources.class), + // i(SiteUserOptions.class)); + // final UserOptionsPanel panel = new UserOptionsPanel(presenter, + // i(EntityHeader.class), + // i(I18nTranslationService.class), i(NotifyLevelImages.class), + // i(UserOptionsCollection.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + + register(GroupOptionsCollection.class, new Factory<EntityOptionsToolsConf>(EntityOptionsToolsConf.class) { + @Override + public EntityOptionsToolsConf create() { + final GroupOptionsToolsConfPresenter presenter = new GroupOptionsToolsConfPresenter( + i(StateManager.class), i(Session.class), i(I18nTranslationService.class), + i(GroupOptions.class), p(GroupServiceAsync.class)); + final EntityOptionsToolsConfPanel panel = new EntityOptionsToolsConfPanel(presenter, + i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(UserOptionsCollection.class, new Factory<UserOptionsToolsConf>(UserOptionsToolsConf.class) { + @Override + public UserOptionsToolsConf create() { + final UserOptionsToolsConfPresenter presenter = new UserOptionsToolsConfPresenter(i(Session.class), + i(StateManager.class), i(I18nTranslationService.class), i(UserOptions.class), + p(GroupServiceAsync.class)); + final EntityOptionsToolsConfPanel panel = new EntityOptionsToolsConfPanel(presenter, + i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(GroupOptionsCollection.class, new Factory<GroupOptionsLogo>(GroupOptionsLogo.class) { + @Override + public GroupOptionsLogo create() { + final EntityOptionsLogoPresenter presenter = new GroupOptionsLogoPresenter(i(Session.class), + i(EntityHeader.class), i(GroupOptions.class), i(StateManager.class), p(UserServiceAsync.class), + p(ChatEngine.class)); + final GroupOptionsLogoPanel panel = new GroupOptionsLogoPanel(presenter, i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(UserOptionsCollection.class, new Factory<UserOptionsLogo>(UserOptionsLogo.class) { + @Override + public UserOptionsLogo create() { + final EntityOptionsLogoPresenter presenter = new UserOptionsLogoPresenter(i(Session.class), + i(EntityHeader.class), i(UserOptions.class), i(StateManager.class), p(UserServiceAsync.class), + p(ChatEngine.class)); + final UserOptionsLogoPanel panel = new UserOptionsLogoPanel(presenter, i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(GroupOptionsCollection.class, new Factory<GroupOptionsDefLicense>(GroupOptionsDefLicense.class) { + @Override + public GroupOptionsDefLicense create() { + final GroupOptionsDefLicensePresenter presenter = new GroupOptionsDefLicensePresenter( + i(GroupOptions.class), i(StateManager.class), i(Session.class), p(LicenseWizard.class), + p(LicenseChangeAction.class)); + final EntityOptionsDefLicensePanel panel = new EntityOptionsDefLicensePanel(presenter, + i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(UserOptionsCollection.class, new Factory<UserOptionsDefLicense>(UserOptionsDefLicense.class) { + @Override + public UserOptionsDefLicense create() { + final UserOptionsDefLicensePresenter presenter = new UserOptionsDefLicensePresenter( + i(UserOptions.class), i(Session.class), p(LicenseWizard.class), p(LicenseChangeAction.class)); + final EntityOptionsDefLicensePanel panel = new EntityOptionsDefLicensePanel(presenter, + i(WorkspaceSkeleton.class), i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(GroupOptionsCollection.class, new Factory<GroupOptionsPublicSpaceConf>( + GroupOptionsPublicSpaceConf.class) { + @Override + public GroupOptionsPublicSpaceConf create() { + final WsThemeSelector themeSelector = i(WsThemeSelector.class); + final GroupOptionsPublicSpaceConfPresenter presenter = new GroupOptionsPublicSpaceConfPresenter( + i(Session.class), i(StateManager.class), i(GroupOptions.class), i(WsThemeManager.class), + themeSelector, p(GroupServiceAsync.class), i(WsBackManager.class)); + final EntityOptionsPublicSpaceConfPanel panel = new EntityOptionsPublicSpaceConfPanel(presenter, + i(WorkspaceSkeleton.class), i(I18nTranslationService.class), themeSelector, + i(FileDownloadUtils.class)); + presenter.init(panel); + return presenter; + } + }); + + register(UserOptionsCollection.class, + new Factory<UserOptionsPublicSpaceConf>(UserOptionsPublicSpaceConf.class) { + @Override + public UserOptionsPublicSpaceConf create() { + final WsThemeSelector themeSelector = i(WsThemeSelector.class); + final UserOptionsPublicSpaceConfPresenter presenter = new UserOptionsPublicSpaceConfPresenter( + i(Session.class), i(StateManager.class), i(UserOptions.class), i(WsThemeManager.class), + themeSelector, p(GroupServiceAsync.class), i(WsBackManager.class)); + final EntityOptionsPublicSpaceConfPanel panel = new EntityOptionsPublicSpaceConfPanel( + presenter, i(WorkspaceSkeleton.class), i(I18nTranslationService.class), themeSelector, + i(FileDownloadUtils.class)); + presenter.init(panel); + return presenter; + } + }); + + register(Singleton.class, new Factory<LicenseChangeAction>(LicenseChangeAction.class) { + @Override + public LicenseChangeAction create() { + return new LicenseChangeAction(p(GroupServiceAsync.class), i(Session.class), + i(I18nTranslationService.class), i(StateManager.class)); + } + }); + + register(Singleton.class, new Factory<RenameAction>(RenameAction.class) { + @Override + public RenameAction create() { + return new RenameAction(i(I18nTranslationService.class), i(Session.class), p(ContentServiceAsync.class)); + } + }); + + register(Singleton.class, new Factory<LicenseWizard>(LicenseWizard.class) { + @Override + public LicenseWizard create() { + final LicenseWizardPresenter presenter = new LicenseWizardPresenter( + i(LicenseWizardFirstFormView.class), i(LicenseWizardSndFormView.class), + i(LicenseWizardTrdFormView.class), i(LicenseWizardFrdFormView.class), i(Session.class)); + final LicenseWizardPanel panel = new LicenseWizardPanel(presenter, i(WorkspaceSkeleton.class), + i(I18nTranslationService.class)); + presenter.init(panel); + return presenter; + } + }); + + register(Singleton.class, new Factory<LicenseWizardFirstFormView>(LicenseWizardFirstFormView.class) { + @Override + public LicenseWizardFirstFormView create() { + return new LicenseWizardFirstForm(i(I18nTranslationService.class)); + } + }); + + register(Singleton.class, new Factory<LicenseWizardSndFormView>(LicenseWizardSndFormView.class) { + @Override + public LicenseWizardSndFormView create() { + return new LicenseWizardSndForm(i(I18nTranslationService.class)); + } + }); + + register(Singleton.class, new Factory<LicenseWizardTrdFormView>(LicenseWizardTrdFormView.class) { + @Override + public LicenseWizardTrdFormView create() { + return new LicenseWizardTrdForm(i(Images.class), i(I18nTranslationService.class)); + } + }); + + register(Singleton.class, new Factory<LicenseWizardFrdFormView>(LicenseWizardFrdFormView.class) { + @Override + public LicenseWizardFrdFormView create() { + return new LicenseWizardFrdForm(i(I18nTranslationService.class), i(Session.class)); + } + }); + + register(Singleton.class, new Factory<FileUploader>(FileUploader.class) { + @Override + public FileUploader create() { + final FileUploaderPresenter presenter = new FileUploaderPresenter(i(Session.class)); + final FileUploaderDialog panel = new FileUploaderDialog(presenter, i(I18nUITranslationService.class), + i(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + + @Override + public void onAfterCreated(final FileUploader uploader) { + i(ContextNavigator.class).addFileUploaderListener(uploader); + } + }); + + register(Singleton.class, new Factory<SiteSearcher>(SiteSearcher.class) { + @Override + public SiteSearcher create() { + final SiteSearcherPresenter presenter = new SiteSearcherPresenter(p(StateManager.class)); + final SiteSearcherView view = new SiteSearcherPanel(presenter, i(I18nTranslationService.class), + i(WorkspaceSkeleton.class)); + presenter.init(view); + return presenter; + } + }); + + register(Singleton.class, new Factory<I18nTranslator>(I18nTranslator.class) { + @Override + public I18nTranslator create() { + final I18nTranslatorPresenter presenter = new I18nTranslatorPresenter(i(Session.class), + i(I18nServiceAsync.class), i(I18nUITranslationService.class)); + final I18nTranslatorView view = new I18nTranslatorPanel(presenter, i(I18nTranslationService.class), + i(LanguageSelector.class), i(WorkspaceSkeleton.class), i(Images.class)); + presenter.init(view); + return presenter; + } + }); + + // register(ApplicationComponentGroup.class, new + // Factory<SiteOptionsI18nTranslatorAction>( + // SiteOptionsI18nTranslatorAction.class) { + // @Override + // public SiteOptionsI18nTranslatorAction create() { + // return new SiteOptionsI18nTranslatorAction(i(SiteOptions.class), + // i(I18nTranslationService.class), + // i(IconResources.class), p(I18nTranslator.class)); + // } + // }); + + // register(Singleton.class, new Factory<SignIn>(SignIn.class) { + // @Override + // public SignIn create() { + // final SignInPresenter presenter = new + // SignInPresenter(i(Session.class), i(StateManager.class), + // i(I18nUITranslationService.class), p(UserServiceAsync.class), + // p(Register.class)); + // final SignInView panel = new SignInPanel(presenter, + // i(I18nTranslationService.class), + // i(WorkspaceSkeleton.class), i(NotifyLevelImages.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + // + // register(Singleton.class, new Factory<Register>(Register.class) { + // @Override + // public Register create() { + // final RegisterPresenter presenter = new + // RegisterPresenter(i(Session.class), i(StateManager.class), + // i(I18nUITranslationService.class), p(UserServiceAsync.class), + // p(SignIn.class)); + // final RegisterView panel = new RegisterPanel(presenter, + // i(I18nTranslationService.class), + // i(WorkspaceSkeleton.class), i(Session.class), + // i(NotifyLevelImages.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + + // register(Singleton.class, new Factory<NewGroup>(NewGroup.class) { + // @Override + // public NewGroup create() { + // final NewGroupPresenter presenter = new + // NewGroupPresenter(i(I18nTranslationService.class), + // i(Session.class), i(StateManager.class), + // p(GroupServiceAsync.class)); + // final NewGroupPanel view = new NewGroupPanel(presenter, + // i(I18nTranslationService.class), + // p(LicenseWizard.class), i(NotifyLevelImages.class)); + // presenter.init(view); + // return presenter; + // } + // }); + + register(Singleton.class, new Factory<UserLiveSearcher>(UserLiveSearcher.class) { + @Override + public UserLiveSearcher create() { + final UserLiveSearcherPresenter presenter = new UserLiveSearcherPresenter(); + final EntityLiveSearcherView view = new UserLiveSearcherPanel(presenter, + i(I18nTranslationService.class), i(FileDownloadUtils.class)); + presenter.init(view); + return presenter; + } + }); + + register(Singleton.class, new Factory<GroupLiveSearcher>(GroupLiveSearcher.class) { + @Override + public GroupLiveSearcher create() { + final GroupLiveSearcherPresenter presenter = new GroupLiveSearcherPresenter(); + final EntityLiveSearcherView view = new GroupLiveSearchPanel(presenter, + i(I18nTranslationService.class), i(FileDownloadUtils.class)); + presenter.init(view); + return presenter; + } + }); + + register(Singleton.class, new Factory<ToolSelector>(ToolSelector.class) { + @Override + public ToolSelector create() { + final ToolSelectorPresenter presenter = new ToolSelectorPresenter(i(StateManager.class), + i(WsThemeManager.class)); + return presenter; + } + }); + + register(Singleton.class, new Factory<LanguageSelector>(LanguageSelector.class) { + @Override + public LanguageSelector create() { + final LanguageSelectorPresenter presenter = new LanguageSelectorPresenter(i(Session.class)); + final LanguageSelectorView view = new LanguageSelectorPanel(presenter, i(I18nTranslationService.class)); + presenter.init(view); + return presenter; + } + }); + + // Register of tokens like "signin", "newgroup", "translate" etcetera + i(StateManager.class).addSiteToken(SiteCommonTokens.SIGNIN, new HistoryTokenCallback() { + + @Override + public void onHistoryToken() { + i(SignIn.class).doSignIn(); + } + }); + + i(StateManager.class).addSiteToken(SiteCommonTokens.REGISTER, new HistoryTokenCallback() { + + @Override + public void onHistoryToken() { + i(Register.class).doRegister(); + } + }); + + i(StateManager.class).addSiteToken(SiteCommonTokens.NEWGROUP, new HistoryTokenCallback() { + + @Override + public void onHistoryToken() { + i(NewGroup.class).doNewGroup(); + } + }); + + i(StateManager.class).addSiteToken(SiteCommonTokens.TRANSLATE, new HistoryTokenCallback() { + + @Override + public void onHistoryToken() { + i(I18nTranslator.class).doShowTranslator(); + } + }); + + register(NoDecoration.class, new Factory<ActionContentToolbar>(ActionContentToolbar.class) { + @Override + public ActionContentToolbar create() { + final ActionCntCtxToolbarPanel<StateToken> tbar = new ActionCntCtxToolbarPanel<StateToken>( + AbstractFoldableContentActions.CONTENT_TOPBAR, p(ActionManager.class), + i(WorkspaceSkeleton.class)); + final ActionContentToolbar toolbar = new ActionContentToolbarPresenter(tbar); + return toolbar; + } + }); + + register(Singleton.class, new Factory<ContentEditor>(ContentEditor.class) { + @Override + public ContentEditor create() { + final ContentEditorPresenter presenter = new ContentEditorPresenter(i(I18nTranslationService.class), + i(Session.class), i(RTEImgResources.class), p(InsertLinkDialog.class), + p(ColorWebSafePalette.class), p(EditHtmlDialog.class), p(InsertImageDialog.class), + p(InsertMediaDialog.class), p(InsertTableDialog.class), p(InsertSpecialCharDialog.class), + i(SchedulerManager.class), true, i(StateManager.class), i(SiteSignOutLink.class), + i(WorkspaceSkeleton.class), i(TimerWrapper.class), i(EntityTitle.class)); + final ContentEditorPanel panel = new ContentEditorPanel(presenter, i(I18nUITranslationService.class), + i(GlobalShortcutRegister.class), i(GuiBindingsRegister.class)); + presenter.init(panel); + return presenter; + } + }); + register(NoDecoration.class, new Factory<ActionContextTopToolbar>(ActionContextTopToolbar.class) { + @Override + public ActionContextTopToolbar create() { + final ActionCntCtxToolbarPanel<StateToken> panel = new ActionCntCtxToolbarPanel<StateToken>( + AbstractFoldableContentActions.CONTEXT_TOPBAR, p(ActionManager.class), + i(WorkspaceSkeleton.class)); + final ActionContextTopToolbar toolbar = new ActionContextTopToolbar(panel); + return toolbar; + } + }); + + register(NoDecoration.class, new Factory<ActionContextBottomToolbar>(ActionContextBottomToolbar.class) { + @Override + public ActionContextBottomToolbar create() { + final ActionCntCtxToolbarPanel<StateToken> panel = new ActionCntCtxToolbarPanel<StateToken>( + AbstractFoldableContentActions.CONTEXT_BOTTOMBAR, p(ActionManager.class), + i(WorkspaceSkeleton.class)); + final ActionContextBottomToolbar toolbar = new ActionContextBottomToolbar(panel); + return toolbar; + } + }); + + register(Singleton.class, new Factory<ContextNavigator>(ContextNavigator.class) { + @Override + public ContextNavigator create() { + final ContextNavigatorPresenter presenter = new ContextNavigatorPresenter(i(StateManager.class), + i(Session.class), i(I18nTranslationService.class), i(ContentIconsRegistry.class), + i(ContentCapabilitiesRegistry.class), i(ActionContextTopToolbar.class), + i(ActionContextBottomToolbar.class), i(ContextActionRegistry.class), + p(FileDownloadUtils.class), true, i(RenameAction.class)); + final ContextNavigatorPanel panel = new ContextNavigatorPanel(presenter, + i(I18nTranslationService.class), i(WorkspaceSkeleton.class), i(ActionManager.class)); + presenter.init(panel); + return presenter; + } + }); + + register(Singleton.class, new Factory<ContextPropEditor>(ContextPropEditor.class) { + @Override + public ContextPropEditor create() { + final ContextPropEditorPresenter presenter = new ContextPropEditorPresenter(i(Session.class), + i(StateManager.class), i(ContentCapabilitiesRegistry.class), p(TagsSummary.class), + p(ContentServiceAsync.class), i(EntitySubTitle.class)); + final ContextPropEditorView view = new ContextPropEditorPanel(presenter, + i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), p(LanguageSelector.class), + i(Images.class)); + presenter.init(view); + return presenter; + } + }); + + register(InsertImageGroup.class, new Factory<InsertImageLocal>(InsertImageLocal.class) { + @Override + public InsertImageLocal create() { + final InsertImageLocalPresenter presenter = new InsertImageLocalPresenter(i(InsertImageDialog.class), + i(Session.class)); + final InsertImageLocalPanel panel = new InsertImageLocalPanel(presenter, + i(I18nTranslationService.class), i(FileDownloadUtils.class), i(Session.class)); + presenter.init(panel); + return presenter; + } + }); + + // register(ApplicationComponentGroup.class, new + // Factory<MaxMinWorkspace>(MaxMinWorkspace.class) { + // @Override + // public MaxMinWorkspace create() { + // final MaxMinWorkspacePresenter presenter = new + // MaxMinWorkspacePresenter( + // i(GlobalShortcutRegister.class), i(IconResources.class), + // i(I18nTranslationService.class), + // i(SiteOptions.class)); + // final MaxMinWorkspacePanel panel = new + // MaxMinWorkspacePanel(i(WorkspaceSkeleton.class)); + // presenter.init(panel); + // return presenter; + // } + // }); + + register(InsertLinkGroup.class, new Factory<InsertLinkLocal>(InsertLinkLocal.class) { + @Override + public InsertLinkLocal create() { + final InsertLinkLocalPresenter presenter = new InsertLinkLocalPresenter(i(InsertLinkDialog.class)); + final InsertLinkLocalPanel panel = new InsertLinkLocalPanel(presenter, i(WorkspaceSkeleton.class), + i(I18nTranslationService.class), i(FileDownloadUtils.class), i(StateTokenUtils.class)); + presenter.init(panel); + return presenter; + } + }); + + register(InsertMediaGroup.class, new Factory<InsertMediaLocal>(InsertMediaLocal.class) { + @Override + public InsertMediaLocal create() { + final InsertMediaLocalPresenter presenter = new InsertMediaLocalPresenter(i(InsertMediaDialog.class), + i(Session.class), p(MediaUtils.class)); + final InsertMediaLocalPanel panel = new InsertMediaLocalPanel(presenter, + i(I18nTranslationService.class), i(FileDownloadUtils.class)); + presenter.init(panel); + return presenter; + } + }); + i(GlobalShortcutRegister.class).enable(); + } + +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,41 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; - -public interface EntityHeader { - - void addAction(OldGuiActionDescrip descriptor); - - void addWidget(View widget); - - /** - * Refresh the logo from the group info in the client session - */ - void refreshGroupLogo(); - - /** - * Reload the logo from the group reloaded from the server - */ - void reloadGroupLogoImage(); - -} \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,44 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.IconLabel; - -import com.google.gwt.user.client.ui.AbstractImagePrototype; - -public class EntityHeaderButton extends IconLabel implements View { - public EntityHeaderButton(final AbstractImagePrototype icon, final String text) { - super(icon, text, false); - setDefStyle(); - } - - public EntityHeaderButton(final String text, final AbstractImagePrototype icon) { - super(text, icon, false); - setDefStyle(); - } - - private void setDefStyle() { - addStyleName("kune-Margin-Medium-t"); - addStyleName("kune-pointer"); - addStyleName("kune-floatright"); - } - -} \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,132 +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 org.ourproject.kune.workspace.client.entityheader; - -import java.util.Date; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsTheme; - -import cc.kune.core.client.services.FileConstants; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; - -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; - -public class EntityHeaderPanel extends HorizontalPanel implements EntityHeaderView { - - private final Provider<FileDownloadUtils> downloadProvider; - private final EntityTextLogo entityTextLogo; - private final Images images; - private final VerticalPanel vpanel; - private final ComplexToolbar toolbar; - - public EntityHeaderPanel(final WorkspaceSkeleton wskel, final Provider<FileDownloadUtils> downloadProvider, - final Images images, final GuiBindingsRegister bindings) { - super(); - super.setWidth("100%"); - this.downloadProvider = downloadProvider; - this.images = images; - vpanel = new VerticalPanel(); - vpanel.setWidth("100%"); - vpanel.setHorizontalAlignment(ALIGN_RIGHT); - entityTextLogo = new EntityTextLogo(); - add(entityTextLogo); - toolbar = new ComplexToolbar(bindings); - toolbar.setTranspStyle(); - vpanel.add(toolbar); - add(vpanel); - wskel.addToEntityMainHeader(this); - } - - public void addAction(final OldGuiActionDescrip descriptor) { - toolbar.add(descriptor); - } - - public void addWidget(final View view) { - final Widget widget = (Widget) view; - vpanel.add(widget); - } - - public void reloadImage(final GroupDTO group) { - entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(group.getStateToken()) + "&nocache=" - + new Date().getTime()); - } - - @Deprecated - public void setFullLogo(final StateToken stateToken, final boolean clipped) { - clear(); - final String imageUrl = downloadProvider.get().getImageUrl(stateToken); - Image logo; - if (clipped) { - logo = new Image(imageUrl, 0, 0, FileConstants.LOGO_DEF_WIDTH, FileConstants.LOGO_DEF_HEIGHT); - } else { - logo = new Image(imageUrl); - logo.setWidth(String.valueOf(FileConstants.LOGO_DEF_WIDTH)); - logo.setHeight(String.valueOf(FileConstants.LOGO_DEF_HEIGHT)); - } - add(logo); - } - - public void setLargeFont() { - entityTextLogo.setLargeFont(); - } - - public void setLogoImage(final StateToken stateToken) { - entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(stateToken)); - } - - public void setLogoImageVisible(final boolean visible) { - entityTextLogo.setLogoVisible(visible); - } - - public void setLogoText(final String groupName) { - entityTextLogo.setLogoText(groupName); - } - - public void setMediumFont() { - entityTextLogo.setMediumFont(); - } - - public void setSmallFont() { - entityTextLogo.setSmallFont(); - } - - public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - if (oldTheme != null) { - entityTextLogo.removeStyleDependentName(oldTheme.toString()); - } - entityTextLogo.addStyleDependentName(newTheme.toString()); - } - - public void showDefUserLogo() { - entityTextLogo.setLogoImage(images.personAvatarDef()); - } -} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,102 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.workspace.client.themes.WsTheme; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; - -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; - -import com.calclab.suco.client.events.Listener2; - -public class EntityHeaderPresenter implements EntityHeader { - private static final int MEDIUM_NAME_LIMIT = 90; - private static final int LARGE_NAME_LIMIT = 20; - - private EntityHeaderView view; - private final Session session; - - public EntityHeaderPresenter(final StateManager stateManager, final WsThemeManager theme, final Session session) { - this.session = session; - - stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(final String oldGroup, final String newGroup) { - setGroupLogo(session.getCurrentState().getGroup()); - } - }); - theme.addOnThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); - } - }); - } - - public void addAction(final OldGuiActionDescrip descriptor) { - view.addAction(descriptor); - } - - public void addWidget(final View widget) { - view.addWidget(widget); - } - - public void init(final EntityHeaderView view) { - this.view = view; - } - - public void refreshGroupLogo() { - setGroupLogo(session.getCurrentState().getGroup()); - } - - public void reloadGroupLogoImage() { - view.reloadImage(session.getCurrentState().getGroup()); - } - - void setGroupLogo(final GroupDTO group) { - if (group.hasLogo()) { - setLogoText(group.getLongName()); - view.setLogoImage(group.getStateToken()); - view.setLogoImageVisible(true); - } else { - setLogoText(group.getLongName()); - if (group.isPersonal()) { - view.showDefUserLogo(); - view.setLogoImageVisible(true); - } else { - view.setLogoImageVisible(false); - } - } - } - - void setLogoText(final String name) { - final int length = name.length(); - if (length <= LARGE_NAME_LIMIT) { - view.setLargeFont(); - } else if (length <= MEDIUM_NAME_LIMIT) { - view.setMediumFont(); - } else { - view.setSmallFont(); - } - view.setLogoText(name); - } -} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,52 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.workspace.client.themes.WsTheme; - -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; - -public interface EntityHeaderView { - - void addAction(OldGuiActionDescrip descriptor); - - void addWidget(View view); - - void reloadImage(GroupDTO group); - - void setLargeFont(); - - void setLogoImage(StateToken stateToken); - - void setLogoImageVisible(boolean visible); - - void setLogoText(final String groupName); - - void setMediumFont(); - - void setSmallFont(); - - void setTheme(final WsTheme oldTheme, WsTheme newTheme); - - void showDefUserLogo(); -} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,117 +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 org.ourproject.kune.workspace.client.entityheader; - -import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; - -public class EntityTextLogo extends VerticalPanel { - - public static final String LOGO_NAME = "k-elogop-ln"; - public static final String LOGO_IMAGE = "k-elogop-image"; - - private static final String _100 = "100%"; - private static final String LOGO_MEDIUM_FONT_STYLE = "k-elogo-l-m"; - private static final String LOGO_SMALL_FONT_STYLE = "k-elogo-l-s"; - private static final String LOGO_LARGE_FONT_STYLE = "k-elogo-l-l"; - private final Label logoLabel; - private final Image logoImage; - - public EntityTextLogo() { - // Initialize - super(); - final HorizontalPanel generalHP = new HorizontalPanel(); - final VerticalPanel logoTextVP = new VerticalPanel(); - logoImage = new Image(); - logoLabel = new Label(); - final Label expandCell = new Label(""); - - logoImage.ensureDebugId(LOGO_IMAGE); - logoLabel.ensureDebugId(LOGO_NAME); - - // Layout - add(generalHP); - generalHP.add(logoImage); - generalHP.add(logoTextVP); - logoTextVP.add(logoLabel); - - // Set properties - - expandCell.setStyleName("k-elogop-expand"); - generalHP.setWidth(_100); - generalHP.setHeight(_100); - generalHP.setCellWidth(logoTextVP, _100); - generalHP.setCellHeight(logoTextVP, _100); - logoTextVP.setWidth(_100); - logoTextVP.setCellWidth(logoLabel, _100); - super.setVerticalAlignment(ALIGN_MIDDLE); - logoTextVP.setVerticalAlignment(ALIGN_MIDDLE); - generalHP.setVerticalAlignment(ALIGN_MIDDLE); - setStylePrimaryName("k-entitytextlogo"); - addStyleName("k-entitytextlogo-no-border"); - logoImage.setVisible(false); - setLogoTextImpl(""); - } - - public void setLargeFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_LARGE_FONT_STYLE); - } - - public void setLogoImage(final AbstractImagePrototype imageProto) { - imageProto.applyTo(logoImage); - } - - public void setLogoImage(final String url) { - Image.prefetch(url); - logoImage.setUrl(url); - } - - public void setLogoText(final String text) { - setLogoTextImpl(text); - } - - public void setLogoVisible(final boolean visible) { - logoImage.setVisible(visible); - } - - public void setMediumFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_MEDIUM_FONT_STYLE); - } - - public void setSmallFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_SMALL_FONT_STYLE); - } - - private void resetFontSize() { - logoLabel.removeStyleName(LOGO_LARGE_FONT_STYLE); - logoLabel.removeStyleName(LOGO_SMALL_FONT_STYLE); - logoLabel.removeStyleName(LOGO_MEDIUM_FONT_STYLE); - } - - private void setLogoTextImpl(final String text) { - logoLabel.setText(text); - } -} \ No newline at end of file Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin) Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,54 +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 org.ourproject.kune.workspace.client.nohomepage; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; - -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateNoContentDTO; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; - -public class NoHomePagePresenter implements NoHomePage { - - private NoHomePageView view; - - public NoHomePagePresenter(final StateManager stateManager, final Provider<EntityHeader> entityLogoProvider) { - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(StateAbstractDTO state) { - if (state instanceof StateNoContentDTO) { - view.clearWs(); - entityLogoProvider.get().refreshGroupLogo(); - } - } - }); - } - - public View getView() { - return view; - } - - public void init(NoHomePageView view) { - this.view = view; - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,54 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.nohomepage; + +import org.ourproject.kune.platf.client.View; + +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateNoContentDTO; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.ioc.Provider; + +public class NoHomePagePresenter implements NoHomePage { + + private NoHomePageView view; + + public NoHomePagePresenter(final StateManager stateManager, final Provider<EntityHeader> entityLogoProvider) { + stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + public void onEvent(StateAbstractDTO state) { + if (state instanceof StateNoContentDTO) { + view.clearWs(); + entityLogoProvider.get().refreshGroupLogo(); + } + } + }); + } + + public View getView() { + return view; + } + + public void init(NoHomePageView view) { + this.view = view; + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,103 +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 org.ourproject.kune.workspace.client.oldsn.other; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.actions.OldAbstractAction; -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; -import org.ourproject.kune.platf.client.actions.PropertyChangeListener; -import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; - -import cc.kune.core.client.resources.icons.IconConstants; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; - -public class AddAsBuddieHeaderButton { - - public static class AddAsBuddieAction extends AbstractExtendedAction { - private final Provider<ChatEngine> chatEngine; - private final Session session; - - public AddAsBuddieAction(final Provider<ChatEngine> chatEngine, final Session session, - final StateManager stateManager, final I18nTranslationService i18n, final IconResources img) { - super(); - this.chatEngine = chatEngine; - this.session = session; - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }); - chatEngine.get().addOnRosterChanged(new Listener0() { - public void onEvent() { - setState(session.getCurrentState()); - } - }); - putValue(Action.NAME, i18n.t("Add as a buddie")); - putValue(Action.SMALL_ICON, IconConstants.toPath(img.addGreen())); - } - - public void actionPerformed(final ActionEvent event) { - chatEngine.get().addNewBuddie(session.getCurrentState().getGroup().getShortName()); - NotifyUser.info("Added as buddie. Waiting buddie response"); - setEnabled(false); - } - - private void setState(final StateAbstractDTO state) { - final String groupName = state.getGroup().getShortName(); - final boolean isPersonal = state.getGroup().isPersonal(); - final boolean isLogged = session.isLogged(); - if (isLogged && isPersonal && (!chatEngine.get().isBuddie(groupName)) - && (!session.getCurrentUser().getShortName().equals(groupName))) { - setEnabled(true); - } else { - setEnabled(false); - } - } - } - - public AddAsBuddieHeaderButton(final Provider<ChatEngine> chatEngine, final Session session, - final StateManager stateManager, final I18nTranslationService i18n, final IconResources img, - final EntityHeader entityHeader) { - final AddAsBuddieAction buddieAction = new AddAsBuddieAction(chatEngine, session, stateManager, i18n, img); - final ButtonDescriptor button = new ButtonDescriptor(buddieAction); - button.setVisible(false); - buddieAction.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(OldAbstractAction.ENABLED)) { - button.setVisible((Boolean) event.getNewValue()); - } - } - }); - entityHeader.addAction(button); - } -} \ No newline at end of file Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,63 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.platf.client.app.GroupOptionsCollection; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; - -import cc.kune.common.client.noti.NotifyLevelImages; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.i18n.I18nTranslationService; - -public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { - - public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; - public static final String GROUP_OPTIONS_ERROR_ID = "k-gop-err-mess"; - private final EntityHeader entityHeader; - - private final GroupOptionsCollection entityPreferencesGroup; - - public GroupOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, - final I18nTranslationService i18n, final NotifyLevelImages images, - final GroupOptionsCollection entityOptionsGroup) { - super(GROUP_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID); - this.entityHeader = entityHeader; - this.entityPreferencesGroup = entityOptionsGroup; - super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); - } - - @Override - public void addAction(final OldGuiActionDescrip descriptor) { - entityHeader.addAction(descriptor); - } - - @Override - public void createAndShow() { - createAndShowItImpl(); - } - - private void createAndShowItImpl() { - entityPreferencesGroup.createAll(); - super.createAndShow(); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,63 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.options; + +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; +import org.ourproject.kune.platf.client.app.GroupOptionsCollection; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; + +import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { + + public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; + public static final String GROUP_OPTIONS_ERROR_ID = "k-gop-err-mess"; + private final EntityHeader entityHeader; + + private final GroupOptionsCollection entityPreferencesGroup; + + public GroupOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, + final I18nTranslationService i18n, final NotifyLevelImages images, + final GroupOptionsCollection entityOptionsGroup) { + super(GROUP_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID); + this.entityHeader = entityHeader; + this.entityPreferencesGroup = entityOptionsGroup; + super.setIconCls("k-options-icon"); + super.setTitle(i18n.t(CoreMessages.GROUP_OPTIONS_DIALOG_TITLE)); + } + + @Override + public void addAction(final OldGuiActionDescrip descriptor) { + // entityHeader.addAction(descriptor); + } + + @Override + public void createAndShow() { + createAndShowItImpl(); + } + + private void createAndShowItImpl() { + entityPreferencesGroup.createAll(); + super.createAndShow(); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,55 +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 org.ourproject.kune.workspace.client.options; - -import org.ourproject.kune.platf.client.app.UserOptionsCollection; -import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; - -import cc.kune.common.client.noti.NotifyLevelImages; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.i18n.I18nTranslationService; - -public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { - - public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; - public static final String USER_OPTIONS_ERROR_ID = "k-uop-err-mess"; - - private final UserOptionsCollection userPreferencesGroup; - - public UserOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, - final I18nTranslationService i18n, final NotifyLevelImages images, - final UserOptionsCollection userOptionsGroup) { - super(USER_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, USER_OPTIONS_ERROR_ID); - this.userPreferencesGroup = userOptionsGroup; - super.setIconCls("k-options-icon"); - super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); - } - - @Override - public void createAndShow() { - createAndShowItImpl(); - } - - private void createAndShowItImpl() { - userPreferencesGroup.createAll(); - super.createAndShow(); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,55 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.options; + +import org.ourproject.kune.platf.client.app.UserOptionsCollection; +import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; + +import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + +public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { + + public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; + public static final String USER_OPTIONS_ERROR_ID = "k-uop-err-mess"; + + private final UserOptionsCollection userPreferencesGroup; + + public UserOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, + final I18nTranslationService i18n, final NotifyLevelImages images, + final UserOptionsCollection userOptionsGroup) { + super(USER_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, USER_OPTIONS_ERROR_ID); + this.userPreferencesGroup = userOptionsGroup; + super.setIconCls("k-options-icon"); + super.setTitle(i18n.t(CoreMessages.USER_OPTIONS_DIALOG_TITLE)); + } + + @Override + public void createAndShow() { + createAndShowItImpl(); + } + + private void createAndShowItImpl() { + userPreferencesGroup.createAll(); + super.createAndShow(); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,72 +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 org.ourproject.kune.workspace.client.options.logo; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.options.EntityOptions; - -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.Session; - -import com.calclab.suco.client.ioc.Provider; - -public abstract class EntityOptionsLogoPresenter implements GroupOptionsLogo, UserOptionsLogo { - - protected EntityOptionsLogoView view; - protected final Session session; - private final EntityHeader entityLogo; - private final EntityOptions entityOptions; - protected final Provider<UserServiceAsync> userService; - protected final Provider<ChatEngine> chatEngine; - - public EntityOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, - final EntityOptions entityOptions, final Provider<UserServiceAsync> userService, - final Provider<ChatEngine> chatEngine) { - this.session = session; - this.entityLogo = entityLogo; - this.entityOptions = entityOptions; - this.userService = userService; - this.chatEngine = chatEngine; - } - - public View getView() { - return view; - } - - public void init(final EntityOptionsLogoView view) { - this.view = view; - entityOptions.addTab(view); - setState(); - } - - public void onSubmitComplete(final int httpStatus, final String photoBinary) { - entityLogo.reloadGroupLogoImage(); - } - - public void onSubmitFailed(final int httpStatus, final String responseText) { - NotifyUser.error("Error setting the logo: " + responseText); - } - - protected abstract void setState(); - -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,72 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.options.logo; + +import org.ourproject.kune.chat.client.ChatEngine; +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import org.ourproject.kune.workspace.client.options.EntityOptions; + +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.ws.entheader.EntityHeader; + +import com.calclab.suco.client.ioc.Provider; + +public abstract class EntityOptionsLogoPresenter implements GroupOptionsLogo, UserOptionsLogo { + + protected EntityOptionsLogoView view; + protected final Session session; + private final EntityHeader entityLogo; + private final EntityOptions entityOptions; + protected final Provider<UserServiceAsync> userService; + protected final Provider<ChatEngine> chatEngine; + + public EntityOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, + final EntityOptions entityOptions, final Provider<UserServiceAsync> userService, + final Provider<ChatEngine> chatEngine) { + this.session = session; + this.entityLogo = entityLogo; + this.entityOptions = entityOptions; + this.userService = userService; + this.chatEngine = chatEngine; + } + + public View getView() { + return view; + } + + public void init(final EntityOptionsLogoView view) { + this.view = view; + entityOptions.addTab(view); + setState(); + } + + public void onSubmitComplete(final int httpStatus, final String photoBinary) { + entityLogo.reloadGroupLogoImage(); + } + + public void onSubmitFailed(final int httpStatus, final String responseText) { + NotifyUser.error("Error setting the logo: " + responseText); + } + + protected abstract void setState(); + +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,56 +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 org.ourproject.kune.workspace.client.options.logo; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.options.EntityOptions; - -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.events.Listener2; -import com.calclab.suco.client.ioc.Provider; - -public class GroupOptionsLogoPresenter extends EntityOptionsLogoPresenter { - - public GroupOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, - final EntityOptions entityOptions, final StateManager stateManager, - final Provider<UserServiceAsync> userService, final Provider<ChatEngine> chatEngine) { - super(session, entityLogo, entityOptions, userService, chatEngine); - stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(final String group1, final String group2) { - setState(); - } - }); - } - - @Override - public void init(final EntityOptionsLogoView view) { - super.init(view); - view.setNormalGroupsLabels(); - } - - @Override - protected void setState() { - view.setUploadParams(session.getUserHash(), session.getCurrentStateToken().toString()); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,56 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.options.logo; + +import org.ourproject.kune.chat.client.ChatEngine; +import org.ourproject.kune.workspace.client.options.EntityOptions; + +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; + +import com.calclab.suco.client.events.Listener2; +import com.calclab.suco.client.ioc.Provider; + +public class GroupOptionsLogoPresenter extends EntityOptionsLogoPresenter { + + public GroupOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, + final EntityOptions entityOptions, final StateManager stateManager, + final Provider<UserServiceAsync> userService, final Provider<ChatEngine> chatEngine) { + super(session, entityLogo, entityOptions, userService, chatEngine); + stateManager.onGroupChanged(new Listener2<String, String>() { + public void onEvent(final String group1, final String group2) { + setState(); + } + }); + } + + @Override + public void init(final EntityOptionsLogoView view) { + super.init(view); + view.setNormalGroupsLabels(); + } + + @Override + protected void setState() { + view.setUploadParams(session.getUserHash(), session.getCurrentStateToken().toString()); + } +} Deleted: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,73 +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 org.ourproject.kune.workspace.client.options.logo; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.options.EntityOptions; - -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.UserInfoDTO; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; - -public class UserOptionsLogoPresenter extends EntityOptionsLogoPresenter { - - public UserOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, - final EntityOptions entityOptions, final StateManager stateManager, - final Provider<UserServiceAsync> userService, final Provider<ChatEngine> chatEngine) { - super(session, entityLogo, entityOptions, userService, chatEngine); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { - setState(); - } - }); - } - - @Override - public void init(final EntityOptionsLogoView view) { - super.init(view); - view.setPersonalGroupsLabels(); - } - - @Override - public void onSubmitComplete(final int httpStatus, final String photoBinary) { - super.onSubmitComplete(httpStatus, photoBinary); - final GroupDTO group = session.getCurrentState().getGroup(); - if (session.getCurrentUser().getShortName().equals(group.getShortName())) { - userService.get().getUserAvatarBaser64(session.getUserHash(), group.getStateToken(), - new AsyncCallbackSimple<String>() { - public void onSuccess(final String photoBinary) { - chatEngine.get().setAvatar(photoBinary); - } - }); - } - } - - @Override - protected void setState() { - view.setUploadParams(session.getUserHash(), session.getCurrentUser().getStateToken().toString()); - } -} Copied: branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java (from rev 1248, trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java) =================================================================== --- branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java (rev 0) +++ branches/wave-jetty-embed-guice/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,73 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.options.logo; + +import org.ourproject.kune.chat.client.ChatEngine; +import org.ourproject.kune.workspace.client.options.EntityOptions; + +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.ioc.Provider; + +public class UserOptionsLogoPresenter extends EntityOptionsLogoPresenter { + + public UserOptionsLogoPresenter(final Session session, final EntityHeader entityLogo, + final EntityOptions entityOptions, final StateManager stateManager, + final Provider<UserServiceAsync> userService, final Provider<ChatEngine> chatEngine) { + super(session, entityLogo, entityOptions, userService, chatEngine); + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO parameter) { + setState(); + } + }); + } + + @Override + public void init(final EntityOptionsLogoView view) { + super.init(view); + view.setPersonalGroupsLabels(); + } + + @Override + public void onSubmitComplete(final int httpStatus, final String photoBinary) { + super.onSubmitComplete(httpStatus, photoBinary); + final GroupDTO group = session.getCurrentState().getGroup(); + if (session.getCurrentUser().getShortName().equals(group.getShortName())) { + userService.get().getUserAvatarBaser64(session.getUserHash(), group.getStateToken(), + new AsyncCallbackSimple<String>() { + public void onSuccess(final String photoBinary) { + chatEngine.get().setAvatar(photoBinary); + } + }); + } + } + + @Override + protected void setState() { + view.setUploadParams(session.getUserHash(), session.getCurrentUser().getStateToken().toString()); + } +} Copied: branches/wave-jetty-embed-guice/src/test/java/cc/kune/core/client/ws (from rev 1248, trunk/src/test/java/cc/kune/core/client/ws) Deleted: branches/wave-jetty-embed-guice/src/test/java/testsuites/OthersTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/OthersTestSuite.java 2011-02-11 18:17:57 UTC (rev 1247) +++ branches/wave-jetty-embed-guice/src/test/java/testsuites/OthersTestSuite.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -1,57 +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 testsuites; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.ourproject.kune.blogs.server.BlogServerToolTest; -import org.ourproject.kune.chat.ChatToolTest; -import org.ourproject.kune.chat.server.managers.XmppManagerTest; -import org.ourproject.kune.docs.DocumentToolTest; -import org.ourproject.kune.docs.server.DocumentServerToolTest; -import org.ourproject.kune.gallery.server.GalleryServerToolTest; -import org.ourproject.kune.rack.filters.rest.TestRESTMethodFinder; -import org.ourproject.kune.rack.filters.rest.TestRESTServiceDefinition; -import org.ourproject.kune.wiki.server.WikiServerToolTest; -import org.ourproject.kune.workspace.client.entityheader.EntityLogoPresenterTest; -import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenterTest; -import org.ourproject.kune.workspace.client.socialnet.RolActionTest; -import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest; -import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenterTest; -import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenterTest; - -/** - * Rescan with : - * - * <pre> - * find src/test/java/org/ourproject/kune/{chat,docs,gallery,wiki,workspace,blogs,rack} -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g' - * - * </pre> - * - */ -(a)RunWith(Suite.class) -@SuiteClasses({ ChatToolTest.class, XmppManagerTest.class, DocumentToolTest.class, DocumentServerToolTest.class, - GalleryServerToolTest.class, WikiServerToolTest.class, EntityLogoPresenterTest.class, - ToolSelectorPresenterTest.class, TagsSummaryPresenterTest.class, RolActionTest.class, RolComparatorTest.class, - LicenseWizardPresenterTest.class, BlogServerToolTest.class, TestRESTServiceDefinition.class, - TestRESTMethodFinder.class }) -public class OthersTestSuite { -} Copied: branches/wave-jetty-embed-guice/src/test/java/testsuites/OthersTestSuite.java (from rev 1248, trunk/src/test/java/testsuites/OthersTestSuite.java) =================================================================== --- branches/wave-jetty-embed-guice/src/test/java/testsuites/OthersTestSuite.java (rev 0) +++ branches/wave-jetty-embed-guice/src/test/java/testsuites/OthersTestSuite.java 2011-02-12 02:18:52 UTC (rev 1249) @@ -0,0 +1,58 @@ +/* + * + * 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 testsuites; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.ourproject.kune.blogs.server.BlogServerToolTest; +import org.ourproject.kune.chat.ChatToolTest; +import org.ourproject.kune.chat.server.managers.XmppManagerTest; +import org.ourproject.kune.docs.DocumentToolTest; +import org.ourproject.kune.docs.server.DocumentServerToolTest; +import org.ourproject.kune.gallery.server.GalleryServerToolTest; +import org.ourproject.kune.rack.filters.rest.TestRESTMethodFinder; +import org.ourproject.kune.rack.filters.rest.TestRESTServiceDefinition; +import org.ourproject.kune.wiki.server.WikiServerToolTest; +import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenterTest; +import org.ourproject.kune.workspace.client.socialnet.RolActionTest; +import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest; +import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenterTest; +import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenterTest; + +import cc.kune.core.client.ws.entheader.EntityLogoPresenterTest; + +/** + * Rescan with : + * + * <pre> + * find src/test/java/org/ourproject/kune/{chat,docs,gallery,wiki,workspace,blogs,rack} -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g' + * + * </pre> + * + */ +(a)RunWith(Suite.class) +@SuiteClasses({ ChatToolTest.class, XmppManagerTest.class, DocumentToolTest.class, DocumentServerToolTest.class, + GalleryServerToolTest.class, WikiServerToolTest.class, EntityLogoPresenterTest.class, + ToolSelectorPresenterTest.class, TagsSummaryPresenterTest.class, RolActionTest.class, RolComparatorTest.class, + LicenseWizardPresenterTest.class, BlogServerToolTest.class, TestRESTServiceDefinition.class, + TestRESTMethodFinder.class }) +public class OthersTestSuite { +}

1 0

r1248 - in trunk/src: main/java/cc/kune/chat/client main/java/cc/kune/client main/java/cc/kune/common main/java/cc/kune/core/client main/java/cc/kune/core/client/ws main/java/cc/kune/core/client/ws/entheader main/java/cc/kune/core/public main/java/org/ourproject/kune/app/public/css main/java/org/ourproject/kune/blogs/client main/java/org/ourproject/kune/docs/client main/java/org/ourproject/kune/gallery/client main/java/org/ourproject/kune/wiki/client main/java/org/ourproject/kune/workspace/cl
by Vicente J. Ruiz Jurado 11 Feb '11

11 Feb '11

Author: vjrj_ Date: 2011-02-12 00:06:04 +0100 (Sat, 12 Feb 2011) New Revision: 1248 Added: trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/core/client/ws/entheader/ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePresenter.java trunk/src/test/java/cc/kune/core/client/ws/ trunk/src/test/java/cc/kune/core/client/ws/entheader/ Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/ Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspace.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspaceView.java trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java trunk/src/test/java/cc/kune/core/client/ws/entheader/EntityLogoPresenterTest.java trunk/src/test/java/testsuites/OthersTestSuite.java Log: Entity header updated Copied: trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java (from rev 1244, trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java) =================================================================== --- trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -0,0 +1,117 @@ +/* + * + * 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.chat.client; + +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.PropertyChangeEvent; +import cc.kune.common.client.actions.PropertyChangeListener; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.im.client.roster.XmppRoster; +import com.calclab.emite.im.client.roster.events.RosterGroupChangedEvent; +import com.calclab.emite.im.client.roster.events.RosterGroupChangedHandler; +import com.calclab.suco.client.Suco; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class AddAsBuddieHeaderButton { + + public static class AddAsBuddieAction extends AbstractExtendedAction { + private final Provider<ChatClientDefault> chatEngine; + private final Session session; + + @Inject + public AddAsBuddieAction(final Provider<ChatClientDefault> chatEngine, final Session session, + final StateManager stateManager, final I18nTranslationService i18n, final IconResources img) { + super(); + this.chatEngine = chatEngine; + this.session = session; + stateManager.onStateChanged(new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); + } + }); + Suco.get(XmppRoster.class).addRosterGroupChangedHandler(new RosterGroupChangedHandler() { + + @Override + public void onGroupChanged(final RosterGroupChangedEvent event) { + setState(session.getCurrentState()); + } + }); + putValue(Action.NAME, i18n.t("Add as a buddie")); + putValue(Action.SMALL_ICON, IconConstants.toPath(img.addGreen())); + } + + @Override + public void actionPerformed(final ActionEvent event) { + chatEngine.get().addNewBuddie(session.getCurrentState().getGroup().getShortName()); + NotifyUser.info("Added as buddie. Waiting buddie response"); + setEnabled(false); + } + + private boolean currentGroupsIsAsPerson(final StateAbstractDTO state) { + return state.getGroup().isPersonal(); + } + + private boolean isNotMe(final String groupName) { + return !session.getCurrentUser().getShortName().equals(groupName); + } + + private void setState(final StateAbstractDTO state) { + final String groupName = state.getGroup().getShortName(); + final boolean imLogged = session.isLogged(); + final boolean isNotBuddie = !chatEngine.get().isBuddie(groupName); + if (imLogged && currentGroupsIsAsPerson(state) && isNotBuddie && isNotMe(groupName)) { + setEnabled(true); + } else { + setEnabled(false); + } + } + } + + @Inject + public AddAsBuddieHeaderButton(final AddAsBuddieAction buddieAction, final EntityHeader entityHeader) { + final ButtonDescriptor button = new ButtonDescriptor(buddieAction); + button.setVisible(false); + buddieAction.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(AbstractAction.ENABLED)) { + button.setVisible((Boolean) event.getNewValue()); + } + } + }); + entityHeader.addAction(button); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/chat/client/AddAsBuddieHeaderButton.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -32,5 +32,6 @@ protected void configure() { bind(ChatClient.class).to(ChatClientDefault.class).in(Singleton.class); bind(ChatOptions.class).in(Singleton.class); + bind(AddAsBuddieHeaderButton.class).in(Singleton.class); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -44,6 +44,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.pspace.client.PSpaceGinModule; import cc.kune.pspace.client.PSpacePresenter; @@ -71,6 +72,8 @@ Provider<CorePresenter> getCorePresenter(); + AsyncProvider<EntityHeaderPresenter> getEntityHeaderPresenter(); + AsyncProvider<EntityLicensePresenter> getEntityLicensePresenter(); ErrorHandler getErrorHandler(); Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-02-11 23:06:04 UTC (rev 1248) @@ -10,9 +10,11 @@    - +   - <source path='client' /> + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> <public path="public" /> <inherits name='org.cobogw.gwt.user.User' /> <inherits name='com.google.gwt.inject.Inject' /> Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -88,6 +88,9 @@ import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreViewImpl; +import cc.kune.core.client.ws.entheader.EntityHeader; +import cc.kune.core.client.ws.entheader.EntityHeaderPanel; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; import cc.kune.gspace.client.WsArmorImpl; @@ -139,6 +142,8 @@ GroupMembersPanel.class, GroupMembersPresenter.GroupMembersProxy.class); bindPresenter(EntityLicensePresenter.class, EntityLicensePresenter.EntityLicenseView.class, EntityLicensePanel.class, EntityLicensePresenter.EntityLicenseProxy.class); + bindPresenter(EntityHeaderPresenter.class, EntityHeaderPresenter.EntityHeaderView.class, + EntityHeaderPanel.class, EntityHeaderPresenter.EntityHeaderProxy.class); bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); bindPresenter(SignInPresenter.class, SignInView.class, SignInPanel.class, SignInPresenter.SignInProxy.class); @@ -147,6 +152,7 @@ bind(SignIn.class).to(SignInPresenter.class).in(Singleton.class); bind(Register.class).to(RegisterPresenter.class).in(Singleton.class); bind(NewGroup.class).to(NewGroupPresenter.class).in(Singleton.class); + bind(EntityHeader.class).to(EntityHeaderPresenter.class).in(Singleton.class); bind(UserMessagesPresenter.class).in(Singleton.class); bind(UserMessagesPanel.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,5 +1,6 @@ package cc.kune.core.client; +import cc.kune.chat.client.AddAsBuddieHeaderButton; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; @@ -14,13 +15,15 @@ @Inject public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter, - final Provider<SiteUserOptionsPresenter> userOptions, final Provider<EntityLicensePresenter> licenseFooter) { + final Provider<SiteUserOptionsPresenter> userOptions, final Provider<EntityLicensePresenter> licenseFooter, + final Provider<AddAsBuddieHeaderButton> buddieButton) { session.onInitDataReceived(new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { grouMembersPresenter.get(); userOptions.get(); licenseFooter.get(); + buddieButton.get(); } }); } Copied: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java (from rev 1244, trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -0,0 +1,42 @@ +/* + * + * 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.core.client.ws.entheader; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; + +import com.google.gwt.user.client.ui.IsWidget; + +public interface EntityHeader { + + void addAction(GuiActionDescrip descriptor); + + void addWidget(IsWidget widget); + + /** + * Refresh the logo from the group info in the client session + */ + void refreshGroupLogo(); + + /** + * Reload the logo from the group reloaded from the server + */ + void reloadGroupLogoImage(); + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeader.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java (from rev 1244, trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -0,0 +1,152 @@ +/* + * + * 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.core.client.ws.entheader; + +import java.util.Date; + +import cc.kune.common.client.actions.ui.ActionFlowPanel; +import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter.EntityHeaderView; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.gspace.client.WsArmor; + +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.gwtplatform.mvp.client.ViewImpl; + +public class EntityHeaderPanel extends ViewImpl implements EntityHeaderView { + + private final Provider<FileDownloadUtils> downloadProvider; + private final EntityTextLogo entityTextLogo; + private final CoreResources images; + private final HorizontalPanel mainPanel; + private final ActionFlowPanel toolbar; + private final VerticalPanel vpanel; + + @Inject + public EntityHeaderPanel(final Provider<FileDownloadUtils> downloadProvider, final CoreResources images, + final GuiProvider bindings, final WsArmor armor) { + mainPanel = new HorizontalPanel(); + mainPanel.setWidth("100%"); + this.downloadProvider = downloadProvider; + this.images = images; + vpanel = new VerticalPanel(); + vpanel.setWidth("100%"); + vpanel.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT); + entityTextLogo = new EntityTextLogo(); + mainPanel.add(entityTextLogo); + toolbar = new ActionFlowPanel(bindings); + vpanel.add(toolbar); + mainPanel.add(vpanel); + armor.getEntityHeader().add(mainPanel); + } + + @Override + public void addAction(final GuiActionDescrip descriptor) { + toolbar.add(descriptor); + } + + @Override + public void addWidget(final IsWidget view) { + final Widget widget = (Widget) view; + vpanel.add(widget); + } + + @Override + public Widget asWidget() { + return mainPanel; + } + + @Override + public void reloadImage(final GroupDTO group) { + entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(group.getStateToken()) + "&nocache=" + + new Date().getTime()); + } + + @Deprecated + public void setFullLogo(final StateToken stateToken, final boolean clipped) { + mainPanel.clear(); + final String imageUrl = downloadProvider.get().getImageUrl(stateToken); + Image logo; + if (clipped) { + logo = new Image(imageUrl, 0, 0, FileConstants.LOGO_DEF_WIDTH, FileConstants.LOGO_DEF_HEIGHT); + } else { + logo = new Image(imageUrl); + logo.setWidth(String.valueOf(FileConstants.LOGO_DEF_WIDTH)); + logo.setHeight(String.valueOf(FileConstants.LOGO_DEF_HEIGHT)); + } + mainPanel.add(logo); + } + + @Override + public void setLargeFont() { + entityTextLogo.setLargeFont(); + } + + @Override + public void setLogoImage(final StateToken stateToken) { + entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(stateToken)); + } + + @Override + public void setLogoImageVisible(final boolean visible) { + entityTextLogo.setLogoVisible(visible); + } + + @Override + public void setLogoText(final String groupName) { + entityTextLogo.setLogoText(groupName); + } + + @Override + public void setMediumFont() { + entityTextLogo.setMediumFont(); + } + + // + // @Override + // public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { + // if (oldTheme != null) { + // entityTextLogo.removeStyleDependentName(oldTheme.toString()); + // } + // entityTextLogo.addStyleDependentName(newTheme.toString()); + // } + + @Override + public void setSmallFont() { + entityTextLogo.setSmallFont(); + } + + @Override + public void showDefUserLogo() { + entityTextLogo.setLogoImage(AbstractImagePrototype.create(images.personAvatarDef())); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPanel.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java (from rev 1244, trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -0,0 +1,146 @@ +/* + * + * 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.core.client.ws.entheader; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.state.GroupChangedEvent; +import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.proxy.Proxy; +import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; + +public class EntityHeaderPresenter extends + Presenter<EntityHeaderPresenter.EntityHeaderView, EntityHeaderPresenter.EntityHeaderProxy> implements + EntityHeader { + + @ProxyCodeSplit + public interface EntityHeaderProxy extends Proxy<EntityHeaderPresenter> { + } + public interface EntityHeaderView extends View { + void addAction(GuiActionDescrip descriptor); + + void addWidget(IsWidget widget); + + void reloadImage(GroupDTO group); + + void setLargeFont(); + + void setLogoImage(StateToken stateToken); + + void setLogoImageVisible(boolean visible); + + void setLogoText(final String groupName); + + void setMediumFont(); + + void setSmallFont(); + + // void setTheme(final WsTheme oldTheme, WsTheme newTheme); + + void showDefUserLogo(); + } + + private static final int LARGE_NAME_LIMIT = 20; + + private static final int MEDIUM_NAME_LIMIT = 90; + private final Session session; + + @Inject + public EntityHeaderPresenter(final EventBus eventBus, final EntityHeaderView view, final EntityHeaderProxy proxy, + final StateManager stateManager, final Session session) { + super(eventBus, view, proxy); + this.session = session; + stateManager.onGroupChanged(new GroupChangedHandler() { + @Override + public void onGroupChanged(final GroupChangedEvent event) { + setGroupLogo(session.getCurrentState().getGroup()); + } + }); + // theme.addOnThemeChanged(new Listener2<WsTheme, WsTheme>() { + // @Override + // public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + // // getView().setTheme(oldTheme, newTheme); + // } + // }); + } + + @Override + public void addAction(final GuiActionDescrip descriptor) { + getView().addAction(descriptor); + } + + @Override + public void addWidget(final IsWidget widget) { + getView().addWidget(widget); + } + + @Override + public void refreshGroupLogo() { + setGroupLogo(session.getCurrentState().getGroup()); + } + + @Override + public void reloadGroupLogoImage() { + getView().reloadImage(session.getCurrentState().getGroup()); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + void setGroupLogo(final GroupDTO group) { + if (group.hasLogo()) { + setLogoText(group.getLongName()); + getView().setLogoImage(group.getStateToken()); + getView().setLogoImageVisible(true); + } else { + setLogoText(group.getLongName()); + if (group.isPersonal()) { + getView().showDefUserLogo(); + getView().setLogoImageVisible(true); + } else { + getView().setLogoImageVisible(false); + } + } + } + + void setLogoText(final String name) { + final int length = name.length(); + if (length <= LARGE_NAME_LIMIT) { + getView().setLargeFont(); + } else if (length <= MEDIUM_NAME_LIMIT) { + getView().setMediumFont(); + } else { + getView().setSmallFont(); + } + getView().setLogoText(name); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java (from rev 1244, trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -0,0 +1,117 @@ +/* + * + * 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.core.client.ws.entheader; + +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; + +public class EntityTextLogo extends VerticalPanel { + + public static final String LOGO_NAME = "k-elogop-ln"; + public static final String LOGO_IMAGE = "k-elogop-image"; + + private static final String _100 = "100%"; + private static final String LOGO_MEDIUM_FONT_STYLE = "k-elogo-l-m"; + private static final String LOGO_SMALL_FONT_STYLE = "k-elogo-l-s"; + private static final String LOGO_LARGE_FONT_STYLE = "k-elogo-l-l"; + private final Label logoLabel; + private final Image logoImage; + + public EntityTextLogo() { + // Initialize + super(); + final HorizontalPanel generalHP = new HorizontalPanel(); + final VerticalPanel logoTextVP = new VerticalPanel(); + logoImage = new Image(); + logoLabel = new Label(); + final Label expandCell = new Label(""); + + logoImage.ensureDebugId(LOGO_IMAGE); + logoLabel.ensureDebugId(LOGO_NAME); + + // Layout + add(generalHP); + generalHP.add(logoImage); + generalHP.add(logoTextVP); + logoTextVP.add(logoLabel); + + // Set properties + + expandCell.setStyleName("k-elogop-expand"); + generalHP.setWidth(_100); + generalHP.setHeight(_100); + generalHP.setCellWidth(logoTextVP, _100); + generalHP.setCellHeight(logoTextVP, _100); + logoTextVP.setWidth(_100); + logoTextVP.setCellWidth(logoLabel, _100); + super.setVerticalAlignment(ALIGN_MIDDLE); + logoTextVP.setVerticalAlignment(ALIGN_MIDDLE); + generalHP.setVerticalAlignment(ALIGN_MIDDLE); + setStylePrimaryName("k-entitytextlogo"); + addStyleName("k-entitytextlogo-no-border"); + logoImage.setVisible(false); + setLogoTextImpl(""); + } + + public void setLargeFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_LARGE_FONT_STYLE); + } + + public void setLogoImage(final AbstractImagePrototype imageProto) { + imageProto.applyTo(logoImage); + } + + public void setLogoImage(final String url) { + Image.prefetch(url); + logoImage.setUrl(url); + } + + public void setLogoText(final String text) { + setLogoTextImpl(text); + } + + public void setLogoVisible(final boolean visible) { + logoImage.setVisible(visible); + } + + public void setMediumFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_MEDIUM_FONT_STYLE); + } + + public void setSmallFont() { + resetFontSize(); + logoLabel.addStyleName(LOGO_SMALL_FONT_STYLE); + } + + private void resetFontSize() { + logoLabel.removeStyleName(LOGO_LARGE_FONT_STYLE); + logoLabel.removeStyleName(LOGO_SMALL_FONT_STYLE); + logoLabel.removeStyleName(LOGO_MEDIUM_FONT_STYLE); + } + + private void setLogoTextImpl(final String text) { + logoLabel.setText(text); + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 23:06:04 UTC (rev 1248) @@ -923,6 +923,7 @@ font-size: 16px; color: #784421; } + .k-footer-license-label-title { margin-right: 5px; color: #280b0b; @@ -932,4 +933,79 @@ float: right; margin: 10px 15px 0px 5px; cursor: pointer; -} \ No newline at end of file +} + + +.k-entitytextlogo-border { + border: 2px solid #F2F2F2; +} + +.k-entitytextlogo-no-border { + border: none; +} + +.k-entitytextlogo { + height: 60px; + margin: 5px; + overflow: hidden; + width: 468px; +} + +.k-entitytextlogo table { + vertical-align: middle; +} + +.k-elogo-l-l { + font-size: 46px; +} + +.k-elogo-l-m { + font-size: 167%; +} + +.k-elogo-l-s { + font-size: 108%; +} + +.k-entitytextlogo .gwt-Label { + font-weight: 700; + margin: 5px; + height: 27px; +} + +.k-entitytextlogo-default .gwt-Label { + color: #69312F; +} + +.k-entitytextlogo-green .gwt-Label { + color: #250; +} + +.k-entitytextlogo-blue .gwt-Label { + color: #000080; +} + +.k-entitytextlogo-grey .gwt-Label { + color: #1A1A1A; +} + +.k-entitytextlogo-purple .gwt-Label { + color: #440055; +} + +.k-entitytextlogo-red .gwt-Label { + color: #800000; +} + +.k-elogo-plink { + color: #CCC; + font-size: 85%; + margin: 5px; + text-decoration: underline; + white-space: nowrap; + background-color: #FFF; +} + +.k-elogop-expand { + background-color: transparent; +} Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2011-02-11 23:06:04 UTC (rev 1248) @@ -69,80 +69,6 @@ border-bottom-width: 5px; } -.k-entitytextlogo-border { - border: 2px solid #F2F2F2; -} - -.k-entitytextlogo-no-border { - border: none; -} - -.k-entitytextlogo { - height: 60px; - margin: 0 0 4px 0; - overflow: hidden; - width: 468px; -} - -.k-entitytextlogo table { - vertical-align: middle; -} - -.k-elogo-l-l { - font-size: 272%; -} - -.k-elogo-l-m { - font-size: 167%; -} - -.k-elogo-l-s { - font-size: 108%; -} - -.k-entitytextlogo .gwt-Label { - font-weight: 700; - margin: 5px; - height: 27px; -} - -.k-entitytextlogo-default .gwt-Label { - color: #69312F; -} - -.k-entitytextlogo-green .gwt-Label { - color: #250; -} - -.k-entitytextlogo-blue .gwt-Label { - color: #000080; -} - -.k-entitytextlogo-grey .gwt-Label { - color: #1A1A1A; -} - -.k-entitytextlogo-purple .gwt-Label { - color: #440055; -} - -.k-entitytextlogo-red .gwt-Label { - color: #800000; -} - -.k-elogo-plink { - color: #CCC; - font-size: 85%; - margin: 5px; - text-decoration: underline; - white-space: nowrap; - background-color: #FFF; -} - -.k-elogop-expand { - background-color: transparent; -} - .k-entity-default .x-layout-split,.k-entity-default .x-layout-collapsed { background: #DD8A3D none repeat scroll 0% 50%; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -31,7 +31,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -44,6 +43,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -39,7 +39,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsBackManager; @@ -55,6 +54,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.decorator.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -31,7 +31,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -44,6 +43,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -39,7 +39,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsBackManager; @@ -55,6 +54,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.decorator.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -30,7 +30,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -43,6 +42,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -39,7 +39,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsBackManager; @@ -55,6 +54,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.decorator.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -31,7 +31,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -44,6 +43,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -39,7 +39,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsBackManager; @@ -55,6 +54,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.decorator.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -38,7 +38,6 @@ import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -53,6 +52,7 @@ import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -71,9 +71,6 @@ import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocal; import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPanel; import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPresenter; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter; import org.ourproject.kune.workspace.client.i18n.I18nTranslator; import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPanel; import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPresenter; @@ -97,7 +94,6 @@ import org.ourproject.kune.workspace.client.nohomepage.NoHomePage; import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePanel; import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePresenter; -import org.ourproject.kune.workspace.client.oldsn.other.AddAsBuddieHeaderButton; import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbar; import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbarPresenter; import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbar; @@ -212,6 +208,7 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteCommonTokens; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateTokenUtils; import cc.kune.core.shared.dto.UserSimpleDTO; @@ -384,17 +381,21 @@ } }); - register(ApplicationComponentGroup.class, new Factory<EntityHeader>(EntityHeader.class) { - @Override - public EntityHeader create() { - final EntityHeaderPresenter presenter = new EntityHeaderPresenter(i(StateManager.class), - i(WsThemeManager.class), i(Session.class)); - final EntityHeaderPanel panel = new EntityHeaderPanel(i(WorkspaceSkeleton.class), - p(FileDownloadUtils.class), i(Images.class), i(GuiBindingsRegister.class)); - presenter.init(panel); - return presenter; - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<EntityHeader>(EntityHeader.class) { + // @Override + // public EntityHeader create() { + // final EntityHeaderPresenter presenter = new + // EntityHeaderPresenter(i(StateManager.class), + // i(WsThemeManager.class), i(Session.class)); + // final EntityHeaderPanel panel = new + // EntityHeaderPanel(i(WorkspaceSkeleton.class), + // p(FileDownloadUtils.class), i(Images.class), + // i(GuiBindingsRegister.class)); + // presenter.init(panel); + // return presenter; + // } + // }); register(Singleton.class, new Factory<WsBackManager>(WsBackManager.class) { @Override @@ -540,13 +541,16 @@ // } // }); - register(ApplicationComponentGroup.class, new Factory<AddAsBuddieHeaderButton>(AddAsBuddieHeaderButton.class) { - @Override - public AddAsBuddieHeaderButton create() { - return new AddAsBuddieHeaderButton(p(ChatEngine.class), i(Session.class), i(StateManager.class), - i(I18nTranslationService.class), i(IconResources.class), i(EntityHeader.class)); - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<AddAsBuddieHeaderButton>(AddAsBuddieHeaderButton.class) { + // @Override + // public AddAsBuddieHeaderButton create() { + // return new AddAsBuddieHeaderButton(p(ChatEngine.class), + // i(Session.class), i(StateManager.class), + // i(I18nTranslationService.class), i(IconResources.class), + // i(EntityHeader.class)); + // } + // }); // register(ApplicationComponentGroup.class, new // Factory<BuddiesSummary>(BuddiesSummary.class) { Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,41 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; - -public interface EntityHeader { - - void addAction(OldGuiActionDescrip descriptor); - - void addWidget(View widget); - - /** - * Refresh the logo from the group info in the client session - */ - void refreshGroupLogo(); - - /** - * Reload the logo from the group reloaded from the server - */ - void reloadGroupLogoImage(); - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,44 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.IconLabel; - -import com.google.gwt.user.client.ui.AbstractImagePrototype; - -public class EntityHeaderButton extends IconLabel implements View { - public EntityHeaderButton(final AbstractImagePrototype icon, final String text) { - super(icon, text, false); - setDefStyle(); - } - - public EntityHeaderButton(final String text, final AbstractImagePrototype icon) { - super(text, icon, false); - setDefStyle(); - } - - private void setDefStyle() { - addStyleName("kune-Margin-Medium-t"); - addStyleName("kune-pointer"); - addStyleName("kune-floatright"); - } - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,132 +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 org.ourproject.kune.workspace.client.entityheader; - -import java.util.Date; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsTheme; - -import cc.kune.core.client.services.FileConstants; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; - -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; - -public class EntityHeaderPanel extends HorizontalPanel implements EntityHeaderView { - - private final Provider<FileDownloadUtils> downloadProvider; - private final EntityTextLogo entityTextLogo; - private final Images images; - private final VerticalPanel vpanel; - private final ComplexToolbar toolbar; - - public EntityHeaderPanel(final WorkspaceSkeleton wskel, final Provider<FileDownloadUtils> downloadProvider, - final Images images, final GuiBindingsRegister bindings) { - super(); - super.setWidth("100%"); - this.downloadProvider = downloadProvider; - this.images = images; - vpanel = new VerticalPanel(); - vpanel.setWidth("100%"); - vpanel.setHorizontalAlignment(ALIGN_RIGHT); - entityTextLogo = new EntityTextLogo(); - add(entityTextLogo); - toolbar = new ComplexToolbar(bindings); - toolbar.setTranspStyle(); - vpanel.add(toolbar); - add(vpanel); - wskel.addToEntityMainHeader(this); - } - - public void addAction(final OldGuiActionDescrip descriptor) { - toolbar.add(descriptor); - } - - public void addWidget(final View view) { - final Widget widget = (Widget) view; - vpanel.add(widget); - } - - public void reloadImage(final GroupDTO group) { - entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(group.getStateToken()) + "&nocache=" - + new Date().getTime()); - } - - @Deprecated - public void setFullLogo(final StateToken stateToken, final boolean clipped) { - clear(); - final String imageUrl = downloadProvider.get().getImageUrl(stateToken); - Image logo; - if (clipped) { - logo = new Image(imageUrl, 0, 0, FileConstants.LOGO_DEF_WIDTH, FileConstants.LOGO_DEF_HEIGHT); - } else { - logo = new Image(imageUrl); - logo.setWidth(String.valueOf(FileConstants.LOGO_DEF_WIDTH)); - logo.setHeight(String.valueOf(FileConstants.LOGO_DEF_HEIGHT)); - } - add(logo); - } - - public void setLargeFont() { - entityTextLogo.setLargeFont(); - } - - public void setLogoImage(final StateToken stateToken) { - entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(stateToken)); - } - - public void setLogoImageVisible(final boolean visible) { - entityTextLogo.setLogoVisible(visible); - } - - public void setLogoText(final String groupName) { - entityTextLogo.setLogoText(groupName); - } - - public void setMediumFont() { - entityTextLogo.setMediumFont(); - } - - public void setSmallFont() { - entityTextLogo.setSmallFont(); - } - - public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - if (oldTheme != null) { - entityTextLogo.removeStyleDependentName(oldTheme.toString()); - } - entityTextLogo.addStyleDependentName(newTheme.toString()); - } - - public void showDefUserLogo() { - entityTextLogo.setLogoImage(images.personAvatarDef()); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,102 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.workspace.client.themes.WsTheme; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; - -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; - -import com.calclab.suco.client.events.Listener2; - -public class EntityHeaderPresenter implements EntityHeader { - private static final int MEDIUM_NAME_LIMIT = 90; - private static final int LARGE_NAME_LIMIT = 20; - - private EntityHeaderView view; - private final Session session; - - public EntityHeaderPresenter(final StateManager stateManager, final WsThemeManager theme, final Session session) { - this.session = session; - - stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(final String oldGroup, final String newGroup) { - setGroupLogo(session.getCurrentState().getGroup()); - } - }); - theme.addOnThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); - } - }); - } - - public void addAction(final OldGuiActionDescrip descriptor) { - view.addAction(descriptor); - } - - public void addWidget(final View widget) { - view.addWidget(widget); - } - - public void init(final EntityHeaderView view) { - this.view = view; - } - - public void refreshGroupLogo() { - setGroupLogo(session.getCurrentState().getGroup()); - } - - public void reloadGroupLogoImage() { - view.reloadImage(session.getCurrentState().getGroup()); - } - - void setGroupLogo(final GroupDTO group) { - if (group.hasLogo()) { - setLogoText(group.getLongName()); - view.setLogoImage(group.getStateToken()); - view.setLogoImageVisible(true); - } else { - setLogoText(group.getLongName()); - if (group.isPersonal()) { - view.showDefUserLogo(); - view.setLogoImageVisible(true); - } else { - view.setLogoImageVisible(false); - } - } - } - - void setLogoText(final String name) { - final int length = name.length(); - if (length <= LARGE_NAME_LIMIT) { - view.setLargeFont(); - } else if (length <= MEDIUM_NAME_LIMIT) { - view.setMediumFont(); - } else { - view.setSmallFont(); - } - view.setLogoText(name); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,52 +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 org.ourproject.kune.workspace.client.entityheader; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.workspace.client.themes.WsTheme; - -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; - -public interface EntityHeaderView { - - void addAction(OldGuiActionDescrip descriptor); - - void addWidget(View view); - - void reloadImage(GroupDTO group); - - void setLargeFont(); - - void setLogoImage(StateToken stateToken); - - void setLogoImageVisible(boolean visible); - - void setLogoText(final String groupName); - - void setMediumFont(); - - void setSmallFont(); - - void setTheme(final WsTheme oldTheme, WsTheme newTheme); - - void showDefUserLogo(); -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityTextLogo.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,117 +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 org.ourproject.kune.workspace.client.entityheader; - -import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; - -public class EntityTextLogo extends VerticalPanel { - - public static final String LOGO_NAME = "k-elogop-ln"; - public static final String LOGO_IMAGE = "k-elogop-image"; - - private static final String _100 = "100%"; - private static final String LOGO_MEDIUM_FONT_STYLE = "k-elogo-l-m"; - private static final String LOGO_SMALL_FONT_STYLE = "k-elogo-l-s"; - private static final String LOGO_LARGE_FONT_STYLE = "k-elogo-l-l"; - private final Label logoLabel; - private final Image logoImage; - - public EntityTextLogo() { - // Initialize - super(); - final HorizontalPanel generalHP = new HorizontalPanel(); - final VerticalPanel logoTextVP = new VerticalPanel(); - logoImage = new Image(); - logoLabel = new Label(); - final Label expandCell = new Label(""); - - logoImage.ensureDebugId(LOGO_IMAGE); - logoLabel.ensureDebugId(LOGO_NAME); - - // Layout - add(generalHP); - generalHP.add(logoImage); - generalHP.add(logoTextVP); - logoTextVP.add(logoLabel); - - // Set properties - - expandCell.setStyleName("k-elogop-expand"); - generalHP.setWidth(_100); - generalHP.setHeight(_100); - generalHP.setCellWidth(logoTextVP, _100); - generalHP.setCellHeight(logoTextVP, _100); - logoTextVP.setWidth(_100); - logoTextVP.setCellWidth(logoLabel, _100); - super.setVerticalAlignment(ALIGN_MIDDLE); - logoTextVP.setVerticalAlignment(ALIGN_MIDDLE); - generalHP.setVerticalAlignment(ALIGN_MIDDLE); - setStylePrimaryName("k-entitytextlogo"); - addStyleName("k-entitytextlogo-no-border"); - logoImage.setVisible(false); - setLogoTextImpl(""); - } - - public void setLargeFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_LARGE_FONT_STYLE); - } - - public void setLogoImage(final AbstractImagePrototype imageProto) { - imageProto.applyTo(logoImage); - } - - public void setLogoImage(final String url) { - Image.prefetch(url); - logoImage.setUrl(url); - } - - public void setLogoText(final String text) { - setLogoTextImpl(text); - } - - public void setLogoVisible(final boolean visible) { - logoImage.setVisible(visible); - } - - public void setMediumFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_MEDIUM_FONT_STYLE); - } - - public void setSmallFont() { - resetFontSize(); - logoLabel.addStyleName(LOGO_SMALL_FONT_STYLE); - } - - private void resetFontSize() { - logoLabel.removeStyleName(LOGO_LARGE_FONT_STYLE); - logoLabel.removeStyleName(LOGO_SMALL_FONT_STYLE); - logoLabel.removeStyleName(LOGO_MEDIUM_FONT_STYLE); - } - - private void setLogoTextImpl(final String text) { - logoLabel.setText(text); - } -} \ No newline at end of file Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin (from rev 1244, trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin) Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspace.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspace.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspace.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.entityheader.maxmin; +package org.ourproject.kune.workspace.client.entityheadermaxmin; public interface MaxMinWorkspace { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePanel.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePanel.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.entityheader.maxmin; +package org.ourproject.kune.workspace.client.entityheadermaxmin; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,137 +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 org.ourproject.kune.workspace.client.entityheader.maxmin; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.KeyStroke; -import org.ourproject.kune.platf.client.actions.Shortcut; -import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; -import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; - -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.gwt.resources.client.ImageResource; - -public class MaxMinWorkspacePresenter implements MaxMinWorkspace { - public class MaximizeAction extends AbstractExtendedAction { - public MaximizeAction(final String name, final ImageResource img) { - super(); - putValue(Action.NAME, name); - putValue(Action.SMALL_ICON, img); - } - - public void actionPerformed(final ActionEvent event) { - showMaximized(true); - } - } - public class MinimizeAction extends AbstractExtendedAction { - public MinimizeAction(final String name, final ImageResource img) { - super(); - putValue(Action.NAME, name); - putValue(Action.SMALL_ICON, img); - } - - public void actionPerformed(final ActionEvent event) { - showMaximized(false); - } - } - - public static final String MIN_ICON = "mmwp-min_bt"; - public static final String MAX_ICON = "mmwp-max_bt"; - private MaxMinWorkspaceView view; - - private boolean maximized; - - private final IconResources images; - - private final I18nTranslationService i18n; - - private final GlobalShortcutRegister shortcutReg; - - private OldMenuItemDescriptor maximizeButton; - - private OldMenuItemDescriptor minimizeButton; - private final SiteOptions siteOptions; - - public MaxMinWorkspacePresenter(final GlobalShortcutRegister shortcutReg, final IconResources images, - final I18nTranslationService i18n, final SiteOptions siteOptions) { - this.shortcutReg = shortcutReg; - this.images = images; - this.i18n = i18n; - this.siteOptions = siteOptions; - maximized = false; - - } - - public View getView() { - return view; - } - - public void init(final MaxMinWorkspaceView view) { - this.view = view; - createActions(); - } - - public void maximize() { - showMaximized(true); - } - - public void minimize() { - showMaximized(false); - } - - private void createActions() { - final KeyStroke shortcut = Shortcut.getShortcut(true, true, false, false, Character.valueOf('F')); - - final MaximizeAction maximizeAction = new MaximizeAction(i18n.t("Maximize the workspace"), images.maximize()); - maximizeAction.setShortcut(shortcut); - maximizeButton = new OldMenuItemDescriptor(maximizeAction); - maximizeButton.setPosition(0); - maximizeButton.setId(MAX_ICON); - - final MinimizeAction minimizeAction = new MinimizeAction(i18n.t("Minimize the workspace"), images.minimize()); - minimizeAction.setShortcut(shortcut); - minimizeButton = new OldMenuItemDescriptor(minimizeAction); - minimizeButton.setPosition(1); - minimizeButton.setVisible(false); - minimizeButton.setId(MIN_ICON); - - shortcutReg.put(shortcut, new AbstractExtendedAction() { - public void actionPerformed(final ActionEvent event) { - showMaximized(!maximized); - } - }); - - siteOptions.addAction(maximizeButton); - siteOptions.addAction(minimizeButton); - } - - private void showMaximized(final boolean maximized) { - maximizeButton.setVisible(!maximized); - minimizeButton.setVisible(maximized); - this.maximized = maximized; - view.setMaximized(maximized); - } -} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePresenter.java (from rev 1245, trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspacePresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -0,0 +1,141 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.entityheadermaxmin; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; +import org.ourproject.kune.platf.client.actions.Action; +import org.ourproject.kune.platf.client.actions.ActionEvent; +import org.ourproject.kune.platf.client.actions.KeyStroke; +import org.ourproject.kune.platf.client.actions.Shortcut; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; +import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; + +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.resources.client.ImageResource; + +public class MaxMinWorkspacePresenter implements MaxMinWorkspace { + public class MaximizeAction extends AbstractExtendedAction { + public MaximizeAction(final String name, final ImageResource img) { + super(); + putValue(Action.NAME, name); + putValue(Action.SMALL_ICON, img); + } + + @Override + public void actionPerformed(final ActionEvent event) { + showMaximized(true); + } + } + public class MinimizeAction extends AbstractExtendedAction { + public MinimizeAction(final String name, final ImageResource img) { + super(); + putValue(Action.NAME, name); + putValue(Action.SMALL_ICON, img); + } + + @Override + public void actionPerformed(final ActionEvent event) { + showMaximized(false); + } + } + + public static final String MAX_ICON = "mmwp-max_bt"; + public static final String MIN_ICON = "mmwp-min_bt"; + private final I18nTranslationService i18n; + + private final IconResources images; + + private OldMenuItemDescriptor maximizeButton; + + private boolean maximized; + + private OldMenuItemDescriptor minimizeButton; + // private final SiteOptions siteOptions; + + private final GlobalShortcutRegister shortcutReg; + + private MaxMinWorkspaceView view; + + public MaxMinWorkspacePresenter(final GlobalShortcutRegister shortcutReg, final IconResources images, + final I18nTranslationService i18n) { + this.shortcutReg = shortcutReg; + this.images = images; + this.i18n = i18n; + // this.siteOptions = siteOptions; + maximized = false; + + } + + private void createActions() { + final KeyStroke shortcut = Shortcut.getShortcut(true, true, false, false, Character.valueOf('F')); + + final MaximizeAction maximizeAction = new MaximizeAction(i18n.t("Maximize the workspace"), images.maximize()); + maximizeAction.setShortcut(shortcut); + maximizeButton = new OldMenuItemDescriptor(maximizeAction); + maximizeButton.setPosition(0); + maximizeButton.setId(MAX_ICON); + + final MinimizeAction minimizeAction = new MinimizeAction(i18n.t("Minimize the workspace"), images.minimize()); + minimizeAction.setShortcut(shortcut); + minimizeButton = new OldMenuItemDescriptor(minimizeAction); + minimizeButton.setPosition(1); + minimizeButton.setVisible(false); + minimizeButton.setId(MIN_ICON); + + shortcutReg.put(shortcut, new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + showMaximized(!maximized); + } + }); + + // siteOptions.addAction(maximizeButton); + // siteOptions.addAction(minimizeButton); + } + + public View getView() { + return view; + } + + public void init(final MaxMinWorkspaceView view) { + this.view = view; + createActions(); + } + + @Override + public void maximize() { + showMaximized(true); + } + + @Override + public void minimize() { + showMaximized(false); + } + + private void showMaximized(final boolean maximized) { + maximizeButton.setVisible(!maximized); + minimizeButton.setVisible(maximized); + this.maximized = maximized; + view.setMaximized(maximized); + } +} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspaceView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspaceView.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheadermaxmin/MaxMinWorkspaceView.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.entityheader.maxmin; +package org.ourproject.kune.workspace.client.entityheadermaxmin; import org.ourproject.kune.platf.client.View; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -20,9 +20,9 @@ package org.ourproject.kune.workspace.client.nohomepage; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateNoContentDTO; Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -1,103 +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 org.ourproject.kune.workspace.client.oldsn.other; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.actions.OldAbstractAction; -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; -import org.ourproject.kune.platf.client.actions.PropertyChangeListener; -import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; - -import cc.kune.core.client.resources.icons.IconConstants; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; - -public class AddAsBuddieHeaderButton { - - public static class AddAsBuddieAction extends AbstractExtendedAction { - private final Provider<ChatEngine> chatEngine; - private final Session session; - - public AddAsBuddieAction(final Provider<ChatEngine> chatEngine, final Session session, - final StateManager stateManager, final I18nTranslationService i18n, final IconResources img) { - super(); - this.chatEngine = chatEngine; - this.session = session; - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }); - chatEngine.get().addOnRosterChanged(new Listener0() { - public void onEvent() { - setState(session.getCurrentState()); - } - }); - putValue(Action.NAME, i18n.t("Add as a buddie")); - putValue(Action.SMALL_ICON, IconConstants.toPath(img.addGreen())); - } - - public void actionPerformed(final ActionEvent event) { - chatEngine.get().addNewBuddie(session.getCurrentState().getGroup().getShortName()); - NotifyUser.info("Added as buddie. Waiting buddie response"); - setEnabled(false); - } - - private void setState(final StateAbstractDTO state) { - final String groupName = state.getGroup().getShortName(); - final boolean isPersonal = state.getGroup().isPersonal(); - final boolean isLogged = session.isLogged(); - if (isLogged && isPersonal && (!chatEngine.get().isBuddie(groupName)) - && (!session.getCurrentUser().getShortName().equals(groupName))) { - setEnabled(true); - } else { - setEnabled(false); - } - } - } - - public AddAsBuddieHeaderButton(final Provider<ChatEngine> chatEngine, final Session session, - final StateManager stateManager, final I18nTranslationService i18n, final IconResources img, - final EntityHeader entityHeader) { - final AddAsBuddieAction buddieAction = new AddAsBuddieAction(chatEngine, session, stateManager, i18n, img); - final ButtonDescriptor button = new ButtonDescriptor(buddieAction); - button.setVisible(false); - buddieAction.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(OldAbstractAction.ENABLED)) { - button.setVisible((Boolean) event.getNewValue()); - } - } - }); - entityHeader.addAction(button); - } -} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -22,10 +22,10 @@ import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.app.GroupOptionsCollection; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import cc.kune.common.client.noti.NotifyLevelImages; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { @@ -48,7 +48,7 @@ @Override public void addAction(final OldGuiActionDescrip descriptor) { - entityHeader.addAction(descriptor); + // entityHeader.addAction(descriptor); } @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -21,10 +21,10 @@ import org.ourproject.kune.platf.client.app.UserOptionsCollection; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import cc.kune.common.client.noti.NotifyLevelImages; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.i18n.I18nTranslationService; public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -22,11 +22,11 @@ import org.ourproject.kune.chat.client.ChatEngine; import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.options.EntityOptions; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; +import cc.kune.core.client.ws.entheader.EntityHeader; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -20,12 +20,12 @@ package org.ourproject.kune.workspace.client.options.logo; import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.options.EntityOptions; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -20,13 +20,13 @@ package org.ourproject.kune.workspace.client.options.logo; import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.options.EntityOptions; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserInfoDTO; Copied: trunk/src/test/java/cc/kune/core/client/ws/entheader (from rev 1244, trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader) Modified: trunk/src/test/java/cc/kune/core/client/ws/entheader/EntityLogoPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/test/java/cc/kune/core/client/ws/entheader/EntityLogoPresenterTest.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.entityheader; +package cc.kune.core.client.ws.entheader; import org.junit.Before; import org.junit.Test; @@ -26,30 +26,32 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ws.entheader.EntityHeaderPresenter.EntityHeaderView; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; public class EntityLogoPresenterTest { + private EntityHeaderPresenter entityLogoPresenter; + private Session session; private StateManager stateManager; - private Session session; - private EntityHeaderPresenter entityLogoPresenter; private EntityHeaderView view; @Before public void before() { stateManager = Mockito.mock(StateManager.class); session = Mockito.mock(Session.class); - WsThemeManager theme = Mockito.mock(WsThemeManager.class); - entityLogoPresenter = new EntityHeaderPresenter(stateManager, theme, session); + final WsThemeManager theme = Mockito.mock(WsThemeManager.class); + // entityLogoPresenter = new EntityHeaderPresenter(stateManager, theme, + // session); view = Mockito.mock(EntityHeaderView.class); - entityLogoPresenter.init(view); + // entityLogoPresenter.init(view); } @Test public void testCommProjectNoLogo() { - GroupDTO group = new GroupDTO("shortname", "longname", GroupType.COMMUNITY); + final GroupDTO group = new GroupDTO("shortname", "longname", GroupType.COMMUNITY); group.setHasLogo(false); entityLogoPresenter.setGroupLogo(group); Mockito.verify(view, Mockito.never()).setLogoImageVisible(true); @@ -63,6 +65,16 @@ testGroupWIthLogo(GroupType.COMMUNITY); } + private void testGroupWIthLogo(final GroupType groupType) { + final GroupDTO group = new GroupDTO("shortname", "longname", groupType); + group.setHasLogo(true); + entityLogoPresenter.setGroupLogo(group); + Mockito.verify(view, Mockito.times(1)).setLogoImageVisible(true); + Mockito.verify(view, Mockito.never()).setLogoImageVisible(false); + Mockito.verify(view, Mockito.never()).showDefUserLogo(); + Mockito.verify(view, Mockito.times(1)).setLogoImage((StateToken) Mockito.anyObject()); + } + @Test public void testOrgWithLogo() { testGroupWIthLogo(GroupType.ORGANIZATION); @@ -80,7 +92,7 @@ @Test public void testPersonalProjectNoLogo() { - GroupDTO group = new GroupDTO("shortname", "longname", GroupType.PERSONAL); + final GroupDTO group = new GroupDTO("shortname", "longname", GroupType.PERSONAL); group.setHasLogo(false); entityLogoPresenter.setGroupLogo(group); Mockito.verify(view, Mockito.times(1)).setLogoImageVisible(true); @@ -94,14 +106,4 @@ testGroupWIthLogo(GroupType.PROJECT); } - private void testGroupWIthLogo(GroupType groupType) { - GroupDTO group = new GroupDTO("shortname", "longname", groupType); - group.setHasLogo(true); - entityLogoPresenter.setGroupLogo(group); - Mockito.verify(view, Mockito.times(1)).setLogoImageVisible(true); - Mockito.verify(view, Mockito.never()).setLogoImageVisible(false); - Mockito.verify(view, Mockito.never()).showDefUserLogo(); - Mockito.verify(view, Mockito.times(1)).setLogoImage((StateToken) Mockito.anyObject()); - } - } Modified: trunk/src/test/java/testsuites/OthersTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/OthersTestSuite.java 2011-02-11 18:17:57 UTC (rev 1247) +++ trunk/src/test/java/testsuites/OthersTestSuite.java 2011-02-11 23:06:04 UTC (rev 1248) @@ -31,13 +31,14 @@ import org.ourproject.kune.rack.filters.rest.TestRESTMethodFinder; import org.ourproject.kune.rack.filters.rest.TestRESTServiceDefinition; import org.ourproject.kune.wiki.server.WikiServerToolTest; -import org.ourproject.kune.workspace.client.entityheader.EntityLogoPresenterTest; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenterTest; import org.ourproject.kune.workspace.client.socialnet.RolActionTest; import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest; import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenterTest; import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenterTest; +import cc.kune.core.client.ws.entheader.EntityLogoPresenterTest; + /** * Rescan with : *

1 0

r1247 - in trunk: . src/main/java/cc/kune/client src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/ui src/main/java/cc/kune/core/client/ui/footer src/main/java/cc/kune/core/client/ui/footer/license src/main/java/cc/kune/core/public src/main/java/cc/kune/gspace/client/resources src/main/java/org/ourproject/kune/workspace/client src/main/resources
by Vicente J. Ruiz Jurado 11 Feb '11

11 Feb '11

Author: vjrj_ Date: 2011-02-11 19:17:57 +0100 (Fri, 11 Feb 2011) New Revision: 1247 Added: trunk/src/main/java/cc/kune/core/client/ui/footer/ trunk/src/main/java/cc/kune/core/client/ui/footer/license/ Removed: trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicenseView.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/ Modified: trunk/TODO trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/resources/wave-server.properties Log: few changes in licenses Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/TODO 2011-02-11 18:17:57 UTC (rev 1247) @@ -11,6 +11,7 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** >> Delete host/room conf in ws.html ** HelloWord with samples of extensions: sitebar, sitebar options menu, siteuseroptions, sn, ... ** TODO Register of "reserved words" not permitted for groups/users names (in server and in client) ** TODO WIAB under proxies Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-11 18:17:57 UTC (rev 1247) @@ -42,6 +42,7 @@ import cc.kune.core.client.sn.GroupMembersPresenter; import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.pspace.client.PSpaceGinModule; @@ -70,6 +71,8 @@ Provider<CorePresenter> getCorePresenter(); + AsyncProvider<EntityLicensePresenter> getEntityLicensePresenter(); + ErrorHandler getErrorHandler(); EventBus getEventBus(); Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-11 18:17:57 UTC (rev 1247) @@ -84,6 +84,8 @@ import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.StateManagerDefault; +import cc.kune.core.client.ui.footer.license.EntityLicensePanel; +import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreViewImpl; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -135,6 +137,8 @@ NewGroupPresenter.NewGroupProxy.class); bindPresenter(GroupMembersPresenter.class, GroupMembersPresenter.GroupMembersView.class, GroupMembersPanel.class, GroupMembersPresenter.GroupMembersProxy.class); + bindPresenter(EntityLicensePresenter.class, EntityLicensePresenter.EntityLicenseView.class, + EntityLicensePanel.class, EntityLicensePresenter.EntityLicenseProxy.class); bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); bindPresenter(SignInPresenter.class, SignInView.class, SignInPanel.class, SignInPresenter.SignInProxy.class); Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-11 18:17:57 UTC (rev 1247) @@ -5,6 +5,7 @@ import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; import cc.kune.core.client.sn.GroupMembersPresenter; import cc.kune.core.client.state.Session; +import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import com.google.inject.Inject; import com.google.inject.Provider; @@ -13,12 +14,13 @@ @Inject public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter, - final Provider<SiteUserOptionsPresenter> userOptions) { + final Provider<SiteUserOptionsPresenter> userOptions, final Provider<EntityLicensePresenter> licenseFooter) { session.onInitDataReceived(new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { grouMembersPresenter.get(); userOptions.get(); + licenseFooter.get(); } }); } Copied: trunk/src/main/java/cc/kune/core/client/ui/footer/license (from rev 1244, trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot) Modified: trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java 2011-02-11 18:17:57 UTC (rev 1247) @@ -17,97 +17,115 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensefoot; +package cc.kune.core.client.ui.footer.license; -import org.ourproject.kune.platf.client.ui.SimpleToolbar; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.adamtacy.client.ui.effects.examples.Fade; +import org.adamtacy.client.ui.effects.examples.Show; import cc.kune.common.client.ui.KuneWindowUtils; +import cc.kune.core.client.ui.footer.license.EntityLicensePresenter.EntityLicenseView; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.dom.client.MouseOutEvent; import com.google.gwt.event.dom.client.MouseOutHandler; import com.google.gwt.event.dom.client.MouseOverEvent; import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.user.client.Element; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.gwtext.client.core.Ext; -import com.gwtext.client.core.ExtElement; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; -public class EntityLicensePanel implements EntityLicenseView { +public class EntityLicensePanel extends ViewImpl implements EntityLicenseView { public static final String LICENSE_LABEL = "k-elp-lic-lab"; + private final I18nTranslationService i18n; + private final Element labelElement; + private final FlowPanel licenseBar; private final Image licenseImage; private final Label licenseLabel; - private final I18nTranslationService i18n; - private final SimpleToolbar licenseBar; - private final WorkspaceSkeleton ws; - private final ExtElement labelElement; - public EntityLicensePanel(final EntityLicensePresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { + @Inject + public EntityLicensePanel(final I18nTranslationService i18n, final WsArmor armor) { this.i18n = i18n; - this.ws = ws; licenseImage = new Image(); licenseLabel = new Label("", false); - licenseBar = new SimpleToolbar(); - licenseBar.addSpacer(); - licenseBar.add(licenseImage, VerticalPanel.ALIGN_TOP); + licenseBar = new FlowPanel(); + licenseBar.add(licenseImage); licenseBar.add(licenseLabel); - - final ClickHandler clickListener = new ClickHandler() { - public void onClick(final ClickEvent event) { - presenter.onLicenseClick(); - } - }; - - // licenseLabel.addClickHandler(clickListener); - licenseImage.addClickHandler(clickListener); - licenseImage.addMouseOutHandler(new MouseOutHandler() { + @Override public void onMouseOut(final MouseOutEvent event) { // fade(false); } }); licenseImage.addMouseOverHandler(new MouseOverHandler() { + @Override public void onMouseOver(final MouseOverEvent event) { - fade(true); + show(); } }); + licenseImage.addStyleName("k-footer-license-img"); + licenseLabel.addStyleName("k-footer-license-label"); + armor.getEntityFooter().add(licenseBar); + labelElement = licenseLabel.getElement(); + } - licenseLabel.addStyleName("kune-Margin-Large-l"); - licenseLabel.setStyleName("k-elp-limg"); - licenseImage.setStyleName("k-elp-limg"); - ws.getEntityWorkspace().getBottomTitle().add(licenseBar); - labelElement = Ext.get(licenseLabel.getElement()); + @Override + public Widget asWidget() { + return null; } + @Override public void attach() { licenseBar.setVisible(true); } + @Override public void detach() { licenseBar.setVisible(false); } + private void fade() { + final Fade fade = new Fade(labelElement); + fade.setDuration(.5); + fade.play(); + } + + @Override + public HasClickHandlers getImage() { + return licenseImage; + } + + @Override + public HasClickHandlers getLabel() { + return licenseLabel; + } + + @Override public void openWindow(final String url) { KuneWindowUtils.open(url); } + private void show() { + if ("0".equals(labelElement.getStyle().getOpacity())) { + final Show show = new Show(labelElement); + show.setDuration(.5); + show.play(); + } + } + + @Override public void showLicense(final String groupName, final LicenseDTO licenseDTO) { final String licenseText = i18n.t("© [%s], under license: [%s]", groupName, licenseDTO.getLongName()); licenseLabel.setText(licenseText); // KuneUiUtils.setQuickTip(licenseLabel, licenseText); licenseImage.setUrl(licenseDTO.getImageUrl()); - fade(false); + fade(); } - - private void fade(final boolean in) { - labelElement.setOpacity(in ? 1 : 0, true); - ws.getEntityWorkspace().refreshBottomTitle(); - } } Modified: trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java 2011-02-11 18:17:57 UTC (rev 1247) @@ -17,49 +17,84 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.licensefoot; +package cc.kune.core.client.ui.footer.license; -import org.ourproject.kune.platf.client.View; - +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import com.calclab.suco.client.events.Listener; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.proxy.Proxy; +import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; -public class EntityLicensePresenter { +public class EntityLicensePresenter extends + Presenter<EntityLicensePresenter.EntityLicenseView, EntityLicensePresenter.EntityLicenseProxy> { - private EntityLicenseView view; + @ProxyCodeSplit + public interface EntityLicenseProxy extends Proxy<EntityLicensePresenter> { + } + public interface EntityLicenseView extends View { + void attach(); + + void detach(); + + HasClickHandlers getImage(); + + HasClickHandlers getLabel(); + + void openWindow(String url); + + void showLicense(String groupName, LicenseDTO licenseDTO); + + } + private LicenseDTO license; - public EntityLicensePresenter(final StateManager stateManager) { - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO state) { + @Inject + public EntityLicensePresenter(final EventBus eventBus, final EntityLicenseView view, + final EntityLicenseProxy proxy, final StateManager stateManager) { + super(eventBus, view, proxy); + stateManager.onStateChanged(new StateChangedHandler() { + + @Override + public void onStateChanged(final StateChangedEvent event) { + final StateAbstractDTO state = event.getState(); if (state instanceof StateContainerDTO) { setLicense((StateContainerDTO) state); } else { - view.detach(); + getView().detach(); } } }); - } + final ClickHandler clickHandler = new ClickHandler() { - public View getView() { - return view; + @Override + public void onClick(final ClickEvent event) { + getView().openWindow(license.getUrl()); + } + }; + getView().getImage().addClickHandler(clickHandler); + getView().getLabel().addClickHandler(clickHandler); } - public void init(final EntityLicenseView view) { - this.view = view; + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); } - public void onLicenseClick() { - view.openWindow(license.getUrl()); - } - private void setLicense(final StateContainerDTO state) { this.license = state.getLicense(); - view.showLicense(state.getGroup().getLongName(), license); - view.attach(); + getView().showLicense(state.getGroup().getShortName(), license); + getView().attach(); } } Deleted: trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicenseView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicenseView.java 2011-02-11 18:17:57 UTC (rev 1247) @@ -1,36 +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 org.ourproject.kune.workspace.client.licensefoot; - -import org.ourproject.kune.platf.client.View; - -import cc.kune.core.shared.dto.LicenseDTO; - -public interface EntityLicenseView extends View { - - void attach(); - - void detach(); - - void openWindow(String url); - - void showLicense(String groupName, LicenseDTO licenseDTO); - -} Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 18:17:57 UTC (rev 1247) @@ -913,4 +913,23 @@ .k-maxsize { width: 100%; height: 100%; +} + +.k-footer-license-label { + float: right; + margin-top: 8px; + cursor: pointer; + font-weight: bold; + font-size: 16px; + color: #784421; +} +.k-footer-license-label-title { + margin-right: 5px; + color: #280b0b; +} + +.k-footer-license-img { + float: right; + margin: 10px 15px 0px 5px; + cursor: pointer; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-02-11 18:17:57 UTC (rev 1247) @@ -33,7 +33,7 @@ -moz-border-radius-bottomleft: 10px; border-top-bottom-radius: 10px; background-color: #f7ebe3; - padding: 7px 10px 0px 17px; + /* padding: 7px 10px 0px 17px; */ overflow: hidden; } @@ -120,6 +120,7 @@ border-bottom-right-radius: 7px; padding: 7px 7px 0 7px; overflow: hidden; + border-collapse:separate; } .docFooter span { @@ -161,6 +162,7 @@ .entityToolsSouth { border-top: 2px solid #FFF; padding: 10px; + border-collapse: separate; } .entityToolsSouth span { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-11 18:17:57 UTC (rev 1247) @@ -82,8 +82,6 @@ import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPanel; import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPresenter; import org.ourproject.kune.workspace.client.i18n.LanguageSelectorView; -import org.ourproject.kune.workspace.client.licensefoot.EntityLicensePanel; -import org.ourproject.kune.workspace.client.licensefoot.EntityLicensePresenter; import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPanel; @@ -448,16 +446,19 @@ } }); - register(ApplicationComponentGroup.class, new Factory<EntityLicensePresenter>(EntityLicensePresenter.class) { - @Override - public EntityLicensePresenter create() { - final EntityLicensePresenter presenter = new EntityLicensePresenter(i(StateManager.class)); - final EntityLicensePanel panel = new EntityLicensePanel(presenter, i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<EntityLicensePresenter>(EntityLicensePresenter.class) { + // @Override + // public EntityLicensePresenter create() { + // final EntityLicensePresenter presenter = new + // EntityLicensePresenter(i(StateManager.class)); + // final EntityLicensePanel panel = new EntityLicensePanel(presenter, + // i(I18nUITranslationService.class), + // i(WorkspaceSkeleton.class)); + // presenter.init(panel); + // return presenter; + // } + // }); register(ApplicationComponentGroup.class, new Factory<RateIt>(RateIt.class) { @Override Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2011-02-11 04:00:24 UTC (rev 1246) +++ trunk/src/main/resources/wave-server.properties 2011-02-11 18:17:57 UTC (rev 1247) @@ -39,7 +39,7 @@ account_store_directory = _accounts # Currently supported delta store types: memory, file -delta_store_type = file +delta_store_type = memory # The location where deltas are stored on disk. This should be changed. # Note: This is only used when using the file delta store. It is ignored

1 0

r1246 - in trunk: . src/main/java/cc/kune/common/public/gxt-custom/css src/main/java/cc/kune/core/client/sitebar src/main/java/cc/kune/core/public src/main/java/cc/kune/gspace/client src/main/webapp/WEB-INF/publicspace/public/templates/basic
by Vicente J. Ruiz Jurado 11 Feb '11

11 Feb '11

Author: vjrj_ Date: 2011-02-11 05:00:24 +0100 (Fri, 11 Feb 2011) New Revision: 1246 Modified: trunk/CREDITS trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/public/about.html trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css Log: SN Refactorization Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/CREDITS 2011-02-11 04:00:24 UTC (rev 1246) @@ -18,7 +18,7 @@ Freire staff. * Daniel Jiménez for the initial help and coordination * Javier de la Cueva and Leovigildo García-Bobadilla for the legal support +* The <URL:http://iepala.es> staff for their support and infraestructure * Jonathan Araña Cruz, Roxu and all the <URL:http://xsto.info> staff for help with the infraestructure -* Johnattan Rupire for web contributions. -* The <URL:http://iepala.es> staff for their support +* Johnattan Rupire and William Austen Bradbury for web contributions and translations. * and <URL:http://ourproject.org> and again <URL:http://xsto.info> for sharing with us their resources Modified: trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-11 04:00:24 UTC (rev 1246) @@ -1380,6 +1380,9 @@ background-color: #f09134; background-image: none; border-color: #b36427; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .x-menu-item-active a.x-menu-item { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-11 04:00:24 UTC (rev 1246) @@ -108,6 +108,7 @@ public void onAppStart(final AppStartEvent event) { final IsActionExtensible right = getView().getRightBar(); OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); + // OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowDownBlack()); // OPTIONS_MENU.setParent(RIGHT_TOOLBAR); OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); @@ -146,7 +147,7 @@ gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16()); aboutAction.putValue(Action.NAME, i18n.t("About kune")); - aboutAction.putValue(Action.SMALL_ICON, res.kuneIcon16()); + aboutAction.putValue(Action.SMALL_ICON, res.info()); // aboutAction.setShortcut(shortcut); // shortcutReg.put(shortcut, aboutAction); Modified: trunk/src/main/java/cc/kune/core/public/about.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/about.html 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/src/main/java/cc/kune/core/public/about.html 2011-02-11 04:00:24 UTC (rev 1246) @@ -13,7 +13,7 @@ </img> </a> </span> -<p>Version 0.0.7 (r1239+c71)</p> +<p>Version 0.0.7 (r1244+c1)</p> <h1><a name="section_1">CREDITS</a></h1> <h2><a name="section_1_1">Authors</a></h2> @@ -32,9 +32,9 @@ Freire staff. </li><li>Daniel Jiménez for the initial help and coordination </li><li>Javier de la Cueva and Leovigildo García-Bobadilla for the legal support + </li><li>The <a href="http://iepala.es">http://iepala.es</a> staff for their support and infraestructure </li><li>Jonathan Araña Cruz, Roxu and all the <a href="http://xsto.info">http://xsto.info</a> staff for help with the infraestructure - </li><li>Johnattan Rupire for web contributions. - </li><li>The <a href="http://iepala.es">http://iepala.es</a> staff for their support + </li><li>Johnattan Rupire and William Austen Bradbury for web contributions and translations. </li><li>and <a href="http://ourproject.org">http://ourproject.org</a> and again <a href="http://xsto.info">http://xsto.info</a> for sharing with us their resources </li></ul> <h1><a name="section_2">LICENSES</a></h1> Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 04:00:24 UTC (rev 1246) @@ -903,4 +903,14 @@ color: #FFF; font-size: 16px; font-weight: bold; +} + +.k-frame-def { + margin: 0px; + border: 0px; +} + +.k-maxsize { + width: 100%; + height: 100%; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-02-11 04:00:24 UTC (rev 1246) @@ -28,7 +28,6 @@ import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; @@ -76,10 +75,8 @@ DockLayoutPanel splitCenter; @UiField DockLayoutPanel splitEast; - @UiField TabLayoutPanel tabs; - @UiField SimplePanel userSpace; @@ -90,8 +87,7 @@ tabs.setStyleName("k-spaces"); homeSpace.add(RootPanel.get("k-home-ini")); publicSpace.add(pspace.getWidget()); - userSpace.add(new Label("User space")); - // userSpace.add(new WebClient()); + // userSpace.add(new Label("User space")); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-11 04:00:24 UTC (rev 1246) @@ -1,12 +1,12 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> -<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:kp="urn:import:cc.kune.pspace.client" - xmlns:g="urn:import:com.google.gwt.user.client.ui"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:kp="urn:import:cc.kune.pspace.client" xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:with field='res' type='cc.kune.gspace.client.resources.WsArmorResources' /> <ui:style> .frame { - border: 0px; - margin: 0px; + border: 0px; + margin: 0px; } </ui:style> <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' @@ -28,7 +28,9 @@ <g:header size='0' /> <g:SimplePanel ui:field="userSpace" width="100%" height="100%"> - </g:SimplePanel> + <g:Frame url="http://localhost:9898/" styleName="{style.frame}" + ui:field="frame" width="100%" height="100%" /> + </g:SimplePanel> </g:tab> <g:tab> <g:header size='0' /> @@ -106,7 +108,7 @@ </g:tab> <g:tab> <g:header size='0' /> - <g:SimplePanel ui:field="publicSpace" width="100%" + <g:SimplePanel ui:field="publicSpace" width="100%" height="100%"></g:SimplePanel> </g:tab> </g:TabLayoutPanel> Modified: trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css =================================================================== --- trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css 2011-02-11 03:28:34 UTC (rev 1245) +++ trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css 2011-02-11 04:00:24 UTC (rev 1246) @@ -9,7 +9,7 @@ } .page { - width: 800px; + /* width: 800px; */ margin: 2em auto; padding: 1em; background-color: #fff;

1 0

11 Feb '11

Author: vjrj_ Date: 2011-02-11 04:28:34 +0100 (Fri, 11 Feb 2011) New Revision: 1245 Added: trunk/script/header.html trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java trunk/src/main/java/cc/kune/core/public/about.html trunk/src/main/java/cc/kune/core/public/frame-def.css trunk/src/main/java/cc/kune/core/public/images/group-def-icon.gif trunk/src/main/java/cc/kune/core/public/logo-kune-big.png trunk/src/test/java/cc/kune/common/ trunk/src/test/java/cc/kune/common/client/ trunk/src/test/java/cc/kune/common/client/actions/ trunk/src/test/java/cc/kune/common/client/actions/ui/ trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/ trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java Removed: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css trunk/src/main/java/org/ourproject/kune/platf/public/images/group-def-icon.gif trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java Modified: trunk/CREDITS trunk/TODO trunk/img/webtemplate/web_template-2011.svg trunk/script/css-update.sh trunk/script/generateAbout.sh trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java Log: SN Refactorization Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/CREDITS 2011-02-11 03:28:34 UTC (rev 1245) @@ -18,6 +18,7 @@ Freire staff. * Daniel Jiménez for the initial help and coordination * Javier de la Cueva and Leovigildo García-Bobadilla for the legal support -* Jonathan Araña Cruz, Roxu and all the xsto staff for help with the infraestructure +* Jonathan Araña Cruz, Roxu and all the <URL:http://xsto.info> staff for help with the infraestructure * Johnattan Rupire for web contributions. -* and ourproject.org and again xsto.info for sharing with us their resources +* The <URL:http://iepala.es> staff for their support +* and <URL:http://ourproject.org> and again <URL:http://xsto.info> for sharing with us their resources Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/TODO 2011-02-11 03:28:34 UTC (rev 1245) @@ -11,6 +11,8 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** HelloWord with samples of extensions: sitebar, sitebar options menu, siteuseroptions, sn, ... +** TODO Register of "reserved words" not permitted for groups/users names (in server and in client) ** TODO WIAB under proxies https://groups.google.com/group/wave-protocol/browse_thread/thread/202dee4b… ** TODO StateManager #signin while already signed in NPE Modified: trunk/img/webtemplate/web_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_template-2011.svg 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/img/webtemplate/web_template-2011.svg 2011-02-11 03:28:34 UTC (rev 1245) @@ -52,16 +52,16 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.78961905" - inkscape:cx="493.46544" - inkscape:cy="448.12343" - inkscape:current-layer="layer7" + inkscape:zoom="2.7077228" + inkscape:cx="962.93133" + inkscape:cy="392.7939" + inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="false" inkscape:window-width="1280" - inkscape:window-height="974" + inkscape:window-height="747" inkscape:window-x="0" - inkscape:window-y="21" + inkscape:window-y="1024" inkscape:window-maximized="1" inkscape:snap-bbox="false" inkscape:bbox-paths="true" @@ -232,7 +232,7 @@ id="g5365"> <path transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" - d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -242,7 +242,7 @@ sodipodi:type="arc" /> <path transform="matrix(0.05245387,0,0,0.05245387,400.1808,-0.554549)" - d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -567,7 +567,7 @@ transform="translate(-751,-12)"> <path transform="translate(0,-3)" - d="m 333,232 a 11,11 0 1 1 -22,0 11,11 0 1 1 22,0 z" + d="m 333,232 c 0,6.07513 -4.92487,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.07513,0 11,4.92487 11,11 z" sodipodi:ry="11" sodipodi:rx="11" sodipodi:cy="232" @@ -2546,7 +2546,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(0.475,0,0,0.95,-21.570622,377.21335)" - d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" sodipodi:ry="10" sodipodi:rx="20" sodipodi:cy="32.362183" @@ -2559,7 +2559,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,8.0842525,364.37023)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -2578,14 +2578,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.7154875,362.20909)" /> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,7.7663825,370.24449)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -2604,14 +2604,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.2467045,371.75097)" /> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,-0.8112855,366.96948)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -2627,6 +2627,48 @@ height="113.28773" x="-48.066803" y="340.33881" /> + <rect + style="opacity:0.84999999999999998;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect6139" + width="167.08397" + height="134.83969" + x="879.38934" + y="307.78625" /> + <rect + style="opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.1996699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect6141" + width="164.7063" + height="32.31588" + x="880.42413" + y="328.24014" /> + <text + xml:space="preserve" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="889.85516" + y="349.36758" + id="text24744-4" + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan24746-6" + x="889.85516" + y="349.36758">menu item</tspan></text> + <text + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + sodipodi:linespacing="125%" + id="text6164" + y="379.36758" + x="889.85516" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve"><tspan + y="379.36758" + x="889.85516" + id="tspan6166" + sodipodi:role="line">menu item</tspan></text> </g> <g inkscape:groupmode="layer" Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/script/css-update.sh 2011-02-11 03:28:34 UTC (rev 1245) @@ -17,3 +17,4 @@ cp src/main/java/cc/kune/core/public/ws.html target/kune-0.0.7/ws/ cp src/main/webapp/templates/basic/basic.css target/kune-0.0.7/templates/basic/basic.css cp src/main/webapp/templates/basic/docs.liquid.html target/kune-0.0.7/templates/basic/ +cp src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css target/kune-0.0.7/ws/gxt-custom/css/gxt-op-common.css Modified: trunk/script/generateAbout.sh =================================================================== --- trunk/script/generateAbout.sh 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/script/generateAbout.sh 2011-02-11 03:28:34 UTC (rev 1245) @@ -13,9 +13,9 @@ VER=`grep "<version>" pom.xml | head -1 | sed 's/..version.//g'` -echo Kune >> $tmp -echo "--------------------------------------------------------------------------------" >> $tmp +#echo "kune" >> $tmp +#echo "--------------------------------------------------------------------------------" >> $tmp echo Version $VER '('$SVNVER')' >> $tmp -txt2html -h 80 --preserve_indent -8 --style_url /ws/css/richtext.css --infile $tmp --infile CREDITS --infile COPYRIGHT --outfile war/ws/about.html +txt2html --prepend_file bin/header.html -h 80 --preserve_indent -8 --style_url frame-def.css --infile $tmp --infile CREDITS --infile COPYRIGHT --outfile src/main/java/cc/kune/core/public/about.html rm $tmp Added: trunk/script/header.html =================================================================== --- trunk/script/header.html (rev 0) +++ trunk/script/header.html 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,6 @@ +<span> + <a target="_blank" href="http://kune.ourproject.org/" title="kune" rel="home"> +<img src="logo-kune-big.png" alt="kune-logo" height="36" width="200"> +</img> +</a> +</span> Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -56,6 +56,7 @@ import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.emite.im.client.chat.ChatManager; import com.calclab.emite.im.client.roster.XmppRoster; +import com.calclab.emite.reconnect.client.SessionReconnect; import com.calclab.emite.xep.avatar.client.AvatarManager; import com.calclab.emite.xep.muc.client.Room; import com.calclab.emite.xep.muc.client.RoomManager; @@ -133,7 +134,7 @@ xmppSession = Suco.get(XmppSession.class); chatManager = Suco.get(ChatManager.class); roomManager = Suco.get(RoomManager.class); - // Suco.get(SessionReconnect.class); + Suco.get(SessionReconnect.class); eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() { @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -31,7 +31,6 @@ import com.extjs.gxt.ui.client.widget.menu.Menu; import com.extjs.gxt.ui.client.widget.menu.MenuItem; import com.extjs.gxt.ui.client.widget.menu.SeparatorMenuItem; -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.UIObject; @@ -107,7 +106,6 @@ protected String getMenuPosition() { final MenuPosition position = (MenuPosition) descriptor.getValue(MENU_POSITION); - GWT.log("menu position" + position == null ? "none" : position.name()); return position == null ? DEF_MENU_POSITION : position.name(); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -31,6 +31,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; +import cc.kune.common.client.utils.TextUtils; import com.extjs.gxt.ui.client.event.MenuEvent; import com.extjs.gxt.ui.client.event.SelectionListener; @@ -91,7 +92,6 @@ public void componentSelected(final MenuEvent ce) { final AbstractAction action = descriptor.getAction(); if (action != null) { - action.actionPerformed(new ActionEvent(getItemObjectOfAction(descriptor), Event.getCurrentEvent())); } } @@ -157,7 +157,7 @@ @Override protected void setToolTipText(final String tooltip) { - if (tooltip != null) { + if (TextUtils.notEmpty(tooltip)) { item.setToolTip(new GxtDefTooltip(tooltip)); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -25,6 +25,7 @@ import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.utils.TextUtils; import com.extjs.gxt.ui.client.Style.ButtonScale; import com.extjs.gxt.ui.client.event.ButtonEvent; @@ -142,7 +143,7 @@ @Override public void setToolTipText(final String tooltip) { if (button != null) { - if (tooltip != null && tooltip.length() > 0) { + if (TextUtils.notEmpty(tooltip)) { button.setToolTip(new GxtDefTooltip(tooltip)); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.utils.TextUtils; import com.extjs.gxt.ui.client.widget.menu.MenuItem; @@ -72,7 +73,9 @@ @Override public void setToolTipText(final String tooltip) { - item.setToolTip(new GxtDefTooltip(tooltip)); + if (TextUtils.notEmpty(tooltip)) { + item.setToolTip(new GxtDefTooltip(tooltip)); + } } @Override Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -19,6 +19,9 @@ */ package cc.kune.common.client.actions.ui.descrip; +import java.util.ArrayList; +import java.util.List; + import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; @@ -32,7 +35,7 @@ /** The action. */ private final AbstractAction action; - private GuiAddCondition addCondition = new GuiAddConditionAdapter(); + private final List<GuiAddCondition> addConditions; /** The item DOM id. */ private String id; @@ -56,9 +59,15 @@ this.action = action; position = NO_POSITION; parent = NO_PARENT; + addConditions = new ArrayList<GuiAddCondition>(); } @Override + public void add(final GuiAddCondition addCondition) { + addConditions.add(addCondition); + } + + @Override public void fire(final ActionEvent event) { action.actionPerformed(event); } @@ -69,11 +78,6 @@ } @Override - public GuiAddCondition getAddCondition() { - return addCondition; - } - - @Override public String getId() { return id; } @@ -147,19 +151,16 @@ @Override public boolean mustBeAdded() { - boolean result = false; - if (addCondition != null) { - result = addCondition.mustBeAdded(this); + final boolean result = true; + for (final GuiAddCondition addCondition : addConditions) { + if (!addCondition.mustBeAdded(this)) { + return false; + } } return result; } @Override - public void setAddCondition(final GuiAddCondition addCondition) { - this.addCondition = addCondition; - } - - @Override public void setEnabled(final boolean enabled) { super.putValue(Action.ENABLED, enabled); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -26,12 +26,12 @@ void addPropertyChangeListener(final PropertyChangeListener listener); + void add(final GuiAddCondition addCondition); + void fire(final ActionEvent event); AbstractAction getAction(); - GuiAddCondition getAddCondition(); - String getId(); Object getItem(); @@ -64,8 +64,6 @@ void removePropertyChangeListener(final PropertyChangeListener listener); - void setAddCondition(final GuiAddCondition addCondition); - void setEnabled(final boolean enabled); void setId(final String id); Deleted: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,28 +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.common.client.actions.ui.descrip; - - -public class GuiAddConditionAdapter implements GuiAddCondition { - @Override - public boolean mustBeAdded(final GuiActionDescrip descrip) { - return true; - } -} Modified: trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -89,7 +89,7 @@ } public static void showAlertMessage(final String title, final String message, final SimpleCallback callback) { - eventBus.fireEvent(new ConfirmAskEvent(title, message, i18n.t("Ok"), i18n.t("Close"), callback)); + eventBus.fireEvent(new ConfirmAskEvent(title, message, i18n.t("Ok"), "", callback)); } public static void showProgress(final String text) { Deleted: trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,2347 +0,0 @@ -body { - background-color: #16181a; - color: #fcfcfc; -} - -.ext-el-mask { - background-color: #ccc; -} - -.ext-el-mask-msg { - border-color: #223; - background-color: #3f4757; - background-image: url(../images/box/tb-blue.gif); -} - -.ext-el-mask-msg div { - background-color: #232d38; - border-color: #556; - color: #fff; - font: normal 14px tahoma, arial, helvetica, sans-serif; -} - -.x-mask-loading div { - background-color: #232d38; - background-image: url(../images/grid/loading.gif); -} - -.x-item-disabled { - color: #ddd; -} - -.x-item-disabled * { - color: #ddd !important; -} - -.x-splitbar-proxy { - background-color: #aaa; -} - -.x-color-palette a { - border-color: #fff; -} - -.x-color-palette a:hover,.x-color-palette a.x-color-palette-sel { - border-color: #8bb8f3; - background-color: #deecfd; -} - -.x-color-palette em { - border-color: #aca899; -} - -.x-ie-shadow { - background-color: #777; -} - -/* -.x-shadow .xsmc { - background-image: url(../images/default/shadow-c.png); -} - -.x-shadow .xsml,.x-shadow .xsmr { - background-image: url(../images/default/shadow-lr.png); -} - -.x-shadow .xstl,.x-shadow .xstc,.x-shadow .xstr,.x-shadow .xsbl,.x-shadow .xsbc,.x-shadow .xsbr { - background-image: url(../images/default/shadow.png); -} -*/ -.loading-indicator { - font-size: 14px; - background-image: url(../images/grid/loading.gif); -} - -.x-spotlight { - background-color: #ccc; -} - -.x-tab-panel-header,.x-tab-panel-footer { - background-color: #e18325; - border-color: #8db2e3; - overflow: hidden; - zoom: 1; -} - -.x-tab-panel-header,.x-tab-panel-footer { - border-color: #222; -} - -ul.x-tab-strip-top { - background-color: #343843; - background-image: url(../images/tabs/tab-strip-bg.gif); - border-bottom-color: #343d4e; -} - -ul.x-tab-strip-bottom { - background-color: #343843; - background-image: url(../images/tabs/tab-strip-btm-bg.gif); - border-top-color: #343843; -} - -.x-tab-panel-header-plain .x-tab-strip-spacer,.x-tab-panel-footer-plain .x-tab-strip-spacer { - border-color: #222; - background-color: #e18325; -} - -.x-tab-strip span.x-tab-strip-text { - font: normal 14px tahoma, arial, helvetica; - color: #fff; -} - -.x-tab-strip-over span.x-tab-strip-text { - color: #fff; -} - -.x-tab-strip-active span.x-tab-strip-text { - color: black; - font-weight: bold; -} - -.x-tab-strip-disabled .x-tabs-text { - color: #aaaaaa; -} - -.x-tab-strip-top .x-tab-right,.x-tab-strip-top .x-tab-left,.x-tab-strip-top .x-tab-strip-inner { - background-image: url(../images/tabs/tabs-sprite.gif); -} - -.x-tab-strip-bottom .x-tab-right { - background-image: url(../images/tabs/tab-btm-inactive-right-bg.gif); -} - -.x-tab-strip-bottom .x-tab-left { - background-image: url(../images/tabs/tab-btm-inactive-left-bg.gif); -} - -.x-tab-strip-bottom .x-tab-strip-active .x-tab-right { - background-image: url(../images/tabs/tab-btm-right-bg.gif); -} - -.x-tab-strip-bottom .x-tab-strip-active .x-tab-left { - background-image: url(../images/tabs/tab-btm-left-bg.gif); -} - -.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close { - background-image: url(../images/tabs/tab-close.gif); -} - -.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover { - background-image: url(../images/tabs/tab-close.gif); -} - -.x-tab-panel-body { - border-color: #18181a; - background-color: #fff; -} - -.x-tab-panel-body-top { - border-top: 0 none; -} - -.x-tab-panel-body-bottom { - border-bottom: 0 none; -} - -.x-tab-scroller-left { - background-image: url(../images/tabs/scroll-left.gif); - border-bottom-color: #8db2e3; -} - -.x-tab-scroller-left-over { - background-position: 0 0; -} - -.x-tab-scroller-left-disabled { - background-position: -18px 0; - opacity: .5; - -moz-opacity: .5; - filter: alpha(opacity = 50); - cursor: default; -} - -.x-tab-scroller-right { - background-image: url(../images/tabs/scroll-right.gif); - border-bottom-color: #8db2e3; -} - -.x-tab-panel-bbar .x-toolbar,.x-tab-panel-tbar .x-toolbar { - border-color: #99bbe8; -} - -.x-form-field { - font: normal 15px tahoma, arial, helvetica, sans-serif; -} - -.x-form-text,textarea.x-form-field { - color: #ffffff; - background-color: #33373d; - background-image: url(../images/form/text-bg.gif); - border-color: #737b8c; - border-width: 2px; -} - -.x-form-text,.ext-ie .x-form-file { - height: 26px; -} - -.ext-strict .x-form-text { - height: 20px; -} - -.x-form-select-one { - background-color: #fff; - border-color: #b5b8c8; -} - -.x-form-check-group-label { - border-bottom: 1px solid #99bbe8; - color: #fff; -} - -.x-editor .x-form-check-wrap { - background-color: #fff; -} - -.x-form-field-wrap .x-form-trigger { - background-image: url(../images/form/trigger.gif); - border-bottom-color: #737b8c; - border-bottom-width: 2px; - height: 24px; - width: 20px; -} - -.x-form-field-wrap .x-form-trigger.x-form-trigger-over { - border-bottom-color: #d97e27; -} - -.x-form-field-wrap .x-form-trigger.x-form-trigger-click { - border-bottom-color: #c86e19; -} - -.x-small-editor .x-form-field-wrap .x-form-trigger { - height: 20px; -} - -.x-form-field-wrap .x-form-trigger-over { - background-position: -20px 0; -} - -.x-form-field-wrap .x-form-trigger-click { - background-position: -40px 0; -} - -.x-trigger-wrap-focus .x-form-trigger { - background-position: -60px 0; -} - -.x-trigger-wrap-focus .x-form-trigger-over { - background-position: -80px 0; -} - -.x-trigger-wrap-focus .x-form-trigger-click { - background-position: -100px 0; -} - -.x-form-field-wrap .x-form-date-trigger { - background-image: url(../images/form/date-trigger.gif); -} - -.x-form-field-wrap .x-form-clear-trigger { - background-image: url(../images/form/clear-trigger.gif); -} - -.x-form-field-wrap .x-form-search-trigger { - background-image: url(../images/form/search-trigger.gif); -} - -.x-trigger-wrap-focus .x-form-trigger { - border-bottom-color: #737b8c; -} - -.x-item-disabled .x-form-trigger-over { - border-bottom-color: #b5b8c8; -} - -.x-item-disabled .x-form-trigger-click { - border-bottom-color: #b5b8c8; -} - -.x-form-focus,textarea.x-form-focus { - border-color: #ff9c33; -} - -.x-form-invalid,textarea.x-form-invalid { - background-color: #15171a; - background-image: url(../images/grid/invalid_line.gif); - border-color: #c30; -} - -.ext-safari .x-form-invalid { - background-color: #fee; - border-color: #ff7870; -} - -.x-form-inner-invalid,textarea.x-form-inner-invalid { - background-color: #fff; - background-image: url(../images/grid/invalid_line.gif); -} - -.x-form-grow-sizer { - font: normal 15px tahoma, arial, helvetica, sans-serif; -} - -.x-form-item { - font: normal 15px tahoma, arial, helvetica, sans-serif; -} - -.x-form-invalid-msg { - color: #c0272b; - font: normal 14px tahoma, arial, helvetica, sans-serif; - background-image: url(../images/default/shared/warning.gif); -} - -.x-form-empty-field { - color: #dadadd; -} - -.x-small-editor .x-form-text { - height: 22px; -} - -.x-small-editor .x-form-field { - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.ext-safari .x-small-editor .x-form-field { - font: normal 15px arial, tahoma, helvetica, sans-serif; -} - -.x-form-invalid-icon { - background-image: url(../images/form/exclamation.gif); - height: 25px; - width: 19px; - background-position: center right; -} - -.x-fieldset { - border-color: #737B8C; - color: white !important; -} - -.x-fieldset legend { - font: bold 14px tahoma, arial, helvetica, sans-serif; - color: white !important; -} - -.x-btn { - font: normal 14px tahoma, verdana, helvetica; -} - -.x-btn button { - font: normal 14px arial, tahoma, verdana, helvetica; - color: #fffffa; - padding-left: 6px !important; - padding-right: 6px !important; -} - -.x-btn-over .x-btn button { - color: #fff; -} - -.x-btn-noicon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-left .x-btn-text,.x-btn-icon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-right .x-btn-text - { - height: 18px; -} - -.x-btn-icon .x-btn-small .x-btn-text { - width: 18px; -} - -.x-btn-text-icon .x-btn-icon-small-left .x-btn-text { - padding-left: 21px !important; -} - -.x-btn-text-icon .x-btn-icon-small-right .x-btn-text { - padding-right: 21px !important; -} - -.x-btn-text-icon .x-btn-icon-medium-left .x-btn-text { - padding-left: 29px !important; -} - -.x-btn-text-icon .x-btn-icon-medium-right .x-btn-text { - padding-right: 29px !important; -} - -.x-btn-text-icon .x-btn-icon-large-left .x-btn-text { - padding-left: 37px !important; -} - -.x-btn-text-icon .x-btn-icon-large-right .x-btn-text { - padding-right: 37px !important; -} - -.x-btn em { - font-style: normal; - font-weight: normal; -} - -.x-btn-tl,.x-btn-tr,.x-btn-tc,.x-btn-ml,.x-btn-mr,.x-btn-mc,.x-btn-bl,.x-btn-br,.x-btn-bc { - background-image: url(../images/button/btn.gif); -} - -.x-btn-click .x-btn-text,.x-btn-menu-active .x-btn-text,.x-btn-pressed .x-btn-text { - color: #fff; -} - -.x-btn-pressed .x-btn-text { - font-style: italic; - text-decoration: underline; - font-weight: bold; - color: black !important; -} - -.x-btn-disabled * { - color: #eee !important; -} - -.x-btn-mc em.x-btn-arrow { - background-image: url(../images/button/arrow.gif); - padding-right: 13px; -} - -.x-btn-mc em.x-btn-split { - background-image: url(../images/button/s-arrow.gif); - padding-right: 20px; -} - -.x-contrast .x-btn-mc em.x-btn-split { - padding-right: 0px; -} - -.x-btn-over .x-btn-mc em.x-btn-split,.x-btn-click .x-btn-mc em.x-btn-split,.x-btn-menu-active .x-btn-mc em.x-btn-split,.x-btn-pressed .x-btn-mc em.x-btn-split - { - background-image: url(../images/button/s-arrow-o.gif); -} - -.x-btn-mc em.x-btn-arrow-bottom { - background-image: url(../images/button/s-arrow-b-noline.gif); -} - -.x-btn-mc em.x-btn-split-bottom { - background-image: url(../images/button/s-arrow-b.gif); -} - -.x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-btn-pressed .x-btn-mc em.x-btn-split-bottom - { - background-image: url(../images/button/s-arrow-bo.gif); -} - -.x-btn-group-header { - color: #d2d2d2; -} - -.x-btn-group-tc { - background-image: url(../images/button/group-tb.gif); -} - -.x-btn-group-tl { - background-image: url(../images/button/group-cs.gif); -} - -.x-btn-group-tr { - background-image: url(../images/button/group-cs.gif); -} - -.x-btn-group-bc { - background-image: url(../images/button/group-tb.gif); -} - -.x-btn-group-bl { - background-image: url(../images/button/group-cs.gif); -} - -.x-btn-group-br { - background-image: url(../images/button/group-cs.gif); -} - -.x-btn-group-ml { - background-image: url(../images/button/group-lr.gif); -} - -.x-btn-group-mr { - background-image: url(../images/button/group-lr.gif); -} - -.x-btn-group-notitle .x-btn-group-tc { - background-image: url(../images/button/group-tb.gif); -} - -.x-toolbar { - border-color: #18181a; - background-color: #393d4e; - background-image: url(../images/toolbar/bg.gif); -} - -.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label { - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.x-toolbar .x-item-disabled { - color: gray; -} - -.x-toolbar .x-item-disabled * { - color: gray; -} - -.x-toolbar .x-btn-mc em.x-btn-split { - background-image: url(../images/button/s-arrow-noline.gif); -} - -.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split - { - background-image: url(../images/button/s-arrow-o.gif); -} - -.x-toolbar .x-btn-mc em.x-btn-split-bottom { - background-image: url(../images/button/s-arrow-b-noline.gif); -} - -.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split-bottom - { - background-image: url(../images/button/s-arrow-bo.gif); -} - -.x-toolbar .xtb-sep { - background-image: url(../images/grid/grid-blue-split.gif); -} - -.x-toolbar .x-btn { - padding-left: 3px; - padding-right: 3px; -} - -.x-toolbar .x-btn-mc em.x-btn-arrow { - padding-right: 10px; -} - -.x-toolbar .x-btn-text-icon .x-btn-icon-small-left .x-btn-text { - padding-left: 18px !important; -} - -.x-toolbar .x-btn-mc em.x-btn-split { - padding-right: 14px; -} - -.x-tbar-page-first { - background-image: url(../images/grid/page-first.gif) !important; -} - -.x-tbar-loading { - background-image: url(../images/grid/refresh.gif) !important; -} - -.x-tbar-page-last { - background-image: url(../images/grid/page-last.gif) !important; -} - -.x-tbar-page-next { - background-image: url(../images/grid/page-next.gif) !important; -} - -.x-tbar-page-prev { - background-image: url(../images/grid/page-prev.gif) !important; -} - -.x-item-disabled .x-tbar-loading { - background-image: url(../images/grid/loading.gif) !important; -} - -.x-item-disabled .x-tbar-page-first { - background-image: url(../images/grid/page-first-disabled.gif) !important; -} - -.x-item-disabled .x-tbar-page-last { - background-image: url(../images/grid/page-last-disabled.gif) !important; -} - -.x-item-disabled .x-tbar-page-next { - background-image: url(../images/grid/page-next-disabled.gif) !important; -} - -.x-item-disabled .x-tbar-page-prev { - background-image: url(../images/grid/page-prev-disabled.gif) !important; -} - -.x-paging-info { - color: #444; -} - -.x-toolbar-more-icon { - background-image: url(../images/toolbar/more.gif) !important; -} - -.x-statusbar .x-status-busy { - background-image: url(../images/grid/loading.gif); -} - -.x-statusbar .x-status-text-panel { - border-color: #99bbe8 #fff #fff #99bbe8; -} - -.x-resizable-handle { - background-color: #fff; - color: #000; -} - -.x-resizable-over .x-resizable-handle-east,.x-resizable-pinned .x-resizable-handle-east,.x-resizable-over .x-resizable-handle-west,.x-resizable-pinned .x-resizable-handle-west - { - background-image: url(../images/sizer/e-handle.gif); -} - -.x-resizable-over .x-resizable-handle-south,.x-resizable-pinned .x-resizable-handle-south,.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north - { - background-image: url(../images/sizer/s-handle.gif); -} - -.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north { - background-image: url(../images/sizer/s-handle.gif); -} - -.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast { - background-image: url(../images/sizer/se-handle.gif); -} - -.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest { - background-image: url(../images/sizer/nw-handle.gif); -} - -.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast { - background-image: url(../images/sizer/ne-handle.gif); -} - -.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest { - background-image: url(../images/sizer/sw-handle.gif); -} - -.x-resizable-proxy { - border-color: #3b5a82; -} - -.x-resizable-overlay { - background-color: #fff; -} - -.x-grid3 { - background-color: #1f2933; -} - -.x-grid-panel .x-panel-mc .x-panel-body { - border-color: #223; -} - -.x-grid3-hd-row td,.x-grid3-row td,.x-grid3-summary-row td { - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.x-grid3-hd-row td { - border-left-color: #556; - border-right-color: #223; -} - -.x-grid-row-loading { - background-color: #fff; - background-image: url(../images/default/shared/loading-balls.gif); -} - -.x-grid3-row { - border-bottom: 1px solid #111; -} - -.x-grid3-row-alt { - background-color: #1b232b; -} - -.x-grid3-row-over { - background-color: #7e5530; - background-image: none; -} - -.x-grid3-resize-proxy { - background-color: #777; -} - -.x-grid3-resize-marker { - background-color: #777; -} - -.x-grid3-header { - background-color: #3b3f50; - background-image: url(../images/grid/grid3-hrow.gif); -} - -.x-grid3-header-pop { - border-left-color: #d0d0d0; -} - -.x-grid3-header-pop-inner { - border-left-color: #eee; - background-image: url(../images/default/grid/hd-pop.gif); -} - -td.x-grid3-hd-over,td.sort-desc,td.sort-asc,td.x-grid3-hd-menu-open { - border-left-color: #889; - border-right-color: #445; -} - -td.x-grid3-hd-over .x-grid3-hd-inner,td.sort-desc .x-grid3-hd-inner,td.sort-asc .x-grid3-hd-inner,td.x-grid3-hd-menu-open .x-grid3-hd-inner - { - background-color: #4e628a; - background-image: url(../images/grid/grid3-hrow-over.gif); -} - -.x-grid3-cell-inner,.x-grid3-hd-inner { - color: #fff; -} - -.sort-asc .x-grid3-sort-icon { - background-image: url(../images/grid/sort_asc.gif); - width: 15px; - height: 9px; - margin-left: 5px; -} - -.sort-desc .x-grid3-sort-icon { - background-image: url(../images/grid/sort_desc.gif); - width: 15px; - height: 9px; - margin-left: 5px; -} - -.x-grid3-cell-text,.x-grid3-hd-text { - color: #fff; -} - -.x-grid3-split { - background-image: url(../images/default/grid/grid-split.gif); -} - -.x-grid3-hd-text { - color: fff; -} - -.x-dd-drag-proxy .x-grid3-hd-inner { - background-color: #bec7da; - background-image: url(../images/grid/grid3-hrow-over.gif); - border-color: #aaccf6; -} - -.col-move-top { - background-image: url(../images/default/grid/col-move-top.gif); -} - -.col-move-bottom { - background-image: url(../images/default/grid/col-move-bottom.gif); -} - -.x-grid3-row-selected { - background-color: #e5872c !important; - background-image: none; - border-style: solid; - font-weight: bold !important; - color: black !important; -} - -.x-grid3-highlightrow { - border: 1px dotted #e5872c !important; - background-color: #666360; - text-decoration: underline; -} - -.x-grid3-group-selected { - background-color: #e5872c !important; -} - -.x-grid3-row-selected .x-grid3-cell-inner { - color: black !important; -} - -.x-grid3-cell-selected .x-grid3-cell-inner { - background-color: #ffa340 !important; - color: black !important; - font-weight: bold; -} - -.x-grid3-cell-selected span { - color: black !important; -} - -.x-grid3-cell-selected .x-grid3-cell-text { - color: black; -} - -.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker { - background-color: #ebeadb !important; - background-image: url(../images/default/grid/grid-hrow.gif) !important; - color: #fff; - border-top-color: #fff; - border-right-color: #6fa0df !important; -} - -.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div { - color: fff !important; -} - -.x-grid3-dirty-cell { - background-image: url(../images/grid/dirty.gif); -} - -.x-grid3-topbar,.x-grid3-bottombar { - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.x-grid3-bottombar .x-toolbar { - border-top-color: #a9bfd3; -} - -.x-props-grid .x-grid3-td-name .x-grid3-cell-inner { - background-image: url(../images/grid/grid3-special-col-bg.gif) !important; - color: #fff !important; -} - -.x-props-grid .x-grid3-td-value { - color: #fff !important; -} - -.x-props-grid .x-grid3-body .x-grid3-td-name { - background-color: #263240 !important; - border-right-color: #223; -} - -.xg-hmenu-sort-asc .x-menu-item-icon { - background-image: url(../images/grid/hmenu-asc.gif); -} - -.xg-hmenu-sort-desc .x-menu-item-icon { - background-image: url(../images/grid/hmenu-desc.gif); -} - -.xg-hmenu-lock .x-menu-item-icon { - background-image: url(../images/grid/hmenu-lock.gif); -} - -.xg-hmenu-unlock .x-menu-item-icon { - background-image: url(../images/grid/hmenu-unlock.gif); -} - -.x-grid3-hd-btn { - background-color: #c2c9d0; - background-image: url(../images/grid/grid3-hd-btn.gif); -} - -.x-grid3-body .x-grid3-td-expander { - background-image: url(../images/grid/grid3-special-col-bg.gif); -} - -.x-grid3-row-expander { - background-image: url(../images/grid/row-expand-sprite.gif); -} - -.x-grid3-body .x-grid3-td-checker { - background-image: url(../images/grid/grid3-special-col-bg.gif); -} - -.x-grid3-row-checker,.x-grid3-hd-checker { - background-image: url(../images/default/grid/row-check-sprite.gif); -} - -.x-grid3-body .x-grid3-td-numberer { - background-image: url(../images/grid/grid3-special-col-bg.gif); -} - -.x-grid3-body .x-grid3-td-numberer .x-grid3-cell-inner { - color: #fff; -} - -.x-grid3-body .x-grid3-td-row-icon { - background-image: url(../images/grid/grid3-special-col-bg.gif); -} - -.x-grid3-body .x-grid3-row-selected .x-grid3-td-numberer,.x-grid3-body .x-grid3-row-selected .x-grid3-td-checker,.x-grid3-body .x-grid3-row-selected .x-grid3-td-expander - { - background-image: url(../images/grid/grid3-special-col-sel-bg.gif); -} - -.x-grid3-check-col { - background-image: url(../images/menu/unchecked.gif); -} - -.x-grid3-check-col-on { - background-image: url(../images/menu/checked.gif); -} - -.x-grid-group,.x-grid-group-body,.x-grid-group-hd { - zoom: 1; -} - -.x-grid-group-hd { - border-bottom-color: #4e628a; -} - -.x-grid-group-hd div.x-grid-group-title { - background-image: url(../images/grid/group-collapse.gif); - background-position: 3px 6px; - color: #ffd; - font: bold 14px tahoma, arial, helvetica, sans-serif; -} - -.x-grid-group-collapsed .x-grid-group-hd div.x-grid-group-title { - background-image: url(../images/grid/group-expand.gif); -} - -.x-group-by-icon { - background-image: url(../images/grid/group-by.gif); -} - -.x-cols-icon { - background-image: url(../images/grid/columns.gif); -} - -.x-show-groups-icon { - background-image: url(../images/grid/group-by.gif); -} - -.x-grid-empty { - color: gray; - font: normal 14px tahoma, arial, helvetica, sans-serif; -} - -.x-grid-with-col-lines .x-grid3-row td.x-grid3-cell { - border-right-color: #ededed; -} - -.x-grid-with-col-lines .x-grid3-row { - border-top-color: #ededed; -} - -.x-grid-with-col-lines .x-grid3-row-selected { - border-top-color: #a3bae9; -} - -.x-dd-drag-ghost { - color: #000; - font: normal 14px arial, helvetica, sans-serif; - border-color: #ddd #bbb #bbb #ddd; - background-color: #bec7da; -} - -/* -.x-dd-drop-nodrop .x-dd-drop-icon { - background-image: url(../images/default/dd/drop-no.gif); -} - -.x-dd-drop-ok .x-dd-drop-icon { - background-image: url(../images/default/dd/drop-yes.gif); -} - -.x-dd-drop-ok-add .x-dd-drop-icon { - background-image: url(../images/default/dd/drop-add.gif); -} -*/ -.x-view-selector { - background-color: #c3daf9; - border-color: #3399bb; -} - -.x-tree-node-expanded .x-tree-node-icon { - background-image: url(../images/tree/folder-open.gif); -} - -.x-tree-node-leaf .x-tree-node-icon { - background-image: url(../images/default/tree/leaf.gif); -} - -.x-tree-node-collapsed .x-tree-node-icon { - background-image: url(../images/tree/folder.gif); -} - -.x-tree-node-loading .x-tree-node-icon { - background-image: url(../images/default/tree/loading.gif) !important; -} - -.x-tree-node .x-tree-node-inline-icon { - background-image: none; -} - -.x-tree-node-loading a span { - font-style: italic; - color: #444444; -} - -.ext-ie .x-tree-node-el input { - width: 14px; - height: 14px; -} - -.x-tree-lines .x-tree-elbow { - background-image: url(../images/tree/elbow.gif); -} - -.x-tree-lines .x-tree-elbow-plus { - background-image: url(../images/tree/elbow-plus.gif); -} - -.x-tree-lines .x-tree-elbow-minus { - background-image: url(../images/tree/elbow-minus.gif); -} - -.x-tree-lines .x-tree-elbow-end { - background-image: url(../images/tree/elbow-end.gif); -} - -.x-tree-lines .x-tree-elbow-end-plus { - background-image: url(../images/tree/elbow-end-plus.gif); -} - -.x-tree-lines .x-tree-elbow-end-minus { - background-image: url(../images/tree/elbow-end-minus.gif); -} - -.x-tree-lines .x-tree-elbow-line { - background-image: url(../images/tree/elbow-line.gif); -} - -.x-tree-no-lines .x-tree-elbow-plus { - background-image: url(../images/tree/elbow-plus-nl.gif); -} - -.x-tree-no-lines .x-tree-elbow-minus { - background-image: url(../images/tree/elbow-minus-nl.gif); -} - -.x-tree-no-lines .x-tree-elbow-end-plus { - background-image: url(../images/tree/elbow-end-plus-nl.gif); -} - -.x-tree-no-lines .x-tree-elbow-end-minus { - background-image: url(../images/tree/elbow-end-minus-nl.gif); -} - -.x-tree-arrows .x-tree-elbow-plus { - background-image: url(../images/tree/arrows.gif); -} - -.x-tree-arrows .x-tree-elbow-minus { - background-image: url(../images/tree/arrows.gif); -} - -.x-tree-arrows .x-tree-elbow-end-plus { - background-image: url(../images/tree/arrows.gif); -} - -.x-tree-arrows .x-tree-elbow-end-minus { - background-image: url(../images/tree/arrows.gif); -} - -.x-tree-node { - color: #000; - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.x-tree-node a,.x-dd-drag-ghost a { - color: #fff; -} - -.x-tree-node a span,.x-dd-drag-ghost a span { - color: #fff; -} - -.x-tree-node .x-tree-selected a,.x-dd-drag-ghost a { - color: #fff; -} - -.x-tree-node .x-tree-selected a span,.x-dd-drag-ghost a span { - color: #fff; -} - -.x-tree-node .x-tree-node-disabled a span { - color: gray !important; -} - -.x-tree-node div.x-tree-drag-insert-below { - border-bottom-color: #36c; -} - -.x-tree-node div.x-tree-drag-insert-above { - border-top-color: #36c; -} - -.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below a { - border-bottom-color: #36c; -} - -.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above a { - border-top-color: #36c; -} - -.x-tree-node .x-tree-drag-append a span { - background-color: #ddd; - border-color: gray; -} - -.x-tree-node .x-tree-node-over { - background-color: #7e5530; -} - -.x-tree-node .x-tree-selected { - background-color: #e5872c; - font-weight: bold; -} - -.x-tree-drop-ok-append .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-add.gif); -} - -.x-tree-drop-ok-above .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-over.gif); -} - -.x-tree-drop-ok-below .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-under.gif); -} - -.x-tree-drop-ok-between .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-between.gif); -} - -.x-date-picker { - border-color: #737b8c; - background-color: #21252e; -} - -.x-date-middle,.x-date-left,.x-date-right { - background-image: url(../images/shared/hd-sprite.gif); - color: #fff; - font: bold 14px "sans serif", tahoma, verdana, helvetica; -} - -.x-date-middle .x-btn .x-btn-text { - color: #fff; -} - -.x-date-middle .x-btn-mc em.x-btn-arrow { - background-image: url(../images/toolbar/btn-arrow-light.gif); -} - -.x-date-right a { - background-image: url(../images/shared/right-btn.gif); -} - -.x-date-left a { - background-image: url(../images/shared/left-btn.gif); -} - -.x-date-inner th { - background-color: #363d4a; - background-image: url(../images/toolbar/bg.gif); - border-bottom-color: #535b5c; - font: normal 13px arial, helvetica, tahoma, sans-serif; - color: #fff; -} - -.x-date-inner td { - border-color: #112; -} - -.x-date-inner a { - font: normal 14px arial, helvetica, tahoma, sans-serif; - color: #fff; - padding: 2px 7px 1px 3px; /* Structure to account for larger, bolder fonts in Access theme. */ -} - -.x-date-inner .x-date-active { - color: #000; -} - -.x-date-inner .x-date-selected a { - background-color: #e5872c; - background-image: none; - border-color: #864900; - padding: 1px 6px 1px 2px; /* Structure to account for larger, bolder fonts in Access theme. */ -} - -.x-date-inner .x-date-today a { - border-color: #99a; -} - -.x-date-inner .x-date-selected span { - font-weight: bold; -} - -.x-date-inner .x-date-prevday a,.x-date-inner .x-date-nextday a { - color: #aaa; -} - -.x-date-bottom { - border-top-color: #737b8c; - background-color: #464d5a; - background-image: url(../images/shared/glass-bg.gif); -} - -.x-date-inner a:hover,.x-date-inner .x-date-disabled a:hover { - color: #fff; - background-color: #7e5530; -} - -.x-date-inner .x-date-disabled a { - background-color: #eee; - color: #bbb; -} - -.x-date-mmenu { - background-color: #eee !important; -} - -.x-date-mmenu .x-menu-item { - font-size: 13px; - color: #000; -} - -.x-date-mp { - background-color: #21252e; -} - -.x-date-mp td { - font: normal 14px arial, helvetica, tahoma, sans-serif; -} - -.x-date-mp-btns button { - background-color: #083772; - color: #fff; - border-color: #3366cc #000055 #000055 #3366cc; - font: normal 14px arial, helvetica, tahoma, sans-serif; -} - -.x-date-mp-btns { - background-color: #dfecfb; - background-image: url(../images/shared/glass-bg.gif); -} - -.x-date-mp-btns td { - border-top-color: #c5d2df; -} - -td.x-date-mp-month a,td.x-date-mp-year a { - color: #fff; -} - -td.x-date-mp-month a:hover,td.x-date-mp-year a:hover { - color: fff; - background-color: #7e5530; -} - -td.x-date-mp-sel a { - background-color: #e5872c; - background-image: none; - border-color: #864900; -} - -.x-date-mp-ybtn a { - background-image: url(../images/panel/tool-sprites.gif); -} - -td.x-date-mp-sep { - border-right-color: #c5d2df; -} - -.x-tip .x-tip-close { - background-image: url(../images/qtip/close.gif); -} - -.x-tip .x-tip-tc,.x-tip .x-tip-tl,.x-tip .x-tip-tr,.x-tip .x-tip-bc,.x-tip .x-tip-bl,.x-tip .x-tip-br,.x-tip .x-tip-ml,.x-tip .x-tip-mr - { - background-image: url(../images/qtip/tip-sprite.gif); -} - -.x-tip .x-tip-mc { - font: normal 14px tahoma, arial, helvetica, sans-serif; -} - -.x-tip .x-tip-ml { - background-color: #fff; -} - -.x-tip .x-tip-header-text { - font: bold 14px tahoma, arial, helvetica, sans-serif; - color: #ffd; -} - -.x-tip .x-tip-body { - font: normal 14px tahoma, arial, helvetica, sans-serif; - color: #000; -} - -.x-form-invalid-tip .x-tip-tc,.x-form-invalid-tip .x-tip-tl,.x-form-invalid-tip .x-tip-tr,.x-form-invalid-tip .x-tip-bc,.x-form-invalid-tip .x-tip-bl,.x-form-invalid-tip .x-tip-br,.x-form-invalid-tip .x-tip-ml,.x-form-invalid-tip .x-tip-mr - { - background-image: url(../images/default/form/error-tip-corners.gif); -} - -.x-form-invalid-tip .x-tip-body { - background-image: url(../images/form/exclamation.gif); -} - -.x-tip-anchor { - background-image: url(../images/qtip/tip-anchor-sprite.gif); -} - -.x-menu { - border-color: #222; - background-color: #414551; - background-image: url(../images/menu/menu.gif); -} - -.x-menu-nosep { - background-image: none; -} - -.x-menu-list-item { - font: normal 14px tahoma, arial, sans-serif; -} - -.x-menu-item-arrow { - background-image: url(../images/menu/menu-parent.gif); -} - -.x-menu-sep { - background-color: #223; - border-bottom-color: #666; -} - -a.x-menu-item { - color: #fffff6; -} - -.x-menu-item-active { - background-color: #f09134; - background-image: none; - border-color: #b36427; -} - -.x-menu-item-active a.x-menu-item { - border-color: #b36427; -} - -.x-menu-check-item .x-menu-item-icon { - background-image: url(../images/default/menu/unchecked.gif); -} - -.x-menu-item-checked .x-menu-item-icon { - background-image: url(../images/default/menu/checked.gif); -} - -.x-menu-item-checked .x-menu-group-item .x-menu-item-icon { - background-image: url(../images/menu/group-checked.gif); -} - -.x-menu-group-item .x-menu-item-icon { - background-image: none; -} - -.x-menu-plain { - background-color: #fff !important; -} - -.x-menu .x-date-picker { - border-color: #a3bad9; -} - -.x-cycle-menu .x-menu-item-checked { - border-color: #a3bae9 !important; - background-color: #def8f6; -} - -.x-menu-scroller-top { - background-image: url(../images/layout/mini-top.gif); -} - -.x-menu-scroller-bottom { - background-image: url(../images/layout/mini-bottom.gif); -} - -.x-box-tl { - background-image: url(../images/default/box/corners.gif); -} - -.x-box-tc { - background-image: url(../images/default/box/tb.gif); -} - -.x-box-tr { - background-image: url(../images/default/box/corners.gif); -} - -.x-box-ml { - background-image: url(../images/default/box/l.gif); -} - -.x-box-mc { - background-color: #eee; - background-image: url(../images/default/box/tb.gif); - font-family: "Myriad Pro", "Myriad Web", "Tahoma", "Helvetica", "Arial", sans-serif; - color: #393939; - font-size: 15px; -} - -.x-box-mc h3 { - font-size: 18px; - font-weight: bold; -} - -.x-box-mr { - background-image: url(../images/default/box/r.gif); -} - -.x-box-bl { - background-image: url(../images/default/box/corners.gif); -} - -.x-box-bc { - background-image: url(../images/default/box/tb.gif); -} - -.x-box-br { - background-image: url(../images/default/box/corners.gif); -} - -.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr { - background-image: url(../images/default/box/corners-blue.gif); -} - -.x-box-blue .x-box-bc,.x-box-blue .x-box-mc,.x-box-blue .x-box-tc { - background-image: url(../images/default/box/tb-blue.gif); -} - -.x-box-blue .x-box-mc { - background-color: #c3daf9; -} - -.x-box-blue .x-box-mc h3 { - color: #17385b; -} - -.x-box-blue .x-box-ml { - background-image: url(../images/default/box/l-blue.gif); -} - -.x-box-blue .x-box-mr { - background-image: url(../images/default/box/r-blue.gif); -} - -.x-combo-list { - border: 2px solid #232732; - background-color: #555566 !important; - font: normal 15px tahoma, arial, helvetica, sans-serif; -} - -.x-combo-list-inner { - background-color: #414551; -} - -.x-combo-list-hd { - font: bold 14px tahoma, arial, helvetica, sans-serif; - color: fff; - background-image: url(../images/default/layout/panel-title-light-bg.gif); - border-bottom-color: #98c0f4; -} - -.x-resizable-pinned .x-combo-list-inner { - border-bottom-color: #98c0f4; -} - -.x-combo-list-item { - border-color: #556; -} - -.x-combo-list .x-combo-selected { - border-color: #e5872c !important; - background-color: #e5872c; - font-weight: bold; -} - -.x-combo-list .x-toolbar { - border-top-color: #98c0f4; -} - -.x-combo-list-small { - font: normal 14px tahoma, arial, helvetica, sans-serif; -} - -.x-panel { - border-color: #18181a; -} - -.x-panel-header { - color: #fff !important; - font-weight: bold; - font-size: 14px; - font-family: tahoma, arial, verdana, sans-serif; - border-color: #18181a; - background-image: url(../images/panel/white-top-bottom.gif); -} - -.x-panel-body { - color: #fffff6; - border-color: #18181a; - background-color: #232d38; -} - -.x-tab-panel .x-panel-body { - color: #fffff6; - border-color: #18181a; - background-color: #1f2730; -} - -.x-panel-bbar .x-toolbar,.x-panel-tbar .x-toolbar { - border-color: #223; -} - -.x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar { - border-top-color: #223; -} - -.x-panel-body-noheader,.x-panel-mc .x-panel-body { - border-top-color: #223; -} - -.x-panel-tl .x-panel-header { - color: fff; - font: bold 14px tahoma, arial, verdana, sans-serif; -} - -.x-panel-tc { - background-image: url(../images/panel/top-bottom.gif); -} - -.x-panel-tl,.x-panel-tr,.x-panel-bl,.x-panel-br { - background-image: url(../images/panel/corners-sprite.gif); - border-bottom-color: #222224; -} - -.x-panel-bc { - background-image: url(../images/panel/top-bottom.gif); -} - -.x-panel-mc { - font: normal 14px tahoma, arial, helvetica, sans-serif; - background-color: #3f4757; -} - -.x-panel-ml { - background-image: url(../images/panel/left-right.gif); -} - -.x-panel-mr { - background-image: url(../images/panel/left-right.gif); -} - -.x-tool { - background-image: url(../images/panel/tool-sprites.gif); -} - -.x-tool-resize { -background-position:0 -360px; -} - -.x-tool-resize-over { -background-position:-15px -360px; -} - -.x-tool-move { -background-position:0 -375px; -} - -.x-tool-move-over { -background-position:-15px -375px; -} - -.x-panel-ghost { - background-color: #3f4757; -} - -.x-panel-ghost ul { - border-color: #18181a; -} - -.x-panel-dd-spacer { - border-color: #18181a; -} - -.x-panel-fbar td,.x-panel-fbar span,.x-panel-fbar input,.x-panel-fbar div,.x-panel-fbar select,.x-panel-fbar label { - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.x-window-proxy { - background-color: #1f2833; - border-color: #18181a; -} - -.x-window-tl .x-window-header { - color: #fff !important; - font: bold 14px tahoma, arial, verdana, sans-serif; -} - -.x-window-tc { - background-image: url(../images/window/top-bottom.png); -} - -.x-window-tl { - background-image: url(../images/window/left-corners.png); -} - -.x-window-tr { - background-image: url(../images/window/right-corners.png); -} - -.x-window-bc { - background-image: url(../images/window/top-bottom.png); -} - -.x-window-bl { - background-image: url(../images/window/left-corners.png); -} - -.x-window-br { - background-image: url(../images/window/right-corners.png); -} - -.x-window-mc { - border-color: #18181a; - font: normal 14px tahoma, arial, helvetica, sans-serif; - background-color: #1f2833; -} - -.x-window-ml { - background-image: url(../images/window/left-right.png); -} - -.x-window-mr { - background-image: url(../images/window/left-right.png); -} - -.x-window-maximized .x-window-tc { - background-color: #fff; -} - -.x-window-bbar .x-toolbar { - border-top-color: #323945; -} - -.x-panel-ghost .x-window-tl { - border-bottom-color: #323945; -} - -.x-panel-collapsed .x-window-tl { - border-bottom-color: #323945; -} - -.x-dlg-mask { - background-color: #ccc; -} - -.x-window-plain .x-window-mc { - background-color: #464f61; - border-color: #636778; -} - -.ext-ie .x-window-plain .x-window-mc { - background-color: #3f4757; -} - -.x-window-plain .x-window-body { - color: #fffff6; - border-color: #464F61; -} - -body.x-body-masked .x-window-plain .x-window-mc { - background-color: #464f61; -} - -.x-html-editor-wrap { - border-color: #737B8C; - background-color: #fff; -} - -.x-html-editor-wrap iframe { - background-color: #fff; -} - -.x-panel-noborder .x-panel-header-noborder { - border-bottom-color: #343d4e; -} - -.x-panel-noborder .x-panel-tbar-noborder .x-toolbar { - border-bottom-color: #343d4e; -} - -.x-panel-noborder .x-panel-bbar-noborder .x-toolbar { - border-top-color: #343d4e; -} - -.x-tab-panel-bbar-noborder .x-toolbar { - border-top-color: #343d4e; -} - -.x-tab-panel-tbar-noborder .x-toolbar { - border-bottom-color: #343d4e; -} - -.x-border-layout-ct { - background-color: #3f4757; -} - -.x-accordion-hd { - color: #fff; - font-weight: normal; - background-image: url(../images/panel/light-hd.gif); -} - -.x-layout-collapsed { - background-color: #323845; - border-color: #1a1a1c; -} - -.x-layout-collapsed-over { - background-color: #2d3440; -} - -.x-layout-split-west .x-layout-mini { - background-image: url(../images/default/layout/mini-left.gif); -} - -.x-layout-split-east .x-layout-mini { - background-image: url(../images/default/layout/mini-right.gif); -} - -.x-layout-split-north .x-layout-mini { - background-image: url(../images/default/layout/mini-top.gif); -} - -.x-layout-split-south .x-layout-mini { - background-image: url(../images/default/layout/mini-bottom.gif); -} - -.x-layout-cmini-west .x-layout-mini { - background-image: url(../images/default/layout/mini-right.gif); -} - -.x-layout-cmini-east .x-layout-mini { - background-image: url(../images/default/layout/mini-left.gif); -} - -.x-layout-cmini-north .x-layout-mini { - background-image: url(../images/default/layout/mini-bottom.gif); -} - -.x-layout-cmini-south .x-layout-mini { - background-image: url(../images/default/layout/mini-top.gif); -} - -.x-progress-wrap { - border-color: #18181a; -} - -.x-progress-inner { - background-color: #232d38; - background-image: none; -} - -.x-progress-bar { - background-color: #f39a00; - background-image: url(../images/progress/progress-bg.gif); - border-top-color: #a66900; - border-bottom-color: #a66900; - border-right-color: #ffb941; -} - -.x-progress-text { - font-size: 14px; - font-weight: bold; - color: #fff; -} - -.x-progress-text-back { - color: #aaa; - line-height: 11px; -} - -.x-list-header { - background-color: #393d4e; - background-image: url(../images/toolbar/bg.gif); - background-position: 0 top; -} - -.x-list-header-inner div em { - border-left-color: #667; - font: normal 14px arial, tahoma, helvetica, sans-serif; - line-height: 14px; -} - -.x-list-body dt em { - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.x-list-over { - background-color: #eee; -} - -.x-list-selected { - background-color: #dfe8f6; - font-weight: bold; -} - -.x-list-resizer { - border-left-color: #555; - border-right-color: #555; -} - -.x-list-header-inner em.sort-asc,.x-list-header-inner em.sort-desc { - background-image: url(../images/grid/sort-hd.gif); - border-color: #3e4e6c; -} - -.x-slider-input { - color: black; -} - -.x-slider-horz,.x-slider-horz .x-slider-end,.x-slider-horz .x-slider-inner { - background-image: url(../images/slider/slider-bg.png); -} - -.x-slider-horz .x-slider-thumb { - background-image: url(../images/slider/slider-thumb.png); -} - -.x-slider-vert,.x-slider-vert .x-slider-end,.x-slider-vert .x-slider-inner { - background-image: url(../images/slider/slider-v-bg.png); -} - -.x-slider-vert .x-slider-thumb { - background-image: url(../images/slider/slider-v-thumb.png); -} - -.x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text { - font-size: 15px; -} - -.x-window-dlg .ext-mb-textarea { - font: normal 15px tahoma, arial, helvetica, sans-serif; -} - -.x-window-dlg .x-msg-box-wait { - background-image: url(../images/grid/loading.gif); -} - -.x-window-dlg .ext-mb-info { - background-image: url(../images/window/icon-info.gif); -} - -.x-window-dlg .ext-mb-warning { - background-image: url(../images/window/icon-warning.gif); -} - -.x-window-dlg .ext-mb-question { - background-image: url(../images/window/icon-question.gif); -} - -.x-window-dlg .ext-mb-error { - background-image: url(../images/window/icon-error.gif); -} - -.x-border { - border: 1px solid #18181a; -} - -.x-grid3-hd-row .x-grid3-hd { - border-left-color: #555566; - border-right-color: black; -} - -.x-grid3-row { - border-color: #1f2933 black black; -} - -.x-grid3-row-checker,.x-grid3-hd-checker { - background-image: url(../images/grid/row-check-sprite.gif); -} - -.x-grid3-footer { - background: none repeat scroll 0 0 black; - border-bottom: 1px solid #393c4c; - border-top: 1px solid #393c4c; -} - -.x-grid3-footer-row { - background: none repeat scroll 0 0 black; -} - -.x-tree3 { - background-color: #232D38; -} - -.x-tree3-node-text { - color: white; -} - -.x-tree3-node { - color: white; - font: normal 14px arial, tahoma, helvetica, sans-serif; -} - -.x-tree3-node .x-ftree2-node-over { - background-color: #7e5530 !important; -} - -.x-tree3-node .x-ftree2-selected { - background-color: #e5872c !important; - font-weight: bold; - color: black !important; -} - -.x-tree3-node .x-ftree2-selected .x-tree3-node-text { - color: black !important; -} - -.x-view,x-combo-list { - background-color: #232D38; -} - -.x-view { - border: 1px solid #18181a; -} - -.x-view-highlightrow { - border: 1px dotted #e5872c !important; - background-color: #666360; - text-decoration: underline; -} - -.x-view-item,.x-combo-list-item { - border: 1px solid black !important; - border-top: 1px solid #232D38 !important; -} - -.x-view-item-over,.x-combo-over { - background: #7e5530; - border: 1px dotted #e5872c !important; -} - -.x-view-item-sel,.x-combo-selected { - background: #e5872c none repeat scroll 0%; - border: 1px dotted #e5872c !important; - font-weight: bold; - color: black !important; -} - - - -.x-date-left-icon { - background-image: url(../images/shared/left-btn.gif); -} - -.x-date-right-icon { - background-image: url(../images/shared/right-btn.gif); -} - -.x-date-days td { - background: url(../images/shared/glass-bg.gif) 0px -5px; - color: white; -} - -.x-date-mp-btns button { - background-color: #282f40; - color: #fff; - border-color: #1b1d29; -} - -.x-grid-group-hd .x-grid-group-div { - color: white; -} - -.x-grid3-summary-row { - background: none repeat scroll 0 50% #21252e !important; -} - -.x-status-text-panel { - border-color: black #fff #fff black !important; -} - -.x-menubar { - border-color: black; - background-color: #d0def0; - background-image: url(../images/toolbar/bg.gif); -} - -.x-menubar-item-active { - background-color: #e5872c; -} - -.x-drag-proxy { - background-color: #3f4757; - border: 1px solid black; -} - -.x-grid3-hd-row .x-grid3-hd,.x-grid3-row .x-grid3-cell,.x-grid3-summary-row .x-grid3-cell { - font: 12px arial, tahoma, helvetica, sans-serif !important; -} - -.x-grid3-row-selected,.x-grid3-row-selected .x-grid3-cell { - font-weight: bold !important; -} - -.x-tree3-node-text { - font: 12px arial, tahoma, helvetica, sans-serif; - font-weight: bold; -} - -.x-tree3-node .x-ftree2-selected { - font-weight: bold !important; -} - -.x-grid3-row-selected .x-tree3-node-text { - color: black !important; -} - -.x-contrast .x-ftree2-selected .x-tree3-node-text { - font-style: italic; - text-decoration: underline; -} - -.x-aria-focusframe-side { - background-color: #ff8800; -} - -.x-contrast .x-grid3-cell-selected { - font-weight: bold !important; - font-style: italic !important; - font-size: 13px !important; -} - -.x-contrast .x-grid3-row-selected x-tree3-node-text,.x-contrast .x-grid3-row-selected .x-tree3-node-text { - font-weight: bold !important; - font-style: italic !important; - font-size: 13px !important; -} - -.x-contrast .x-column-header-sel { - font-style: italic !important; - font-weight: bold !important; -} - -.x-contrast .x-btn-tr i,.x-contrast .x-btn-tl i,.x-contrast .x-btn-mr i,.x-contrast .x-btn-ml i,.x-contrast .x-btn-br i,.x-contrast .x-btn-bl i - { - width: auto; -} - -.x-contrast .x-btn-menu .x-btn-mr i:before { - content: url(../images/button/arrow.gif); -} - -.x-contrast .x-slider-thumb i:before { - content: url(../images/slider/slider-thumb-single.png); -} - -.x-contrast .x-slider { - border: 1px solid yellow; -} - -.x-contrast .x-form-trigger:after { - content: url(../images/form/trigger-single.gif); -} - -.x-contrast .x-panel { - border: 1px solid yellow !important; -} - -.x-contrast .x-btn { - border: 1px solid yellow !important; -} - -.x-contrast .x-grid3 .sort-asc span:after { - content: url(../images/grid/sort_asc.gif); - position: absolute; - top: 8px; -} - -.x-contrast .x-grid3 .sort-desc span:after { - content: url(../images/grid/sort_desc.gif); - position: absolute; - top: 8px; -} - -.x-contrast .x-menu-check-item:before { - content: url(../images/grid/row-check.gif); - position: relative; - left: 0px; -} - -.x-contrast .x-menu-checked:before { - content: url(../images/grid/row-check-sel.gif); - float: left; -} - -.x-contrast .x-menu-item-radio:before { - content: none; - position: relative; - left: 0px; -} - -.x-contrast .x-menu-radio-sel:before { - content: url(../images/menu/group-checked.gif); - float: left; -} - -.x-contrast .x-grid-group .x-grid3-group-selected .x-grid-group-div { - font-weight: bold !important; - font-style: italic !important; -} - -.x-contrast .x-grid-group-div:before { - content: url(../images/grid/group-expand.gif); - padding-right: 5px; -} - -.x-contrast .x-grid-group-collapsed .x-grid-group-div:before { - content: url(../images/grid/group-collapse.gif); - padding-right: 5px; -} - -.x-contrast .x-grid3-row-collapsed .x-grid3-row-expander:after { - content: url(../images/grid/group-expand.gif); -} - -.x-contrast .x-grid3-row-expanded .x-grid3-row-expander:after { - content: url(../images/grid/group-collapse.gif); -} - -.x-contrast .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker:after { - content: url(../images/grid/row-check.gif); -} - -.x-contrast .x-grid3-row-selected .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker-on .x-grid3-hd-checker:after { - content: url(../images/grid/row-check-sel.gif); -} - -.x-contrast .x-tool-close i:before { - content: url(../images/panel/tool-close.gif); -} - -.x-contrast .x-tool-gear i:before { - content: url(../images/panel/tool-gear.gif); -} - -.x-contrast .x-tool-toggle i:before { - content: url(../images/panel/tool-collapse.gif); -} - -.x-contrast .x-panel-collapsed .x-tool-toggle i:before { - content: url(../images/panel/tool-expand.gif); -} - -.x-contrast .x-tool-maximize i:before { - content: url(../images/panel/tool-maximize.gif); -} - -.x-contrast .x-tool-minimize i:before { - content: url(../images/panel/tool-minimize.gif); -} - -.x-contrast .x-tree3-node-joint-expand .x-tree3-node-text:before { - content: url(../images/tree/tree-expanded.png); - position: absolute; - left: -25px; -} - -.x-contrast .x-tree3-node-joint-collapse .x-tree3-node-text:before { - content: url(../images/tree/tree-collapsed.png); - position: absolute; - left: -25px; -} - -.x-contrast .arrow-up i:before { - content: url(../images/icons/top2.gif); -} - -.x-contrast .arrow-double-right i:before { - content: url(../images/icons/doubleright2.gif); -} - -.x-contrast .arrow-right i:before { - content: url(../images/icons/right2.gif); -} - -.x-contrast .arrow-left i:before { - content: url(../images/icons/left2.gif); -} - -.x-contrast .arrow-double-left i:before { - content: url(../images/icons/doubleleft2.gif); -} - -.x-contrast .arrow-double-right i:before { - content: url(../images/icons/doubleright2.gif); -} - -.x-contrast .arrow-down i:before { - content: url(../images/icons/down2.gif); -} - -.x-contrast .x-date-left-icon i:before { - content: url(../images/shared/left-btn.gif); -} - -.x-contrast .x-date-right-icon i:before { - content: url(../images/shared/right-btn.gif); -} - -.x-contrast .x-grid3-hd-btn:before { - content: url("../images/grid/grid3-hd-btn-contrast.gif"); - border: 1px solid yellow; -} - -.x-contrast .x-row-editor .x-btns { - background-color: black; -} - -.x-contrast .x-html-editor-wrap .x-btn-pressed button { - border: 3px solid black; -} - -.x-contrast .x-window, .x-contrast .x-info, .x-contrast .x-tip { - background-color: black; - border: 1px solid black; -} - -.x-contrast .x-menu-item-arrow:before { - content: url(../images/shared/right-btn.gif); -} - -.x-contrast .x-menu-scroller-top:before { - content: url("../images/layout/mini-top.gif"); - position: absolute; - left: 45px; -} - -.x-contrast .x-menu-scroller-bottom:before { - content: url("../images/layout/mini-bottom.gif"); - position: absolute; - left: 45px; -} - -.x-spinner-field .x-form-twin-triggers .x-form-spinner-up{ - height: 11px; -} -.x-spinner-field .x-form-twin-triggers .x-form-spinner-down { - height: 11px; -} - - -.x-spinner-field .x-form-twin-triggers .x-form-spinner-down { - top:13px; -} - - -.x-spinner-field .x-form-spinner-up { - background-image: url('../images/form/spinner.gif'); -} -.x-spinner-field .x-form-spinner-down { - background-image: url('../images/form/spinner.gif'); -} - - - - - - - - - - - - - -.x-spinner-field .x-form-spinner-down { - background-position:0 -13px; -} - -.x-trigger-wrap-focus .x-form-spinner-up { - background-position:-100px 0; -} - -.x-trigger-wrap-focus .x-form-spinner-down { - background-position:-100px -13px; -} - -.x-form-field-wrap .x-form-spinner-overup{ - background-position:-20px 0; -} -.x-form-field-wrap .x-form-spinner-clickup{ - background-position:-40px 0; -} - -.x-trigger-wrap-focus .x-form-spinner-overup{ - background-position:-120px 0; -} - -.x-trigger-wrap-focus .x-form-spinner-clickup{ - background-position:-140px 0; -} - -.x-form-field-wrap .x-form-spinner-overdown{ - background-position:-60px -13px; -} -.x-form-field-wrap .x-form-spinner-clickdown{ - background-position:-80px -13px; -} -.x-trigger-wrap-focus .x-form-spinner-overdown{ - background-position:-160px -13px; -} -.x-trigger-wrap-focus .x-form-spinner-clickdown{ - background-position:-180px -13px; -} - - -.x-form-field-wrap .x-form-spinner-overup, -.x-form-field-wrap .x-form-spinner-clickup{ - border-bottom-color: #d97e27; -} -.x-form-field-wrap .x-form-spinner-overdown, -.x-form-field-wrap .x-form-spinner-clickdown{ - border-bottom-color: #d97e27; -} - -.x-trigger-wrap-focus .x-form-spinner-down, -.x-trigger-wrap-focus .x-form-spinner-up{ - border-bottom-color: #d97e27; -} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,57 +1,57 @@ -body { - background-color: #16181a; - color: #fcfcfc; +body { /* background-color: #16181a; + color: #fcfcfc; */ + } .ext-el-mask { - background-color: #ccc; + background-color: #ccc; } .ext-el-mask-msg { - border-color: #223; - background-color: #3f4757; - background-image: url(../images/box/tb-blue.gif); + border-color: #223; + background-color: #3f4757; + background-image: url(../images/box/tb-blue.gif); } .ext-el-mask-msg div { - background-color: #232d38; - border-color: #556; - color: #fff; - font: normal 14px tahoma, arial, helvetica, sans-serif; + background-color: #232d38; + border-color: #556; + color: #fff; + font: normal 14px 'Ubuntu', Arial } .x-mask-loading div { - background-color: #232d38; - background-image: url(../images/grid/loading.gif); + background-color: #232d38; + background-image: url(../images/grid/loading.gif); } .x-item-disabled { - color: #ddd; + color: #ddd; } .x-item-disabled * { - color: #ddd !important; + color: #ddd !important; } .x-splitbar-proxy { - background-color: #aaa; + background-color: #aaa; } .x-color-palette a { - border-color: #fff; + border-color: #fff; } .x-color-palette a:hover,.x-color-palette a.x-color-palette-sel { - border-color: #8bb8f3; - background-color: #deecfd; + border-color: #8bb8f3; + background-color: #deecfd; } .x-color-palette em { - border-color: #aca899; + border-color: #aca899; } .x-ie-shadow { - background-color: #777; + background-color: #777; } /* @@ -68,893 +68,915 @@ } */ .loading-indicator { - font-size: 14px; - background-image: url(../images/grid/loading.gif); + font-size: 14px; + background-image: url(../images/grid/loading.gif); } .x-spotlight { - background-color: #ccc; + background-color: #ccc; } -.x-tab-panel-header,.x-tab-panel-footer { - background-color: #e18325; - border-color: #8db2e3; - overflow: hidden; - zoom: 1; +.x-tab-panel-header,.x-tab-panel-footer { /* background-color: #e18325; + border-color: #8db2e3; */ + overflow: hidden; + zoom: 1; } .x-tab-panel-header,.x-tab-panel-footer { - border-color: #222; + border-color: #552200; } ul.x-tab-strip-top { - background-color: #343843; - background-image: url(../images/tabs/tab-strip-bg.gif); - border-bottom-color: #343d4e; + background-color: #343843; + background-image: url(../images/tabs/tab-strip-bg.gif); + border-bottom-color: #343d4e; } ul.x-tab-strip-bottom { - background-color: #343843; - background-image: url(../images/tabs/tab-strip-btm-bg.gif); - border-top-color: #343843; + background-color: #343843; + background-image: url(../images/tabs/tab-strip-btm-bg.gif); + border-top-color: #343843; } -.x-tab-panel-header-plain .x-tab-strip-spacer,.x-tab-panel-footer-plain .x-tab-strip-spacer { - border-color: #222; - background-color: #e18325; +.x-tab-panel-header-plain .x-tab-strip-spacer,.x-tab-panel-footer-plain .x-tab-strip-spacer + { + border-color: #552200; + background-color: #e18325; } .x-tab-strip span.x-tab-strip-text { - font: normal 14px tahoma, arial, helvetica; - color: #fff; + font: normal 14px tahoma, arial, helvetica; + color: #fff; } .x-tab-strip-over span.x-tab-strip-text { - color: #fff; + color: #fff; } .x-tab-strip-active span.x-tab-strip-text { - color: black; - font-weight: bold; + color: black; + font-weight: bold; } .x-tab-strip-disabled .x-tabs-text { - color: #aaaaaa; + color: #aaaaaa; } -.x-tab-strip-top .x-tab-right,.x-tab-strip-top .x-tab-left,.x-tab-strip-top .x-tab-strip-inner { - background-image: url(../images/tabs/tabs-sprite.gif); +.x-tab-strip-top .x-tab-right,.x-tab-strip-top .x-tab-left,.x-tab-strip-top .x-tab-strip-inner + { + background-image: url(../images/tabs/tabs-sprite.gif); } .x-tab-strip-bottom .x-tab-right { - background-image: url(../images/tabs/tab-btm-inactive-right-bg.gif); + background-image: url(../images/tabs/tab-btm-inactive-right-bg.gif); } .x-tab-strip-bottom .x-tab-left { - background-image: url(../images/tabs/tab-btm-inactive-left-bg.gif); + background-image: url(../images/tabs/tab-btm-inactive-left-bg.gif); } .x-tab-strip-bottom .x-tab-strip-active .x-tab-right { - background-image: url(../images/tabs/tab-btm-right-bg.gif); + background-image: url(../images/tabs/tab-btm-right-bg.gif); } .x-tab-strip-bottom .x-tab-strip-active .x-tab-left { - background-image: url(../images/tabs/tab-btm-left-bg.gif); + background-image: url(../images/tabs/tab-btm-left-bg.gif); } .x-tab-strip .x-tab-strip-closable a.x-tab-strip-close { - background-image: url(../images/tabs/tab-close.gif); + background-image: url(../images/tabs/tab-close.gif); } .x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover { - background-image: url(../images/tabs/tab-close.gif); + background-image: url(../images/tabs/tab-close.gif); } .x-tab-panel-body { - border-color: #18181a; - background-color: #fff; + border-color: #18181a; + background-color: #fff; } .x-tab-panel-body-top { - border-top: 0 none; + border-top: 0 none; } .x-tab-panel-body-bottom { - border-bottom: 0 none; + border-bottom: 0 none; } .x-tab-scroller-left { - background-image: url(../images/tabs/scroll-left.gif); - border-bottom-color: #8db2e3; + background-image: url(../images/tabs/scroll-left.gif); + border-bottom-color: #8db2e3; } .x-tab-scroller-left-over { - background-position: 0 0; + background-position: 0 0; } .x-tab-scroller-left-disabled { - background-position: -18px 0; - opacity: .5; - -moz-opacity: .5; - filter: alpha(opacity = 50); - cursor: default; + background-position: -18px 0; + opacity: .5; + -moz-opacity: .5; + filter: alpha(opacity = 50); + cursor: default; } .x-tab-scroller-right { - background-image: url(../images/tabs/scroll-right.gif); - border-bottom-color: #8db2e3; + background-image: url(../images/tabs/scroll-right.gif); + border-bottom-color: #8db2e3; } .x-tab-panel-bbar .x-toolbar,.x-tab-panel-tbar .x-toolbar { - border-color: #99bbe8; + border-color: #99bbe8; } .x-form-field { - font: normal 15px tahoma, arial, helvetica, sans-serif; + font: normal 15px 'Ubuntu', Arial } -.x-form-text,textarea.x-form-field { - color: #ffffff; - background-color: #33373d; - background-image: url(../images/form/text-bg.gif); - border-color: #737b8c; - border-width: 2px; +.x-form-text,textarea.x-form-field { /* color: #ffffff; + background-color: #33373d; + background-image: url(../images/form/text-bg.gif); */ + border-color: #737b8c; + border-width: 2px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } .x-form-text,.ext-ie .x-form-file { - height: 26px; + height: 26px; } .ext-strict .x-form-text { - height: 20px; + height: 20px; } .x-form-select-one { - background-color: #fff; - border-color: #b5b8c8; + background-color: #fff; + border-color: #b5b8c8; } .x-form-check-group-label { - border-bottom: 1px solid #99bbe8; - color: #fff; + border-bottom: 1px solid #99bbe8; + color: #fff; } .x-editor .x-form-check-wrap { - background-color: #fff; + background-color: #fff; } .x-form-field-wrap .x-form-trigger { - background-image: url(../images/form/trigger.gif); - border-bottom-color: #737b8c; - border-bottom-width: 2px; - height: 24px; - width: 20px; + background-image: url(../images/form/trigger.gif); + border-bottom-color: #737b8c; + border-bottom-width: 2px; + height: 24px; + width: 20px; } .x-form-field-wrap .x-form-trigger.x-form-trigger-over { - border-bottom-color: #d97e27; + border-bottom-color: #d97e27; } .x-form-field-wrap .x-form-trigger.x-form-trigger-click { - border-bottom-color: #c86e19; + border-bottom-color: #c86e19; } .x-small-editor .x-form-field-wrap .x-form-trigger { - height: 20px; + height: 20px; } .x-form-field-wrap .x-form-trigger-over { - background-position: -20px 0; + background-position: -20px 0; } .x-form-field-wrap .x-form-trigger-click { - background-position: -40px 0; + background-position: -40px 0; } .x-trigger-wrap-focus .x-form-trigger { - background-position: -60px 0; + background-position: -60px 0; } .x-trigger-wrap-focus .x-form-trigger-over { - background-position: -80px 0; + background-position: -80px 0; } .x-trigger-wrap-focus .x-form-trigger-click { - background-position: -100px 0; + background-position: -100px 0; } .x-form-field-wrap .x-form-date-trigger { - background-image: url(../images/form/date-trigger.gif); + background-image: url(../images/form/date-trigger.gif); } .x-form-field-wrap .x-form-clear-trigger { - background-image: url(../images/form/clear-trigger.gif); + background-image: url(../images/form/clear-trigger.gif); } .x-form-field-wrap .x-form-search-trigger { - background-image: url(../images/form/search-trigger.gif); + background-image: url(../images/form/search-trigger.gif); } .x-trigger-wrap-focus .x-form-trigger { - border-bottom-color: #737b8c; + border-bottom-color: #737b8c; } .x-item-disabled .x-form-trigger-over { - border-bottom-color: #b5b8c8; + border-bottom-color: #b5b8c8; } .x-item-disabled .x-form-trigger-click { - border-bottom-color: #b5b8c8; + border-bottom-color: #b5b8c8; } .x-form-focus,textarea.x-form-focus { - border-color: #ff9c33; + border-color: #ff9c33; } .x-form-invalid,textarea.x-form-invalid { - background-color: #15171a; - background-image: url(../images/grid/invalid_line.gif); - border-color: #c30; + /*background-color: #15171a; */ + background-image: url(../images/grid/invalid_line.gif); + border-color: #c30; } .ext-safari .x-form-invalid { - background-color: #fee; - border-color: #ff7870; + background-color: #fee; + border-color: #ff7870; } .x-form-inner-invalid,textarea.x-form-inner-invalid { - background-color: #fff; - background-image: url(../images/grid/invalid_line.gif); + background-color: #fff; + background-image: url(../images/grid/invalid_line.gif); } .x-form-grow-sizer { - font: normal 15px tahoma, arial, helvetica, sans-serif; + font: normal 15px 'Ubuntu', Arial } .x-form-item { - font: normal 15px tahoma, arial, helvetica, sans-serif; + font: normal 15px 'Ubuntu', Arial } - +/* .x-form-invalid-msg { - color: #c0272b; - font: normal 14px tahoma, arial, helvetica, sans-serif; - background-image: url(../images/default/shared/warning.gif); + color: #c0272b; + font: normal 14px 'Ubuntu', Arial background-image : + url(../images/default/shared/warning.gif); } - +*/ .x-form-empty-field { - color: #dadadd; + color: #dadadd; } .x-small-editor .x-form-text { - height: 22px; + height: 22px; } .x-small-editor .x-form-field { - font: normal 14px arial, tahoma, helvetica, sans-serif; + font: normal 14px arial, tahoma, helvetica, sans-serif; } .ext-safari .x-small-editor .x-form-field { - font: normal 15px arial, tahoma, helvetica, sans-serif; + font: normal 15px arial, tahoma, helvetica, sans-serif; } .x-form-invalid-icon { - background-image: url(../images/form/exclamation.gif); - height: 25px; - width: 19px; - background-position: center right; + background-image: url(../images/form/exclamation.gif); + height: 25px; + width: 19px; + background-position: center right; } .x-fieldset { - border-color: #737B8C; - color: white !important; + border-color: #737B8C; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + /* color: white !important; */ } .x-fieldset legend { - font: bold 14px tahoma, arial, helvetica, sans-serif; - color: white !important; + font: bold 14px 'Ubuntu', Arial color : white !important; } .x-btn { - font: normal 14px tahoma, verdana, helvetica; + font: normal 13px } .x-btn button { - font: normal 14px arial, tahoma, verdana, helvetica; - color: #fffffa; - padding-left: 6px !important; - padding-right: 6px !important; + font: normal 13px 'Ubuntu', Arial color : #fffffa; + padding-left: 6px !important; + padding-right: 6px !important; } -.x-btn-over .x-btn button { - color: #fff; +.x-btn-over .x-btn button { /* color: #fff; */ + } .x-btn-noicon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-left .x-btn-text,.x-btn-icon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-right .x-btn-text - { - height: 23px; /* 18px; */ + { + height: 23px; /* 18px; */ } .x-btn-icon .x-btn-small .x-btn-text { - width: 23px; /* 18px; */ + width: 23px; /* 18px; */ } .x-btn-text-icon .x-btn-icon-small-left .x-btn-text { - padding-left: 21px !important; + padding-left: 21px !important; } .x-btn-text-icon .x-btn-icon-small-right .x-btn-text { - padding-right: 21px !important; + padding-right: 21px !important; } .x-btn-text-icon .x-btn-icon-medium-left .x-btn-text { - padding-left: 29px !important; + padding-left: 29px !important; } .x-btn-text-icon .x-btn-icon-medium-right .x-btn-text { - padding-right: 29px !important; + padding-right: 29px !important; } .x-btn-text-icon .x-btn-icon-large-left .x-btn-text { - padding-left: 37px !important; + padding-left: 37px !important; } .x-btn-text-icon .x-btn-icon-large-right .x-btn-text { - padding-right: 37px !important; + padding-right: 37px !important; } .x-btn em { - font-style: normal; - font-weight: normal; + font-style: normal; + font-weight: normal; } -.x-btn-tl,.x-btn-tr,.x-btn-tc,.x-btn-ml,.x-btn-mr,.x-btn-mc,.x-btn-bl,.x-btn-br,.x-btn-bc { - background-image: url(../images/button/btn.gif); +.x-btn-tl,.x-btn-tr,.x-btn-tc,.x-btn-ml,.x-btn-mr,.x-btn-mc,.x-btn-bl,.x-btn-br,.x-btn-bc + { /* background-image: url(../images/button/btn.gif); */ + padding: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + /* text-decoration: none; + vertical-align: middle; + background-color: #F2F2F2;*/ + background-image: none; } -.x-btn-click .x-btn-text,.x-btn-menu-active .x-btn-text,.x-btn-pressed .x-btn-text { - color: #fff; +.x-btn-click .x-btn-text,.x-btn-menu-active .x-btn-text,.x-btn-pressed .x-btn-text + { + color: orange; } .x-btn-pressed .x-btn-text { - font-style: italic; - text-decoration: underline; - font-weight: bold; - color: black !important; + font-style: italic; + text-decoration: underline; + font-weight: bold; + color: black !important; } .x-btn-disabled * { - color: #eee !important; + color: #eee !important; } .x-btn-mc em.x-btn-arrow { - background-image: url(../images/button/arrow.gif); - padding-right: 13px; + background-image: url(../images/button/arrow.gif); + padding-right: 13px; } .x-btn-mc em.x-btn-split { - background-image: url(../images/button/s-arrow.gif); - padding-right: 20px; + background-image: url(../images/button/s-arrow.gif); + padding-right: 20px; } .x-contrast .x-btn-mc em.x-btn-split { - padding-right: 0px; + padding-right: 0px; } .x-btn-over .x-btn-mc em.x-btn-split,.x-btn-click .x-btn-mc em.x-btn-split,.x-btn-menu-active .x-btn-mc em.x-btn-split,.x-btn-pressed .x-btn-mc em.x-btn-split - { - background-image: url(../images/button/s-arrow-o.gif); + { + background-image: url(../images/button/s-arrow-o.gif); } .x-btn-mc em.x-btn-arrow-bottom { - background-image: url(../images/button/s-arrow-b-noline.gif); + background-image: url(../images/button/s-arrow-b-noline.gif); } .x-btn-mc em.x-btn-split-bottom { - background-image: url(../images/button/s-arrow-b.gif); + background-image: url(../images/button/s-arrow-b.gif); } .x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-btn-pressed .x-btn-mc em.x-btn-split-bottom - { - background-image: url(../images/button/s-arrow-bo.gif); + { + background-image: url(../images/button/s-arrow-bo.gif); } .x-btn-group-header { - color: #d2d2d2; + color: #d2d2d2; } .x-btn-group-tc { - background-image: url(../images/button/group-tb.gif); + background-image: url(../images/button/group-tb.gif); } .x-btn-group-tl { - background-image: url(../images/button/group-cs.gif); + background-image: url(../images/button/group-cs.gif); } .x-btn-group-tr { - background-image: url(../images/button/group-cs.gif); + background-image: url(../images/button/group-cs.gif); } .x-btn-group-bc { - background-image: url(../images/button/group-tb.gif); + background-image: url(../images/button/group-tb.gif); } .x-btn-group-bl { - background-image: url(../images/button/group-cs.gif); + background-image: url(../images/button/group-cs.gif); } .x-btn-group-br { - background-image: url(../images/button/group-cs.gif); + background-image: url(../images/button/group-cs.gif); } .x-btn-group-ml { - background-image: url(../images/button/group-lr.gif); + background-image: url(../images/button/group-lr.gif); } .x-btn-group-mr { - background-image: url(../images/button/group-lr.gif); + background-image: url(../images/button/group-lr.gif); } .x-btn-group-notitle .x-btn-group-tc { - background-image: url(../images/button/group-tb.gif); + background-image: url(../images/button/group-tb.gif); } .x-toolbar { - border-color: #18181a; - background-color: #393d4e; - background-image: url(../images/toolbar/bg.gif); + border-color: #18181a; + background-color: #393d4e; + background-image: url(../images/toolbar/bg.gif); } -.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label { - font: normal 14px arial, tahoma, helvetica, sans-serif; +.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label + { + font: normal 14px arial, tahoma, helvetica, sans-serif; } .x-toolbar .x-item-disabled { - color: gray; + color: gray; } .x-toolbar .x-item-disabled * { - color: gray; + color: gray; } .x-toolbar .x-btn-mc em.x-btn-split { - background-image: url(../images/button/s-arrow-noline.gif); + background-image: url(../images/button/s-arrow-noline.gif); } .x-toolbar .x-btn-over .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split - { - background-image: url(../images/button/s-arrow-o.gif); + { + background-image: url(../images/button/s-arrow-o.gif); } .x-toolbar .x-btn-mc em.x-btn-split-bottom { - background-image: url(../images/button/s-arrow-b-noline.gif); + background-image: url(../images/button/s-arrow-b-noline.gif); } .x-toolbar .x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split-bottom - { - background-image: url(../images/button/s-arrow-bo.gif); + { + background-image: url(../images/button/s-arrow-bo.gif); } .x-toolbar .xtb-sep { - background-image: url(../images/grid/grid-blue-split.gif); + background-image: url(../images/grid/grid-blue-split.gif); } .x-toolbar .x-btn { - padding-left: 3px; - padding-right: 3px; + padding-left: 3px; + padding-right: 3px; } .x-toolbar .x-btn-mc em.x-btn-arrow { - padding-right: 10px; + padding-right: 10px; } .x-toolbar .x-btn-text-icon .x-btn-icon-small-left .x-btn-text { - padding-left: 18px !important; + padding-left: 18px !important; } .x-toolbar .x-btn-mc em.x-btn-split { - padding-right: 14px; + padding-right: 14px; } .x-tbar-page-first { - background-image: url(../images/grid/page-first.gif) !important; + background-image: url(../images/grid/page-first.gif) !important; } .x-tbar-loading { - background-image: url(../images/grid/refresh.gif) !important; + background-image: url(../images/grid/refresh.gif) !important; } .x-tbar-page-last { - background-image: url(../images/grid/page-last.gif) !important; + background-image: url(../images/grid/page-last.gif) !important; } .x-tbar-page-next { - background-image: url(../images/grid/page-next.gif) !important; + background-image: url(../images/grid/page-next.gif) !important; } .x-tbar-page-prev { - background-image: url(../images/grid/page-prev.gif) !important; + background-image: url(../images/grid/page-prev.gif) !important; } .x-item-disabled .x-tbar-loading { - background-image: url(../images/grid/loading.gif) !important; + background-image: url(../images/grid/loading.gif) !important; } .x-item-disabled .x-tbar-page-first { - background-image: url(../images/grid/page-first-disabled.gif) !important; + background-image: url(../images/grid/page-first-disabled.gif) !important; } .x-item-disabled .x-tbar-page-last { - background-image: url(../images/grid/page-last-disabled.gif) !important; + background-image: url(../images/grid/page-last-disabled.gif) !important; } .x-item-disabled .x-tbar-page-next { - background-image: url(../images/grid/page-next-disabled.gif) !important; + background-image: url(../images/grid/page-next-disabled.gif) !important; } .x-item-disabled .x-tbar-page-prev { - background-image: url(../images/grid/page-prev-disabled.gif) !important; + background-image: url(../images/grid/page-prev-disabled.gif) !important; } .x-paging-info { - color: #444; + color: #444; } .x-toolbar-more-icon { - background-image: url(../images/toolbar/more.gif) !important; + background-image: url(../images/toolbar/more.gif) !important; } .x-statusbar .x-status-busy { - background-image: url(../images/grid/loading.gif); + background-image: url(../images/grid/loading.gif); } .x-statusbar .x-status-text-panel { - border-color: #99bbe8 #fff #fff #99bbe8; + border-color: #99bbe8 #fff #fff #99bbe8; } .x-resizable-handle { - background-color: #fff; - color: #000; + background-color: #fff; + color: #000; } .x-resizable-over .x-resizable-handle-east,.x-resizable-pinned .x-resizable-handle-east,.x-resizable-over .x-resizable-handle-west,.x-resizable-pinned .x-resizable-handle-west - { - background-image: url(../images/sizer/e-handle.gif); + { + background-image: url(../images/sizer/e-handle.gif); } .x-resizable-over .x-resizable-handle-south,.x-resizable-pinned .x-resizable-handle-south,.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north - { - background-image: url(../images/sizer/s-handle.gif); + { + background-image: url(../images/sizer/s-handle.gif); } -.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north { - background-image: url(../images/sizer/s-handle.gif); +.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north + { + background-image: url(../images/sizer/s-handle.gif); } -.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast { - background-image: url(../images/sizer/se-handle.gif); +.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast + { + background-image: url(../images/sizer/se-handle.gif); } -.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest { - background-image: url(../images/sizer/nw-handle.gif); +.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest + { + background-image: url(../images/sizer/nw-handle.gif); } -.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast { - background-image: url(../images/sizer/ne-handle.gif); +.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast + { + background-image: url(../images/sizer/ne-handle.gif); } -.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest { - background-image: url(../images/sizer/sw-handle.gif); +.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest + { + background-image: url(../images/sizer/sw-handle.gif); } .x-resizable-proxy { - border-color: #3b5a82; + border-color: #3b5a82; } .x-resizable-overlay { - background-color: #fff; + background-color: #fff; } .x-grid3 { - background-color: #1f2933; + background-color: #1f2933; } -.x-grid-panel .x-panel-mc .x-panel-body { - border-color: #223; +.x-grid-panel .x-panel-mc .x-panel-body { /* border-color: #223; */ + } .x-grid3-hd-row td,.x-grid3-row td,.x-grid3-summary-row td { - font: normal 14px arial, tahoma, helvetica, sans-serif; + font: normal 14px arial, tahoma, helvetica, sans-serif; } .x-grid3-hd-row td { - border-left-color: #556; - border-right-color: #223; + border-left-color: #556; + border-right-color: #223; } .x-grid-row-loading { - background-color: #fff; - background-image: url(../images/default/shared/loading-balls.gif); + background-color: #fff; + background-image: url(../images/default/shared/loading-balls.gif); } .x-grid3-row { - border-bottom: 1px solid #111; + border-bottom: 1px solid #111; } .x-grid3-row-alt { - background-color: #1b232b; + background-color: #1b232b; } .x-grid3-row-over { - background-color: #7e5530; - background-image: none; + background-color: #7e5530; + background-image: none; } .x-grid3-resize-proxy { - background-color: #777; + background-color: #777; } .x-grid3-resize-marker { - background-color: #777; + background-color: #777; } .x-grid3-header { - background-color: #3b3f50; - background-image: url(../images/grid/grid3-hrow.gif); + background-color: #3b3f50; + background-image: url(../images/grid/grid3-hrow.gif); } .x-grid3-header-pop { - border-left-color: #d0d0d0; + border-left-color: #d0d0d0; } .x-grid3-header-pop-inner { - border-left-color: #eee; - background-image: url(../images/default/grid/hd-pop.gif); + border-left-color: #eee; + background-image: url(../images/default/grid/hd-pop.gif); } td.x-grid3-hd-over,td.sort-desc,td.sort-asc,td.x-grid3-hd-menu-open { - border-left-color: #889; - border-right-color: #445; + border-left-color: #889; + border-right-color: #445; } td.x-grid3-hd-over .x-grid3-hd-inner,td.sort-desc .x-grid3-hd-inner,td.sort-asc .x-grid3-hd-inner,td.x-grid3-hd-menu-open .x-grid3-hd-inner - { - background-color: #4e628a; - background-image: url(../images/grid/grid3-hrow-over.gif); + { + background-color: #4e628a; + background-image: url(../images/grid/grid3-hrow-over.gif); } .x-grid3-cell-inner,.x-grid3-hd-inner { - color: #fff; + color: #fff; } .sort-asc .x-grid3-sort-icon { - background-image: url(../images/grid/sort_asc.gif); - width: 15px; - height: 9px; - margin-left: 5px; + background-image: url(../images/grid/sort_asc.gif); + width: 15px; + height: 9px; + margin-left: 5px; } .sort-desc .x-grid3-sort-icon { - background-image: url(../images/grid/sort_desc.gif); - width: 15px; - height: 9px; - margin-left: 5px; + background-image: url(../images/grid/sort_desc.gif); + width: 15px; + height: 9px; + margin-left: 5px; } .x-grid3-cell-text,.x-grid3-hd-text { - color: #fff; + color: #fff; } .x-grid3-split { - background-image: url(../images/default/grid/grid-split.gif); + background-image: url(../images/default/grid/grid-split.gif); } .x-grid3-hd-text { - color: fff; + color: fff; } .x-dd-drag-proxy .x-grid3-hd-inner { - background-color: #bec7da; - background-image: url(../images/grid/grid3-hrow-over.gif); - border-color: #aaccf6; + background-color: #bec7da; + background-image: url(../images/grid/grid3-hrow-over.gif); + border-color: #aaccf6; } .col-move-top { - background-image: url(../images/default/grid/col-move-top.gif); + background-image: url(../images/default/grid/col-move-top.gif); } .col-move-bottom { - background-image: url(../images/default/grid/col-move-bottom.gif); + background-image: url(../images/default/grid/col-move-bottom.gif); } .x-grid3-row-selected { - background-color: #e5872c !important; - background-image: none; - border-style: solid; - font-weight: bold !important; - color: black !important; + background-color: #e5872c !important; + background-image: none; + border-style: solid; + font-weight: bold !important; + color: black !important; } .x-grid3-highlightrow { - border: 1px dotted #e5872c !important; - background-color: #666360; - text-decoration: underline; + border: 1px dotted #e5872c !important; + background-color: #666360; + text-decoration: underline; } .x-grid3-group-selected { - background-color: #e5872c !important; + background-color: #e5872c !important; } .x-grid3-row-selected .x-grid3-cell-inner { - color: black !important; + color: black !important; } .x-grid3-cell-selected .x-grid3-cell-inner { - background-color: #ffa340 !important; - color: black !important; - font-weight: bold; + background-color: #ffa340 !important; + color: black !important; + font-weight: bold; } .x-grid3-cell-selected span { - color: black !important; + color: black !important; } .x-grid3-cell-selected .x-grid3-cell-text { - color: black; + color: black; } -.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker { - background-color: #ebeadb !important; - background-image: url(../images/default/grid/grid-hrow.gif) !important; - color: #fff; - border-top-color: #fff; - border-right-color: #6fa0df !important; +.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker + { + background-color: #ebeadb !important; + background-image: url(../images/default/grid/grid-hrow.gif) !important; + color: #fff; + border-top-color: #fff; + border-right-color: #6fa0df !important; } -.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div { - color: fff !important; +.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div + { + color: fff !important; } .x-grid3-dirty-cell { - background-image: url(../images/grid/dirty.gif); + background-image: url(../images/grid/dirty.gif); } .x-grid3-topbar,.x-grid3-bottombar { - font: normal 14px arial, tahoma, helvetica, sans-serif; + font: normal 14px arial, tahoma, helvetica, sans-serif; } .x-grid3-bottombar .x-toolbar { - border-top-color: #a9bfd3; + border-top-color: #a9bfd3; } .x-props-grid .x-grid3-td-name .x-grid3-cell-inner { - background-image: url(../images/grid/grid3-special-col-bg.gif) !important; - color: #fff !important; + background-image: url(../images/grid/grid3-special-col-bg.gif) + !important; + color: #fff !important; } .x-props-grid .x-grid3-td-value { - color: #fff !important; + color: #fff !important; } .x-props-grid .x-grid3-body .x-grid3-td-name { - background-color: #263240 !important; - border-right-color: #223; + background-color: #263240 !important; + border-right-color: #223; } .xg-hmenu-sort-asc .x-menu-item-icon { - background-image: url(../images/grid/hmenu-asc.gif); + background-image: url(../images/grid/hmenu-asc.gif); } .xg-hmenu-sort-desc .x-menu-item-icon { - background-image: url(../images/grid/hmenu-desc.gif); + background-image: url(../images/grid/hmenu-desc.gif); } .xg-hmenu-lock .x-menu-item-icon { - background-image: url(../images/grid/hmenu-lock.gif); + background-image: url(../images/grid/hmenu-lock.gif); } .xg-hmenu-unlock .x-menu-item-icon { - background-image: url(../images/grid/hmenu-unlock.gif); + background-image: url(../images/grid/hmenu-unlock.gif); } .x-grid3-hd-btn { - background-color: #c2c9d0; - background-image: url(../images/grid/grid3-hd-btn.gif); + background-color: #c2c9d0; + background-image: url(../images/grid/grid3-hd-btn.gif); } .x-grid3-body .x-grid3-td-expander { - background-image: url(../images/grid/grid3-special-col-bg.gif); + background-image: url(../images/grid/grid3-special-col-bg.gif); } .x-grid3-row-expander { - background-image: url(../images/grid/row-expand-sprite.gif); + background-image: url(../images/grid/row-expand-sprite.gif); } .x-grid3-body .x-grid3-td-checker { - background-image: url(../images/grid/grid3-special-col-bg.gif); + background-image: url(../images/grid/grid3-special-col-bg.gif); } .x-grid3-row-checker,.x-grid3-hd-checker { - background-image: url(../images/default/grid/row-check-sprite.gif); + background-image: url(../images/default/grid/row-check-sprite.gif); } .x-grid3-body .x-grid3-td-numberer { - background-image: url(../images/grid/grid3-special-col-bg.gif); + background-image: url(../images/grid/grid3-special-col-bg.gif); } .x-grid3-body .x-grid3-td-numberer .x-grid3-cell-inner { - color: #fff; + color: #fff; } .x-grid3-body .x-grid3-td-row-icon { - background-image: url(../images/grid/grid3-special-col-bg.gif); + background-image: url(../images/grid/grid3-special-col-bg.gif); } .x-grid3-body .x-grid3-row-selected .x-grid3-td-numberer,.x-grid3-body .x-grid3-row-selected .x-grid3-td-checker,.x-grid3-body .x-grid3-row-selected .x-grid3-td-expander - { - background-image: url(../images/grid/grid3-special-col-sel-bg.gif); + { + background-image: url(../images/grid/grid3-special-col-sel-bg.gif); } .x-grid3-check-col { - background-image: url(../images/menu/unchecked.gif); + background-image: url(../images/menu/unchecked.gif); } .x-grid3-check-col-on { - background-image: url(../images/menu/checked.gif); + background-image: url(../images/menu/checked.gif); } .x-grid-group,.x-grid-group-body,.x-grid-group-hd { - zoom: 1; + zoom: 1; } .x-grid-group-hd { - border-bottom-color: #4e628a; + border-bottom-color: #4e628a; } .x-grid-group-hd div.x-grid-group-title { - background-image: url(../images/grid/group-collapse.gif); - background-position: 3px 6px; - color: #ffd; - font: bold 14px tahoma, arial, helvetica, sans-serif; + background-image: url(../images/grid/group-collapse.gif); + background-position: 3px 6px; + color: #ffd; + font: bold 14px 'Ubuntu', Arial } .x-grid-group-collapsed .x-grid-group-hd div.x-grid-group-title { - background-image: url(../images/grid/group-expand.gif); + background-image: url(../images/grid/group-expand.gif); } .x-group-by-icon { - background-image: url(../images/grid/group-by.gif); + background-image: url(../images/grid/group-by.gif); } .x-cols-icon { - background-image: url(../images/grid/columns.gif); + background-image: url(../images/grid/columns.gif); } .x-show-groups-icon { - background-image: url(../images/grid/group-by.gif); + background-image: url(../images/grid/group-by.gif); } .x-grid-empty { - color: gray; - font: normal 14px tahoma, arial, helvetica, sans-serif; + color: gray; + font: normal 14px 'Ubuntu', Arial } .x-grid-with-col-lines .x-grid3-row td.x-grid3-cell { - border-right-color: #ededed; + border-right-color: #ededed; } .x-grid-with-col-lines .x-grid3-row { - border-top-color: #ededed; + border-top-color: #ededed; } .x-grid-with-col-lines .x-grid3-row-selected { - border-top-color: #a3bae9; + border-top-color: #a3bae9; } .x-dd-drag-ghost { - color: #000; - font: normal 14px arial, helvetica, sans-serif; - border-color: #ddd #bbb #bbb #ddd; - background-color: #bec7da; + color: #000; + font: normal 14px arial, helvetica, sans-serif; + border-color: #ddd #bbb #bbb #ddd; + background-color: #bec7da; } /* @@ -971,708 +993,726 @@ } */ .x-view-selector { - background-color: #c3daf9; - border-color: #3399bb; + background-color: #c3daf9; + border-color: #3399bb; } .x-tree-node-expanded .x-tree-node-icon { - background-image: url(../images/tree/folder-open.gif); + background-image: url(../images/tree/folder-open.gif); } .x-tree-node-leaf .x-tree-node-icon { - background-image: url(../images/default/tree/leaf.gif); + background-image: url(../images/default/tree/leaf.gif); } .x-tree-node-collapsed .x-tree-node-icon { - background-image: url(../images/tree/folder.gif); + background-image: url(../images/tree/folder.gif); } .x-tree-node-loading .x-tree-node-icon { - background-image: url(../images/default/tree/loading.gif) !important; + background-image: url(../images/default/tree/loading.gif) !important; } .x-tree-node .x-tree-node-inline-icon { - background-image: none; + background-image: none; } .x-tree-node-loading a span { - font-style: italic; - color: #444444; + font-style: italic; + color: #444444; } .ext-ie .x-tree-node-el input { - width: 14px; - height: 14px; + width: 14px; + height: 14px; } .x-tree-lines .x-tree-elbow { - background-image: url(../images/tree/elbow.gif); + background-image: url(../images/tree/elbow.gif); } .x-tree-lines .x-tree-elbow-plus { - background-image: url(../images/tree/elbow-plus.gif); + background-image: url(../images/tree/elbow-plus.gif); } .x-tree-lines .x-tree-elbow-minus { - background-image: url(../images/tree/elbow-minus.gif); + background-image: url(../images/tree/elbow-minus.gif); } .x-tree-lines .x-tree-elbow-end { - background-image: url(../images/tree/elbow-end.gif); + background-image: url(../images/tree/elbow-end.gif); } .x-tree-lines .x-tree-elbow-end-plus { - background-image: url(../images/tree/elbow-end-plus.gif); + background-image: url(../images/tree/elbow-end-plus.gif); } .x-tree-lines .x-tree-elbow-end-minus { - background-image: url(../images/tree/elbow-end-minus.gif); + background-image: url(../images/tree/elbow-end-minus.gif); } .x-tree-lines .x-tree-elbow-line { - background-image: url(../images/tree/elbow-line.gif); + background-image: url(../images/tree/elbow-line.gif); } .x-tree-no-lines .x-tree-elbow-plus { - background-image: url(../images/tree/elbow-plus-nl.gif); + background-image: url(../images/tree/elbow-plus-nl.gif); } .x-tree-no-lines .x-tree-elbow-minus { - background-image: url(../images/tree/elbow-minus-nl.gif); + background-image: url(../images/tree/elbow-minus-nl.gif); } .x-tree-no-lines .x-tree-elbow-end-plus { - background-image: url(../images/tree/elbow-end-plus-nl.gif); + background-image: url(../images/tree/elbow-end-plus-nl.gif); } .x-tree-no-lines .x-tree-elbow-end-minus { - background-image: url(../images/tree/elbow-end-minus-nl.gif); + background-image: url(../images/tree/elbow-end-minus-nl.gif); } .x-tree-arrows .x-tree-elbow-plus { - background-image: url(../images/tree/arrows.gif); + background-image: url(../images/tree/arrows.gif); } .x-tree-arrows .x-tree-elbow-minus { - background-image: url(../images/tree/arrows.gif); + background-image: url(../images/tree/arrows.gif); } .x-tree-arrows .x-tree-elbow-end-plus { - background-image: url(../images/tree/arrows.gif); + background-image: url(../images/tree/arrows.gif); } .x-tree-arrows .x-tree-elbow-end-minus { - background-image: url(../images/tree/arrows.gif); + background-image: url(../images/tree/arrows.gif); } .x-tree-node { - color: #000; - font: normal 14px arial, tahoma, helvetica, sans-serif; + color: #000; + font: normal 14px arial, tahoma, helvetica, sans-serif; } .x-tree-node a,.x-dd-drag-ghost a { - color: #fff; + color: #fff; } .x-tree-node a span,.x-dd-drag-ghost a span { - color: #fff; + color: #fff; } .x-tree-node .x-tree-selected a,.x-dd-drag-ghost a { - color: #fff; + color: #fff; } .x-tree-node .x-tree-selected a span,.x-dd-drag-ghost a span { - color: #fff; + color: #fff; } .x-tree-node .x-tree-node-disabled a span { - color: gray !important; + color: gray !important; } .x-tree-node div.x-tree-drag-insert-below { - border-bottom-color: #36c; + border-bottom-color: #36c; } .x-tree-node div.x-tree-drag-insert-above { - border-top-color: #36c; + border-top-color: #36c; } .x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below a { - border-bottom-color: #36c; + border-bottom-color: #36c; } .x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above a { - border-top-color: #36c; + border-top-color: #36c; } .x-tree-node .x-tree-drag-append a span { - background-color: #ddd; - border-color: gray; + background-color: #ddd; + border-color: gray; } .x-tree-node .x-tree-node-over { - background-color: #7e5530; + background-color: #7e5530; } .x-tree-node .x-tree-selected { - background-color: #e5872c; - font-weight: bold; + background-color: #e5872c; + font-weight: bold; } .x-tree-drop-ok-append .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-add.gif); + background-image: url(../images/default/tree/drop-add.gif); } .x-tree-drop-ok-above .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-over.gif); + background-image: url(../images/default/tree/drop-over.gif); } .x-tree-drop-ok-below .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-under.gif); + background-image: url(../images/default/tree/drop-under.gif); } .x-tree-drop-ok-between .x-dd-drop-icon { - background-image: url(../images/default/tree/drop-between.gif); + background-image: url(../images/default/tree/drop-between.gif); } .x-date-picker { - border-color: #737b8c; - background-color: #21252e; + border-color: #737b8c; + background-color: #21252e; } .x-date-middle,.x-date-left,.x-date-right { - background-image: url(../images/shared/hd-sprite.gif); - color: #fff; - font: bold 14px "sans serif", tahoma, verdana, helvetica; + background-image: url(../images/shared/hd-sprite.gif); + color: #fff; + font: bold 14px "sans serif", tahoma, verdana, helvetica; } .x-date-middle .x-btn .x-btn-text { - color: #fff; + color: #fff; } .x-date-middle .x-btn-mc em.x-btn-arrow { - background-image: url(../images/toolbar/btn-arrow-light.gif); + background-image: url(../images/toolbar/btn-arrow-light.gif); } .x-date-right a { - background-image: url(../images/shared/right-btn.gif); + background-image: url(../images/shared/right-btn.gif); } .x-date-left a { - background-image: url(../images/shared/left-btn.gif); + background-image: url(../images/shared/left-btn.gif); } .x-date-inner th { - background-color: #363d4a; - background-image: url(../images/toolbar/bg.gif); - border-bottom-color: #535b5c; - font: normal 13px arial, helvetica, tahoma, sans-serif; - color: #fff; + background-color: #363d4a; + background-image: url(../images/toolbar/bg.gif); + border-bottom-color: #535b5c; + font: normal 13px arial, helvetica, tahoma, sans-serif; + color: #fff; } .x-date-inner td { - border-color: #112; + border-color: #112; } .x-date-inner a { - font: normal 14px arial, helvetica, tahoma, sans-serif; - color: #fff; - padding: 2px 7px 1px 3px; /* Structure to account for larger, bolder fonts in Access theme. */ + font: normal 14px arial, helvetica, tahoma, sans-serif; + color: #fff; + padding: 2px 7px 1px 3px; + /* Structure to account for larger, bolder fonts in Access theme. */ } .x-date-inner .x-date-active { - color: #000; + color: #000; } .x-date-inner .x-date-selected a { - background-color: #e5872c; - background-image: none; - border-color: #864900; - padding: 1px 6px 1px 2px; /* Structure to account for larger, bolder fonts in Access theme. */ + background-color: #e5872c; + background-image: none; + border-color: #864900; + padding: 1px 6px 1px 2px; + /* Structure to account for larger, bolder fonts in Access theme. */ } .x-date-inner .x-date-today a { - border-color: #99a; + border-color: #99a; } .x-date-inner .x-date-selected span { - font-weight: bold; + font-weight: bold; } .x-date-inner .x-date-prevday a,.x-date-inner .x-date-nextday a { - color: #aaa; + color: #aaa; } .x-date-bottom { - border-top-color: #737b8c; - background-color: #464d5a; - background-image: url(../images/shared/glass-bg.gif); + border-top-color: #737b8c; + background-color: #464d5a; + background-image: url(../images/shared/glass-bg.gif); } .x-date-inner a:hover,.x-date-inner .x-date-disabled a:hover { - color: #fff; - background-color: #7e5530; + color: #fff; + background-color: #7e5530; } .x-date-inner .x-date-disabled a { - background-color: #eee; - color: #bbb; + background-color: #eee; + color: #bbb; } .x-date-mmenu { - background-color: #eee !important; + background-color: #eee !important; } .x-date-mmenu .x-menu-item { - font-size: 13px; - color: #000; + font-size: 13px; + color: #000; } .x-date-mp { - background-color: #21252e; + background-color: #21252e; } .x-date-mp td { - font: normal 14px arial, helvetica, tahoma, sans-serif; + font: normal 14px arial, helvetica, tahoma, sans-serif; } .x-date-mp-btns button { - background-color: #083772; - color: #fff; - border-color: #3366cc #000055 #000055 #3366cc; - font: normal 14px arial, helvetica, tahoma, sans-serif; + background-color: #083772; + color: #fff; + border-color: #3366cc #000055 #000055 #3366cc; + font: normal 14px arial, helvetica, tahoma, sans-serif; } .x-date-mp-btns { - background-color: #dfecfb; - background-image: url(../images/shared/glass-bg.gif); + background-color: #dfecfb; + background-image: url(../images/shared/glass-bg.gif); } .x-date-mp-btns td { - border-top-color: #c5d2df; + border-top-color: #c5d2df; } td.x-date-mp-month a,td.x-date-mp-year a { - color: #fff; + color: #fff; } td.x-date-mp-month a:hover,td.x-date-mp-year a:hover { - color: fff; - background-color: #7e5530; + color: fff; + background-color: #7e5530; } td.x-date-mp-sel a { - background-color: #e5872c; - background-image: none; - border-color: #864900; + background-color: #e5872c; + background-image: none; + border-color: #864900; } .x-date-mp-ybtn a { - background-image: url(../images/panel/tool-sprites.gif); + background-image: url(../images/panel/tool-sprites.gif); } td.x-date-mp-sep { - border-right-color: #c5d2df; + border-right-color: #c5d2df; } .x-tip .x-tip-close { - background-image: url(../images/qtip/close.gif); + background-image: url(../images/qtip/close.gif); } .x-tip .x-tip-tc,.x-tip .x-tip-tl,.x-tip .x-tip-tr,.x-tip .x-tip-bc,.x-tip .x-tip-bl,.x-tip .x-tip-br,.x-tip .x-tip-ml,.x-tip .x-tip-mr - { - background-image: url(../images/qtip/tip-sprite.gif); + { + background-image: url(../images/qtip/tip-sprite.gif); } .x-tip .x-tip-mc { - font: normal 14px tahoma, arial, helvetica, sans-serif; + font: normal 14px 'Ubuntu', Arial } .x-tip .x-tip-ml { - background-color: #fff; + background-color: #fff; } .x-tip .x-tip-header-text { - font: bold 14px tahoma, arial, helvetica, sans-serif; - color: #ffd; + font: bold 14px 'Ubuntu', Arial color : #ffd; } .x-tip .x-tip-body { - font: normal 14px tahoma, arial, helvetica, sans-serif; - color: #000; + font: normal 14px 'Ubuntu', Arial color : #000; } .x-form-invalid-tip .x-tip-tc,.x-form-invalid-tip .x-tip-tl,.x-form-invalid-tip .x-tip-tr,.x-form-invalid-tip .x-tip-bc,.x-form-invalid-tip .x-tip-bl,.x-form-invalid-tip .x-tip-br,.x-form-invalid-tip .x-tip-ml,.x-form-invalid-tip .x-tip-mr - { - background-image: url(../images/default/form/error-tip-corners.gif); + { + background-image: url(../../gxt/images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-body { - background-image: url(../images/form/exclamation.gif); + background-image: url(../images/form/exclamation.gif); } .x-tip-anchor { - background-image: url(../images/qtip/tip-anchor-sprite.gif); + background-image: url(../images/qtip/tip-anchor-sprite.gif); } .x-menu { - border-color: #222; - background-color: #414551; - background-image: url(../images/menu/menu.gif); + border-color: #552200; + /* background-color: transparent; + background-image: url(../images/menu/menu.gif); */ + font: 13px 'Ubuntu', arial; + kfilter: alpha(opacity = 95); + -moz-opacity: 0.95; + -khtml-opacity: 0.95; + opacity: 0.95; + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; } .x-menu-nosep { - background-image: none; + background-image: none; } .x-menu-list-item { - font: normal 14px tahoma, arial, sans-serif; + font: normal 14px tahoma, arial, sans-serif; } .x-menu-item-arrow { - background-image: url(../images/menu/menu-parent.gif); + background-image: url(../images/menu/menu-parent.gif); } -.x-menu-sep { - background-color: #223; - border-bottom-color: #666; +.x-menu-sep { /* background-color: #223; + border-bottom-color: #666; */ + } a.x-menu-item { - color: #fffff6; + color: #fffff6; } .x-menu-item-active { - background-color: #f09134; - background-image: none; - border-color: #b36427; + background-color: #f09134; + background-image: none; + border-color: #b36427; } .x-menu-item-active a.x-menu-item { - border-color: #b36427; + border-color: #b36427; } .x-menu-check-item .x-menu-item-icon { - background-image: url(../images/default/menu/unchecked.gif); + background-image: url(../images/default/menu/unchecked.gif); } .x-menu-item-checked .x-menu-item-icon { - background-image: url(../images/default/menu/checked.gif); + background-image: url(../images/default/menu/checked.gif); } .x-menu-item-checked .x-menu-group-item .x-menu-item-icon { - background-image: url(../images/menu/group-checked.gif); + background-image: url(../images/menu/group-checked.gif); } .x-menu-group-item .x-menu-item-icon { - background-image: none; + background-image: none; } .x-menu-plain { - background-color: #fff !important; + background-color: #fff !important; } .x-menu .x-date-picker { - border-color: #a3bad9; + border-color: #a3bad9; } .x-cycle-menu .x-menu-item-checked { - border-color: #a3bae9 !important; - background-color: #def8f6; + border-color: #a3bae9 !important; + background-color: #def8f6; } .x-menu-scroller-top { - background-image: url(../images/layout/mini-top.gif); + background-image: url(../images/layout/mini-top.gif); } .x-menu-scroller-bottom { - background-image: url(../images/layout/mini-bottom.gif); + background-image: url(../images/layout/mini-bottom.gif); } .x-box-tl { - background-image: url(../images/default/box/corners.gif); + background-image: url(../images/default/box/corners.gif); } .x-box-tc { - background-image: url(../images/default/box/tb.gif); + background-image: url(../images/default/box/tb.gif); } .x-box-tr { - background-image: url(../images/default/box/corners.gif); + background-image: url(../images/default/box/corners.gif); } .x-box-ml { - background-image: url(../images/default/box/l.gif); + background-image: url(../images/default/box/l.gif); } .x-box-mc { - background-color: #eee; - background-image: url(../images/default/box/tb.gif); - font-family: "Myriad Pro", "Myriad Web", "Tahoma", "Helvetica", "Arial", sans-serif; - color: #393939; - font-size: 15px; + background-color: #eee; + background-image: url(../images/default/box/tb.gif); + font-family: "Myriad Pro", "Myriad Web", "Tahoma", "Helvetica", "Arial", + sans-serif; + color: #393939; + font-size: 15px; } .x-box-mc h3 { - font-size: 18px; - font-weight: bold; + font-size: 18px; + font-weight: bold; } .x-box-mr { - background-image: url(../images/default/box/r.gif); + background-image: url(../images/default/box/r.gif); } .x-box-bl { - background-image: url(../images/default/box/corners.gif); + background-image: url(../images/default/box/corners.gif); } .x-box-bc { - background-image: url(../images/default/box/tb.gif); + background-image: url(../images/default/box/tb.gif); } .x-box-br { - background-image: url(../images/default/box/corners.gif); + background-image: url(../images/default/box/corners.gif); } -.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr { - background-image: url(../images/default/box/corners-blue.gif); +.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr + { + background-image: url(../images/default/box/corners-blue.gif); } .x-box-blue .x-box-bc,.x-box-blue .x-box-mc,.x-box-blue .x-box-tc { - background-image: url(../images/default/box/tb-blue.gif); + background-image: url(../images/default/box/tb-blue.gif); } .x-box-blue .x-box-mc { - background-color: #c3daf9; + background-color: #c3daf9; } .x-box-blue .x-box-mc h3 { - color: #17385b; + color: #17385b; } .x-box-blue .x-box-ml { - background-image: url(../images/default/box/l-blue.gif); + background-image: url(../images/default/box/l-blue.gif); } .x-box-blue .x-box-mr { - background-image: url(../images/default/box/r-blue.gif); + background-image: url(../images/default/box/r-blue.gif); } .x-combo-list { - border: 2px solid #232732; - background-color: #555566 !important; - font: normal 15px tahoma, arial, helvetica, sans-serif; + border: 2px solid #232732; + background-color: #555566 !important; + font: normal 15px 'Ubuntu', Arial } .x-combo-list-inner { - background-color: #414551; + background-color: #280b0b; } .x-combo-list-hd { - font: bold 14px tahoma, arial, helvetica, sans-serif; - color: fff; - background-image: url(../images/default/layout/panel-title-light-bg.gif); - border-bottom-color: #98c0f4; + font: bold 14px 'Ubuntu', Arial color : fff; + background-image: url(../images/default/layout/panel-title-light-bg.gif); + border-bottom-color: #98c0f4; } .x-resizable-pinned .x-combo-list-inner { - border-bottom-color: #98c0f4; + border-bottom-color: #98c0f4; } .x-combo-list-item { - border-color: #556; + border-color: #556; } .x-combo-list .x-combo-selected { - border-color: #e5872c !important; - background-color: #e5872c; - font-weight: bold; + border-color: #e5872c !important; + background-color: #e5872c; + font-weight: bold; } .x-combo-list .x-toolbar { - border-top-color: #98c0f4; + border-top-color: #98c0f4; } .x-combo-list-small { - font: normal 14px tahoma, arial, helvetica, sans-serif; + font: normal 14px 'Ubuntu', Arial } .x-panel { - border-color: #18181a; + border-color: #18181a; } .x-panel-header { - color: #fff !important; - font-weight: bold; - font-size: 14px; - font-family: tahoma, arial, verdana, sans-serif; - border-color: #18181a; - background-image: url(../images/panel/white-top-bottom.gif); + color: #fff !important; + font-weight: bold; + font-size: 14px; + font-family: tahoma, arial, verdana, sans-serif; + border-color: #18181a; + background-image: url(../images/panel/white-top-bottom.gif); } -.x-panel-body { - color: #fffff6; - border-color: #18181a; - background-color: #232d38; +.x-panel-body { /* color: #fffff6; */ + border-color: #18181a; + background-color: #232d38; } .x-tab-panel .x-panel-body { - color: #fffff6; - border-color: #18181a; - background-color: #1f2730; + color: #fffff6; + border-color: #18181a; + background-color: #1f2730; } .x-panel-bbar .x-toolbar,.x-panel-tbar .x-toolbar { - border-color: #223; + /* border-color: #223; */ + } .x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar { - border-top-color: #223; + /* border-top-color: #223; */ + } .x-panel-body-noheader,.x-panel-mc .x-panel-body { - border-top-color: #223; + /* border-top-color: #223; */ + } .x-panel-tl .x-panel-header { - color: fff; - font: bold 14px tahoma, arial, verdana, sans-serif; + color: fff; + font: bold 14px tahoma, arial, verdana, sans-serif; } .x-panel-tc { - background-image: url(../images/panel/top-bottom.gif); + /* background-image: url(../images/panel/top-bottom.gif); */ + } .x-panel-tl,.x-panel-tr,.x-panel-bl,.x-panel-br { - background-image: url(../images/panel/corners-sprite.gif); - border-bottom-color: #222224; + /* background-image: url(../images/panel/corners-sprite.gif); + border-bottom-color: #222224; */ + } .x-panel-bc { - background-image: url(../images/panel/top-bottom.gif); + /* background-image: url(../images/panel/top-bottom.gif); */ + } .x-panel-mc { - font: normal 14px tahoma, arial, helvetica, sans-serif; - background-color: #3f4757; + font: normal 14px 'Ubuntu', Arial background-color : #3f4757; } .x-panel-ml { - background-image: url(../images/panel/left-right.gif); + /* background-image: url(../images/panel/left-right.gif); */ + } .x-panel-mr { - background-image: url(../images/panel/left-right.gif); + /* background-image: url(../images/panel/left-right.gif); */ + } .x-tool { - background-image: url(../images/panel/tool-sprites.gif); + background-image: url(../images/panel/tool-sprites.gif); } .x-tool-resize { -background-position:0 -360px; + background-position: 0 -360px; } .x-tool-resize-over { -background-position:-15px -360px; + background-position: -15px -360px; } .x-tool-move { -background-position:0 -375px; + background-position: 0 -375px; } .x-tool-move-over { -background-position:-15px -375px; + background-position: -15px -375px; } .x-panel-ghost { - background-color: #3f4757; + background-color: #3f4757; } .x-panel-ghost ul { - border-color: #18181a; + border-color: #18181a; } .x-panel-dd-spacer { - border-color: #18181a; + border-color: #18181a; } -.x-panel-fbar td,.x-panel-fbar span,.x-panel-fbar input,.x-panel-fbar div,.x-panel-fbar select,.x-panel-fbar label { - font: normal 14px arial, tahoma, helvetica, sans-serif; +.x-panel-fbar td,.x-panel-fbar span,.x-panel-fbar input,.x-panel-fbar div,.x-panel-fbar select,.x-panel-fbar label + { + font: normal 14px arial, tahoma, helvetica, sans-serif; } .x-window-proxy { - background-color: #1f2833; - border-color: #18181a; + background-color: #1f2833; + border-color: #18181a; } .x-window-tl .x-window-header { - color: #fff !important; - font: bold 14px tahoma, arial, verdana, sans-serif; + color: #fff !important; + font: bold 14px tahoma, arial, verdana, sans-serif; } .x-window-tc { - background-image: url(../images/window/top-bottom.png); + background-image: url(../images/window/top-bottom.png); } .x-window-tl { - background-image: url(../images/window/left-corners.png); + background-image: url(../images/window/left-corners.png); } .x-window-tr { - background-image: url(../images/window/right-corners.png); + background-image: url(../images/window/right-corners.png); } .x-window-bc { - background-image: url(../images/window/top-bottom.png); + background-image: url(../images/window/top-bottom.png); } .x-window-bl { - background-image: url(../images/window/left-corners.png); + background-image: url(../images/window/left-corners.png); } .x-window-br { - background-image: url(../images/window/right-corners.png); + background-image: url(../images/window/right-corners.png); } .x-window-mc { - border-color: #18181a; - font: normal 14px tahoma, arial, helvetica, sans-serif; - background-color: #1f2833; + border-color: #18181a; + font: normal 14px 'Ubuntu', Arial background-color : #1f2833; } .x-window-ml { - background-image: url(../images/window/left-right.png); + background-image: url(../images/window/left-right.png); } .x-window-mr { - background-image: url(../images/window/left-right.png); + background-image: url(../images/window/left-right.png); } .x-window-maximized .x-window-tc { - background-color: #fff; + background-color: #fff; } .x-window-bbar .x-toolbar { - border-top-color: #323945; + border-top-color: #323945; } .x-panel-ghost .x-window-tl { - border-bottom-color: #323945; + border-bottom-color: #323945; } .x-panel-collapsed .x-window-tl { - border-bottom-color: #323945; + border-bottom-color: #323945; } .x-dlg-mask { - background-color: #ccc; + background-color: #ccc; } .x-window-plain .x-window-mc { - background-color: #464f61; - border-color: #636778; + background-color: #464f61; + border-color: #636778; } .ext-ie .x-window-plain .x-window-mc { @@ -1680,668 +1720,664 @@ } .x-window-plain .x-window-body { - color: #fffff6; - border-color: #464F61; + color: #fffff6; + border-color: #464F61; } body.x-body-masked .x-window-plain .x-window-mc { - background-color: #464f61; + background-color: #464f61; } .x-html-editor-wrap { - border-color: #737B8C; - background-color: #fff; + border-color: #737B8C; + background-color: #fff; } .x-html-editor-wrap iframe { - background-color: #fff; + background-color: #fff; } .x-panel-noborder .x-panel-header-noborder { - border-bottom-color: #343d4e; + border-bottom-color: #343d4e; } .x-panel-noborder .x-panel-tbar-noborder .x-toolbar { - border-bottom-color: #343d4e; + border-bottom-color: #343d4e; } .x-panel-noborder .x-panel-bbar-noborder .x-toolbar { - border-top-color: #343d4e; + border-top-color: #343d4e; } .x-tab-panel-bbar-noborder .x-toolbar { - border-top-color: #343d4e; + border-top-color: #343d4e; } .x-tab-panel-tbar-noborder .x-toolbar { - border-bottom-color: #343d4e; + border-bottom-color: #343d4e; } .x-border-layout-ct { - background-color: #3f4757; + background-color: #3f4757; } .x-accordion-hd { - color: #fff; - font-weight: normal; - background-image: url(../images/panel/light-hd.gif); + color: #fff; + font-weight: normal; + background-image: url(../images/panel/light-hd.gif); } .x-layout-collapsed { - background-color: #323845; - border-color: #1a1a1c; + background-color: #323845; + border-color: #1a1a1c; } .x-layout-collapsed-over { - background-color: #2d3440; + background-color: #2d3440; } .x-layout-split-west .x-layout-mini { - background-image: url(../images/default/layout/mini-left.gif); + background-image: url(../images/default/layout/mini-left.gif); } .x-layout-split-east .x-layout-mini { - background-image: url(../images/default/layout/mini-right.gif); + background-image: url(../images/default/layout/mini-right.gif); } .x-layout-split-north .x-layout-mini { - background-image: url(../images/default/layout/mini-top.gif); + background-image: url(../images/default/layout/mini-top.gif); } .x-layout-split-south .x-layout-mini { - background-image: url(../images/default/layout/mini-bottom.gif); + background-image: url(../images/default/layout/mini-bottom.gif); } .x-layout-cmini-west .x-layout-mini { - background-image: url(../images/default/layout/mini-right.gif); + background-image: url(../images/default/layout/mini-right.gif); } .x-layout-cmini-east .x-layout-mini { - background-image: url(../images/default/layout/mini-left.gif); + background-image: url(../images/default/layout/mini-left.gif); } .x-layout-cmini-north .x-layout-mini { - background-image: url(../images/default/layout/mini-bottom.gif); + background-image: url(../images/default/layout/mini-bottom.gif); } .x-layout-cmini-south .x-layout-mini { - background-image: url(../images/default/layout/mini-top.gif); + background-image: url(../images/default/layout/mini-top.gif); } .x-progress-wrap { - border-color: #18181a; + border-color: #18181a; } .x-progress-inner { - background-color: #232d38; - background-image: none; + background-color: #232d38; + background-image: none; } .x-progress-bar { - background-color: #f39a00; - background-image: url(../images/progress/progress-bg.gif); - border-top-color: #a66900; - border-bottom-color: #a66900; - border-right-color: #ffb941; + background-color: #f39a00; + background-image: url(../images/progress/progress-bg.gif); + border-top-color: #a66900; + border-bottom-color: #a66900; + border-right-color: #ffb941; } .x-progress-text { - font-size: 14px; - font-weight: bold; - color: #fff; + font-size: 14px; + font-weight: bold; + color: #fff; } .x-progress-text-back { - color: #aaa; - line-height: 11px; + color: #aaa; + line-height: 11px; } .x-list-header { - background-color: #393d4e; - background-image: url(../images/toolbar/bg.gif); - background-position: 0 top; + background-color: #393d4e; + background-image: url(../images/toolbar/bg.gif); + background-position: 0 top; } .x-list-header-inner div em { - border-left-color: #667; - font: normal 14px arial, tahoma, helvetica, sans-serif; - line-height: 14px; + border-left-color: #667; + font: normal 14px arial, tahoma, helvetica, sans-serif; + line-height: 14px; } .x-list-body dt em { - font: normal 14px arial, tahoma, helvetica, sans-serif; + font: normal 14px arial, tahoma, helvetica, sans-serif; } .x-list-over { - background-color: #eee; + background-color: #eee; } .x-list-selected { - background-color: #dfe8f6; - font-weight: bold; + background-color: #dfe8f6; + font-weight: bold; } .x-list-resizer { - border-left-color: #555; - border-right-color: #555; + border-left-color: #555; + border-right-color: #555; } .x-list-header-inner em.sort-asc,.x-list-header-inner em.sort-desc { - background-image: url(../images/grid/sort-hd.gif); - border-color: #3e4e6c; + background-image: url(../images/grid/sort-hd.gif); + border-color: #3e4e6c; } .x-slider-input { - color: black; + color: black; } -.x-slider-horz,.x-slider-horz .x-slider-end,.x-slider-horz .x-slider-inner { - background-image: url(../images/slider/slider-bg.png); +.x-slider-horz,.x-slider-horz .x-slider-end,.x-slider-horz .x-slider-inner + { + background-image: url(../images/slider/slider-bg.png); } .x-slider-horz .x-slider-thumb { - background-image: url(../images/slider/slider-thumb.png); + background-image: url(../images/slider/slider-thumb.png); } -.x-slider-vert,.x-slider-vert .x-slider-end,.x-slider-vert .x-slider-inner { - background-image: url(../images/slider/slider-v-bg.png); +.x-slider-vert,.x-slider-vert .x-slider-end,.x-slider-vert .x-slider-inner + { + background-image: url(../images/slider/slider-v-bg.png); } .x-slider-vert .x-slider-thumb { - background-image: url(../images/slider/slider-v-thumb.png); + background-image: url(../images/slider/slider-v-thumb.png); } .x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text { - font-size: 15px; + font-size: 15px; } .x-window-dlg .ext-mb-textarea { - font: normal 15px tahoma, arial, helvetica, sans-serif; + font: normal 15px 'Ubuntu', Arial } .x-window-dlg .x-msg-box-wait { - background-image: url(../images/grid/loading.gif); + background-image: url(../images/grid/loading.gif); } .x-window-dlg .ext-mb-info { - background-image: url(../images/window/icon-info.gif); + background-image: url(../images/window/icon-info.gif); } .x-window-dlg .ext-mb-warning { - background-image: url(../images/window/icon-warning.gif); + background-image: url(../images/window/icon-warning.gif); } .x-window-dlg .ext-mb-question { - background-image: url(../images/window/icon-question.gif); + background-image: url(../images/window/icon-question.gif); } .x-window-dlg .ext-mb-error { - background-image: url(../images/window/icon-error.gif); + background-image: url(../images/window/icon-error.gif); } .x-border { - border: 1px solid #18181a; + border: 1px solid #18181a; } .x-grid3-hd-row .x-grid3-hd { - border-left-color: #555566; - border-right-color: black; + border-left-color: #555566; + border-right-color: black; } .x-grid3-row { - border-color: #1f2933 black black; + border-color: #1f2933 black black; } .x-grid3-row-checker,.x-grid3-hd-checker { - background-image: url(../images/grid/row-check-sprite.gif); + background-image: url(../images/grid/row-check-sprite.gif); } .x-grid3-footer { - background: none repeat scroll 0 0 black; - border-bottom: 1px solid #393c4c; - border-top: 1px solid #393c4c; + background: none repeat scroll 0 0 black; + border-bottom: 1px solid #393c4c; + border-top: 1px solid #393c4c; } .x-grid3-footer-row { - background: none repeat scroll 0 0 black; + background: none repeat scroll 0 0 black; } .x-tree3 { - background-color: #232D38; + background-color: #232D38; } .x-tree3-node-text { - color: white; + color: white; } .x-tree3-node { - color: white; - font: normal 14px arial, tahoma, helvetica, sans-serif; + color: white; + font: normal 14px arial, tahoma, helvetica, sans-serif; } .x-tree3-node .x-ftree2-node-over { - background-color: #7e5530 !important; + background-color: #7e5530 !important; } .x-tree3-node .x-ftree2-selected { - background-color: #e5872c !important; - font-weight: bold; - color: black !important; + background-color: #e5872c !important; + font-weight: bold; + color: black !important; } .x-tree3-node .x-ftree2-selected .x-tree3-node-text { - color: black !important; + color: black !important; } .x-view,x-combo-list { - background-color: #232D38; + background-color: #232D38; } .x-view { - border: 1px solid #18181a; + border: 1px solid #18181a; } -.x-view-highlightrow { - border: 1px dotted #e5872c !important; - background-color: #666360; - text-decoration: underline; +.x-view-highlightrow { + border: 1px dotted #e5872c !important; + background-color: #666360; + text-decoration: underline; } .x-view-item,.x-combo-list-item { - border: 1px solid black !important; - border-top: 1px solid #232D38 !important; + border: 1px solid black !important; + border-top: 1px solid #232D38 !important; } .x-view-item-over,.x-combo-over { - background: #7e5530; - border: 1px dotted #e5872c !important; + background: #7e5530; + border: 1px dotted #e5872c !important; } .x-view-item-sel,.x-combo-selected { - background: #e5872c none repeat scroll 0%; - border: 1px dotted #e5872c !important; - font-weight: bold; - color: black !important; + background: #e5872c none repeat scroll 0%; + border: 1px dotted #e5872c !important; + font-weight: bold; + color: black !important; } - - .x-date-left-icon { - background-image: url(../images/shared/left-btn.gif); + background-image: url(../images/shared/left-btn.gif); } .x-date-right-icon { - background-image: url(../images/shared/right-btn.gif); + background-image: url(../images/shared/right-btn.gif); } .x-date-days td { - background: url(../images/shared/glass-bg.gif) 0px -5px; - color: white; + background: url(../images/shared/glass-bg.gif) 0px -5px; + color: white; } .x-date-mp-btns button { - background-color: #282f40; - color: #fff; - border-color: #1b1d29; + background-color: #282f40; + color: #fff; + border-color: #1b1d29; } .x-grid-group-hd .x-grid-group-div { - color: white; + color: white; } .x-grid3-summary-row { - background: none repeat scroll 0 50% #21252e !important; + background: none repeat scroll 0 50% #21252e !important; } .x-status-text-panel { - border-color: black #fff #fff black !important; + border-color: black #fff #fff black !important; } .x-menubar { - border-color: black; - background-color: #d0def0; - background-image: url(../images/toolbar/bg.gif); + border-color: black; + background-color: #d0def0; + background-image: url(../images/toolbar/bg.gif); } .x-menubar-item-active { - background-color: #e5872c; + background-color: #e5872c; } .x-drag-proxy { - background-color: #3f4757; - border: 1px solid black; + background-color: #3f4757; + border: 1px solid black; } -.x-grid3-hd-row .x-grid3-hd,.x-grid3-row .x-grid3-cell,.x-grid3-summary-row .x-grid3-cell { - font: 12px arial, tahoma, helvetica, sans-serif !important; +.x-grid3-hd-row .x-grid3-hd,.x-grid3-row .x-grid3-cell,.x-grid3-summary-row .x-grid3-cell + { + font: 12px arial, tahoma, helvetica, sans-serif !important; } .x-grid3-row-selected,.x-grid3-row-selected .x-grid3-cell { - font-weight: bold !important; + font-weight: bold !important; } .x-tree3-node-text { - font: 12px arial, tahoma, helvetica, sans-serif; - font-weight: bold; + font: 12px arial, tahoma, helvetica, sans-serif; + font-weight: bold; } .x-tree3-node .x-ftree2-selected { - font-weight: bold !important; + font-weight: bold !important; } .x-grid3-row-selected .x-tree3-node-text { - color: black !important; + color: black !important; } .x-contrast .x-ftree2-selected .x-tree3-node-text { - font-style: italic; - text-decoration: underline; + font-style: italic; + text-decoration: underline; } .x-aria-focusframe-side { - background-color: #ff8800; + background-color: #ff8800; } .x-contrast .x-grid3-cell-selected { - font-weight: bold !important; - font-style: italic !important; - font-size: 13px !important; + font-weight: bold !important; + font-style: italic !important; + font-size: 13px !important; } -.x-contrast .x-grid3-row-selected x-tree3-node-text,.x-contrast .x-grid3-row-selected .x-tree3-node-text { - font-weight: bold !important; - font-style: italic !important; - font-size: 13px !important; +.x-contrast .x-grid3-row-selected x-tree3-node-text,.x-contrast .x-grid3-row-selected .x-tree3-node-text + { + font-weight: bold !important; + font-style: italic !important; + font-size: 13px !important; } .x-contrast .x-column-header-sel { - font-style: italic !important; - font-weight: bold !important; + font-style: italic !important; + font-weight: bold !important; } .x-contrast .x-btn-tr i,.x-contrast .x-btn-tl i,.x-contrast .x-btn-mr i,.x-contrast .x-btn-ml i,.x-contrast .x-btn-br i,.x-contrast .x-btn-bl i - { - width: auto; + { + width: auto; } .x-contrast .x-btn-menu .x-btn-mr i:before { - content: url(../images/button/arrow.gif); + content: url(../images/button/arrow.gif); } .x-contrast .x-slider-thumb i:before { - content: url(../images/slider/slider-thumb-single.png); + content: url(../images/slider/slider-thumb-single.png); } .x-contrast .x-slider { - border: 1px solid yellow; + border: 1px solid yellow; } .x-contrast .x-form-trigger:after { - content: url(../images/form/trigger-single.gif); + content: url(../images/form/trigger-single.gif); } .x-contrast .x-panel { - border: 1px solid yellow !important; + border: 1px solid yellow !important; } .x-contrast .x-btn { - border: 1px solid yellow !important; + border: 1px solid yellow !important; } .x-contrast .x-grid3 .sort-asc span:after { - content: url(../images/grid/sort_asc.gif); - position: absolute; - top: 8px; + content: url(../images/grid/sort_asc.gif); + position: absolute; + top: 8px; } .x-contrast .x-grid3 .sort-desc span:after { - content: url(../images/grid/sort_desc.gif); - position: absolute; - top: 8px; + content: url(../images/grid/sort_desc.gif); + position: absolute; + top: 8px; } .x-contrast .x-menu-check-item:before { - content: url(../images/grid/row-check.gif); - position: relative; - left: 0px; + content: url(../images/grid/row-check.gif); + position: relative; + left: 0px; } .x-contrast .x-menu-checked:before { - content: url(../images/grid/row-check-sel.gif); - float: left; + content: url(../images/grid/row-check-sel.gif); + float: left; } .x-contrast .x-menu-item-radio:before { - content: none; - position: relative; - left: 0px; + content: none; + position: relative; + left: 0px; } .x-contrast .x-menu-radio-sel:before { - content: url(../images/menu/group-checked.gif); - float: left; + content: url(../images/menu/group-checked.gif); + float: left; } .x-contrast .x-grid-group .x-grid3-group-selected .x-grid-group-div { - font-weight: bold !important; - font-style: italic !important; + font-weight: bold !important; + font-style: italic !important; } .x-contrast .x-grid-group-div:before { - content: url(../images/grid/group-expand.gif); - padding-right: 5px; + content: url(../images/grid/group-expand.gif); + padding-right: 5px; } .x-contrast .x-grid-group-collapsed .x-grid-group-div:before { - content: url(../images/grid/group-collapse.gif); - padding-right: 5px; + content: url(../images/grid/group-collapse.gif); + padding-right: 5px; } .x-contrast .x-grid3-row-collapsed .x-grid3-row-expander:after { - content: url(../images/grid/group-expand.gif); + content: url(../images/grid/group-expand.gif); } .x-contrast .x-grid3-row-expanded .x-grid3-row-expander:after { - content: url(../images/grid/group-collapse.gif); + content: url(../images/grid/group-collapse.gif); } -.x-contrast .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker:after { - content: url(../images/grid/row-check.gif); +.x-contrast .x-grid3-row-checker:after,.x-contrast .x-grid3-hd-checker:after + { + content: url(../images/grid/row-check.gif); } -.x-contrast .x-grid3-row-selected .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker-on .x-grid3-hd-checker:after { - content: url(../images/grid/row-check-sel.gif); +.x-contrast .x-grid3-row-selected .x-grid3-row-checker:after,.x-contrast .x-grid3-hd-checker-on .x-grid3-hd-checker:after + { + content: url(../images/grid/row-check-sel.gif); } .x-contrast .x-tool-close i:before { - content: url(../images/panel/tool-close.gif); + content: url(../images/panel/tool-close.gif); } .x-contrast .x-tool-gear i:before { - content: url(../images/panel/tool-gear.gif); + content: url(../images/panel/tool-gear.gif); } .x-contrast .x-tool-toggle i:before { - content: url(../images/panel/tool-collapse.gif); + content: url(../images/panel/tool-collapse.gif); } .x-contrast .x-panel-collapsed .x-tool-toggle i:before { - content: url(../images/panel/tool-expand.gif); + content: url(../images/panel/tool-expand.gif); } .x-contrast .x-tool-maximize i:before { - content: url(../images/panel/tool-maximize.gif); + content: url(../images/panel/tool-maximize.gif); } .x-contrast .x-tool-minimize i:before { - content: url(../images/panel/tool-minimize.gif); + content: url(../images/panel/tool-minimize.gif); } .x-contrast .x-tree3-node-joint-expand .x-tree3-node-text:before { - content: url(../images/tree/tree-expanded.png); - position: absolute; - left: -25px; + content: url(../images/tree/tree-expanded.png); + position: absolute; + left: -25px; } .x-contrast .x-tree3-node-joint-collapse .x-tree3-node-text:before { - content: url(../images/tree/tree-collapsed.png); - position: absolute; - left: -25px; + content: url(../images/tree/tree-collapsed.png); + position: absolute; + left: -25px; } .x-contrast .arrow-up i:before { - content: url(../images/icons/top2.gif); + content: url(../images/icons/top2.gif); } .x-contrast .arrow-double-right i:before { - content: url(../images/icons/doubleright2.gif); + content: url(../images/icons/doubleright2.gif); } .x-contrast .arrow-right i:before { - content: url(../images/icons/right2.gif); + content: url(../images/icons/right2.gif); } .x-contrast .arrow-left i:before { - content: url(../images/icons/left2.gif); + content: url(../images/icons/left2.gif); } .x-contrast .arrow-double-left i:before { - content: url(../images/icons/doubleleft2.gif); + content: url(../images/icons/doubleleft2.gif); } .x-contrast .arrow-double-right i:before { - content: url(../images/icons/doubleright2.gif); + content: url(../images/icons/doubleright2.gif); } .x-contrast .arrow-down i:before { - content: url(../images/icons/down2.gif); + content: url(../images/icons/down2.gif); } .x-contrast .x-date-left-icon i:before { - content: url(../images/shared/left-btn.gif); + content: url(../images/shared/left-btn.gif); } .x-contrast .x-date-right-icon i:before { - content: url(../images/shared/right-btn.gif); + content: url(../images/shared/right-btn.gif); } .x-contrast .x-grid3-hd-btn:before { - content: url("../images/grid/grid3-hd-btn-contrast.gif"); - border: 1px solid yellow; + content: url("../images/grid/grid3-hd-btn-contrast.gif"); + border: 1px solid yellow; } .x-contrast .x-row-editor .x-btns { - background-color: black; + background-color: black; } .x-contrast .x-html-editor-wrap .x-btn-pressed button { - border: 3px solid black; + border: 3px solid black; } -.x-contrast .x-window, .x-contrast .x-info, .x-contrast .x-tip { - background-color: black; - border: 1px solid black; +.x-contrast .x-window,.x-contrast .x-info,.x-contrast .x-tip { + background-color: black; + border: 1px solid black; } .x-contrast .x-menu-item-arrow:before { - content: url(../images/shared/right-btn.gif); + content: url(../images/shared/right-btn.gif); } -.x-contrast .x-menu-scroller-top:before { - content: url("../images/layout/mini-top.gif"); - position: absolute; - left: 45px; +.x-contrast .x-menu-scroller-top:before { + content: url("../images/layout/mini-top.gif"); + position: absolute; + left: 45px; } -.x-contrast .x-menu-scroller-bottom:before { - content: url("../images/layout/mini-bottom.gif"); - position: absolute; - left: 45px; +.x-contrast .x-menu-scroller-bottom:before { + content: url("../images/layout/mini-bottom.gif"); + position: absolute; + left: 45px; } -.x-spinner-field .x-form-twin-triggers .x-form-spinner-up{ - height: 11px; +.x-spinner-field .x-form-twin-triggers .x-form-spinner-up { + height: 11px; } + .x-spinner-field .x-form-twin-triggers .x-form-spinner-down { - height: 11px; + height: 11px; } - .x-spinner-field .x-form-twin-triggers .x-form-spinner-down { - top:13px; + top: 13px; } - .x-spinner-field .x-form-spinner-up { - background-image: url('../images/form/spinner.gif'); + background-image: url('../images/form/spinner.gif'); } + .x-spinner-field .x-form-spinner-down { - background-image: url('../images/form/spinner.gif'); + background-image: url('../images/form/spinner.gif'); } - - - - - - - - - - - - .x-spinner-field .x-form-spinner-down { - background-position:0 -13px; + background-position: 0 -13px; } .x-trigger-wrap-focus .x-form-spinner-up { - background-position:-100px 0; + background-position: -100px 0; } .x-trigger-wrap-focus .x-form-spinner-down { - background-position:-100px -13px; + background-position: -100px -13px; } -.x-form-field-wrap .x-form-spinner-overup{ - background-position:-20px 0; +.x-form-field-wrap .x-form-spinner-overup { + background-position: -20px 0; } -.x-form-field-wrap .x-form-spinner-clickup{ - background-position:-40px 0; + +.x-form-field-wrap .x-form-spinner-clickup { + background-position: -40px 0; } -.x-trigger-wrap-focus .x-form-spinner-overup{ - background-position:-120px 0; +.x-trigger-wrap-focus .x-form-spinner-overup { + background-position: -120px 0; } -.x-trigger-wrap-focus .x-form-spinner-clickup{ - background-position:-140px 0; +.x-trigger-wrap-focus .x-form-spinner-clickup { + background-position: -140px 0; } -.x-form-field-wrap .x-form-spinner-overdown{ - background-position:-60px -13px; +.x-form-field-wrap .x-form-spinner-overdown { + background-position: -60px -13px; } -.x-form-field-wrap .x-form-spinner-clickdown{ - background-position:-80px -13px; + +.x-form-field-wrap .x-form-spinner-clickdown { + background-position: -80px -13px; } -.x-trigger-wrap-focus .x-form-spinner-overdown{ - background-position:-160px -13px; + +.x-trigger-wrap-focus .x-form-spinner-overdown { + background-position: -160px -13px; } -.x-trigger-wrap-focus .x-form-spinner-clickdown{ - background-position:-180px -13px; + +.x-trigger-wrap-focus .x-form-spinner-clickdown { + background-position: -180px -13px; } - -.x-form-field-wrap .x-form-spinner-overup, -.x-form-field-wrap .x-form-spinner-clickup{ +.x-form-field-wrap .x-form-spinner-overup,.x-form-field-wrap .x-form-spinner-clickup + { border-bottom-color: #d97e27; } -.x-form-field-wrap .x-form-spinner-overdown, -.x-form-field-wrap .x-form-spinner-clickdown{ + +.x-form-field-wrap .x-form-spinner-overdown,.x-form-field-wrap .x-form-spinner-clickdown + { border-bottom-color: #d97e27; } -.x-trigger-wrap-focus .x-form-spinner-down, -.x-trigger-wrap-focus .x-form-spinner-up{ +.x-trigger-wrap-focus .x-form-spinner-down,.x-trigger-wrap-focus .x-form-spinner-up + { border-bottom-color: #d97e27; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -56,8 +56,10 @@ import cc.kune.core.client.notify.msgs.UserNotifierViewImpl; import cc.kune.core.client.notify.spiner.SpinerPresenter; import cc.kune.core.client.notify.spiner.SpinerViewImpl; +import cc.kune.core.client.sitebar.SiteUserOptions; +import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; +import cc.kune.core.client.sitebar.SitebarActionsPanel; import cc.kune.core.client.sitebar.SitebarActionsPresenter; -import cc.kune.core.client.sitebar.SitebarActionsViewImpl; import cc.kune.core.client.sitebar.SitebarNewGroupLink; import cc.kune.core.client.sitebar.SitebarSignInLink; import cc.kune.core.client.sitebar.SitebarSignOutLink; @@ -128,7 +130,7 @@ bindPresenter(SiteLogoPresenter.class, SiteLogoPresenter.SiteLogoView.class, SiteLogoViewImpl.class, SiteLogoPresenter.SiteLogoProxy.class); bindPresenter(SitebarActionsPresenter.class, SitebarActionsPresenter.SitebarActionsView.class, - SitebarActionsViewImpl.class, SitebarActionsPresenter.SitebarActionsProxy.class); + SitebarActionsPanel.class, SitebarActionsPresenter.SitebarActionsProxy.class); bindPresenter(NewGroupPresenter.class, NewGroupView.class, NewGroupPanel.class, NewGroupPresenter.NewGroupProxy.class); bindPresenter(GroupMembersPresenter.class, GroupMembersPresenter.GroupMembersView.class, @@ -169,6 +171,9 @@ bind(PrefetchUtilities.class).in(Singleton.class); bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class); bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class); + bind(BeforeSignOut.class).in(Singleton.class); + bind(SiteTokenListeners.class).asEagerSingleton(); + bind(CoreParts.class).asEagerSingleton(); // SN bind(SNAdminsMenuItemsRegistry.class).in(Singleton.class); @@ -176,11 +181,10 @@ bind(SNPendingsMenuItemsRegistry.class).in(Singleton.class); bind(GroupMembersActionsRegistry.class).in(Singleton.class); + bind(SiteUserOptions.class).to(SiteUserOptionsPresenter.class).in(Singleton.class); bind(SitebarNewGroupLink.class).in(Singleton.class); bind(SitebarSignInLink.class).in(Singleton.class); bind(SitebarSignOutLink.class).in(Singleton.class); - bind(BeforeSignOut.class).in(Singleton.class); - bind(SiteTokenListeners.class).asEagerSingleton(); - bind(CoreParts.class).asEagerSingleton(); + } } Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -2,6 +2,7 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; import cc.kune.core.client.sn.GroupMembersPresenter; import cc.kune.core.client.state.Session; @@ -11,12 +12,13 @@ public class CoreParts { @Inject - public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter) { + public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter, + final Provider<SiteUserOptionsPresenter> userOptions) { session.onInitDataReceived(new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { grouMembersPresenter.get(); - ; + userOptions.get(); } }); } Modified: trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -25,7 +25,7 @@ public class EventBusWithLogging extends SimpleEventBus { @Override public void fireEvent(final GwtEvent<?> event) { - Log.debug("Kune " + event.toDebugString()); + Log.debug("Kune " + event.toDebugString() + " " + event.toString()); super.fireEvent(event); } } Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -20,6 +20,7 @@ package cc.kune.core.client.notify.confirm; import cc.kune.common.client.noti.ConfirmAskEvent; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; import cc.kune.core.client.ui.dialogs.BasicTopDialog; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -57,9 +58,15 @@ @Override public void confirmAsk(final ConfirmAskEvent ask) { dialog.getFirstBtnText().setText(ask.getAcceptBtnMsg()); - dialog.getSecondBtnText().setText(ask.getCancelBtnMsg()); + final String cancelBtnMsg = ask.getCancelBtnMsg(); dialog.setFirstBtnTitle(ask.getAcceptBtnTooltip()); - dialog.setSecondBtnTitle(ask.getCancelBtnTooltip()); + if (TextUtils.notEmpty(cancelBtnMsg)) { + dialog.getSecondBtnText().setText(cancelBtnMsg); + dialog.setSecondBtnTitle(ask.getCancelBtnTooltip()); + dialog.setSecondBtnVisible(true); + } else { + dialog.setSecondBtnVisible(false); + } dialog.getTitleText().setText(ask.getTitle()); askLabel.setText(ask.getMessage()); dialog.showCentered(); Added: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,48 @@ +package cc.kune.core.client.sitebar; + +import cc.kune.core.client.ui.dialogs.BasicTopDialog; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Frame; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; + +public class AboutKuneDialog { + + interface Binder extends UiBinder<Widget, AboutKuneDialog> { + } + public static final String ABOUT_KUNE_BTN_ID = "kune-about-button-diag"; + public static final String ABOUT_KUNE_ID = "kune-about-diag"; + private static final Binder BINDER = GWT.create(Binder.class); + + public static final String SITE_OPTIONS_MENU = "kune-sop-om"; + private final BasicTopDialog dialog; + @UiField + FlowPanel flow; + @UiField + Frame frame; + + @Inject + public AboutKuneDialog(final I18nTranslationService i18n) { + dialog = new BasicTopDialog(ABOUT_KUNE_ID, i18n.t("About Kune"), true, true, false, 400, 400, "", i18n.t("Ok"), + ABOUT_KUNE_BTN_ID, 1); + dialog.getInnerPanel().add(BINDER.createAndBindUi(this)); + dialog.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + dialog.hide(); + } + }); + } + + public void showCentered() { + dialog.showCentered(); + } + +} Added: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:g='urn:import:com.google.gwt.user.client.ui'> + <ui:style> + .panel { + width: 400px; + height: 400px; + } + + .frame { + border: 0px; + margin: 0px; + width: 100%; + height: 400px; + background-color: #F2F2F2; + } + </ui:style> + + <g:FlowPanel styleName="{style.panel}" ui:field="flow"> + <g:Frame styleName="{style.frame}" url="about.html" + ui:field="frame" /> + </g:FlowPanel> +</ui:UiBinder> Added: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,9 @@ +package cc.kune.core.client.sitebar; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; + +public interface SiteUserOptions { + + void addAction(GuiActionDescrip descriptor); + +} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java (from rev 1243, trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,159 @@ +/* + * + * 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.core.client.sitebar; + +import java.util.List; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.sn.actions.GotoGroupAction; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.UserSignInEvent; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.client.state.UserSignOutEvent; +import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class SiteUserOptionsPresenter implements SiteUserOptions { + + public static final String LOGGED_USER_MENU = "kune-sump-lum"; + private final Provider<FileDownloadUtils> downloadProvider; + private final GotoGroupAction gotoGroupAction; + private final I18nTranslationService i18n; + private final IconResources img; + private MenuDescriptor menuDescriptor; + private SubMenuDescriptor partiMenu; + private final Session session; + private final SitebarActionsPresenter siteOptions; + private final StateManager stateManager; + + @Inject + public SiteUserOptionsPresenter(final Session session, final StateManager stateManager, + final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, + final IconResources img, final SitebarActionsPresenter siteOptions, final GotoGroupAction gotoGroupAction) { + super(); + this.session = session; + this.stateManager = stateManager; + this.downloadProvider = downloadProvider; + this.i18n = i18n; + this.img = img; + this.siteOptions = siteOptions; + this.gotoGroupAction = gotoGroupAction; + createActions(); + if (session.isLogged()) { + onUserSignIn(session.getCurrentUserInfo()); // NOPMD by vjrj on 11/02/11 3:37 + } + session.onUserSignIn(new UserSignInHandler() { + @Override + public void onUserSignIn(final UserSignInEvent event) { + SiteUserOptionsPresenter.this.onUserSignIn(event.getUserInfo()); + } + }); + session.onUserSignOut(new UserSignOutHandler() { + + @Override + public void onUserSignOut(final UserSignOutEvent event) { + menuDescriptor.setVisible(false); + SiteUserOptionsPresenter.this.setLoggedUserName(""); + } + }); + } + + @Override + public void addAction(final GuiActionDescrip descriptor) { + addActionImpl(descriptor); + } + + private void addActionImpl(final GuiActionDescrip descriptor) { + descriptor.setParent(menuDescriptor); + siteOptions.getRightToolbar().addAction(descriptor); + } + + private void addPartipation(final GroupDTO group) { + final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl(group.getStateToken()) + : "images/group-def-icon.gif"; + final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); + participant.setItem(group); + participant.putValue(Action.NAME, group.getLongName()); + participant.putValue(Action.SMALL_ICON, logoImageUrl); + participant.setParent(partiMenu); + siteOptions.getRightToolbar().addAction(participant); + } + + private void createActions() { + menuDescriptor = new MenuDescriptor(); + menuDescriptor.setId(LOGGED_USER_MENU); + menuDescriptor.setStyles("k-no-backimage, k-btn-sitebar"); + siteOptions.getRightToolbar().addAction(menuDescriptor); + + partiMenu = new SubMenuDescriptor(i18n.t("Your groups")); + addActionImpl(partiMenu); + + final AbstractExtendedAction userHomeAction = new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + goUserHome(); + } + }; + userHomeAction.putValue(Action.NAME, i18n.t(CoreMessages.YOUR_HOMEPAGE)); + userHomeAction.putValue(Action.SMALL_ICON, img.groupHome()); + final MenuItemDescriptor item = new MenuItemDescriptor(userHomeAction); + item.setPosition(0); + addActionImpl(item); + } + + private void goUserHome() { + stateManager.gotoToken(session.getCurrentUserInfo().getShortName()); + } + + private void onUserSignIn(final UserInfoDTO userInfoDTO) { + menuDescriptor.setVisible(true); + setLoggedUserName(userInfoDTO.getShortName()); + partiMenu.clear(); + final List<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin(); + final List<GroupDTO> groupsIsCollab = userInfoDTO.getGroupsIsCollab(); + for (final GroupDTO group : groupsIsAdmin) { + addPartipation(group); + } + for (final GroupDTO group : groupsIsCollab) { + addPartipation(group); + } + partiMenu.setVisible(!groupsIsAdmin.isEmpty() || !groupsIsCollab.isEmpty()); + } + + private void setLoggedUserName(final String shortName) { + menuDescriptor.putValue(Action.NAME, shortName); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java (from rev 1239, trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,74 @@ +/* + * + * 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.core.client.sitebar; + +import cc.kune.common.client.actions.ui.ActionSimplePanel; +import cc.kune.common.client.actions.ui.IsActionExtensible; +import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; + +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.gwtplatform.mvp.client.ViewImpl; + +public class SitebarActionsPanel extends ViewImpl implements SitebarActionsView { + + private final Provider<AboutKuneDialog> aboutPanel; + private final ActionSimplePanel toolbarLeft; + private final ActionSimplePanel toolbarRight; + + @Inject + public SitebarActionsPanel(final WsArmor armor, final ActionSimplePanel toolbarRight, + final ActionSimplePanel toolbarLeft, final I18nTranslationService i18n, + final Provider<AboutKuneDialog> aboutPanel) { + this.toolbarRight = toolbarRight; + this.toolbarLeft = toolbarLeft; + this.aboutPanel = aboutPanel; + toolbarRight.addStyleName("k-sitebar"); + toolbarRight.addStyleName("k-floatright"); + toolbarLeft.addStyleName("k-sitebar"); + toolbarLeft.addStyleName("k-floatleft"); + armor.getSitebar().add(toolbarLeft); + armor.getSitebar().add(toolbarRight); + } + + @Override + public Widget asWidget() { + return toolbarRight; + } + + @Override + public IsActionExtensible getLeftBar() { + return toolbarLeft; + } + + @Override + public IsActionExtensible getRightBar() { + return toolbarRight; + } + + @Override + public void showAboutDialog() { + aboutPanel.get().showCentered(); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.sitebar; +import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; @@ -30,7 +31,6 @@ import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; import cc.kune.common.client.ui.KuneWindowUtils; import cc.kune.core.client.init.AppStartEvent; -import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -56,6 +56,8 @@ IsActionExtensible getLeftBar(); IsActionExtensible getRightBar(); + + void showAboutDialog(); } public static final ToolbarDescriptor LEFT_TOOLBAR = new ToolbarDescriptor(); @@ -107,14 +109,6 @@ final IsActionExtensible right = getView().getRightBar(); OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options")); // OPTIONS_MENU.setParent(RIGHT_TOOLBAR); - final AbstractExtendedAction action = new AbstractExtendedAction() { - @Override - public void actionPerformed(final ActionEvent event) { - getEventBus().fireEvent(new UserNotifyEvent("Testing only")); - } - }; - action.putValue(Action.NAME, "Test"); - final MenuItemDescriptor testMenuItem = new MenuItemDescriptor(OPTIONS_MENU, action); OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); // final ToolbarSeparatorDescriptor separator = new @@ -131,31 +125,40 @@ }; bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems")); bugsAction.putValue(Action.SMALL_ICON, icons.bug()); - final MenuItemDescriptor bugs = new MenuItemDescriptor(OPTIONS_MENU, bugsAction); + final MenuItemDescriptor reportBugs = new MenuItemDescriptor(OPTIONS_MENU, bugsAction); // final KeyStroke shortcut = Shortcut.getShortcut(true, true, false, // false, Character.valueOf('K')); final AbstractExtendedAction aboutAction = new AbstractExtendedAction() { @Override public void actionPerformed(final ActionEvent event) { - // view.showAboutDialog(); + getView().showAboutDialog(); } }; + final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, new AbstractAction() { + @Override + public void actionPerformed(final ActionEvent event) { + KuneWindowUtils.open("http://kune.ourproject.org/"); + } + }); + gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site")); + gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16()); + aboutAction.putValue(Action.NAME, i18n.t("About kune")); aboutAction.putValue(Action.SMALL_ICON, res.kuneIcon16()); // aboutAction.setShortcut(shortcut); // shortcutReg.put(shortcut, aboutAction); + right.addAction(OPTIONS_MENU); right.addAction(signInLink.get()); right.addAction(signOutLink.get()); // right.addAction(separator2); right.addAction(newGroupLink.get()); // right.addAction(separator); - right.addAction(OPTIONS_MENU); - right.addAction(testMenuItem); + right.addAction(reportBugs); + right.addAction(gotoKuneDevSite); right.addAction(menuSeparator); - right.addAction(bugs); right.addAction(new MenuItemDescriptor(OPTIONS_MENU, aboutAction)); } @@ -164,4 +167,5 @@ protected void revealInParent() { RevealRootContentEvent.fire(this, this); } + } Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -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.core.client.sitebar; - -import cc.kune.common.client.actions.ui.ActionSimplePanel; -import cc.kune.common.client.actions.ui.IsActionExtensible; -import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView; -import cc.kune.gspace.client.WsArmor; - -import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; -import com.gwtplatform.mvp.client.ViewImpl; - -public class SitebarActionsViewImpl extends ViewImpl implements SitebarActionsView { - - private final ActionSimplePanel toolbarLeft; - private final ActionSimplePanel toolbarRight; - - @Inject - public SitebarActionsViewImpl(final WsArmor armor, final ActionSimplePanel toolbarRight, - final ActionSimplePanel toolbarLeft) { - this.toolbarRight = toolbarRight; - this.toolbarLeft = toolbarLeft; - toolbarRight.addStyleName("k-sitebar"); - toolbarRight.addStyleName("k-floatright"); - toolbarLeft.addStyleName("k-sitebar"); - toolbarLeft.addStyleName("k-floatleft"); - armor.getSitebar().add(toolbarLeft); - armor.getSitebar().add(toolbarRight); - } - - @Override - public Widget asWidget() { - return toolbarRight; - } - - @Override - public IsActionExtensible getLeftBar() { - return toolbarLeft; - } - - @Override - public IsActionExtensible getRightBar() { - return toolbarRight; - } - -} Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,25 +0,0 @@ -package cc.kune.core.client.sn.actions.conditions; - -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.GroupDTO; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -@Singleton -public class AdministrableGroupWhenLoggedCondition implements GuiAddCondition { - - private final Session session; - - @Inject - public AdministrableGroupWhenLoggedCondition(final Session session) { - this.session = session; - } - - @Override - public boolean mustBeAdded(final GuiActionDescrip descr) { - return (!((GroupDTO) descr.getItem()).isPersonal() && session.isLogged() && session.getContentState().getGroupRights().isAdministrable()); - } -} Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,25 +0,0 @@ -package cc.kune.core.client.sn.actions.conditions; - -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.GroupDTO; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -@Singleton -public class AdministrablePersonWhenLoggedCondition implements GuiAddCondition { - - private final Session session; - - @Inject - public AdministrablePersonWhenLoggedCondition(final Session session) { - this.session = session; - } - - @Override - public boolean mustBeAdded(final GuiActionDescrip descr) { - return (((GroupDTO) descr.getItem()).isPersonal() && session.isLogged() && session.getContentState().getGroupRights().isAdministrable()); - } -} Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,25 +0,0 @@ -package cc.kune.core.client.sn.actions.conditions; - -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.GroupDTO; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -@Singleton -public class GroupWhenLoggedCondition implements GuiAddCondition { - - private final Session session; - - @Inject - public GroupWhenLoggedCondition(final Session session) { - this.session = session; - } - - @Override - public boolean mustBeAdded(final GuiActionDescrip descr) { - return (!((GroupDTO) descr.getItem()).isPersonal() && session.isLogged()); - } -} Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -3,6 +3,8 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import com.google.inject.Inject; @@ -20,9 +22,12 @@ @Override public boolean mustBeAdded(final GuiActionDescrip descr) { - if (session.getContainerState() instanceof StateContentDTO) { - // FIXME + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState instanceof StateContentDTO) { + return ((StateContentDTO) currentState).getGroupRights().isAdministrable(); + } else { + // session.getContainerState() instanceof StateContentDTO) + return ((StateContainerDTO) currentState).getGroupRights().isAdministrable(); } - return (session.getContentState().getGroupRights().isAdministrable()); } } Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,33 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsEditableCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public IsEditableCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState instanceof StateContentDTO) { + return ((StateContentDTO) currentState).getGroupRights().isEditable(); + } else { + // session.getContainerState() instanceof StateContentDTO) + return ((StateContainerDTO) currentState).getGroupRights().isEditable(); + } + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,26 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsNotMeCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public IsNotMeCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (session.isLogged() && !session.getCurrentUser().getShortName().equals( + ((GroupDTO) descr.getItem()).getShortName())); + } +} Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,33 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsVisibleCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public IsVisibleCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState instanceof StateContentDTO) { + return ((StateContentDTO) currentState).getGroupRights().isVisible(); + } else { + // session.getContainerState() instanceof StateContentDTO) + return ((StateContainerDTO) currentState).getGroupRights().isVisible(); + } + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,25 +0,0 @@ -package cc.kune.core.client.sn.actions.conditions; - -import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.GroupDTO; - -import com.google.inject.Inject; -import com.google.inject.Singleton; - -@Singleton -public class PersonWhenLoggedCondition implements GuiAddCondition { - - private final Session session; - - @Inject - public PersonWhenLoggedCondition(final Session session) { - this.session = session; - } - - @Override - public boolean mustBeAdded(final GuiActionDescrip descr) { - return (((GroupDTO) descr.getItem()).isPersonal() && session.isLogged()); - } -} Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -11,8 +11,8 @@ public GroupMembersActionsRegistry(final JoinGroupAction joinGroupAction, final UnJoinGroupAction unJoinGroupAction) { final ButtonDescriptor join = new ButtonDescriptor(joinGroupAction); final ButtonDescriptor unjoin = new ButtonDescriptor(unJoinGroupAction); - join.setStyles("k-no-backimage"); - unjoin.setStyles("k-no-backimage"); + // join.setStyles("k-no-backimage"); + // unjoin.setStyles("k-no-backimage"); add(join); add(unjoin); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -11,6 +11,7 @@ import cc.kune.core.client.sn.actions.StartChatWithMemberAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; +import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; import cc.kune.core.client.state.Session; @@ -22,15 +23,16 @@ @Inject public SNAdminsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, - final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, - final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, - final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithMemberAction startChatWithUserAction, - final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { + final IsNotMeCondition isNotMe, final ChangeToCollabAction changeToCollabAction, + final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, + final AcceptJoinGroupAction acceptJoinGroupAction, final DenyJoinGroupAction denyJoinGroupAction, + final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction, + final GotoMemberAction gotoMemberAction) { add(new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(changeToCollabAction); - item.setAddCondition(isAdministrableCondition); + item.add(isAdministrableCondition); return item; } }); @@ -38,7 +40,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(removeMemberAction); - item.setAddCondition(isAdministrableCondition); + item.add(isAdministrableCondition); return item; } }); @@ -46,7 +48,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction); - item.setAddCondition(isPersonCondition); + item.add(isPersonCondition); return item; } }); @@ -54,7 +56,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction); - item.setAddCondition(isGroupCondition); + item.add(isGroupCondition); return item; } }); @@ -62,7 +64,8 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); - item.setAddCondition(isPersonCondition); + item.add(isNotMe); + item.add(isPersonCondition); return item; } }); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -11,6 +11,7 @@ import cc.kune.core.client.sn.actions.StartChatWithMemberAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; +import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; import cc.kune.core.client.state.Session; @@ -22,15 +23,16 @@ @Inject public SNCollabsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, - final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, - final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, - final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithMemberAction startChatWithUserAction, - final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { + final IsNotMeCondition isNotMe, final ChangeToCollabAction changeToCollabAction, + final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, + final AcceptJoinGroupAction acceptJoinGroupAction, final DenyJoinGroupAction denyJoinGroupAction, + final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction, + final GotoMemberAction gotoMemberAction) { add(new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(changeToAdminAction); - item.setAddCondition(isAdministrableCondition); + item.add(isAdministrableCondition); return item; } }); @@ -38,7 +40,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(removeMemberAction); - item.setAddCondition(isAdministrableCondition); + item.add(isAdministrableCondition); return item; } }); @@ -46,7 +48,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction); - item.setAddCondition(isPersonCondition); + item.add(isPersonCondition); return item; } }); @@ -54,7 +56,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction); - item.setAddCondition(isGroupCondition); + item.add(isGroupCondition); return item; } }); @@ -62,7 +64,8 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); - item.setAddCondition(isPersonCondition); + item.add(isNotMe); + item.add(isPersonCondition); return item; } }); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -30,7 +30,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(acceptJoinGroupAction); - item.setAddCondition(isAdministrableCondition); + item.add(isAdministrableCondition); return item; } }); @@ -38,7 +38,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(denyJoinGroupAction); - item.setAddCondition(isAdministrableCondition); + item.add(isAdministrableCondition); return item; } }); @@ -46,7 +46,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(gotoPersonAction); - item.setAddCondition(isPersonCondition); + item.add(isPersonCondition); return item; } }); @@ -54,7 +54,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction); - item.setAddCondition(isGroupCondition); + item.add(isGroupCondition); return item; } }); @@ -62,7 +62,7 @@ @Override public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); - item.setAddCondition(isPersonCondition); + item.add(isPersonCondition); return item; } }); Modified: trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -24,6 +24,7 @@ * */ public final class SiteCommonTokens { + public static final String ABOUTKUNE = "about"; public final static String HOME = ""; public final static String NEWGROUP = "newgroup"; public final static String REGISTER = "register"; Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -24,6 +24,7 @@ import cc.kune.core.client.groups.newgroup.NewGroup; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.sitebar.AboutKuneDialog; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -32,6 +33,7 @@ @Singleton public class SiteTokenListeners { + private final Provider<AboutKuneDialog> aboutKuneDialog; private final Provider<NewGroup> newGroup; private final Provider<Register> register; private final Provider<SignIn> signIn; @@ -39,11 +41,13 @@ @Inject public SiteTokenListeners(final EventBus eventBus, final Provider<StateManager> stateManager, - final Provider<SignIn> signIn, final Provider<Register> register, final Provider<NewGroup> newGroup) { + final Provider<SignIn> signIn, final Provider<Register> register, final Provider<NewGroup> newGroup, + final Provider<AboutKuneDialog> aboutKuneDialog) { this.stateManager = stateManager; this.signIn = signIn; this.register = register; this.newGroup = newGroup; + this.aboutKuneDialog = aboutKuneDialog; init(); eventBus.addHandler(AppStartEvent.getType(), new AppStartHandler() { @Override @@ -72,5 +76,12 @@ newGroup.get().doNewGroup(); } }); + stateManager.get().addSiteToken(SiteCommonTokens.ABOUTKUNE, new HistoryTokenCallback() { + @Override + public void onHistoryToken() { + // FIXME, something to come back + aboutKuneDialog.get().showCentered(); + } + }); } } Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -20,6 +20,7 @@ package cc.kune.core.client.ui.dialogs; import cc.kune.common.client.ui.PopupTopPanel; +import cc.kune.common.client.utils.TextUtils; import com.google.gwt.core.client.GWT; import com.google.gwt.event.logical.shared.HasCloseHandlers; @@ -32,6 +33,14 @@ public BasicTopDialog(final String dialogId, final String title, final boolean autohide, final boolean modal, final boolean autoscroll, final int width, final int height, final String icon, + final String firstButtonTitle, final String firstButtonId, final int tabIndexStart) { + this(dialogId, title, autohide, modal, autoscroll, width, height, icon, firstButtonTitle, firstButtonId, "", + "", tabIndexStart); + super.setSecondBtnVisible(false); + } + + public BasicTopDialog(final String dialogId, final String title, final boolean autohide, final boolean modal, + final boolean autoscroll, final int width, final int height, final String icon, final String firstButtonTitle, final String firstButtonId, final String cancelButtonTitle, final String cancelButtonId, final int tabIndexStart) { popup = new PopupTopPanel(autohide, modal); @@ -43,9 +52,13 @@ GWT.log("Not setting size of dialog to: " + String.valueOf(width) + "/" + String.valueOf(height)); super.setTitleIcon(icon); super.getFirstBtnText().setText(firstButtonTitle); - super.getSecondBtnText().setText(cancelButtonTitle); + if (TextUtils.notEmpty(cancelButtonTitle)) { + super.getSecondBtnText().setText(cancelButtonTitle); + } super.setFirstBtnId(firstButtonId); - super.setSecondBtnId(cancelButtonId); + if (TextUtils.notEmpty(cancelButtonId)) { + super.setSecondBtnId(cancelButtonId); + } super.setFirstBtnTabIndex(tabIndexStart); super.setSecondBtnTabIndex(tabIndexStart + 1); } Added: trunk/src/main/java/cc/kune/core/public/about.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/about.html (rev 0) +++ trunk/src/main/java/cc/kune/core/public/about.html 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,195 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title></title> +<meta name="generator" content="HTML::TextToHTML v2.51"/> +<link rel="stylesheet" type="text/css" href="frame-def.css"/> +</head> +<body> +<span> + <a target="_blank" href="http://kune.ourproject.org/" title="kune" rel="home"> +<img src="logo-kune-big.png" alt="kune-logo" height="36" width="200"> +</img> +</a> +</span> +<p>Version 0.0.7 (r1239+c71)</p> +<h1><a name="section_1">CREDITS</a></h1> + +<h2><a name="section_1_1">Authors</a></h2> + +<p>Daniel Gómez Blasco<br/> +Samer Hassan<br/> +Vicente J. Ruiz Jurado +</p> +<h2><a name="section_1_2">Contributors</a></h2> + +<ul> + <li>Thanks to David Trigo and <a href="http://www.esperanto-es.net/">http://www.esperanto-es.net/</a> for suggest the name of +'kune' for our initiative: + <a href="http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469">http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469</a> + </li><li>Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo +Freire staff. + </li><li>Daniel Jiménez for the initial help and coordination + </li><li>Javier de la Cueva and Leovigildo García-Bobadilla for the legal support + </li><li>Jonathan Araña Cruz, Roxu and all the <a href="http://xsto.info">http://xsto.info</a> staff for help with the infraestructure + </li><li>Johnattan Rupire for web contributions. + </li><li>The <a href="http://iepala.es">http://iepala.es</a> staff for their support + </li><li>and <a href="http://ourproject.org">http://ourproject.org</a> and again <a href="http://xsto.info">http://xsto.info</a> for sharing with us their resources +</li></ul> +<h1><a name="section_2">LICENSES</a></h1> + +<p>All programs are either under the GPL, LGPL, Artistic or BSD licenses, see +below for details. +</p> +<p>On Debian systems, the complete text of these licenses can be found in: +</p> +<p>/usr/share/common-licenses/GPL-3<br/> +/usr/share/common-licenses/Artistic<br/> +/usr/share/common-licenses/BSD<br/> +/usr/share/common-licenses/LGPL +</p> +<p>When in doubt, check the individual file, they should all have license +headings and other identifying marks. +</p> +<h2><a name="section_2_1">kune software</a></h2> +<dl> + <dt>Copyright</dt> +<dd> (c) 2007-2011 The kune development team (see CREDITS for details) +</dd></dl> +<p>    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. +</p> +<p>    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. +</p> +<p>    You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. +</p> +<p>See COPYRIGHT-AGPLv3 for a complete text. +</p> +<h2><a name="section_2_2">kune documentation</a></h2> +<dl> + <dt>Copyright</dt> +<dd>(c) The kune development team (see CREDITS an individual docs for details) +<p>   This work is licensed under the Creative Commons Attribution-Share Alike 3.0 + License. To view a copy of this license, visit + <a href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</a> + or send a letter to Creative Commons, 543 Howard Street, 5th Floor, San + Francisco, California, 94105, USA. +</p> +</dd></dl> +<h2><a name="section_2_3">kune graphics</a></h2> +<dl> + <dt>Copyright</dt> +<dd>(c) Vicente J. Ruiz Jurado <<a href="mailto:[email protected]">vjrj(a)ourproject.org</a>> +<p>   This work is licensed under the Creative Commons Attribution-Share Alike 3.0 + License. To view a copy of this license, visit + <a href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</a> + or send a letter to Creative Commons, 543 Howard Street, 5th Floor, San + Francisco, California, 94105, USA. +</p> +</dd></dl> +<h2><a name="section_2_4">some icons</a></h2> +<p>It was downloaded from <a href="http://tango.freedesktop.org/">http://tango.freedesktop.org/</a> +</p><dl> + <dt>Copyright</dt> +<dd> Creative Commons Attribution-ShareAlike 2.5 License Agreement + <a href="http://creativecommons.org/licenses/by-sa/2.5/">http://creativecommons.org/licenses/by-sa/2.5/</a> +</dd></dl> +<p>other from: <a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a> +</p><dl> + <dt>Copyright</dt> +<dd> Creative Commons Attribution 2.5 License Agreement + <a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a> +</dd></dl> +<p>some xmpp icons from pidgin +</p><p>   Purple/Pidgin/Finch is the legal property of its developers. + Copyright (C) 1998-2007 under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. +</p> +<p>and others icons from openoffice.org-style-human debian package +</p><p>   Copyright 2002-2007 Sun Microsystems, Inc. + This product is made available subject to the terms of GNU Lesser General + Public License Version 2.1. A copy of the LGPL license can be found + <a href="http://www.openoffice.org/project/www/license.html">http://www.openoffice.org/project/www/license.html</a> +</p> +<h2><a name="section_2_5">others</a></h2> + +<p>wave / wave in a box +</p><p>   <a href="http://www.waveprotocol.org">http://www.waveprotocol.org</a> <br/> + <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> + <a href="http://www.waveprotocol.org/patent-license">http://www.waveprotocol.org/patent-license</a> +</p> +<p>emite +</p><p>   <a href="http://emite.googlecode.com">http://emite.googlecode.com</a><br/> + Copyright: under GNU Lesser General Public License + <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a> +</p> +<p>suco +</p><p>   <a href="http://suco.googlecode.com">http://suco.googlecode.com</a><br/> + Copyright: under GNU Lesser General Public License + <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a> +</p> +<p>fonts-min.css and reset.css +</p><p>   Copyright (c) 2007, Yahoo! Inc. All rights reserved. + Code licensed under the BSD License: + <a href="http://developer.yahoo.net/yui/license.txt">http://developer.yahoo.net/yui/license.txt</a> +</p> +<p>ext-gwt gxt library: +</p><p>   <a href="http://www.sencha.com/products/extgwt/">http://www.sencha.com/products/extgwt/</a> + Copyright: under GNU General Public License + <a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a> +</p> +<p>gwt-ext (deprecated) library: +</p><p>   <a href="http://code.google.com/p/gwt-ext/">http://code.google.com/p/gwt-ext/</a><br/> + Copyright: under GNU Lesser General Public License + <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a> +</p> +<p>google-gin library: +</p><p>   <a href="https://code.google.com/p/google-gin/">https://code.google.com/p/google-gin/</a> + Copyright: under Apache License 2.0<br/> + <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> +</p> +<p>gwt-platform library: +</p><p>   <a href="https://code.google.com/p/gwt-platform/">https://code.google.com/p/gwt-platform/</a> + Copyright: under Apache License 2.0<br/> + <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> +</p> +<p>emoticons from Adium and Kopete theme +</p><p>   kopete adium theme by robotangel and original "Adiumicons" by Oscar Gruno + under GNU GPL license +</p> +<p>dom region library: +</p><p>   XWiki Platform<br/> + <a href="http://www.xwiki.org/">http://www.xwiki.org/</a><br/> + Copyright: under GNU Lesser General Public License + <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a> +</p> +<dl> + <dt>cortado</dt> +<dd> A video player java applet (Ogg Theora, Ogg Vorbis) + <a href="http://www.flumotion.net/cortado/">http://www.flumotion.net/cortado/</a> + Copyright: (C) 2004 Fluendo S.L under GNU General Public License +</dd></dl> +<p>video embed dialog: +</p><p>   Some ideas and embeded video code from: + <a href="http://www.jovelstefan.de/embedded-video/">http://www.jovelstefan.de/embedded-video/</a> (GPL) + <a href="http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/">http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/</a> +</p> +<p>some license description: +</p><p>   from Wikipedia<br/> + Copyright: under GFDL <a href="http://www.gnu.org/copyleft/fdl.html">http://www.gnu.org/copyleft/fdl.html</a> +</p> +<p>some Action classes: +</p><p>   from GNU Classpath<br/> + Copyright: under GNU General Public License + <a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a></p> + +</body> +</html> Copied: trunk/src/main/java/cc/kune/core/public/frame-def.css (from rev 1239, trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css) =================================================================== --- trunk/src/main/java/cc/kune/core/public/frame-def.css (rev 0) +++ trunk/src/main/java/cc/kune/core/public/frame-def.css 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,16 @@ +/* +Copyright (c) 2007, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.3.1 +*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}/* +Copyright (c) 2007, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.3.1 +*/body{font:13px/1.22 arial,helvetica,clean,sans-serif;font-size:small;font:x-small;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;font-size:108%;line-height:99%;}/* +Copyright (c) 2007, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.4.1 +*/h1{font-size:138.5%;}h2{font-size:123.099998%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:700;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:700;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;width:11.9em;}body{font-family:arial, sans;margin:5px;}.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}blockquote{border:1px dashed #DDD;padding:10px;} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/public/images/group-def-icon.gif (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/public/images/group-def-icon.gif) =================================================================== (Binary files differ) Added: trunk/src/main/java/cc/kune/core/public/logo-kune-big.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/logo-kune-big.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 03:28:34 UTC (rev 1245) @@ -17,6 +17,7 @@ font: 'Ubuntu', Arial; } +/* a { color: darkblue; } @@ -24,7 +25,7 @@ a:visited { color: darkblue; } - +*/ .gwt-DialogBox { border: 2px solid #AAAAAA; background-color: white; @@ -778,10 +779,11 @@ float: left; } -.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel { - float: left; - padding-left: 5px; - color: #e0e0e0; +.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel + { + float: left; + padding-left: 5px; + color: #e0e0e0; } .k-sn-adminslabel { @@ -799,19 +801,25 @@ } */ .k-sn-mainpanel .x-btn button { + font: 13px 'Ubuntu', arial; + border: 2px solid #CCCCCC; cursor: pointer; - font: 13px 'Ubuntu', arial; - padding: 2px; + margin: 0; + padding: 3px 0; + text-decoration: none; + background-color: #F2F2F2; + color: #855585; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - text-decoration: none; vertical-align: middle; - background-color: #F2F2F2; + line-height: 2em !important; + height: 26px !important; + /* +font-size:small; + cursor: pointer; border: 2px gray solid; - height: 26px !important; - line-height: 2em !important; - padding-left: 25px !important; + padding-left: 25px !important; */ } .k-sn-mainpanel .x-btn button:hover { @@ -849,8 +857,8 @@ } -.k-sn-pendingspanel { - /* background-color: #a05a2c; */ +.k-sn-pendingspanel { /* background-color: #a05a2c; */ + } .k-sn-adminsscroll,.k-sn-collabsscroll,.k-sn-pendingsscroll { Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-11 03:28:34 UTC (rev 1245) @@ -52,6 +52,7 @@ rel='stylesheet' type='text/css'> --> <link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css"> <link type="text/css" rel="stylesheet" href="gxt/css/gxt-gray.css"> +<link type="text/css" rel="stylesheet" href="gxt-custom/css/gxt-op-common.css"> <link type="text/css" rel="stylesheet" href="kune-hablar.css"> <link type="text/css" rel="stylesheet" href="kune-chat.css"> <link type="text/css" rel="stylesheet" href="kune-common.css"> Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-11 03:28:34 UTC (rev 1245) @@ -27,7 +27,8 @@ <g:tab> <g:header size='0' /> <g:SimplePanel ui:field="userSpace" width="100%" - height="100%"></g:SimplePanel> + height="100%"> + </g:SimplePanel> </g:tab> <g:tab> <g:header size='0' /> Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,16 +0,0 @@ -/* -Copyright (c) 2007, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.3.1 -*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}/* -Copyright (c) 2007, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.3.1 -*/body{font:13px/1.22 arial,helvetica,clean,sans-serif;font-size:small;font:x-small;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;font-size:108%;line-height:99%;}/* -Copyright (c) 2007, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.4.1 -*/h1{font-size:138.5%;}h2{font-size:123.099998%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:700;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:700;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;width:11.9em;}body{font-family:arial, sans;margin:5px;}.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}blockquote{border:1px dashed #DDD;padding:10px;} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/public/images/group-def-icon.gif =================================================================== (Binary files differ) Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -74,9 +74,6 @@ import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter; -import org.ourproject.kune.workspace.client.entityheader.maxmin.MaxMinWorkspace; -import org.ourproject.kune.workspace.client.entityheader.maxmin.MaxMinWorkspacePanel; -import org.ourproject.kune.workspace.client.entityheader.maxmin.MaxMinWorkspacePresenter; import org.ourproject.kune.workspace.client.i18n.I18nTranslator; import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPanel; import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPresenter; @@ -85,7 +82,6 @@ import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPanel; import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPresenter; import org.ourproject.kune.workspace.client.i18n.LanguageSelectorView; -import org.ourproject.kune.workspace.client.i18n.SiteOptionsI18nTranslatorAction; import org.ourproject.kune.workspace.client.licensefoot.EntityLicensePanel; import org.ourproject.kune.workspace.client.licensefoot.EntityLicensePresenter; import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; @@ -114,8 +110,6 @@ import org.ourproject.kune.workspace.client.options.GroupOptionsPanel; import org.ourproject.kune.workspace.client.options.GroupOptionsPresenter; import org.ourproject.kune.workspace.client.options.UserOptions; -import org.ourproject.kune.workspace.client.options.UserOptionsPanel; -import org.ourproject.kune.workspace.client.options.UserOptionsPresenter; import org.ourproject.kune.workspace.client.options.license.EntityOptionsDefLicensePanel; import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicense; import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicensePresenter; @@ -159,9 +153,6 @@ import org.ourproject.kune.workspace.client.site.msg.ToastMessagePanel; import org.ourproject.kune.workspace.client.site.msg.ToastMessagePresenter; import org.ourproject.kune.workspace.client.sitebar.sitelogo.SiteLogo; -import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; -import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptionsPanel; -import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptionsPresenter; import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgress; import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPanel; import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPresenter; @@ -177,9 +168,6 @@ import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink; import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPanel; import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPresenter; -import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions; -import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptionsPanel; -import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptionsPresenter; import org.ourproject.kune.workspace.client.skel.ActionCntCtxToolbarPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.tags.TagsSummary; @@ -319,18 +307,22 @@ } }); - register(ApplicationComponentGroup.class, new Factory<SiteUserOptions>(SiteUserOptions.class) { - @Override - public SiteUserOptions create() { - final SiteUserOptionsPresenter presenter = new SiteUserOptionsPresenter(i(Session.class), - i(StateManager.class), p(FileDownloadUtils.class), $(I18nTranslationService.class), - $(IconResources.class)); - final SiteUserOptionsPanel panel = new SiteUserOptionsPanel(presenter, i(WorkspaceSkeleton.class), - $(GuiBindingsRegister.class)); - presenter.init(panel); - return presenter; - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<SiteUserOptions>(SiteUserOptions.class) { + // @Override + // public SiteUserOptions create() { + // final SiteUserOptionsPresenter presenter = new + // SiteUserOptionsPresenter(i(Session.class), + // i(StateManager.class), p(FileDownloadUtils.class), + // $(I18nTranslationService.class), + // $(IconResources.class)); + // final SiteUserOptionsPanel panel = new + // SiteUserOptionsPanel(presenter, i(WorkspaceSkeleton.class), + // $(GuiBindingsRegister.class)); + // presenter.init(panel); + // return presenter; + // } + // }); register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) { @Override @@ -354,19 +346,22 @@ return presenter; } }); + // + // register(ApplicationComponentGroup.class, new + // Factory<SiteOptions>(SiteOptions.class) { + // @Override + // public SiteOptions create() { + // final SiteOptionsPresenter presenter = new + // SiteOptionsPresenter(i(I18nUITranslationService.class), + // i(IconResources.class)); + // final SiteOptionsPanel panel = new + // SiteOptionsPanel(i(WorkspaceSkeleton.class), + // i(I18nUITranslationService.class), i(GuiBindingsRegister.class)); + // presenter.init(panel); + // return presenter; + // } + // }); - register(ApplicationComponentGroup.class, new Factory<SiteOptions>(SiteOptions.class) { - @Override - public SiteOptions create() { - final SiteOptionsPresenter presenter = new SiteOptionsPresenter(i(I18nUITranslationService.class), - i(IconResources.class)); - final SiteOptionsPanel panel = new SiteOptionsPanel(i(WorkspaceSkeleton.class), - i(I18nUITranslationService.class), i(GuiBindingsRegister.class)); - presenter.init(panel); - return presenter; - } - }); - register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) { @Override public SiteSearch create() { @@ -631,20 +626,25 @@ return presenter; } }); + // + // register(ApplicationComponentGroup.class, new + // Factory<UserOptions>(UserOptions.class) { + // @Override + // public UserOptions create() { + // final UserOptionsPresenter presenter = new + // UserOptionsPresenter(i(Session.class), + // i(StateManager.class), i(I18nTranslationService.class), + // i(IconResources.class), + // i(SiteUserOptions.class)); + // final UserOptionsPanel panel = new UserOptionsPanel(presenter, + // i(EntityHeader.class), + // i(I18nTranslationService.class), i(NotifyLevelImages.class), + // i(UserOptionsCollection.class)); + // presenter.init(panel); + // return presenter; + // } + // }); - register(ApplicationComponentGroup.class, new Factory<UserOptions>(UserOptions.class) { - @Override - public UserOptions create() { - final UserOptionsPresenter presenter = new UserOptionsPresenter(i(Session.class), - i(StateManager.class), i(I18nTranslationService.class), i(IconResources.class), - i(SiteUserOptions.class)); - final UserOptionsPanel panel = new UserOptionsPanel(presenter, i(EntityHeader.class), - i(I18nTranslationService.class), i(NotifyLevelImages.class), i(UserOptionsCollection.class)); - presenter.init(panel); - return presenter; - } - }); - register(GroupOptionsCollection.class, new Factory<EntityOptionsToolsConf>(EntityOptionsToolsConf.class) { @Override public EntityOptionsToolsConf create() { @@ -849,14 +849,16 @@ } }); - register(ApplicationComponentGroup.class, new Factory<SiteOptionsI18nTranslatorAction>( - SiteOptionsI18nTranslatorAction.class) { - @Override - public SiteOptionsI18nTranslatorAction create() { - return new SiteOptionsI18nTranslatorAction(i(SiteOptions.class), i(I18nTranslationService.class), - i(IconResources.class), p(I18nTranslator.class)); - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<SiteOptionsI18nTranslatorAction>( + // SiteOptionsI18nTranslatorAction.class) { + // @Override + // public SiteOptionsI18nTranslatorAction create() { + // return new SiteOptionsI18nTranslatorAction(i(SiteOptions.class), + // i(I18nTranslationService.class), + // i(IconResources.class), p(I18nTranslator.class)); + // } + // }); // register(Singleton.class, new Factory<SignIn>(SignIn.class) { // @Override @@ -1067,17 +1069,21 @@ } }); - register(ApplicationComponentGroup.class, new Factory<MaxMinWorkspace>(MaxMinWorkspace.class) { - @Override - public MaxMinWorkspace create() { - final MaxMinWorkspacePresenter presenter = new MaxMinWorkspacePresenter( - i(GlobalShortcutRegister.class), i(IconResources.class), i(I18nTranslationService.class), - i(SiteOptions.class)); - final MaxMinWorkspacePanel panel = new MaxMinWorkspacePanel(i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<MaxMinWorkspace>(MaxMinWorkspace.class) { + // @Override + // public MaxMinWorkspace create() { + // final MaxMinWorkspacePresenter presenter = new + // MaxMinWorkspacePresenter( + // i(GlobalShortcutRegister.class), i(IconResources.class), + // i(I18nTranslationService.class), + // i(SiteOptions.class)); + // final MaxMinWorkspacePanel panel = new + // MaxMinWorkspacePanel(i(WorkspaceSkeleton.class)); + // presenter.init(panel); + // return presenter; + // } + // }); register(InsertLinkGroup.class, new Factory<InsertLinkLocal>(InsertLinkLocal.class) { @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -27,7 +27,6 @@ import org.ourproject.kune.platf.client.actions.Shortcut; import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -42,6 +41,7 @@ putValue(Action.SMALL_ICON, img); } + @Override public void actionPerformed(final ActionEvent event) { showMaximized(true); } @@ -53,55 +53,39 @@ putValue(Action.SMALL_ICON, img); } + @Override public void actionPerformed(final ActionEvent event) { showMaximized(false); } } + public static final String MAX_ICON = "mmwp-max_bt"; public static final String MIN_ICON = "mmwp-min_bt"; - public static final String MAX_ICON = "mmwp-max_bt"; - private MaxMinWorkspaceView view; + private final I18nTranslationService i18n; + private final IconResources images; + + private OldMenuItemDescriptor maximizeButton; + private boolean maximized; - private final IconResources images; + private OldMenuItemDescriptor minimizeButton; + // private final SiteOptions siteOptions; - private final I18nTranslationService i18n; - private final GlobalShortcutRegister shortcutReg; - private OldMenuItemDescriptor maximizeButton; + private MaxMinWorkspaceView view; - private OldMenuItemDescriptor minimizeButton; - private final SiteOptions siteOptions; - public MaxMinWorkspacePresenter(final GlobalShortcutRegister shortcutReg, final IconResources images, - final I18nTranslationService i18n, final SiteOptions siteOptions) { + final I18nTranslationService i18n) { this.shortcutReg = shortcutReg; this.images = images; this.i18n = i18n; - this.siteOptions = siteOptions; + // this.siteOptions = siteOptions; maximized = false; } - public View getView() { - return view; - } - - public void init(final MaxMinWorkspaceView view) { - this.view = view; - createActions(); - } - - public void maximize() { - showMaximized(true); - } - - public void minimize() { - showMaximized(false); - } - private void createActions() { final KeyStroke shortcut = Shortcut.getShortcut(true, true, false, false, Character.valueOf('F')); @@ -119,15 +103,35 @@ minimizeButton.setId(MIN_ICON); shortcutReg.put(shortcut, new AbstractExtendedAction() { + @Override public void actionPerformed(final ActionEvent event) { showMaximized(!maximized); } }); - siteOptions.addAction(maximizeButton); - siteOptions.addAction(minimizeButton); + // siteOptions.addAction(maximizeButton); + // siteOptions.addAction(minimizeButton); } + public View getView() { + return view; + } + + public void init(final MaxMinWorkspaceView view) { + this.view = view; + createActions(); + } + + @Override + public void maximize() { + showMaximized(true); + } + + @Override + public void minimize() { + showMaximized(false); + } + private void showMaximized(final boolean maximized) { maximizeButton.setVisible(!maximized); minimizeButton.setVisible(maximized); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -19,11 +19,10 @@ */ package org.ourproject.kune.workspace.client.i18n; -import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; -import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -33,17 +32,18 @@ public class SiteOptionsI18nTranslatorAction extends OldAbstractAction { private final Provider<I18nTranslator> translator; - public SiteOptionsI18nTranslatorAction(final SiteOptions siteOptions, final I18nTranslationService i18n, - final IconResources img, final Provider<I18nTranslator> translator) { + public SiteOptionsI18nTranslatorAction(final I18nTranslationService i18n, final IconResources img, + final Provider<I18nTranslator> translator) { super(); this.translator = translator; putValue(Action.NAME, i18n.t("Help with the translation")); putValue(Action.SMALL_ICON, img.language()); final OldMenuItemDescriptor item = new OldMenuItemDescriptor(this); item.setPosition(1); - siteOptions.addAction(item); + // siteOptions.addAction(item); } + @Override public void actionPerformed(final ActionEvent event) { translator.get().doShowTranslator(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -24,7 +24,6 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; -import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.Session; @@ -35,35 +34,35 @@ public class UserOptionsPresenter extends AbstractTabbedDialogPresenter implements UserOptions { - private UserOptionsView view; + private final I18nTranslationService i18n; private final IconResources img; - private final I18nTranslationService i18n; - private final SiteUserOptions userOptions; private final Session session; private final StateManager stateManager; + // private final SiteUserOptions userOptions; + private UserOptionsView view; public UserOptionsPresenter(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final IconResources img, final SiteUserOptions userOptions) { + final I18nTranslationService i18n, final IconResources img) {// , + // final + // SiteUserOptions + // userOptions) + // { this.session = session; this.stateManager = stateManager; this.i18n = i18n; this.img = img; - this.userOptions = userOptions; + // this.userOptions = userOptions; session.onUserSignOut(new Listener0() { + @Override public void onEvent() { view.hide(); } }); } - public void init(final UserOptionsView view) { - super.init(view); - this.view = view; - createActions(); - } - private void createActions() { final AbstractExtendedAction userPrefsAction = new AbstractExtendedAction() { + @Override public void actionPerformed(final ActionEvent event) { if (!session.isInCurrentUserSpace()) { stateManager.gotoToken(session.getCurrentUser().getStateToken()); @@ -75,6 +74,12 @@ userPrefsAction.putValue(Action.SMALL_ICON, img.prefs()); final OldMenuItemDescriptor prefsItem = new OldMenuItemDescriptor(userPrefsAction); prefsItem.setPosition(1); - userOptions.addAction(prefsItem); + // userOptions.addAction(prefsItem); } + + public void init(final UserOptionsView view) { + super.init(view); + this.view = view; + createActions(); + } } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,25 +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 org.ourproject.kune.workspace.client.sitebar.siteusermenu; - -import org.ourproject.kune.platf.client.actions.ui.IsActionExtensible; - -public interface SiteUserOptions extends IsActionExtensible { -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,52 +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 org.ourproject.kune.workspace.client.sitebar.siteusermenu; - -import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.workspace.client.sitebar.siteoptions.AbstractSiteOptionsPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import com.google.gwt.user.client.ui.Widget; - -public class SiteUserOptionsPanel extends AbstractSiteOptionsPanel implements SiteUserOptionsView { - - public static final String LOGGED_USER_MENU = "kune-sump-lum"; - - private final Widget separator; - - public SiteUserOptionsPanel(final SiteUserOptionsPresenter presenter, final WorkspaceSkeleton wspace, - final GuiBindingsRegister bindings) { - super(bindings, LOGGED_USER_MENU); - final AbstractToolbar siteBar = wspace.getSiteBar(); - siteBar.add(btn); - separator = siteBar.addSeparator(); - } - - public void setLoggedUserName(final String name) { - setBtnText(name); - } - - @Override - public void setVisible(final boolean visible) { - btn.setVisible(visible); - separator.setVisible(visible); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-02-10 18:28:58 UTC (rev 1244) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -1,145 +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 org.ourproject.kune.workspace.client.sitebar.siteusermenu; - -import java.util.List; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.common.GotoGroupAction; -import org.ourproject.kune.platf.client.actions.ui.AbstractActionExtensiblePresenter; -import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; -import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; - -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.UserInfoDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; - -public class SiteUserOptionsPresenter extends AbstractActionExtensiblePresenter implements SiteUserOptions { - - private SiteUserOptionsView view; - private final StateManager stateManager; - private final Session session; - private final Provider<FileDownloadUtils> downloadProvider; - private MenuDescriptor menuDescriptor; - private final I18nTranslationService i18n; - private final IconResources img; - - private MenuDescriptor partiMenu;; - - public SiteUserOptionsPresenter(final Session session, final StateManager stateManager, - final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, - final IconResources img) { - super(); - this.session = session; - this.stateManager = stateManager; - this.downloadProvider = downloadProvider; - this.i18n = i18n; - this.img = img; - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO userInfoDTO) { - onUserSignIn(userInfoDTO); - } - - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - view.setVisible(false); - view.setLoggedUserName(""); - } - }); - } - - @Override - public void addAction(final OldGuiActionDescrip descriptor) { - descriptor.setParent(menuDescriptor); - view.addAction(descriptor); - } - - public View getView() { - return view; - } - - public void init(final SiteUserOptionsView view) { - this.view = view; - createActions(); - } - - private void addPartipation(final GroupDTO group) { - final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl(group.getStateToken()) - : "images/group-def-icon.gif"; - final GotoGroupAction gotoGroupAction = new GotoGroupAction(logoImageUrl, group.getShortName(), - group.getLongName(), stateManager); - view.addAction(new OldMenuItemDescriptor(partiMenu, gotoGroupAction)); - } - - private void createActions() { - menuDescriptor = new MenuDescriptor(); - menuDescriptor.setStandalone(true); - view.addAction(menuDescriptor); - view.setMenu(menuDescriptor); - - partiMenu = new MenuDescriptor(i18n.t("Your groups")); - addAction(partiMenu); - - final AbstractExtendedAction userHomeAction = new AbstractExtendedAction() { - public void actionPerformed(final ActionEvent event) { - goUserHome(); - } - }; - userHomeAction.putValue(Action.NAME, i18n.t(CoreMessages.YOUR_HOMEPAGE)); - userHomeAction.putValue(Action.SMALL_ICON, img.groupHome()); - final OldMenuItemDescriptor item = new OldMenuItemDescriptor(userHomeAction); - item.setPosition(0); - addAction(item); - } - - private void goUserHome() { - stateManager.gotoToken(session.getCurrentUserInfo().getShortName()); - } - - private void onUserSignIn(final UserInfoDTO userInfoDTO) { - view.setVisible(true); - view.setLoggedUserName(userInfoDTO.getShortName()); - partiMenu.clear(); - final List<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin(); - final List<GroupDTO> groupsIsCollab = userInfoDTO.getGroupsIsCollab(); - for (final GroupDTO group : groupsIsAdmin) { - addPartipation(group); - } - for (final GroupDTO group : groupsIsCollab) { - addPartipation(group); - } - partiMenu.setVisible(!groupsIsAdmin.isEmpty() || !groupsIsCollab.isEmpty()); - } - -} Added: trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java =================================================================== --- trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java (rev 0) +++ trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java 2011-02-11 03:28:34 UTC (rev 1245) @@ -0,0 +1,51 @@ +package cc.kune.common.client.actions.ui.descrip; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; + +public class AbstractGuiActionDescripTest { + + private GuiAddCondition addFalseCond; + private GuiAddCondition addTrueCond1; + private GuiAddCondition addTrueCond2; + private GuiAddCondition addTrueCond3; + private MenuDescriptor descriptor; + + @Before + public void before() { + descriptor = new MenuDescriptor(); + addTrueCond1 = Mockito.mock(GuiAddCondition.class); + addTrueCond2 = Mockito.mock(GuiAddCondition.class); + addTrueCond3 = Mockito.mock(GuiAddCondition.class); + addFalseCond = Mockito.mock(GuiAddCondition.class); + Mockito.stub(addTrueCond1.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(true); + Mockito.stub(addTrueCond2.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(true); + Mockito.stub(addTrueCond3.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(true); + Mockito.stub(addFalseCond.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(false); + } + + @Test + public void onffalseAddConditionsShouldDontBeAdded() { + descriptor.add(addTrueCond1); + descriptor.add(addTrueCond2); + descriptor.add(addFalseCond); + assertFalse(descriptor.mustBeAdded()); + } + + @Test + public void twoTrueAddConditionsMustBeAdded() { + descriptor.add(addTrueCond1); + descriptor.add(addTrueCond2); + descriptor.add(addTrueCond3); + assertTrue(descriptor.mustBeAdded()); + } + + @Test + public void withoutAddConditionsMustBeAdded() { + assertTrue(descriptor.mustBeAdded()); + } +} Property changes on: trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

1 0

10 Feb '11

Author: vjrj_ Date: 2011-02-10 19:28:58 +0100 (Thu, 10 Feb 2011) New Revision: 1244 Added: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RolComparator.java trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java trunk/src/main/java/cc/kune/core/client/state/AccessRightsChangedEvent.java trunk/src/main/java/cc/kune/core/public/images/unknown.jpg Removed: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java Log: SN Refactorization Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -34,7 +34,9 @@ import com.extjs.gxt.ui.client.event.SelectionListener; import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.button.ToggleButton; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.ui.AbstractImagePrototype; public abstract class AbstractGxtButtonGui extends AbstractChildGuiItem { @@ -94,6 +96,12 @@ } @Override + public void setIconResource(final ImageResource icon) { + button.setIcon(AbstractImagePrototype.create(icon)); + button.setScale(ButtonScale.SMALL); + } + + @Override protected void setIconStyle(final String style) { button.setIconStyle(style); button.setScale(ButtonScale.SMALL); @@ -117,9 +125,12 @@ if (tooltip != null && !tooltip.isEmpty()) { final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); if (key == null) { - button.setToolTip(new GxtDefTooltip(tooltip)); + // button.setToolTip(new GxtDefTooltip(tooltip)); + button.setTitle(tooltip); } else { - button.setToolTip(new GxtDefTooltip(tooltip + key.toString())); + // button.setToolTip(new GxtDefTooltip(tooltip + + // key.toString())); + button.setTitle(tooltip + key.toString()); } } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -31,11 +31,25 @@ import com.extjs.gxt.ui.client.widget.menu.Menu; import com.extjs.gxt.ui.client.widget.menu.MenuItem; import com.extjs.gxt.ui.client.widget.menu.SeparatorMenuItem; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.UIObject; public abstract class AbstractGxtMenuGui extends AbstractChildGuiItem implements ParentWidget { + public enum MenuPosition { + b, // The top left corner (default) + bl, // The center of the top edge + br, // The bottom right corner ,// The top right corner + c, // The center of the left edge + l, // In the center of the element + r, // The center of the right edge + t, // The bottom left corner + tl, // The center of the bottom edge + tr + } + public static final String DEF_MENU_POSITION = "bl"; + public static final String MENU_POSITION = "menu-position"; protected Menu menu; public AbstractGxtMenuGui() { @@ -52,7 +66,6 @@ public void addSeparator() { menu.add(new SeparatorMenuItem()); - } @Override @@ -92,6 +105,12 @@ return this; } + protected String getMenuPosition() { + final MenuPosition position = (MenuPosition) descriptor.getValue(MENU_POSITION); + GWT.log("menu position" + position == null ? "none" : position.name()); + return position == null ? DEF_MENU_POSITION : position.name(); + } + @Override public void insert(final int position, final UIObject item) { menu.insert((MenuItem) item, position); @@ -104,9 +123,9 @@ public void show(final Object relative) { if (relative instanceof String) { - menu.show(RootPanel.get((String) relative)); + menu.show(RootPanel.get((String) relative).getElement(), getMenuPosition()); } else if (relative instanceof UIObject) { - menu.show(((UIObject) relative).getElement(), "bl"); + menu.show(((UIObject) relative).getElement(), getMenuPosition()); } else if (relative instanceof Position) { final Position position = (Position) relative; menu.showAt(position.getX(), position.getY()); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -36,9 +36,11 @@ import com.extjs.gxt.ui.client.event.SelectionListener; import com.extjs.gxt.ui.client.widget.menu.CheckMenuItem; import com.extjs.gxt.ui.client.widget.menu.MenuItem; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.ui.AbstractImagePrototype; public abstract class AbstractGxtMenuItemGui extends AbstractChildGuiItem { @@ -132,6 +134,11 @@ } @Override + public void setIconResource(final ImageResource icon) { + item.setIcon(AbstractImagePrototype.create(icon)); + } + + @Override protected void setIconStyle(final String style) { item.setIconStyle(style); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -26,11 +26,14 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import com.extjs.gxt.ui.client.Style.ButtonScale; import com.extjs.gxt.ui.client.event.ButtonEvent; import com.extjs.gxt.ui.client.event.SelectionListener; import com.extjs.gxt.ui.client.widget.button.SplitButton; import com.extjs.gxt.ui.client.widget.menu.MenuItem; import com.extjs.gxt.ui.client.widget.menu.SeparatorMenuItem; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.UIObject; public class GxtMenuGui extends AbstractGxtMenuGui implements ParentWidget { @@ -115,6 +118,14 @@ } @Override + public void setIconResource(final ImageResource icon) { + if (button != null) { + button.setIcon(AbstractImagePrototype.create(icon)); + button.setScale(ButtonScale.SMALL); + } + } + + @Override public void setIconStyle(final String style) { if (button != null) { button.setIconStyle(style); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -111,7 +111,7 @@ private void setIcon(final Object icon) { if (icon instanceof ImageResource) { - setIconStyle((IconConstants.CSS_SUFFIX + ((ImageResource) icon).getName())); + setIconResource((ImageResource) icon); } else if (icon instanceof String) { setIconStyle((String) icon); } else if (icon != null) { @@ -119,6 +119,10 @@ } } + public void setIconResource(final ImageResource icon) { + setIconStyle((IconConstants.CSS_SUFFIX + icon.getName())); + } + protected abstract void setIconStyle(String style); private void setStyles(final String styles) { Modified: trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -65,9 +65,9 @@ vpanel.add(image); vpanel.add(label); vpanel.addStyleName("k-basic-thumb"); - vpanel.addStyleName("kune-Margin-Small-trbl"); - vpanel.addStyleName("kune-pointer"); - vpanel.addStyleName("kune-floatleft"); + vpanel.addStyleName("kune-Margin-Mini-trbl"); + vpanel.addStyleName("k-pointer"); + vpanel.addStyleName("k-floatleft"); vpanel.setCellHorizontalAlignment(label, VerticalPanel.ALIGN_CENTER); if (clickHandler instanceof ClickHandler) { addClickHandlerImpl(clickHandler); @@ -110,9 +110,12 @@ image.addClickHandler(clickHandler); } + public void setLabelVisible(final boolean visible) { + label.setVisible(visible); + } + public void setOnOverLabel(final boolean onOverLabel) { this.onOverLabel = onOverLabel; - label.setVisible(!onOverLabel); } public void setText(final String text) { Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -68,6 +68,11 @@ import cc.kune.core.client.sitebar.spaces.SpaceSelectorViewImpl; import cc.kune.core.client.sn.GroupMembersPanel; import cc.kune.core.client.sn.GroupMembersPresenter; +import cc.kune.core.client.sn.actions.registry.GroupMembersActionsRegistry; +import cc.kune.core.client.sn.actions.registry.SNAdminsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNCollabsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNPendingsMenuItemsRegistry; +import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.ContentProvider; import cc.kune.core.client.state.ContentProviderDefault; import cc.kune.core.client.state.HistoryWrapper; @@ -158,12 +163,19 @@ bind(ErrorHandler.class).in(Singleton.class); bind(StateManagerDefault.class).in(Singleton.class); bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); + bind(AccessRightsClientManager.class).in(Singleton.class); bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); bind(PrefetchUtilities.class).in(Singleton.class); bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class); bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class); + // SN + bind(SNAdminsMenuItemsRegistry.class).in(Singleton.class); + bind(SNCollabsMenuItemsRegistry.class).in(Singleton.class); + bind(SNPendingsMenuItemsRegistry.class).in(Singleton.class); + bind(GroupMembersActionsRegistry.class).in(Singleton.class); + bind(SitebarNewGroupLink.class).in(Singleton.class); bind(SitebarSignInLink.class).in(Singleton.class); bind(SitebarSignOutLink.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.gxtui.AbstractGxtMenuGui; import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; @@ -99,7 +100,6 @@ private void init() { getView().getLeftBar().addAction(LEFT_TOOLBAR); getView().getRightBar().addAction(RIGHT_TOOLBAR); - getView().getRightBar().addAction(OPTIONS_MENU); } @ProxyEvent @@ -116,6 +116,7 @@ action.putValue(Action.NAME, "Test"); final MenuItemDescriptor testMenuItem = new MenuItemDescriptor(OPTIONS_MENU, action); OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); + OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); // final ToolbarSeparatorDescriptor separator = new // ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); // final ToolbarSeparatorDescriptor separator2 = new @@ -151,10 +152,12 @@ // right.addAction(separator2); right.addAction(newGroupLink.get()); // right.addAction(separator); + right.addAction(OPTIONS_MENU); right.addAction(testMenuItem); right.addAction(menuSeparator); right.addAction(bugs); right.addAction(new MenuItemDescriptor(OPTIONS_MENU, aboutAction)); + } @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -1,5 +1,6 @@ package cc.kune.core.client.sn; +import cc.kune.common.client.actions.gxtui.AbstractGxtMenuGui; import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.ActionSimplePanel; import cc.kune.common.client.actions.ui.IsActionExtensible; @@ -19,6 +20,7 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.DeckPanel; +import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ScrollPanel; @@ -34,6 +36,8 @@ private static GroupMembersPanelUiBinder uiBinder = GWT.create(GroupMembersPanelUiBinder.class); private final ActionSimplePanel actions; @UiField + Label adminsCount; + @UiField FlowPanel adminsFlow; @UiField Label adminsLabel; @@ -41,10 +45,15 @@ @UiField FlowPanel bottomPanel; @UiField + Label collabsCount; + @UiField FlowPanel collabsFlow; @UiField Label collabsLabel; @UiField + DockLayoutPanel collabsPanel; + + @UiField ScrollPanel collabsScroll; @UiField DeckPanel deck; @@ -59,10 +68,14 @@ @UiField Label orphanProject; @UiField + Label pendingsCount; + @UiField FlowPanel pendingsFlow; @UiField Label pendingsLabel; @UiField + DockLayoutPanel pendingsPanel; + @UiField ScrollPanel pendingsScroll; private final Widget widget; @@ -82,6 +95,7 @@ bottomActionsToolbar = new ActionFlowPanel(guiProvider); actions = new ActionSimplePanel(guiProvider); bottomPanel.add(bottomActionsToolbar); + bottomActionsToolbar.setStyleName("k-sn-bottomPanel-actions"); armor.getEntityToolsNorth().add(widget); deck.showWidget(2); } @@ -125,6 +139,7 @@ final BasicThumb thumb = new BasicThumb(avatarUrl, AVATARSIZE, group.getShortName(), AVATARLABELMAXSIZE, false); final MenuDescriptor menu = new MenuDescriptor(); menu.setStandalone(true); + menu.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); for (final GuiActionDescrip item : menuitems) { item.setParent(menu); } @@ -138,9 +153,8 @@ thumb.addClickHandler(clickHand); actions.add(menu); actions.add(menuitems); - thumb.setTooltip(tooltipTitle, tooltip); - thumb.setOnOverLabel(true); + thumb.setLabelVisible(false); return thumb; } @@ -150,6 +164,31 @@ } @Override + public void setAdminsCount(final int count) { + adminsCount.setText(new StringBuffer("(").append(count).append(")").toString()); + } + + @Override + public void setCollabsCount(final int count) { + collabsCount.setText(new StringBuffer("(").append(count).append(")").toString()); + } + + @Override + public void setCollabsVisible(final boolean visible) { + collabsPanel.setVisible(visible); + } + + @Override + public void setPendingsCount(final int count) { + pendingsCount.setText(new StringBuffer("(").append(count).append(")").toString()); + } + + @Override + public void setPendingVisible(final boolean visible) { + pendingsPanel.setVisible(visible); + } + + @Override public void setVisible(final boolean visible) { deck.setVisible(visible); } Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml 2011-02-10 18:28:58 UTC (rev 1244) @@ -13,54 +13,65 @@ <g:DeckPanel ui:field="deck" addStyleNames="k-sn-deck"> <g:Label ui:field="noMembersVisible" addStyleNames="k-sn-novisible-label" /> <g:Label ui:field="orphanProject" addStyleNames="k-sn-orphan-label" /> - <g:FlowPanel width="100%" height="100px" ui:field="membersFlow"> + <g:FlowPanel width="100%" ui:field="membersFlow"> <g:DockLayoutPanel unit="EM" width="100%" - addStyleNames="k-sn-adminspanel" height="100px"> - <g:north size="2.0"> + addStyleNames="k-sn-adminspanel" height="80px"> + <g:north size="1.2"> + <g:FlowPanel> <g:Label text="Admins" ui:field="adminsLabel" - addStyleNames="k-sn-adminslabel" /> + addStyleNames="k-sn-adminslabel" /><g:Label ui:field="adminsCount" + addStyleNames="k-sn-adminsCountlabel" /> + </g:FlowPanel> </g:north> <g:center> <g:ScrollPanel width="100%" addStyleNames="k-sn-adminsscroll"> - <g:FlowPanel width="100%" height="100%" + <g:FlowPanel addStyleNames="k-sn-adminsflow" ui:field="adminsFlow" /> </g:ScrollPanel> </g:center> </g:DockLayoutPanel> <g:DockLayoutPanel unit="EM" width="100%" - addStyleNames="k-sn-collabspanel" height="100px"> - <g:north size="2.0"> + ui:field="collabsPanel" addStyleNames="k-sn-collabspanel" + height="80px"> + <g:north size="1.2"> + <g:FlowPanel> <g:Label text="Collabs" ui:field="collabsLabel" - addStyleNames="k-sn-collabslabel" /> + addStyleNames="k-sn-collabslabel" /><g:Label ui:field="collabsCount" + addStyleNames="k-sn-collabsCountlabel" /> + </g:FlowPanel> </g:north> <g:center> <g:ScrollPanel ui:field="collabsScroll" width="100%" addStyleNames="k-sn-collabsscroll"> - <g:FlowPanel width="100%" height="100%" - ui:field="collabsFlow" /> + <g:FlowPanel ui:field="collabsFlow" + addStyleNames="k-sn-collabsflow" /> </g:ScrollPanel> </g:center> </g:DockLayoutPanel> <g:DockLayoutPanel unit="EM" width="100%" - addStyleNames="k-sn-pendingspanel" height="100px"> - <g:north size="2.0"> + ui:field="pendingsPanel" addStyleNames="k-sn-pendingspanel" + height="80px"> + <g:north size="1.2"> + <g:FlowPanel> <g:Label text="Pendings" ui:field="pendingsLabel" - addStyleNames="k-sn-pendingslabel" /> + addStyleNames="k-sn-pendingslabel" /><g:Label ui:field="pendingsCount" + addStyleNames="k-sn-pendingsCountlabel" /> + </g:FlowPanel> </g:north> <g:center> <g:ScrollPanel ui:field="pendingsScroll" addStyleNames="k-sn-pendingsscroll" width="100%"> - <g:FlowPanel width="100%" height="100%" + <g:FlowPanel addStyleNames="k-sn-pendingsflow" ui:field="pendingsFlow" /> </g:ScrollPanel> </g:center> </g:DockLayoutPanel> </g:FlowPanel> </g:DeckPanel> - <g:FlowPanel ui:field="bottomPanel" /> + <g:FlowPanel ui:field="bottomPanel" addStyleNames="k-sn-bottomPanel" /> </g:FlowPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -8,7 +8,8 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.sn.actions.registry.AbstractSocialNetworActionsRegistry; +import cc.kune.core.client.sn.actions.registry.AbstractSNMembersActionsRegistry; +import cc.kune.core.client.sn.actions.registry.GroupMembersActionsRegistry; import cc.kune.core.client.sn.actions.registry.SNAdminsMenuItemsRegistry; import cc.kune.core.client.sn.actions.registry.SNCollabsMenuItemsRegistry; import cc.kune.core.client.sn.actions.registry.SNPendingsMenuItemsRegistry; @@ -39,8 +40,9 @@ } public interface GroupMembersView extends View { - int AVATARLABELMAXSIZE = 15; - int AVATARSIZE = 32; + int AVATARLABELMAXSIZE = 4; + // int AVATARSIZE = 32; + int AVATARSIZE = 22; String NOAVATAR = ""; void addAdmin(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, @@ -56,8 +58,18 @@ IsActionExtensible getBottomToolbar(); - void setVisible(boolean b); + void setAdminsCount(int count); + void setCollabsCount(int count); + + void setCollabsVisible(boolean visible); + + void setPendingsCount(int count); + + void setPendingVisible(boolean visible); + + void setVisible(boolean visible); + void showMemberNotPublic(); void showMembers(); @@ -65,9 +77,10 @@ void showOrphan(); } + private final GroupMembersActionsRegistry actionsRegistry; private final SNAdminsMenuItemsRegistry adminsMenuItemsRegistry; + private final SNCollabsMenuItemsRegistry collabsMenuItemsRegistry; - private final Provider<FileDownloadUtils> downloadProvider; private final SNPendingsMenuItemsRegistry pendingsMenuItemsRegistry; private final Session session; @@ -77,13 +90,15 @@ final StateManager stateManager, final Session session, final Provider<FileDownloadUtils> downloadProvider, final SNAdminsMenuItemsRegistry adminsMenuItemsRegistry, final SNCollabsMenuItemsRegistry collabsMenuItemsRegistry, - final SNPendingsMenuItemsRegistry pendingsMenuItemsRegistry) { + final SNPendingsMenuItemsRegistry pendingsMenuItemsRegistry, + final GroupMembersActionsRegistry actionsRegistry) { super(eventBus, view, proxy); this.session = session; this.downloadProvider = downloadProvider; this.adminsMenuItemsRegistry = adminsMenuItemsRegistry; this.collabsMenuItemsRegistry = collabsMenuItemsRegistry; this.pendingsMenuItemsRegistry = pendingsMenuItemsRegistry; + this.actionsRegistry = actionsRegistry; stateManager.onStateChanged(new StateChangedEvent.StateChangedHandler() { @Override public void onStateChanged(final StateChangedEvent event) { @@ -107,11 +122,11 @@ } private void createActions() { - // TODO + getView().getBottomToolbar().addActions(actionsRegistry); } private GuiActionDescCollection createMenuItems(final GroupDTO group, - final AbstractSocialNetworActionsRegistry registry) { + final AbstractSNMembersActionsRegistry registry) { final GuiActionDescCollection items = new GuiActionDescCollection(); for (final Provider<MenuItemDescriptor> provider : registry) { final MenuItemDescriptor menuItem = provider.get(); @@ -130,6 +145,7 @@ getView().setVisible(false); } else { if (state.getSocialNetworkData().isMembersVisible()) { + getView().clear(); setGroupMembers(state.getGroupMembers(), state.getGroupRights()); } else { getView().clear(); @@ -155,7 +171,11 @@ final int numCollabs = collabList.size(); final int numPendings = pendingCollabsList.size(); - if ((numAdmins + numCollabs + numPendings) == 0) { + getView().setAdminsCount(numAdmins); + getView().setCollabsCount(numCollabs); + getView().setPendingsCount(numPendings); + + if ((numAdmins + numCollabs) == 0) { getView().showOrphan(); } else { final boolean userIsAdmin = rights.isAdministrable(); @@ -166,19 +186,22 @@ final String avatar = getAvatar(admin); getView().addAdmin(admin, avatar, admin.getLongName(), "", createMenuItems(admin, adminsMenuItemsRegistry)); - } + getView().setCollabsVisible(numCollabs > 0); for (final GroupDTO collab : collabList) { final String avatar = getAvatar(collab); getView().addCollab(collab, avatar, collab.getLongName(), "", createMenuItems(collab, collabsMenuItemsRegistry)); } if (userIsAdmin) { + getView().setPendingVisible(numPendings > 0); for (final GroupDTO pendingCollab : pendingCollabsList) { final String avatar = getAvatar(pendingCollab); - getView().addCollab(pendingCollab, avatar, pendingCollab.getLongName(), "", + getView().addPending(pendingCollab, avatar, pendingCollab.getLongName(), "", createMenuItems(pendingCollab, pendingsMenuItemsRegistry)); } + } else { + getView().setPendingVisible(false); } getView().showMembers(); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -3,7 +3,6 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -18,13 +17,6 @@ import com.google.inject.Provider; public class AcceptJoinGroupAction extends AbstractExtendedAction { - public class AcceptJoinGroupMenuItem extends MenuItemDescriptor { - - @Inject - public AcceptJoinGroupMenuItem(final AcceptJoinGroupAction action) { - super(action); - } - } private final I18nTranslationService i18n; private final Session session; private final Provider<SocialNetworkServiceAsync> snServiceProvider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -3,7 +3,6 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -18,16 +17,9 @@ import com.google.inject.Provider; public class ChangeToAdminAction extends AbstractExtendedAction { - public class ChangeToAdminMenuItem extends MenuItemDescriptor { - @Inject - public ChangeToAdminMenuItem(final ChangeToAdminAction action) { - super(action); - } - } private final I18nTranslationService i18n; private final Session session; private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; @Inject Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -3,7 +3,6 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -18,12 +17,6 @@ import com.google.inject.Provider; public class ChangeToCollabAction extends AbstractExtendedAction { - public class ChangeToCollabMenuItem extends MenuItemDescriptor { - @Inject - public ChangeToCollabMenuItem(final ChangeToCollabAction action) { - super(action); - } - } private final I18nTranslationService i18n; private final Session session; private final Provider<SocialNetworkServiceAsync> snServiceProvider; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -3,7 +3,6 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -18,16 +17,9 @@ import com.google.inject.Provider; public class DenyJoinGroupAction extends AbstractExtendedAction { - public class DenyJoinGroupMenuItem extends MenuItemDescriptor { - @Inject - public DenyJoinGroupMenuItem(final DenyJoinGroupAction action) { - super(action); - } - } private final I18nTranslationService i18n; private final Session session; private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; @Inject Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -3,7 +3,6 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; @@ -12,12 +11,6 @@ import com.google.inject.Inject; public class GotoGroupAction extends AbstractExtendedAction { - public class GotoGroupMenuItem extends MenuItemDescriptor { - @Inject - public GotoGroupMenuItem(final GotoGroupAction action) { - super(action); - } - } private final StateManager stateManager; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -1,35 +1,17 @@ package cc.kune.core.client.sn.actions; -import cc.kune.common.client.actions.AbstractExtendedAction; -import cc.kune.common.client.actions.Action; -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; -public class GotoMemberAction extends AbstractExtendedAction { - public class GotoMemberMenuItem extends MenuItemDescriptor { - @Inject - public GotoMemberMenuItem(final GotoMemberAction action) { - super(action); - } - } - private final StateManager stateManager; +public class GotoMemberAction extends GotoGroupAction { @Inject public GotoMemberAction(final StateManager stateManager, final I18nTranslationService i18n, final CoreResources res) { - this.stateManager = stateManager; + super(stateManager, i18n, res); putValue(NAME, i18n.t("Visit this member homepage")); - putValue(Action.SMALL_ICON, res.groupHome()); } - @Override - public void actionPerformed(final ActionEvent event) { - stateManager.gotoToken(((GroupDTO) event.getSource()).getStateToken()); - } - } Added: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,17 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class GotoPersonAction extends GotoGroupAction { + + @Inject + public GotoPersonAction(final StateManager stateManager, final I18nTranslationService i18n, final CoreResources res) { + super(stateManager, i18n, res); + putValue(NAME, i18n.t("Visit his/her homepage")); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoPersonAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,58 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class JoinGroupAction extends RolAction { + + @Inject + public JoinGroupAction(final StateManager stateManager, final Session session, final I18nTranslationService i18n, + final CoreResources res, final Provider<SocialNetworkServiceAsync> snServiceProvider, + final AccessRightsClientManager rightsClientManager) { + super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Viewer, false, + true, false); + putValue(NAME, i18n.t("Participate")); + putValue(SHORT_DESCRIPTION, i18n.t("Request to participate in this group")); + putValue(Action.SMALL_ICON, res.addGreen()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().requestJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), + new AsyncCallbackSimple<SocialNetworkRequestResult>() { + @Override + public void onSuccess(final SocialNetworkRequestResult result) { + NotifyUser.hideProgress(); + switch ((result)) { + case accepted: + NotifyUser.info(i18n.t("You are now member of this group")); + stateManager.reload(); + break; + case denied: + NotifyUser.important(i18n.t("Sorry this is a closed group")); + break; + case moderated: + NotifyUser.info(i18n.t("Membership requested. Waiting for admins decision")); + break; + default: + NotifyUser.info(i18n.t("Programatic error in ParticipateAction")); + } + } + }); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -3,7 +3,6 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; @@ -18,12 +17,6 @@ import com.google.inject.Provider; public class RemoveMemberAction extends AbstractExtendedAction { - public class RemoveMemberMenuItem extends MenuItemDescriptor { - @Inject - public RemoveMemberMenuItem(final RemoveMemberAction action) { - super(action); - } - } private final I18nTranslationService i18n; private final Session session; private final Provider<SocialNetworkServiceAsync> snServiceProvider; Added: trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,65 @@ +package cc.kune.core.client.sn.actions; + + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.AccessRightsChangedEvent; +import cc.kune.core.client.state.AccessRightsChangedEvent.AccessRightsChangedHandler; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public abstract class RolAction extends AbstractExtendedAction { + protected final I18nTranslationService i18n; + protected final Session session; + protected final Provider<SocialNetworkServiceAsync> snServiceProvider; + protected final StateManager stateManager; + + @Inject + public RolAction(final StateManager stateManager, final Session session, final I18nTranslationService i18n, + final CoreResources res, final Provider<SocialNetworkServiceAsync> snServiceProvider, + final AccessRightsClientManager rightsManager, final AccessRolDTO rolRequired, final boolean authNeed, + final boolean visibleForNonMemb, final boolean visibleForMembers) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + rightsManager.onRightsChanged(new AccessRightsChangedHandler() { + + @Override + public void onAccessRightsChanged(final AccessRightsChangedEvent event) { + refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, visibleForNonMemb, + event.getCurrentRights()); + + } + }); + } + + public void refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, final boolean isLogged, + final boolean visibleForMembers, final boolean visibleForNonMemb, final AccessRights newRights) { + boolean newVisibility = false; + boolean newEnabled = false; + if (authNeed && !isLogged) { + newVisibility = newEnabled = false; + } else { + // Auth ok + newEnabled = RolComparator.isEnabled(rolRequired, newRights); + if (newEnabled) { + final boolean isMember = RolComparator.isMember(newRights); + newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb; + } else { + newVisibility = false; + } + } + setEnabled(newEnabled); + putValue(GuiActionDescrip.VISIBLE, newVisibility); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/RolAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/core/client/sn/actions/RolComparator.java (from rev 1243, trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RolComparator.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RolComparator.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,45 @@ +/* + * + * 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.core.client.sn.actions; + +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.AccessRolDTO; + +public final class RolComparator { + + public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRights rights) { + switch (rolRequired) { + case Administrator: + return rights.isAdministrable(); + case Editor: + return rights.isEditable(); + case Viewer: + return rights.isVisible(); + } + return false; + } + + public static boolean isMember(final AccessRights newRights) { + return newRights.isAdministrable() || newRights.isEditable(); + } + + private RolComparator() { + } +} Added: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,40 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.chat.client.ChatClient; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class StartChatWithMemberAction extends AbstractExtendedAction { + private final Provider<ChatClient> chatClient; + + private final I18nTranslationService i18n; + + @Inject + public StartChatWithMemberAction(final I18nTranslationService i18n, final CoreResources res, + final Provider<ChatClient> chatClient) { + this.i18n = i18n; + this.chatClient = chatClient; + putValue(NAME, i18n.t("Start a chat with this member")); + putValue(Action.SMALL_ICON, res.newChat()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + chatClient.get().show(); + if (chatClient.get().isLoggedIn()) { + chatClient.get().chat(XmppURI.jid(((GroupDTO) event.getSource()).getShortName())); + } else { + NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); + } + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithMemberAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -1,47 +1,17 @@ package cc.kune.core.client.sn.actions; import cc.kune.chat.client.ChatClient; -import cc.kune.common.client.actions.AbstractExtendedAction; -import cc.kune.common.client.actions.Action; -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.google.inject.Inject; import com.google.inject.Provider; -public class StartChatWithUserAction extends AbstractExtendedAction { - public class StartChatWithUserMenuItem extends MenuItemDescriptor { - @Inject - public StartChatWithUserMenuItem(final StartChatWithUserAction action) { - super(action); - } - } - private final Provider<ChatClient> chatClient; - - private final I18nTranslationService i18n; - +public class StartChatWithUserAction extends StartChatWithMemberAction { @Inject public StartChatWithUserAction(final I18nTranslationService i18n, final CoreResources res, final Provider<ChatClient> chatClient) { - this.i18n = i18n; - this.chatClient = chatClient; - putValue(NAME, i18n.t("Start a chat with this member")); - putValue(Action.SMALL_ICON, res.newChat()); + super(i18n, res, chatClient); + putValue(NAME, i18n.t("Start a chat with this person")); } - - @Override - public void actionPerformed(final ActionEvent event) { - chatClient.get().show(); - if (chatClient.get().isLoggedIn()) { - chatClient.get().chat(XmppURI.jid(((GroupDTO) event.getSource()).getShortName())); - } else { - NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); - } - } - } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -1,60 +1,55 @@ package cc.kune.core.client.sn.actions; -import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; -public class UnJoinGroupAction extends AbstractExtendedAction { - public class UnJoinGroupMenuItem extends MenuItemDescriptor { - @Inject - public UnJoinGroupMenuItem(final UnJoinGroupAction action) { - super(action); - } - } - private final I18nTranslationService i18n; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; +public class UnJoinGroupAction extends RolAction { @Inject public UnJoinGroupAction(final StateManager stateManager, final Session session, final I18nTranslationService i18n, - final CoreResources res, final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; - this.snServiceProvider = snServiceProvider; - putValue(NAME, i18n.t("Do not participate anymore in this group")); + final CoreResources res, final Provider<SocialNetworkServiceAsync> snServiceProvider, + final AccessRightsClientManager rightsClientManager) { + super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Editor, true, + false, true); + putValue(NAME, i18n.t("Leave this group")); + putValue(SHORT_DESCRIPTION, i18n.t("Do not participate anymore in this group")); putValue(Action.SMALL_ICON, res.del()); } @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), ((GroupDTO) event.getSource()).getStateToken(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user info: - // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); + NotifyUser.askConfirmation(i18n.t("Leave this group"), i18n.t("Are you sure?"), new OnAcceptCallback() { + @Override + public void onSuccess() { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().unJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Removed as member")); + stateManager.reload(); + // in the future with user info: + // stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); + } + }); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -3,6 +3,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateContentDTO; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -19,6 +20,9 @@ @Override public boolean mustBeAdded(final GuiActionDescrip descr) { + if (session.getContainerState() instanceof StateContentDTO) { + // FIXME + } return (session.getContentState().getGroupRights().isAdministrable()); } } Added: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,11 @@ +package cc.kune.core.client.sn.actions.registry; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; + +public abstract class AbstractSNActionsRegistry extends GuiActionDescCollection { // NOPMD + // by + // vjrj + // on + // 10/02/11 + // 3:19 +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNActionsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java (from rev 1243, trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,10 @@ +package cc.kune.core.client.sn.actions.registry; + +import java.util.ArrayList; + +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; + +import com.google.inject.Provider; + +public abstract class AbstractSNMembersActionsRegistry extends ArrayList<Provider<MenuItemDescriptor>> { // NOPMD by vjrj on 10/02/11 3:19 +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSNMembersActionsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -1,10 +0,0 @@ -package cc.kune.core.client.sn.actions.registry; - -import java.util.ArrayList; - -import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; - -import com.google.inject.Provider; - -public abstract class AbstractSocialNetworActionsRegistry extends ArrayList<Provider<MenuItemDescriptor>> { // NOPMD by vjrj on 10/02/11 3:19 -} \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,19 @@ +package cc.kune.core.client.sn.actions.registry; + +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.core.client.sn.actions.JoinGroupAction; +import cc.kune.core.client.sn.actions.UnJoinGroupAction; + +import com.google.inject.Inject; + +public class GroupMembersActionsRegistry extends AbstractSNActionsRegistry { + @Inject + public GroupMembersActionsRegistry(final JoinGroupAction joinGroupAction, final UnJoinGroupAction unJoinGroupAction) { + final ButtonDescriptor join = new ButtonDescriptor(joinGroupAction); + final ButtonDescriptor unjoin = new ButtonDescriptor(unJoinGroupAction); + join.setStyles("k-no-backimage"); + unjoin.setStyles("k-no-backimage"); + add(join); + add(unjoin); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -8,7 +8,7 @@ import cc.kune.core.client.sn.actions.GotoGroupAction; import cc.kune.core.client.sn.actions.GotoMemberAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; -import cc.kune.core.client.sn.actions.StartChatWithUserAction; +import cc.kune.core.client.sn.actions.StartChatWithMemberAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; @@ -17,14 +17,14 @@ import com.google.inject.Inject; import com.google.inject.Provider; -public class SNAdminsMenuItemsRegistry extends AbstractSocialNetworActionsRegistry { +public class SNAdminsMenuItemsRegistry extends AbstractSNMembersActionsRegistry { @Inject public SNAdminsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, - final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithUserAction startChatWithUserAction, + final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { add(new Provider<MenuItemDescriptor>() { @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -8,7 +8,7 @@ import cc.kune.core.client.sn.actions.GotoGroupAction; import cc.kune.core.client.sn.actions.GotoMemberAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; -import cc.kune.core.client.sn.actions.StartChatWithUserAction; +import cc.kune.core.client.sn.actions.StartChatWithMemberAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; @@ -17,14 +17,14 @@ import com.google.inject.Inject; import com.google.inject.Provider; -public class SNCollabsMenuItemsRegistry extends AbstractSocialNetworActionsRegistry { +public class SNCollabsMenuItemsRegistry extends AbstractSNMembersActionsRegistry { @Inject public SNCollabsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, - final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithUserAction startChatWithUserAction, + final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { add(new Provider<MenuItemDescriptor>() { @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -6,7 +6,7 @@ import cc.kune.core.client.sn.actions.ChangeToCollabAction; import cc.kune.core.client.sn.actions.DenyJoinGroupAction; import cc.kune.core.client.sn.actions.GotoGroupAction; -import cc.kune.core.client.sn.actions.GotoMemberAction; +import cc.kune.core.client.sn.actions.GotoPersonAction; import cc.kune.core.client.sn.actions.RemoveMemberAction; import cc.kune.core.client.sn.actions.StartChatWithUserAction; import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; @@ -17,7 +17,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -public class SNPendingsMenuItemsRegistry extends AbstractSocialNetworActionsRegistry { +public class SNPendingsMenuItemsRegistry extends AbstractSNMembersActionsRegistry { @Inject public SNPendingsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, @@ -25,7 +25,7 @@ final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithUserAction startChatWithUserAction, - final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { + final GotoGroupAction gotoGroupAction, final GotoPersonAction gotoPersonAction) { add(new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { @@ -45,7 +45,7 @@ add(new Provider<MenuItemDescriptor>() { @Override public MenuItemDescriptor get() { - final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction); + final MenuItemDescriptor item = new MenuItemDescriptor(gotoPersonAction); item.setAddCondition(isPersonCondition); return item; } Added: trunk/src/main/java/cc/kune/core/client/state/AccessRightsChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/AccessRightsChangedEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsChangedEvent.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -0,0 +1,97 @@ +package cc.kune.core.client.state; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class AccessRightsChangedEvent extends GwtEvent<AccessRightsChangedEvent.AccessRightsChangedHandler> { + + public interface HasAccessRightsChangedHandlers extends HasHandlers { + HandlerRegistration addAccessRightsChangedHandler(AccessRightsChangedHandler handler); + } + + public interface AccessRightsChangedHandler extends EventHandler { + public void onAccessRightsChanged(AccessRightsChangedEvent event); + } + + private static final Type<AccessRightsChangedHandler> TYPE = new Type<AccessRightsChangedHandler>(); + + public static void fire(HasHandlers source, cc.kune.core.shared.domain.utils.AccessRights previousRights, cc.kune.core.shared.domain.utils.AccessRights currentRights) { + source.fireEvent(new AccessRightsChangedEvent(previousRights, currentRights)); + } + + public static Type<AccessRightsChangedHandler> getType() { + return TYPE; + } + + cc.kune.core.shared.domain.utils.AccessRights previousRights; + cc.kune.core.shared.domain.utils.AccessRights currentRights; + + public AccessRightsChangedEvent(cc.kune.core.shared.domain.utils.AccessRights previousRights, cc.kune.core.shared.domain.utils.AccessRights currentRights) { + this.previousRights = previousRights; + this.currentRights = currentRights; + } + + protected AccessRightsChangedEvent() { + // Possibly for serialization. + } + + @Override + public Type<AccessRightsChangedHandler> getAssociatedType() { + return TYPE; + } + + public cc.kune.core.shared.domain.utils.AccessRights getPreviousRights() { + return previousRights; + } + + public cc.kune.core.shared.domain.utils.AccessRights getCurrentRights() { + return currentRights; + } + + @Override + protected void dispatch(AccessRightsChangedHandler handler) { + handler.onAccessRightsChanged(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AccessRightsChangedEvent other = (AccessRightsChangedEvent) obj; + if (previousRights == null) { + if (other.previousRights != null) + return false; + } else if (!previousRights.equals(other.previousRights)) + return false; + if (currentRights == null) { + if (other.currentRights != null) + return false; + } else if (!currentRights.equals(other.currentRights)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (previousRights == null ? 1 : previousRights.hashCode()); + hashCode = (hashCode * 37) + (currentRights == null ? 1 : currentRights.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "AccessRightsChangedEvent[" + + previousRights + + "," + + currentRights + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/AccessRightsChangedEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -19,31 +19,35 @@ */ package cc.kune.core.client.state; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; import cc.kune.core.shared.domain.utils.AccessRights; -import com.calclab.suco.client.events.Listener2; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; public class AccessRightsClientManager { - private final AccessRights previousRights; + private final EventBus eventBus; + private AccessRights previousRights; - // private final Event2<AccessRights, AccessRights> onRightsChanged; + @Inject + public AccessRightsClientManager(final EventBus eventBus, final StateManager stateManager) { + this.eventBus = eventBus; + this.previousRights = null; + stateManager.onStateChanged(new StateChangedHandler() { - public AccessRightsClientManager(final StateManager stateManager) { - this.previousRights = null; - // this.onRightsChanged = new Event2<AccessRights , AccessRights - // >("onRightsChanged"); - // stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - // public void onEvent(final StateAbstractDTO newState) { - // final AccessRights rights = newState.getGroupRights(); - // if (!rights.equals(previousRights)) { - // onRightsChanged.fire(previousRights, rights); - // previousRights = rights; - // } - // } - // }); + @Override + public void onStateChanged(final StateChangedEvent event) { + final AccessRights rights = event.getState().getGroupRights(); + if (!rights.equals(previousRights)) { + AccessRightsChangedEvent.fire(eventBus, previousRights, rights); + previousRights = rights; + } + + } + }); } - public void onRightsChanged(final Listener2<AccessRights, AccessRights> listener) { - // onRightsChanged.add(listener); + public void onRightsChanged(final AccessRightsChangedEvent.AccessRightsChangedHandler handler) { + eventBus.addHandler(AccessRightsChangedEvent.getType(), handler); } } Added: trunk/src/main/java/cc/kune/core/public/images/unknown.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/unknown.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-10 18:28:58 UTC (rev 1244) @@ -775,12 +775,56 @@ color: #FFF; text-transform: lowercase; padding-left: 10px; + float: left; } +.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel { + float: left; + padding-left: 5px; + color: #e0e0e0; +} + .k-sn-adminslabel { } +.k-sn-mainpanel .k-basic-thumb { + float: left; +} + +/* +.k-sn-mainpanel .x-btn button { + text-decoration: underline; + white-space: nowrap; +} +*/ +.k-sn-mainpanel .x-btn button { + cursor: pointer; + font: 13px 'Ubuntu', arial; + padding: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + text-decoration: none; + vertical-align: middle; + background-color: #F2F2F2; + border: 2px gray solid; + height: 26px !important; + line-height: 2em !important; + padding-left: 25px !important; +} + +.k-sn-mainpanel .x-btn button:hover { + border: 2px orange solid; + background: #f0f0f0; + color: #855585; +} + +.k-sn-mainpanel .x-btn button:active { + border-top-color: #ffffff; + background: #ffffff; +} + .k-sn-collabslabel { } @@ -789,6 +833,14 @@ } +.k-sn-orphan-label { + padding: 10px; +} + +.k-sn-novisible-label { + padding: 10px; +} + .k-sn-adminspanel { background-color: #a05a2c; } @@ -798,13 +850,17 @@ } .k-sn-pendingspanel { - + /* background-color: #a05a2c; */ } .k-sn-adminsscroll,.k-sn-collabsscroll,.k-sn-pendingsscroll { - padding-left: 10px; + } +.k-sn-adminsflow,.k-sn-collabsflow,.k-sn-pendingsflow { + margin-left: 10px; +} + .k-sn-adminsscroll { } @@ -814,7 +870,7 @@ } .k-sn-pendingsscroll { - margin: 5px; + } .k-userconfirm-label { @@ -823,9 +879,18 @@ } .k-sn-deck { - padding: 5px; + } +.k-sn-bottomPanel { + padding: 0 10px; + float: right; +} + +.k-sn-bottomPanel-actions { + width: 100%; +} + .k-sn-novisible-label,.k-sn-orphan-label { color: #FFF; font-size: 16px; Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-10 18:28:58 UTC (rev 1244) @@ -5,8 +5,8 @@ type='cc.kune.gspace.client.resources.WsArmorResources' /> <ui:style> .frame { - border: 0px; - margin: 0px; + border: 0px; + margin: 0px; } </ui:style> <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' @@ -86,7 +86,7 @@ <g:east size="200.0"> <g:DockLayoutPanel unit="PX" styleName="{res.style.entityTools}" ui:field="splitEast"> - <g:north size="190"> + <g:north size="305"> <g:VerticalPanel width="100%" ui:field="entityToolsNorth" styleName="{res.style.entityToolsNorth}"></g:VerticalPanel> </g:north> Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -461,7 +461,7 @@ register(Singleton.class, new Factory<AccessRightsClientManager>(AccessRightsClientManager.class) { @Override public AccessRightsClientManager create() { - return new AccessRightsClientManager(i(StateManager.class)); + return null; // new AccessRightsClientManager(i(StateManager.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -22,6 +22,7 @@ import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; +import cc.kune.core.client.sn.actions.RolComparator; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -29,7 +30,6 @@ import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Listener2; import com.google.gwt.resources.client.ImageResource; public abstract class RolAction extends AbstractExtendedAction { @@ -54,12 +54,12 @@ return new UIStatus(newVisibility, newEnabled); } + private boolean authNeed; + protected final I18nTranslationService i18n; protected final Session session; protected final StateManager stateManager; - protected final I18nTranslationService i18n; + private boolean visibleForMembers; private boolean visibleForNonMemb; - private boolean visibleForMembers; - private boolean authNeed; public RolAction(final Session session, final StateManager stateManager, final AccessRightsClientManager rightsManager, final I18nTranslationService i18n, @@ -71,26 +71,29 @@ this.visibleForMembers = true; this.visibleForNonMemb = true; this.authNeed = false; - rightsManager.onRightsChanged(new Listener2<AccessRights, AccessRights>() { - public void onEvent(final AccessRights prevRights, final AccessRights newRights) { - setStatus(refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, - visibleForNonMemb, newRights)); - } - - }); + // rightsManager.onRightsChanged(new Listener2<AccessRights, + // AccessRights>() { + // public void onEvent(final AccessRights prevRights, final AccessRights + // newRights) { + // setStatus(refreshStatus(rolRequired, authNeed, session.isLogged(), + // visibleForMembers, + // visibleForNonMemb, newRights)); + // } + // + // }); } public void setMustBeAuthenticated(final boolean authNeed) { this.authNeed = authNeed; } + private void setStatus(final UIStatus refreshStatus) { + setEnabled(refreshStatus.isEnabled()); + putValue(OldGuiActionDescrip.VISIBLE, refreshStatus.isVisible()); + } + public void setVisible(final boolean forMembers, final boolean forNonMembers) { this.visibleForMembers = forMembers; this.visibleForNonMemb = forNonMembers; } - - private void setStatus(final UIStatus refreshStatus) { - setEnabled(refreshStatus.isEnabled()); - putValue(OldGuiActionDescrip.VISIBLE, refreshStatus.isVisible()); - } } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -1,45 +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 org.ourproject.kune.workspace.client.oldsn; - -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; - -public final class RolComparator { - - public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRights rights) { - switch (rolRequired) { - case Administrator: - return rights.isAdministrable(); - case Editor: - return rights.isEditable(); - case Viewer: - return rights.isVisible(); - } - return false; - } - - public static boolean isMember(final AccessRights newRights) { - return newRights.isAdministrable() || newRights.isEditable(); - } - - private RolComparator() { - } -} Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2011-02-10 03:07:28 UTC (rev 1243) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2011-02-10 18:28:58 UTC (rev 1244) @@ -23,8 +23,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.ourproject.kune.workspace.client.oldsn.RolComparator; +import cc.kune.core.client.sn.actions.RolComparator; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO;

1 0

10 Feb '11

Author: vjrj_ Date: 2011-02-10 04:07:28 +0100 (Thu, 10 Feb 2011) New Revision: 1243 Added: trunk/src/main/java/cc/kune/common/client/actions/ActionCollection.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java trunk/src/main/java/cc/kune/core/client/resources/new-chat.gif trunk/src/main/java/cc/kune/core/client/services/ trunk/src/main/java/cc/kune/core/client/services/FileConstants.java trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java trunk/src/main/java/cc/kune/core/client/services/ImageDescriptor.java trunk/src/main/java/cc/kune/core/client/services/ImageSize.java trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java trunk/src/main/java/cc/kune/core/client/sn/ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java trunk/src/main/java/cc/kune/gspace/public/kune-gspace.css trunk/src/main/java/cc/ourproject/ trunk/src/main/java/cc/ourproject/kune/ trunk/src/main/java/cc/ourproject/kune/core/ trunk/src/main/java/cc/ourproject/kune/core/client/ trunk/src/main/java/cc/ourproject/kune/core/client/services/ trunk/src/main/java/org/ourproject/kune/platf/client/actions/OldAbstractAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldGuiActionDescrip.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldMenuItemDescriptor.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationSummaryToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationToolbar.java Removed: trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java trunk/src/main/java/cc/kune/core/client/notify/alerts/ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescrip.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UIStatus.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ Modified: trunk/script/css-update.sh trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/chat/client/ChatClient.java trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtPushButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractActionExtensiblePresenter.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractChildGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/ActionExtensibleView.java trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java trunk/src/main/java/cc/kune/common/client/actions/ui/IsActionExtensible.java trunk/src/main/java/cc/kune/common/client/actions/ui/bind/AbstractGuiBinding.java trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiBinding.java trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiChildBinding.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddCondition.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManager.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialogView.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContent.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContext.java trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoom.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryMessages.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContent.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContext.java trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCollection.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/InputMap.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractActionExtensiblePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractSeparatorDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ActionExtensibleView.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BasicGuiBindings.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescCollection.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingAdapter.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/IsActionExtensible.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContent.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContext.java trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/AbstractUploader.java trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/docs.liquid.html trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java Log: SN Refactorization Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/script/css-update.sh 2011-02-10 03:07:28 UTC (rev 1243) @@ -15,3 +15,5 @@ cp src/main/java/cc/kune/common/public/kune-common.css target/kune-0.0.7/ws/ cp src/main/java/cc/kune/core/public/ws.css target/kune-0.0.7/ws/ cp src/main/java/cc/kune/core/public/ws.html target/kune-0.0.7/ws/ +cp src/main/webapp/templates/basic/basic.css target/kune-0.0.7/templates/basic/basic.css +cp src/main/webapp/templates/basic/docs.liquid.html target/kune-0.0.7/templates/basic/ Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-02-10 03:07:28 UTC (rev 1243) @@ -25,9 +25,9 @@ <set-property name="gwt.logging.systemHandler" value="ENABLED" /> <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" /> -    @@ -40,9 +40,10 @@ <set-configuration-property name="gin.ginjector" value="cc.kune.client.KuneGinjector" />  -  <inherits name="com.google.gwt.user.Debug" />  <entry-point class="cc.kune.client.KuneEntryPoint" /> +  </module> Modified: trunk/src/main/java/cc/kune/chat/client/ChatClient.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -25,9 +25,11 @@ void addNewBuddie(String shortName); + void chat(String shortName); + void chat(XmppURI jid); - boolean isBuddie(String localUserName); + boolean isBuddie(String shortName); boolean isBuddie(XmppURI jid); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -189,10 +189,15 @@ @Override public void addNewBuddie(final String shortName) { - roster.requestAddItem(XmppURI.jid(shortName + "@" + chatOptions.domain), shortName, ""); + roster.requestAddItem(uriFrom(shortName), shortName, ""); } @Override + public void chat(final String shortName) { + chat(uriFrom(shortName)); + } + + @Override public void chat(final XmppURI jid) { chatManager.open(jid); } @@ -290,8 +295,8 @@ } @Override - public boolean isBuddie(final String localUserName) { - return isBuddie(XmppURI.jid(localUserName + "@" + chatOptions.domain)); + public boolean isBuddie(final String shortName) { + return isBuddie(uriFrom(shortName)); } @Override @@ -375,4 +380,8 @@ private void toggleShowDialog() { showDialog(popup == null ? true : !popup.isShowing()); } + + private XmppURI uriFrom(final String shortName) { + return XmppURI.jid(shortName + "@" + chatOptions.domain); + } } Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -64,18 +64,19 @@ public void onModuleLoadCont() { DelayedBindRegistry.bind(ginjector); AsyncCallbackSimple.init(ginjector.getErrorHandler()); - NotifyUser.init(ginjector.getEventBus()); + ginjector.getEventLogger(); + NotifyUser.init(ginjector.getEventBus(), ginjector.getI18n()); ginjector.getCorePresenter().get().forceReveal(); ginjector.getStateManager(); ginjector.getSiteTokenListeners(); - ginjector.getEventLogger(); - ginjector.getI18n(); ginjector.getGxtGuiProvider(); ginjector.getUserNotifierPresenter(); ginjector.getGlobalShortcutRegister(); ginjector.getSpinerPresenter(); + ginjector.getGroupMembersPresenter(); ginjector.getSiteLogoPresenter(); ginjector.getSpacesTabPresenter(); ginjector.getChatClient(); + ginjector.getCoreParts(); } } Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -26,17 +26,20 @@ import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.core.client.CoreGinModule; +import cc.kune.core.client.CoreParts; import cc.kune.core.client.auth.RegisterPresenter; import cc.kune.core.client.auth.SignInPresenter; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.groups.newgroup.NewGroupPresenter; import cc.kune.core.client.logs.EventBusWithLogging; +import cc.kune.core.client.notify.confirm.UserConfirmPresenter; import cc.kune.core.client.notify.msgs.UserNotifierPresenter; import cc.kune.core.client.notify.spiner.SpinerPresenter; import cc.kune.core.client.sitebar.SitebarActionsPresenter; import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; +import cc.kune.core.client.sn.GroupMembersPresenter; import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.ws.CorePresenter; @@ -63,6 +66,8 @@ AsyncProvider<CookiesManager> getCookiesManager(); + CoreParts getCoreParts(); + Provider<CorePresenter> getCorePresenter(); ErrorHandler getErrorHandler(); @@ -73,6 +78,8 @@ GlobalShortcutRegister getGlobalShortcutRegister(); + AsyncProvider<GroupMembersPresenter> getGroupMembersPresenter(); + GuiProvider getGuiProvider(); GwtGuiProvider getGwtGuiProvider(); @@ -103,5 +110,7 @@ StateManager getStateManager(); + AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); + AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -38,10 +38,14 @@ import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.notify.SimpleUserMessage; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.client.ui.IconLabel; +import com.extjs.gxt.ui.client.widget.LayoutContainer; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.VerticalPanel; @@ -139,6 +143,21 @@ panel.add(view); panel.add(simpleIconLabel); + final BasicThumb thumb = new BasicThumb("http://www.truth-out.org/sites/all/themes/truth/images/logo.gif", 60, + "fooo", 5, false, new ClickHandler() { + + @Override + public void onClick(final ClickEvent event) { + userMsg.show("Testing"); + } + }); + thumb.setTooltip("kkkkkkK"); + thumb.setOnOverLabel(true); + final LayoutContainer layout = new LayoutContainer(); + // final QuickTip quickTip = new QuickTip(layout); + // quickTip.setInterceptTitles(true); + layout.add(thumb); + RootPanel.get().add(layout); RootPanel.get().add(view); } } Added: trunk/src/main/java/cc/kune/common/client/actions/ActionCollection.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ActionCollection.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ActionCollection.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,9 @@ +package cc.kune.common.client.actions; + +import java.util.ArrayList; + +public class ActionCollection extends ArrayList<AbstractAction> { + + private static final long serialVersionUID = -3308296009308246636L; + +} Property changes on: trunk/src/main/java/cc/kune/common/client/actions/ActionCollection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,8 +24,8 @@ import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.ui.IconLabel; import com.google.gwt.event.dom.client.ClickEvent; @@ -56,7 +56,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; iconLabel = new IconLabel(""); if (enableTongle) { Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,7 +24,7 @@ import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.Position; @@ -45,7 +45,7 @@ public AbstractGwtMenuGui() { } - public AbstractGwtMenuGui(final AbstractGuiActionDescrip descriptor) { + public AbstractGwtMenuGui(final GuiActionDescrip descriptor) { super(descriptor); } @@ -72,7 +72,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.create(descriptor); menu = new MenuBar(true); menu.setAnimationEnabled(true); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,7 +27,7 @@ import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; @@ -64,7 +64,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; iconLabel = new IconLabel(""); iconLabel.addTextStyleName("oc-ico-pad"); @@ -102,7 +102,7 @@ if (menu == null) { throw new UIException("To add a menu item you need to add the menu before. Item: " + descriptor); } - if (position == AbstractGuiActionDescrip.NO_POSITION) { + if (position == GuiActionDescrip.NO_POSITION) { menu.add(item); } else { menu.insert(position, item); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -25,7 +25,7 @@ import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; import cc.kune.common.client.ui.IconLabel; @@ -49,7 +49,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; iconLabel = new IconLabel(""); descriptor.putValue(ParentWidget.PARENT_UI, this); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.ui.IconLabel; @@ -44,7 +44,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; descriptor.putValue(ParentWidget.PARENT_UI, this); // Standalone menus are menus without and associated button in a toolbar Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,13 +21,13 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.UIException; public class GwtMenuSeparatorGui extends AbstractGuiItem { @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { final AbstractGwtMenuGui menu = ((AbstractGwtMenuGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); if (menu == null) { throw new UIException("To add a menu separator you need to add the menu before. Item: " + descriptor); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.ui.IconLabel; import com.google.gwt.user.client.ui.MenuItem; @@ -39,7 +40,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; item = new MenuItem("", menu); iconLabel = new IconLabel(""); @@ -47,7 +48,7 @@ configureItemFromProperties(); final AbstractGwtMenuGui parentMenu = ((AbstractGwtMenuGui) descriptor.getParent().getValue(PARENT_UI)); final int position = descriptor.getPosition(); - if (position == AbstractGuiActionDescrip.NO_POSITION) { + if (position == GuiActionDescrip.NO_POSITION) { parentMenu.add(item); } else { parentMenu.insert(position, item); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import com.google.gwt.user.client.ui.UIObject; @@ -55,7 +56,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; toolbar = new GwtComplexToolbar(); initWidget(toolbar); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.errors.UIException; @@ -29,7 +29,7 @@ public class GwtToolbarSeparatorGui extends AbstractGuiItem { @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { final GwtToolbarGui toolbar = ((GwtToolbarGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); if (toolbar == null) { throw new UIException("To add a toolbar separator you need to add the toolbar before. Item: " + descriptor); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -25,8 +25,8 @@ import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor; import com.extjs.gxt.ui.client.Style.ButtonScale; @@ -54,7 +54,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; descriptor.putValue(ParentWidget.PARENT_UI, this); if (descriptor instanceof PushButtonDescriptor) { Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,7 +24,7 @@ import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.Position; @@ -41,7 +41,7 @@ public AbstractGxtMenuGui() { } - public AbstractGxtMenuGui(final AbstractGuiActionDescrip descriptor) { + public AbstractGxtMenuGui(final GuiActionDescrip descriptor) { super(descriptor); } @@ -69,7 +69,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; super.create(descriptor); menu = new Menu(); @@ -85,8 +85,7 @@ @Override public void propertyChange(final PropertyChangeEvent event) { if (event.getPropertyName().equals(MenuDescriptor.MENU_SHOW)) { - final String id = (String) descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO); - show(id); + show(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); } } }); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,7 +27,7 @@ import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; @@ -65,7 +65,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; if (descriptor instanceof MenuRadioItemDescriptor) { final CheckMenuItem checkItem = createCheckItem((MenuItemDescriptor) descriptor); @@ -89,9 +89,18 @@ public void componentSelected(final MenuEvent ce) { final AbstractAction action = descriptor.getAction(); if (action != null) { - action.actionPerformed(new ActionEvent(item, Event.getCurrentEvent())); + + action.actionPerformed(new ActionEvent(getItemObjectOfAction(descriptor), Event.getCurrentEvent())); } } + + private Object getItemObjectOfAction(final GuiActionDescrip descriptor) { + // If the action is associated with a item (like a Group, a + // group shortname, a username, etc) we pass this item to + // the action, if not we only pass the menuitem + return descriptor.hasItem() ? descriptor.getItem() + : descriptor.isChild() ? descriptor.getParent().getItem() : item; + } }); child = item; super.create(descriptor); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,7 +23,7 @@ import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import com.extjs.gxt.ui.client.event.ButtonEvent; @@ -71,7 +71,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; descriptor.putValue(ParentWidget.PARENT_UI, this); // Standalone menus are menus without and associated button in a @@ -143,4 +143,9 @@ button.setVisible(visible); } } + + @Override + public boolean shouldBeAdded() { + return notStandAlone; + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,7 +22,7 @@ import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import com.google.gwt.user.client.ui.UIObject; @@ -33,7 +33,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.create(descriptor); final GxtMenuGui menu = (GxtMenuGui) parent; menu.addSeparator(); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtPushButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtPushButtonGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtPushButtonGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,7 +22,7 @@ import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.AbstractGuiItem; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor; public class GxtPushButtonGui extends GxtButtonGui { @@ -32,7 +32,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { final AbstractGuiItem item = super.create(descriptor); final PushButtonDescriptor btn = (PushButtonDescriptor) descriptor; setPressed(btn.isPushed()); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import com.extjs.gxt.ui.client.widget.menu.MenuItem; @@ -33,19 +33,19 @@ super(); } - public GxtSubMenuGui(final AbstractGuiActionDescrip descriptor) { + public GxtSubMenuGui(final GuiActionDescrip descriptor) { super(descriptor); } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.create(descriptor); item = new MenuItem(); item.setSubMenu(menu); final AbstractGxtMenuGui parentMenu = ((AbstractGxtMenuGui) descriptor.getParent().getValue( ParentWidget.PARENT_UI)); final int position = descriptor.getPosition(); - if (position == AbstractGuiActionDescrip.NO_POSITION) { + if (position == GuiActionDescrip.NO_POSITION) { parentMenu.add(item); } else { parentMenu.insert(position, item); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import com.extjs.gxt.ui.client.widget.Component; import com.extjs.gxt.ui.client.widget.toolbar.ToolBar; @@ -35,7 +35,7 @@ super(); } - public GxtToolbarGui(final AbstractGuiActionDescrip descriptor) { + public GxtToolbarGui(final GuiActionDescrip descriptor) { super(descriptor); } @@ -63,7 +63,7 @@ // } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { super.descriptor = descriptor; toolbar = new ToolBar(); initWidget(toolbar); Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; @@ -32,7 +32,7 @@ public class GxtToolbarSeparatorGui extends AbstractChildGuiItem { @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { final GxtToolbarGui toolbar = (GxtToolbarGui) parent; final Type type = ((ToolbarSeparatorDescriptor) descriptor).getSeparatorType(); switch (type) { Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractActionExtensiblePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractActionExtensiblePresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractActionExtensiblePresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,23 +19,23 @@ */ package cc.kune.common.client.actions.ui; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; public abstract class AbstractActionExtensiblePresenter implements IsActionExtensible { @Override - public abstract void addAction(final AbstractGuiActionDescrip descriptor); + public abstract void addAction(final GuiActionDescrip descriptor); public void addActionCollection(final GuiActionDescCollection descriptors) { - for (final AbstractGuiActionDescrip descriptor : descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } @Override - public void addActions(final AbstractGuiActionDescrip... descriptors) { - for (final AbstractGuiActionDescrip descriptor : descriptors) { + public void addActions(final GuiActionDescrip... descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractChildGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractChildGuiItem.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractChildGuiItem.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,7 +19,7 @@ */ package cc.kune.common.client.actions.ui; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.UIException; import com.google.gwt.user.client.ui.UIObject; @@ -33,7 +33,7 @@ super(); } - public AbstractChildGuiItem(final AbstractGuiActionDescrip descriptor) { + public AbstractChildGuiItem(final GuiActionDescrip descriptor) { super(descriptor); } @@ -45,7 +45,7 @@ } @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { final int position = descriptor.getPosition(); if (descriptor.isChild()) { // A menu item is a child, a toolbar separator, also. A button can @@ -57,7 +57,7 @@ if (child != null) { // Sometimes (menu/toolbar separators), there is no Widget to // add/insert - if (position == AbstractGuiActionDescrip.NO_POSITION) { + if (position == GuiActionDescrip.NO_POSITION) { parent.add(child); } else { parent.insert(position, child); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractComposedGuiItem.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,8 +23,8 @@ import cc.kune.common.client.actions.ui.bind.GuiBinding; import cc.kune.common.client.actions.ui.bind.GuiProvider; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.UIException; import com.google.gwt.user.client.ui.Composite; @@ -38,41 +38,47 @@ this.bindings = bindings; } - public void add(final AbstractGuiActionDescrip... descriptors) { - for (final AbstractGuiActionDescrip descriptor : descriptors) { + public void add(final GuiActionDescCollection descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } + public void add(final GuiActionDescrip... descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { + addAction(descriptor); + } + } + @Override - public void addAction(final AbstractGuiActionDescrip descriptor) { + public void addAction(final GuiActionDescrip descriptor) { getGuiItems().add(descriptor); beforeAddWidget(descriptor); } @Override - public void addActions(AbstractGuiActionDescrip... descriptors) { - for (final AbstractGuiActionDescrip descriptor : descriptors) { + public void addActions(final GuiActionDescCollection descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } @Override - public void addActions(final GuiActionDescCollection descriptors) { - for (final AbstractGuiActionDescrip descriptor : descriptors) { + public void addActions(final GuiActionDescrip... descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } - public void addActions(final List<AbstractGuiActionDescrip> descriptors) { - for (final AbstractGuiActionDescrip descriptor : descriptors) { + public void addActions(final List<GuiActionDescrip> descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } protected abstract void addWidget(AbstractGuiItem item); - protected void beforeAddWidget(final AbstractGuiActionDescrip descrip) { + protected void beforeAddWidget(final GuiActionDescrip descrip) { if (descrip.mustBeAdded()) { final GuiBinding binding = bindings.get(descrip.getType()); if (binding == null) { @@ -82,7 +88,7 @@ final AbstractGuiItem item = binding.create(descrip); // Log.debug("Adding: " + descrip); if (binding.shouldBeAdded()) { - if (descrip.getPosition() == AbstractGuiActionDescrip.NO_POSITION) { + if (descrip.getPosition() == GuiActionDescrip.NO_POSITION) { addWidget(item); } else { insertWidget(item, descrip.getPosition()); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,7 +24,7 @@ import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.bind.GuiBinding; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.resources.icons.IconConstants; @@ -34,13 +34,13 @@ public abstract class AbstractGuiItem extends Composite implements GuiBinding { - protected AbstractGuiActionDescrip descriptor; + protected GuiActionDescrip descriptor; public AbstractGuiItem() { super(); } - public AbstractGuiItem(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem(final GuiActionDescrip descriptor) { super(); this.descriptor = descriptor; } @@ -74,12 +74,12 @@ setToolTipText((String) (descriptor.getValue(Action.SHORT_DESCRIPTION))); setIcon(descriptor.getValue(Action.SMALL_ICON)); setEnabled((Boolean) descriptor.getValue(AbstractAction.ENABLED)); - setVisible((Boolean) descriptor.getValue(AbstractGuiActionDescrip.VISIBLE)); - setStyles((String) descriptor.getValue(AbstractGuiActionDescrip.STYLES)); + setVisible((Boolean) descriptor.getValue(GuiActionDescrip.VISIBLE)); + setStyles((String) descriptor.getValue(GuiActionDescrip.STYLES)); } @Override - public abstract AbstractGuiItem create(final AbstractGuiActionDescrip descriptor); + public abstract AbstractGuiItem create(final GuiActionDescrip descriptor); private PropertyChangeListener createActionPropertyChangeListener() { return new PropertyChangeListener() { @@ -94,9 +94,9 @@ setIcon(newValue); } else if (event.getPropertyName().equals(Action.SHORT_DESCRIPTION)) { setToolTipText((String) newValue); - } else if (event.getPropertyName().equals(AbstractGuiActionDescrip.VISIBLE)) { + } else if (event.getPropertyName().equals(GuiActionDescrip.VISIBLE)) { setVisible((Boolean) newValue); - } else if (event.getPropertyName().equals(AbstractGuiActionDescrip.STYLES)) { + } else if (event.getPropertyName().equals(GuiActionDescrip.STYLES)) { setStyles((String) newValue); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionExtensibleView.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionExtensibleView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionExtensibleView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,12 +19,12 @@ */ package cc.kune.common.client.actions.ui; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import com.google.gwt.user.client.ui.IsWidget; public interface ActionExtensibleView extends IsWidget { - void addAction(AbstractGuiActionDescrip descriptor); + void addAction(GuiActionDescrip descriptor); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/ActionSimplePanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -40,6 +40,10 @@ bar.add(item); } + public void clear() { + bar.clear(); + } + @Override protected void insertWidget(final AbstractGuiItem item, final int position) { final int count = bar.getWidgetCount(); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/IsActionExtensible.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/IsActionExtensible.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/IsActionExtensible.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,8 +19,8 @@ */ package cc.kune.common.client.actions.ui; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; public interface IsActionExtensible { @@ -30,22 +30,22 @@ * @param action * the action */ - void addAction(AbstractGuiActionDescrip action); + void addAction(GuiActionDescrip action); /** * Adds some action descriptions * - * @param action - * the action + * @param actions + * the actions */ - void addActions(AbstractGuiActionDescrip... actions); + void addActions(GuiActionDescCollection actions); /** * Adds some action descriptions * - * @param actions - * the actions + * @param action + * the action */ - void addActions(GuiActionDescCollection actions); + void addActions(GuiActionDescrip... actions); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/bind/AbstractGuiBinding.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/bind/AbstractGuiBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/bind/AbstractGuiBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,12 +20,17 @@ package cc.kune.common.client.actions.ui.bind; import cc.kune.common.client.actions.ui.AbstractGuiItem; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; public abstract class AbstractGuiBinding implements GuiBinding { @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { // NOPMD by vjrj on 18/01/11 0:47 + public AbstractGuiItem create(final GuiActionDescrip descriptor) { // NOPMD + // by + // vjrj + // on + // 18/01/11 + // 0:47 return null; } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiBinding.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,11 +20,11 @@ package cc.kune.common.client.actions.ui.bind; import cc.kune.common.client.actions.ui.AbstractGuiItem; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; public interface GuiBinding { - AbstractGuiItem create(AbstractGuiActionDescrip descriptor); + AbstractGuiItem create(GuiActionDescrip descriptor); boolean shouldBeAdded(); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiChildBinding.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiChildBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/bind/GuiChildBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; -import cc.kune.common.client.actions.ui.descrip.AbstractGuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.UIException; import com.google.gwt.user.client.ui.UIObject; @@ -32,7 +32,7 @@ protected ParentWidget parent; @Override - public AbstractGuiItem create(final AbstractGuiActionDescrip descriptor) { + public AbstractGuiItem create(final GuiActionDescrip descriptor) { final int position = descriptor.getPosition(); if (descriptor.isChild()) { // A menu item is a child, a toolbar separator, also. A button can @@ -44,7 +44,7 @@ if (child != null) { // Sometimes (menu/toolbar separators), there is no Widget to // add/insert - if (position == AbstractGuiActionDescrip.NO_POSITION) { + if (position == GuiActionDescrip.NO_POSITION) { parent.add(child); } else { parent.insert(position, child); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,16 +27,8 @@ /** * The Class AbstractUIActionDescriptor. */ -public abstract class AbstractGuiActionDescrip extends ChangeableObject { +public abstract class AbstractGuiActionDescrip extends ChangeableObject implements GuiActionDescrip { - protected static final AbstractGuiActionDescrip NO_PARENT = new NoParentGuiActionDescriptor(); - public static final int NO_POSITION = -1; - /** - * Coma separated, styles of the Gui item - */ - public static final String STYLES = "stylesprop"; - public static final String VISIBLE = "visibleprop"; - /** The action. */ private final AbstractAction action; @@ -48,7 +40,7 @@ /** The item location. */ private String location; - protected AbstractGuiActionDescrip parent = NO_PARENT; + protected GuiActionDescrip parent = NO_PARENT; /** The position where the item will be inserted. */ private int position; @@ -66,33 +58,44 @@ parent = NO_PARENT; } + @Override public void fire(final ActionEvent event) { action.actionPerformed(event); } + @Override public AbstractAction getAction() { return action; } + @Override public GuiAddCondition getAddCondition() { return addCondition; } + @Override public String getId() { return id; } + @Override + public Object getItem() { + return getValue(ITEM); + } + /** * Gets the location, a string used to group actions with locations (top * bar, bottom bar, user bar...). * * @return the location */ + @Override public String getLocation() { return location; } - public AbstractGuiActionDescrip getParent() { + @Override + public GuiActionDescrip getParent() { return parent; } @@ -101,10 +104,12 @@ * * @return the position */ + @Override public int getPosition() { return position; } + @Override public abstract Class<?> getType(); @Override @@ -120,38 +125,55 @@ } } + @Override + public boolean hasItem() { + return getValue(ITEM) != null; + } + + @Override public boolean isChild() { return !parent.equals(NO_PARENT); } + @Override public boolean isEnabled() { return (Boolean) getValue(Action.ENABLED); } + @Override public boolean isVisible() { return (Boolean) getValue(VISIBLE); } + @Override public boolean mustBeAdded() { boolean result = false; if (addCondition != null) { - result = addCondition.mustBeAdded(); + result = addCondition.mustBeAdded(this); } return result; } + @Override public void setAddCondition(final GuiAddCondition addCondition) { this.addCondition = addCondition; } + @Override public void setEnabled(final boolean enabled) { super.putValue(Action.ENABLED, enabled); } + @Override public void setId(final String id) { this.id = id; } + @Override + public void setItem(final Object object) { + putValue(ITEM, object); + } + /** * If we have several toolbars, we can group with the "location" string key * actions that must be in the same location (ex: top bar, bottom bar, and @@ -160,11 +182,13 @@ * @param location * the new location */ + @Override public void setLocation(final String location) { this.location = location; } - public void setParent(final AbstractGuiActionDescrip parent) { + @Override + public void setParent(final GuiActionDescrip parent) { this.parent = parent; } @@ -175,14 +199,17 @@ * @param position * the new position */ + @Override public void setPosition(final int position) { this.position = position; } + @Override public void setStyles(final String styles) { putValue(STYLES, styles); } + @Override public void setVisible(final boolean visible) { putValue(VISIBLE, visible); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescCollection.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,14 +21,13 @@ import java.util.ArrayList; - // @PMD:REVIEWED:AtLeastOneConstructor: by vjrj on 26/05/09 12:31 -public class GuiActionDescCollection extends ArrayList<AbstractGuiActionDescrip> { +public class GuiActionDescCollection extends ArrayList<GuiActionDescrip> { private static final long serialVersionUID = 6759723760404227737L; - public void add(final AbstractGuiActionDescrip... descriptors) { - for (AbstractGuiActionDescrip descriptor : descriptors) { + public void add(final GuiActionDescrip... descriptors) { + for (final GuiActionDescrip descriptor : descriptors) { super.add(descriptor); } } Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,37 @@ +/* + * + * 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.common.client.actions.ui.descrip; + +import java.util.ArrayList; + +import com.google.inject.Provider; + +@Deprecated +public class GuiActionDescProviderCollection extends ArrayList<Provider<GuiActionDescrip>> { + + private static final long serialVersionUID = -7933642706229301169L; + + public void add(final Provider<GuiActionDescrip>... descriptors) { + for (final Provider<GuiActionDescrip> descriptor : descriptors) { + super.add(descriptor); + } + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescProviderCollection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,85 @@ +package cc.kune.common.client.actions.ui.descrip; + +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.PropertyChangeListener; + +public interface GuiActionDescrip { + + /** + * {@link #ITEM} is used to associate a {@link #AbstractGuiActionDescrip} + * with an object like groups, group names, users, and so on, and used to + * execute actions with this item as parameter + */ + public static final String ITEM = "item"; + + public static final AbstractGuiActionDescrip NO_PARENT = new NoParentGuiActionDescriptor(); + + public static final int NO_POSITION = -1; + + /** + * Coma separated, styles of the Gui item + */ + public static final String STYLES = "stylesprop"; + + public static final String VISIBLE = "visibleprop"; + + void addPropertyChangeListener(final PropertyChangeListener listener); + + void fire(final ActionEvent event); + + AbstractAction getAction(); + + GuiAddCondition getAddCondition(); + + String getId(); + + Object getItem(); + + Object[] getKeys(); + + String getLocation(); + + GuiActionDescrip getParent(); + + int getPosition(); + + PropertyChangeListener[] getPropertyChangeListeners(); + + Class<?> getType(); + + Object getValue(final String key); + + boolean hasItem(); + + boolean isChild(); + + boolean isEnabled(); + + boolean isVisible(); + + boolean mustBeAdded(); + + public void putValue(final String key, final Object value); + + void removePropertyChangeListener(final PropertyChangeListener listener); + + void setAddCondition(final GuiAddCondition addCondition); + + void setEnabled(final boolean enabled); + + void setId(final String id); + + void setItem(final Object object); + + void setLocation(final String location); + + void setParent(final GuiActionDescrip parent); + + void setPosition(final int position); + + void setStyles(final String styles); + + void setVisible(final boolean visible); + +} Property changes on: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddCondition.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddCondition.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,8 +19,9 @@ */ package cc.kune.common.client.actions.ui.descrip; + public interface GuiAddCondition { - boolean mustBeAdded(); + boolean mustBeAdded(GuiActionDescrip descript); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,8 @@ public class GuiAddConditionAdapter implements GuiAddCondition { - public boolean mustBeAdded() { + @Override + public boolean mustBeAdded(final GuiActionDescrip descrip) { return true; } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -43,7 +43,7 @@ this(NO_PARENT, action); } - public MenuDescriptor(final AbstractGuiActionDescrip parent, final AbstractAction action) { + public MenuDescriptor(final GuiActionDescrip parent, final AbstractAction action) { super(action); setParent(parent); putValue(MENU_HIDE, false); Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,13 +20,13 @@ package cc.kune.common.client.actions.ui.descrip; import cc.kune.common.client.actions.AbstractAction; -import cc.kune.common.client.errors.UIException; +import cc.kune.core.client.logs.Log; public class MenuItemDescriptor extends AbstractGuiActionDescrip { public MenuItemDescriptor(final AbstractAction action) { super(action); - throw new UIException("You must define a menu item with its parent menu"); + Log.debug("You must define a menu item with its parent menu"); } public MenuItemDescriptor(final MenuDescriptor parent, final AbstractAction action) { Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/SubMenuDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -34,7 +34,7 @@ this(NO_PARENT, action); } - public SubMenuDescriptor(final AbstractGuiActionDescrip parent, final AbstractAction action) { + public SubMenuDescriptor(final GuiActionDescrip parent, final AbstractAction action) { super(action); setParent(parent); putValue(MENU_HIDE, false); Deleted: trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,137 +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.common.client.noti; - -import com.google.gwt.event.shared.EventHandler; -import com.google.gwt.event.shared.GwtEvent; -import com.google.gwt.event.shared.HandlerRegistration; -import com.google.gwt.event.shared.HasHandlers; - -public class AlertEvent extends GwtEvent<AlertEvent.AlertHandler> { - - public interface HasAlertHandlers extends HasHandlers { - HandlerRegistration addAlertHandler(AlertHandler handler); - } - - public interface AlertHandler extends EventHandler { - public void onAlert(AlertEvent event); - } - - private static final Type<AlertHandler> TYPE = new Type<AlertHandler>(); - - public static void fire(HasHandlers source, java.lang.String title, java.lang.String message, cc.kune.common.client.utils.SimpleCallback onOk) { - source.fireEvent(new AlertEvent(title, message, onOk)); - } - - public static void fire(HasHandlers source, java.lang.String message) { - source.fireEvent(new AlertEvent(message)); - } - - public static Type<AlertHandler> getType() { - return TYPE; - } - - java.lang.String title; - java.lang.String message; - cc.kune.common.client.utils.SimpleCallback onOk; - - public AlertEvent(java.lang.String title, java.lang.String message, cc.kune.common.client.utils.SimpleCallback onOk) { - this.title = title; - this.message = message; - this.onOk = onOk; - } - - public AlertEvent(java.lang.String message) { - this.message = message; - } - - protected AlertEvent() { - // Possibly for serialization. - } - - @Override - public Type<AlertHandler> getAssociatedType() { - return TYPE; - } - - public java.lang.String getTitle() { - return title; - } - - public java.lang.String getMessage() { - return message; - } - - public cc.kune.common.client.utils.SimpleCallback getOnOk() { - return onOk; - } - - @Override - protected void dispatch(AlertHandler handler) { - handler.onAlert(this); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AlertEvent other = (AlertEvent) obj; - if (title == null) { - if (other.title != null) - return false; - } else if (!title.equals(other.title)) - return false; - if (message == null) { - if (other.message != null) - return false; - } else if (!message.equals(other.message)) - return false; - if (onOk == null) { - if (other.onOk != null) - return false; - } else if (!onOk.equals(other.onOk)) - return false; - return true; - } - - @Override - public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + (title == null ? 1 : title.hashCode()); - hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); - hashCode = (hashCode * 37) + (onOk == null ? 1 : onOk.hashCode()); - return hashCode; - } - - @Override - public String toString() { - return "AlertEvent[" - + title - + "," - + message - + "," - + onOk - + "]"; - } -} Modified: trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,184 +24,191 @@ import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HasHandlers; -public class ConfirmAskEvent extends GwtEvent<ConfirmAskEvent.ConfirmAskHandler> { +public class ConfirmAskEvent extends GwtEvent<ConfirmAskEvent.ConfirmAskHandler> { - public interface HasConfirmAskHandlers extends HasHandlers { - HandlerRegistration addConfirmAskHandler(ConfirmAskHandler handler); - } + public interface ConfirmAskHandler extends EventHandler { + public void onConfirmAsk(ConfirmAskEvent event); + } - public interface ConfirmAskHandler extends EventHandler { - public void onConfirmAsk(ConfirmAskEvent event); - } + public interface HasConfirmAskHandlers extends HasHandlers { + HandlerRegistration addConfirmAskHandler(ConfirmAskHandler handler); + } - private static final Type<ConfirmAskHandler> TYPE = new Type<ConfirmAskHandler>(); + private static final Type<ConfirmAskHandler> TYPE = new Type<ConfirmAskHandler>(); - public static void fire(HasHandlers source, java.lang.String title, java.lang.String message, java.lang.String acceptBtnMsg, java.lang.String cancelBtnMsg, java.lang.String acceptBtnTooltip, java.lang.String cancelBtnTooltip, cc.kune.common.client.utils.SimpleCallback onAccept, cc.kune.common.client.utils.SimpleCallback onCancel) { - source.fireEvent(new ConfirmAskEvent(title, message, acceptBtnMsg, cancelBtnMsg, acceptBtnTooltip, cancelBtnTooltip, onAccept, onCancel)); - } + public static void fire(final HasHandlers source, final java.lang.String message) { + source.fireEvent(new ConfirmAskEvent(message)); + } - public static void fire(HasHandlers source, java.lang.String message) { - source.fireEvent(new ConfirmAskEvent(message)); - } + public static void fire(final HasHandlers source, final java.lang.String title, final java.lang.String message, + final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, + final java.lang.String acceptBtnTooltip, final java.lang.String cancelBtnTooltip, + final cc.kune.common.client.utils.SimpleCallback callback) { + source.fireEvent(new ConfirmAskEvent(title, message, acceptBtnMsg, cancelBtnMsg, acceptBtnTooltip, + cancelBtnTooltip, callback)); + } - public static Type<ConfirmAskHandler> getType() { - return TYPE; - } + public static Type<ConfirmAskHandler> getType() { + return TYPE; + } - java.lang.String title; - java.lang.String message; - java.lang.String acceptBtnMsg; - java.lang.String cancelBtnMsg; - java.lang.String acceptBtnTooltip; - java.lang.String cancelBtnTooltip; - cc.kune.common.client.utils.SimpleCallback onAccept; - cc.kune.common.client.utils.SimpleCallback onCancel; + java.lang.String acceptBtnMsg; + java.lang.String acceptBtnTooltip; + cc.kune.common.client.utils.SimpleCallback callback; + java.lang.String cancelBtnMsg; + java.lang.String cancelBtnTooltip; + java.lang.String message; + java.lang.String title; - public ConfirmAskEvent(java.lang.String title, java.lang.String message, java.lang.String acceptBtnMsg, java.lang.String cancelBtnMsg, java.lang.String acceptBtnTooltip, java.lang.String cancelBtnTooltip, cc.kune.common.client.utils.SimpleCallback onAccept, cc.kune.common.client.utils.SimpleCallback onCancel) { - this.title = title; - this.message = message; - this.acceptBtnMsg = acceptBtnMsg; - this.cancelBtnMsg = cancelBtnMsg; - this.acceptBtnTooltip = acceptBtnTooltip; - this.cancelBtnTooltip = cancelBtnTooltip; - this.onAccept = onAccept; - this.onCancel = onCancel; - } + protected ConfirmAskEvent() { + // Possibly for serialization. + } - public ConfirmAskEvent(java.lang.String message) { - this.message = message; - } + public ConfirmAskEvent(final java.lang.String message) { + this.message = message; + } - protected ConfirmAskEvent() { - // Possibly for serialization. - } + public ConfirmAskEvent(final java.lang.String title, final java.lang.String message, + final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, + final cc.kune.common.client.utils.SimpleCallback callback) { + this.title = title; + this.message = message; + this.acceptBtnMsg = acceptBtnMsg; + this.cancelBtnMsg = cancelBtnMsg; + this.callback = callback; + } - @Override - public Type<ConfirmAskHandler> getAssociatedType() { - return TYPE; - } + public ConfirmAskEvent(final java.lang.String title, final java.lang.String message, + final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, + final java.lang.String acceptBtnTooltip, final java.lang.String cancelBtnTooltip, + final cc.kune.common.client.utils.SimpleCallback callback) { + this.title = title; + this.message = message; + this.acceptBtnMsg = acceptBtnMsg; + this.cancelBtnMsg = cancelBtnMsg; + this.acceptBtnTooltip = acceptBtnTooltip; + this.cancelBtnTooltip = cancelBtnTooltip; + this.callback = callback; + } - public java.lang.String getTitle() { - return title; - } + @Override + protected void dispatch(final ConfirmAskHandler handler) { + handler.onConfirmAsk(this); + } - public java.lang.String getMessage() { - return message; - } + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ConfirmAskEvent other = (ConfirmAskEvent) obj; + if (title == null) { + if (other.title != null) { + return false; + } + } else if (!title.equals(other.title)) { + return false; + } + if (message == null) { + if (other.message != null) { + return false; + } + } else if (!message.equals(other.message)) { + return false; + } + if (acceptBtnMsg == null) { + if (other.acceptBtnMsg != null) { + return false; + } + } else if (!acceptBtnMsg.equals(other.acceptBtnMsg)) { + return false; + } + if (cancelBtnMsg == null) { + if (other.cancelBtnMsg != null) { + return false; + } + } else if (!cancelBtnMsg.equals(other.cancelBtnMsg)) { + return false; + } + if (acceptBtnTooltip == null) { + if (other.acceptBtnTooltip != null) { + return false; + } + } else if (!acceptBtnTooltip.equals(other.acceptBtnTooltip)) { + return false; + } + if (cancelBtnTooltip == null) { + if (other.cancelBtnTooltip != null) { + return false; + } + } else if (!cancelBtnTooltip.equals(other.cancelBtnTooltip)) { + return false; + } + if (callback == null) { + if (other.callback != null) { + return false; + } + } else if (!callback.equals(other.callback)) { + return false; + } + return true; + } - public java.lang.String getAcceptBtnMsg() { - return acceptBtnMsg; - } + public java.lang.String getAcceptBtnMsg() { + return acceptBtnMsg; + } - public java.lang.String getCancelBtnMsg() { - return cancelBtnMsg; - } + public java.lang.String getAcceptBtnTooltip() { + return acceptBtnTooltip; + } - public java.lang.String getAcceptBtnTooltip() { - return acceptBtnTooltip; - } + @Override + public Type<ConfirmAskHandler> getAssociatedType() { + return TYPE; + } - public java.lang.String getCancelBtnTooltip() { - return cancelBtnTooltip; - } + public cc.kune.common.client.utils.SimpleCallback getCallback() { + return callback; + } - public cc.kune.common.client.utils.SimpleCallback getOnAccept() { - return onAccept; - } + public java.lang.String getCancelBtnMsg() { + return cancelBtnMsg; + } - public cc.kune.common.client.utils.SimpleCallback getOnCancel() { - return onCancel; - } + public java.lang.String getCancelBtnTooltip() { + return cancelBtnTooltip; + } - @Override - protected void dispatch(ConfirmAskHandler handler) { - handler.onConfirmAsk(this); - } + public java.lang.String getMessage() { + return message; + } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConfirmAskEvent other = (ConfirmAskEvent) obj; - if (title == null) { - if (other.title != null) - return false; - } else if (!title.equals(other.title)) - return false; - if (message == null) { - if (other.message != null) - return false; - } else if (!message.equals(other.message)) - return false; - if (acceptBtnMsg == null) { - if (other.acceptBtnMsg != null) - return false; - } else if (!acceptBtnMsg.equals(other.acceptBtnMsg)) - return false; - if (cancelBtnMsg == null) { - if (other.cancelBtnMsg != null) - return false; - } else if (!cancelBtnMsg.equals(other.cancelBtnMsg)) - return false; - if (acceptBtnTooltip == null) { - if (other.acceptBtnTooltip != null) - return false; - } else if (!acceptBtnTooltip.equals(other.acceptBtnTooltip)) - return false; - if (cancelBtnTooltip == null) { - if (other.cancelBtnTooltip != null) - return false; - } else if (!cancelBtnTooltip.equals(other.cancelBtnTooltip)) - return false; - if (onAccept == null) { - if (other.onAccept != null) - return false; - } else if (!onAccept.equals(other.onAccept)) - return false; - if (onCancel == null) { - if (other.onCancel != null) - return false; - } else if (!onCancel.equals(other.onCancel)) - return false; - return true; - } + public java.lang.String getTitle() { + return title; + } - @Override - public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + (title == null ? 1 : title.hashCode()); - hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); - hashCode = (hashCode * 37) + (acceptBtnMsg == null ? 1 : acceptBtnMsg.hashCode()); - hashCode = (hashCode * 37) + (cancelBtnMsg == null ? 1 : cancelBtnMsg.hashCode()); - hashCode = (hashCode * 37) + (acceptBtnTooltip == null ? 1 : acceptBtnTooltip.hashCode()); - hashCode = (hashCode * 37) + (cancelBtnTooltip == null ? 1 : cancelBtnTooltip.hashCode()); - hashCode = (hashCode * 37) + (onAccept == null ? 1 : onAccept.hashCode()); - hashCode = (hashCode * 37) + (onCancel == null ? 1 : onCancel.hashCode()); - return hashCode; - } + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (title == null ? 1 : title.hashCode()); + hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); + hashCode = (hashCode * 37) + (acceptBtnMsg == null ? 1 : acceptBtnMsg.hashCode()); + hashCode = (hashCode * 37) + (cancelBtnMsg == null ? 1 : cancelBtnMsg.hashCode()); + hashCode = (hashCode * 37) + (acceptBtnTooltip == null ? 1 : acceptBtnTooltip.hashCode()); + hashCode = (hashCode * 37) + (cancelBtnTooltip == null ? 1 : cancelBtnTooltip.hashCode()); + hashCode = (hashCode * 37) + (callback == null ? 1 : callback.hashCode()); + return hashCode; + } - @Override - public String toString() { - return "ConfirmAskEvent[" - + title - + "," - + message - + "," - + acceptBtnMsg - + "," - + cancelBtnMsg - + "," - + acceptBtnTooltip - + "," - + cancelBtnTooltip - + "," - + onAccept - + "," - + onCancel - + "]"; - } + @Override + public String toString() { + return "ConfirmAskEvent[" + title + "," + message + "," + acceptBtnMsg + "," + cancelBtnMsg + "," + + acceptBtnTooltip + "," + cancelBtnTooltip + "," + callback + "]"; + } } Modified: trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,13 +23,19 @@ import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.notify.spiner.ProgressShowEvent; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; public class NotifyUser { private static EventBus eventBus; + private static I18nTranslationService i18n; private static SimpleCallback onOk; + public static void askConfirmation(final String tittle, final String message, final SimpleCallback callback) { + eventBus.fireEvent(new ConfirmAskEvent(tittle, message, i18n.t("Yes"), i18n.t("No"), callback)); + } + public static void error(final String message) { eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, message)); } @@ -60,8 +66,9 @@ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, message)); } - public static void init(final EventBus eventBus) { + public static void init(final EventBus eventBus, final I18nTranslationService i18n) { NotifyUser.eventBus = eventBus; + NotifyUser.i18n = i18n; onOk = new SimpleCallback() { @Override @@ -78,11 +85,11 @@ } public static void showAlertMessage(final String title, final String message) { - eventBus.fireEvent(new AlertEvent(title, message, onOk)); + showAlertMessage(title, message, onOk); } public static void showAlertMessage(final String title, final String message, final SimpleCallback callback) { - eventBus.fireEvent(new AlertEvent(title, message, callback)); + eventBus.fireEvent(new ConfirmAskEvent(title, message, i18n.t("Ok"), i18n.t("Close"), callback)); } public static void showProgress(final String text) { Copied: trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,138 @@ +/* + * + * 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.common.client.ui; + +import cc.kune.common.client.utils.TextUtils; + +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; + +/** + * BasicThumb.java + */ +public class BasicThumb extends Composite { + private static final int NOSIZE = -1; + private final Image image; + private final Label label; + private boolean onOverLabel; + + public BasicThumb(final String imageUrl, final int imgSize, final String text, final int textMaxLenght, + final boolean crop) { + this(imageUrl, imgSize, text, textMaxLenght, crop, null); + } + + public BasicThumb(final String imageUrl, final int imgSize, final String text, final int textMaxLenght, + final boolean crop, final ClickHandler clickHandler) { + super(); + onOverLabel = false; + final VerticalPanel vpanel = new VerticalPanel(); + if (imgSize == NOSIZE) { + image = new Image(imageUrl); + } else { + if (crop) { + image = new Image(imageUrl, 0, 0, imgSize, imgSize); + } else { + image = new Image(imageUrl); + image.setPixelSize(imgSize, imgSize); + } + } + final String title = textMaxLenght == NOSIZE ? text : TextUtils.ellipsis(text, textMaxLenght); + label = new Label(title); + vpanel.add(image); + vpanel.add(label); + vpanel.addStyleName("k-basic-thumb"); + vpanel.addStyleName("kune-Margin-Small-trbl"); + vpanel.addStyleName("kune-pointer"); + vpanel.addStyleName("kune-floatleft"); + vpanel.setCellHorizontalAlignment(label, VerticalPanel.ALIGN_CENTER); + if (clickHandler instanceof ClickHandler) { + addClickHandlerImpl(clickHandler); + } + image.addMouseOverHandler(new MouseOverHandler() { + + @Override + public void onMouseOver(final MouseOverEvent event) { + if (onOverLabel) { + label.setVisible(true); + } + } + }); + image.addMouseOutHandler(new MouseOutHandler() { + + @Override + public void onMouseOut(final MouseOutEvent event) { + if (onOverLabel) { + label.setVisible(false); + } + } + }); + initWidget(vpanel); + } + + public BasicThumb(final String imageUrl, final String thumText, final ClickHandler clickHandler) { + this(imageUrl, NOSIZE, thumText, NOSIZE, false, clickHandler); + } + + public BasicThumb(final String imageUrl, final String text, final int textMaxLenght, final ClickHandler clickHandler) { + this(imageUrl, NOSIZE, text, textMaxLenght, false, clickHandler); + } + + public void addClickHandler(final ClickHandler clickHandler) { + addClickHandlerImpl(clickHandler); + } + + private void addClickHandlerImpl(final ClickHandler clickHandler) { + label.addClickHandler(clickHandler); + image.addClickHandler(clickHandler); + } + + public void setOnOverLabel(final boolean onOverLabel) { + this.onOverLabel = onOverLabel; + label.setVisible(!onOverLabel); + } + + public void setText(final String text) { + label.setText(text); + } + + public void setThumbUrl(final String url) { + image.setUrl(url); + } + + public void setTooltip(final String tip) { + // DOM.setElementAttribute(thumbImg.getElement(), "qtip", tip); + image.setTitle(tip); + label.setTitle(tip); + // KuneUiUtils.setQuickTip(thumbImg, tip); + // KuneUiUtils.setQuickTip(thumbLabel, tip); + } + + public void setTooltip(final String tipTitle, final String tip) { + image.setTitle(tip); + label.setTitle(tip); + } +} Added: trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,12 @@ +package cc.kune.common.client.utils; + +import com.google.gwt.core.client.GWT; + +public abstract class OnAcceptCallback implements SimpleCallback { + + @Override + public void onCancel() { + // Do nothing + GWT.log("On cancel callback"); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/utils/OnAcceptCallback.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -49,6 +49,8 @@ import cc.kune.core.client.init.AppStarterDefault; import cc.kune.core.client.init.PrefetchUtilities; import cc.kune.core.client.logs.EventBusWithLogging; +import cc.kune.core.client.notify.confirm.UserConfirmPanel; +import cc.kune.core.client.notify.confirm.UserConfirmPresenter; import cc.kune.core.client.notify.msgs.UserNotifierPresenter; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierProxy; import cc.kune.core.client.notify.msgs.UserNotifierViewImpl; @@ -64,6 +66,8 @@ import cc.kune.core.client.sitebar.logo.SiteLogoViewImpl; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; import cc.kune.core.client.sitebar.spaces.SpaceSelectorViewImpl; +import cc.kune.core.client.sn.GroupMembersPanel; +import cc.kune.core.client.sn.GroupMembersPresenter; import cc.kune.core.client.state.ContentProvider; import cc.kune.core.client.state.ContentProviderDefault; import cc.kune.core.client.state.HistoryWrapper; @@ -122,6 +126,8 @@ SitebarActionsViewImpl.class, SitebarActionsPresenter.SitebarActionsProxy.class); bindPresenter(NewGroupPresenter.class, NewGroupView.class, NewGroupPanel.class, NewGroupPresenter.NewGroupProxy.class); + bindPresenter(GroupMembersPresenter.class, GroupMembersPresenter.GroupMembersView.class, + GroupMembersPanel.class, GroupMembersPresenter.GroupMembersProxy.class); bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); bindPresenter(SignInPresenter.class, SignInView.class, SignInPanel.class, SignInPresenter.SignInProxy.class); @@ -133,6 +139,9 @@ bind(UserMessagesPresenter.class).in(Singleton.class); bind(UserMessagesPanel.class).in(Singleton.class); + bindPresenter(UserConfirmPresenter.class, UserConfirmPresenter.UserConfirmView.class, UserConfirmPanel.class, + UserConfirmPresenter.UserConfirmProxy.class); + // bind(MessagePanelView.class).to(MessagePanel.class); // UI @@ -160,5 +169,6 @@ bind(SitebarSignOutLink.class).in(Singleton.class); bind(BeforeSignOut.class).in(Singleton.class); bind(SiteTokenListeners.class).asEagerSingleton(); + bind(CoreParts.class).asEagerSingleton(); } } Added: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,23 @@ +package cc.kune.core.client; + +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.sn.GroupMembersPresenter; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class CoreParts { + + @Inject + public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter) { + session.onInitDataReceived(new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + grouMembersPresenter.get(); + ; + } + }); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/CoreParts.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -99,7 +99,7 @@ } public void show() { - dialog.show(); + dialog.showCentered(); } public void unMask() { Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,8 +20,8 @@ package cc.kune.core.client.errors; import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.logs.Log; -import cc.kune.core.client.notify.alerts.AlertEvent; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.state.Session; @@ -109,8 +109,8 @@ goHome(); } else if (caught instanceof LastAdminInGroupException) { logException(caught); - eventBus.fireEvent(new AlertEvent(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group." - + " Look for someone to substitute you appropriately as admin before leaving this group."))); + NotifyUser.showAlertMessage(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group." + + " Look for someone to substitute you appropriately as admin before leaving this group.")); } else if (caught instanceof AlreadyGroupMemberException) { logException(caught); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("This group is already a group member"))); Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -286,7 +286,7 @@ @Override public void show() { - dialog.show(); + dialog.showCentered(); } @Override Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,63 +23,59 @@ import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HasHandlers; -import com.gwtplatform.mvp.client.HasEventBus; -public class I18nReadyEvent extends GwtEvent<I18nReadyEvent.I18nReadyHandler> { +public class I18nReadyEvent extends GwtEvent<I18nReadyEvent.I18nReadyHandler> { - public interface HasI18nReadyHandlers extends HasHandlers { - HandlerRegistration addI18nReadyHandler(I18nReadyHandler handler); - } + public interface HasI18nReadyHandlers extends HasHandlers { + HandlerRegistration addI18nReadyHandler(I18nReadyHandler handler); + } - public interface I18nReadyHandler extends EventHandler { - public void onI18nReady(I18nReadyEvent event); - } + public interface I18nReadyHandler extends EventHandler { + public void onI18nReady(I18nReadyEvent event); + } - private static final Type<I18nReadyHandler> TYPE = new Type<I18nReadyHandler>(); + private static final Type<I18nReadyHandler> TYPE = new Type<I18nReadyHandler>(); - public static void fire(HasEventBus source) { - source.fireEvent(new I18nReadyEvent()); - } + public static void fire(final HasHandlers source) { + source.fireEvent(new I18nReadyEvent()); + } - public static Type<I18nReadyHandler> getType() { - return TYPE; - } + public static Type<I18nReadyHandler> getType() { + return TYPE; + } + public I18nReadyEvent() { + } - public I18nReadyEvent() { - } + @Override + protected void dispatch(final I18nReadyHandler handler) { + handler.onI18nReady(this); + } - @Override - public Type<I18nReadyHandler> getAssociatedType() { - return TYPE; - } + @Override + public boolean equals(final Object other) { + if (other != null && other.getClass().equals(this.getClass())) { + final I18nReadyEvent o = (I18nReadyEvent) other; + return true; + } + return false; + } - @Override - protected void dispatch(I18nReadyHandler handler) { - handler.onI18nReady(this); - } + @Override + public Type<I18nReadyHandler> getAssociatedType() { + return TYPE; + } - @Override - public boolean equals(Object other) { - if (other != null && other.getClass().equals(this.getClass())) { - I18nReadyEvent o = (I18nReadyEvent) other; - return true - ; + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + getClass().hashCode(); + return hashCode; } - return false; - } - @Override - public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + getClass().hashCode(); - return hashCode; - } + @Override + public String toString() { + return "I18nReadyEvent[" + "]"; + } - @Override - public String toString() { - return "I18nReadyEvent[" - + "]"; - } - } Copied: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java (from rev 1239, trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,93 @@ +/* + * + * 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.core.client.notify.confirm; + +import cc.kune.common.client.noti.ConfirmAskEvent; +import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; +import cc.kune.core.client.ui.dialogs.BasicTopDialog; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class UserConfirmPanel extends ViewImpl implements UserConfirmView { + private static final String CANCEL_ID = "k-conf-dial"; + private static final String DIALOG_ID = "k-conf-dial-nok"; + private static final String OK_ID = "k-conf-dial-ok"; + private HandlerRegistration acceptHandler; + private final Label askLabel; + private HandlerRegistration cancelHandler; + private final BasicTopDialog dialog; + + @Inject + public UserConfirmPanel(final I18nTranslationService i18n) { + dialog = new BasicTopDialog(DIALOG_ID, "", false, true, false, 100, 100, "", "", OK_ID, "", CANCEL_ID, 1); + askLabel = new Label(); + askLabel.addStyleName("k-userconfirm-label"); + dialog.getInnerPanel().add(askLabel); + } + + @Override + public Widget asWidget() { + return null; + } + + @Override + public void confirmAsk(final ConfirmAskEvent ask) { + dialog.getFirstBtnText().setText(ask.getAcceptBtnMsg()); + dialog.getSecondBtnText().setText(ask.getCancelBtnMsg()); + dialog.setFirstBtnTitle(ask.getAcceptBtnTooltip()); + dialog.setSecondBtnTitle(ask.getCancelBtnTooltip()); + dialog.getTitleText().setText(ask.getTitle()); + askLabel.setText(ask.getMessage()); + dialog.showCentered(); + resetHandlers(); + acceptHandler = dialog.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + ask.getCallback().onSuccess(); + dialog.hide(); + } + }); + cancelHandler = dialog.getSecondBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + ask.getCallback().onCancel(); + dialog.hide(); + } + }); + dialog.showCentered(); + } + + private void resetHandlers() { + if (acceptHandler != null) { + acceptHandler.removeHandler(); + } + if (cancelHandler != null) { + cancelHandler.removeHandler(); + } + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -47,7 +47,7 @@ } @ProxyEvent - public void onConfirmAsk(ConfirmAskEvent event) { + public void onConfirmAsk(final ConfirmAskEvent event) { getView().confirmAsk(event); } Deleted: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,45 +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.core.client.notify.confirm; - -import cc.kune.common.client.noti.ConfirmAskEvent; -import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; - -import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; -import com.gwtplatform.mvp.client.ViewImpl; - -public class UserConfirmViewImpl2 extends ViewImpl implements UserConfirmView { - @Inject - public UserConfirmViewImpl2() { - } - - @Override - public Widget asWidget() { - return null; - } - - @Override - public void confirmAsk(final ConfirmAskEvent ask) { - // TODO Auto-generated method stub - - } - -} Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -355,6 +355,9 @@ @Source("loading-spiner.gif") ImageResource loadingSpiner(); + @Source("new-chat.gif") + ImageResource newChat(); + @Source("nobody.png") ImageResource nobody(); Added: trunk/src/main/java/cc/kune/core/client/resources/new-chat.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/new-chat.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/src/main/java/cc/kune/core/client/services/FileConstants.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/FileConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/services/FileConstants.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,39 @@ +/* + * + * 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.core.client.services; + +public final class FileConstants { + + public final static String HASH = "hash"; + public final static String TOKEN = "token"; + public final static String DOWNLOAD = "download"; + public final static String IMGSIZE = "imgsize"; + public final static String FILENAME = "filename"; + public final static String TYPE_ID = "typeid"; + public final static String USER_LOGO_FIELD = "k-ulogov-ff"; + public final static String GROUP_LOGO_FIELD = "k-glogov-ff"; + public final static int LOGO_DEF_HEIGHT = 60; + public final static int LOGO_DEF_WIDTH = 468; + public final static int LOGO_MIN_HEIGHT = 28; + public final static int LOGO_MIN_WIDTH = 468; + + private FileConstants() { + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/services/FileConstants.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,93 @@ +/* + * + * 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.core.client.services; + +import cc.kune.common.client.utils.Url; +import cc.kune.common.client.utils.UrlParam; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.inject.Inject; + +public class FileDownloadUtils { + + private static final String DOWNLOADSERVLET = "servlets/FileDownloadManager"; + private static final String LOGODOWNLOADSERVLET = "servlets/EntityLogoDownloadManager"; + + private final ImageUtils imageUtils; + private final Session session; + + @Inject + public FileDownloadUtils(final Session session, final ImageUtils imageUtils) { + this.session = session; + this.imageUtils = imageUtils; + } + + private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { + final Url url = new Url(GWT.getModuleBaseURL() + DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, + token.toString())); + if (download) { + url.add(new UrlParam(FileConstants.DOWNLOAD, download)); + } + if (useHash) { + final String hash = session.getUserHash(); + if (hash != null) { + url.add(new UrlParam(FileConstants.HASH, hash)); + } + } + return url.toString(); + } + + public void downloadFile(final StateToken token) { + final String url = calculateUrl(token, true, true); + DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url); + } + + public String getImageResizedUrl(final StateToken token, final ImageSize imageSize) { + return calculateUrl(token, false, true) + "&" + new UrlParam(FileConstants.IMGSIZE, imageSize.toString()); + } + + public String getImageUrl(final StateToken token) { + return calculateUrl(token, false, true); + } + + public String getLogoAvatarHtml(final StateToken groupToken, final boolean groupHasLogo, final boolean isPersonal, + final int size, final int hvspace) { + if (groupHasLogo) { + return "<img hspace='" + hvspace + "' vspace='" + hvspace + "' align='left' style='width: " + size + + "px; height: " + size + "px;' src='" + getLogoImageUrl(groupToken) + "'>"; + } else { + return isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) + : imageUtils.getImageHtml(ImageDescriptor.groupDefIcon); + } + } + + public String getLogoImageUrl(final StateToken token) { + return new Url(GWT.getModuleBaseURL() + LOGODOWNLOADSERVLET, + new UrlParam(FileConstants.TOKEN, token.toString())).toString(); + } + + public String getUrl(final StateToken token) { + return calculateUrl(token, false, false); + } +} Copied: trunk/src/main/java/cc/kune/core/client/services/ImageDescriptor.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageDescriptor.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/ImageDescriptor.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/services/ImageDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,24 @@ +/* + * + * 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.core.client.services; + +public enum ImageDescriptor { + accept, add, addGreen, alert, anybody, arrowDownBlack, arrowDownGreen, arrowDownWhite, arrowLeftGreen, arrowRightBlack, arrowRightGreen, arrowRightWhite, arrowUpGreen, bulletAdd, bulletBlack, bulletBlue, bulletDelete, bulletGreen, bulletPink, bulletPurple, bulletRed, bulletStar, bulletToggleMinus, bulletTogglePlus, bulletYellow, button15cblue, button15cdark, button15clight, button15cxlight, button15lblue, button15ldark, button15llight, button15lxlight, button15rblue, button15rdark, button15rlight, button15rxlight, button17cblue, button17cdark, button17clight, button17cxlight, button17lblue, button17ldark, button17llight, button17lxlight, button17rblue, button17rdark, button17rlight, button17rxlight, button20cblue, button20cdark, button20clight, button20cxlight, button20lblue, button20ldark, button20llight, button20lxlight, button20rblue, button20rdark, button20rlight, button20rxlight, buttonArrowDown, buttonHelpBlue, buttonHelpDark, buttonHelpLight, buttonSitebarArrowDown, by80x15, bync80x15, byncnd80x15, byncsa80x15, bynd80x15, bysa80x15, cancel, clear, copyleft, cross, crossDark, del, emblemImportant, emblemSystem, error, everybody, fullscreen, gnuFdl, groupDefIcon, groupHome, important, info, infoLight, kuneClose, kuneExternalWindow, kuneHelpTranslationIcon, kuneIcon16, kuneLogo16px, kunePreferences, kuneSearchIco, kuneSearchIcoPush, language, nobody, noCopyleft, nt, opentriangle, personDef, remove, rssIcon, searchIco, spinKuneThundGreen, splitterVertBar, star10, star20, star30, star40, star50, star60, star70, star80, star90, starGrey, starSmallYellow, starVsmallYellow, starYellow, step1, step2, step3, step4, step5, themeChoose, triangle +} Copied: trunk/src/main/java/cc/kune/core/client/services/ImageSize.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/ImageSize.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/services/ImageSize.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,24 @@ +/* + * + * 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.core.client.services; + +public enum ImageSize { + sized, thumb, ico +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/services/ImageUtils.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,431 @@ +/* + * + * 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.core.client.services; + +import cc.kune.core.client.resources.CoreResources; + +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.inject.Inject; + +public class ImageUtils { + + private final CoreResources img; + + @Inject + public ImageUtils(final CoreResources img) { + this.img = img; + } + + public ImageResource getImage(final ImageDescriptor imageDescriptor) { + switch (imageDescriptor) { + case accept: { + return img.accept(); + } + case add: { + return img.add(); + } + case addGreen: { + return img.addGreen(); + } + case alert: { + return img.alert(); + } + case anybody: { + return img.anybody(); + } + case arrowDownBlack: { + return img.arrowDownBlack(); + } + case arrowDownGreen: { + return img.arrowDownGreen(); + } + case arrowDownWhite: { + return img.arrowDownWhite(); + } + case arrowLeftGreen: { + return img.arrowLeftGreen(); + } + case arrowRightBlack: { + return img.arrowRightBlack(); + } + case arrowRightGreen: { + return img.arrowRightGreen(); + } + case arrowRightWhite: { + return img.arrowRightWhite(); + } + case arrowUpGreen: { + return img.arrowUpGreen(); + } + case bulletAdd: { + return img.bulletAdd(); + } + case bulletBlack: { + return img.bulletBlack(); + } + case bulletBlue: { + return img.bulletBlue(); + } + case bulletDelete: { + return img.bulletDelete(); + } + case bulletGreen: { + return img.bulletGreen(); + } + case bulletPink: { + return img.bulletPink(); + } + case bulletPurple: { + return img.bulletPurple(); + } + case bulletRed: { + return img.bulletRed(); + } + case bulletStar: { + return img.bulletStar(); + } + case bulletToggleMinus: { + return img.bulletToggleMinus(); + } + case bulletTogglePlus: { + return img.bulletTogglePlus(); + } + case bulletYellow: { + return img.bulletYellow(); + } + case button15cblue: { + return img.button15cblue(); + } + case button15cdark: { + return img.button15cdark(); + } + case button15clight: { + return img.button15clight(); + } + case button15cxlight: { + return img.button15cxlight(); + } + case button15lblue: { + return img.button15lblue(); + } + case button15ldark: { + return img.button15ldark(); + } + case button15llight: { + return img.button15llight(); + } + case button15lxlight: { + return img.button15lxlight(); + } + case button15rblue: { + return img.button15rblue(); + } + case button15rdark: { + return img.button15rdark(); + } + case button15rlight: { + return img.button15rlight(); + } + case button15rxlight: { + return img.button15rxlight(); + } + case button17cblue: { + return img.button17cblue(); + } + case button17cdark: { + return img.button17cdark(); + } + case button17clight: { + return img.button17clight(); + } + case button17cxlight: { + return img.button17cxlight(); + } + case button17lblue: { + return img.button17lblue(); + } + case button17ldark: { + return img.button17ldark(); + } + case button17llight: { + return img.button17llight(); + } + case button17lxlight: { + return img.button17lxlight(); + } + case button17rblue: { + return img.button17rblue(); + } + case button17rdark: { + return img.button17rdark(); + } + case button17rlight: { + return img.button17rlight(); + } + case button17rxlight: { + return img.button17rxlight(); + } + case button20cblue: { + return img.button20cblue(); + } + case button20cdark: { + return img.button20cdark(); + } + case button20clight: { + return img.button20clight(); + } + case button20cxlight: { + return img.button20cxlight(); + } + case button20lblue: { + return img.button20lblue(); + } + case button20ldark: { + return img.button20ldark(); + } + case button20llight: { + return img.button20llight(); + } + case button20lxlight: { + return img.button20lxlight(); + } + case button20rblue: { + return img.button20rblue(); + } + case button20rdark: { + return img.button20rdark(); + } + case button20rlight: { + return img.button20rlight(); + } + case button20rxlight: { + return img.button20rxlight(); + } + case buttonArrowDown: { + return img.buttonArrowDown(); + } + case buttonHelpBlue: { + return img.buttonHelpBlue(); + } + case buttonHelpDark: { + return img.buttonHelpDark(); + } + case buttonHelpLight: { + return img.buttonHelpLight(); + } + case buttonSitebarArrowDown: { + return img.buttonSitebarArrowDown(); + } + case by80x15: { + return img.by80x15(); + } + case bync80x15: { + return img.bync80x15(); + } + case byncnd80x15: { + return img.byncnd80x15(); + } + case byncsa80x15: { + return img.byncsa80x15(); + } + case bynd80x15: { + return img.bynd80x15(); + } + case bysa80x15: { + return img.bysa80x15(); + } + case cancel: { + return img.cancel(); + } + case clear: { + return img.clear(); + } + case copyleft: { + return img.copyleft(); + } + case cross: { + return img.cross(); + } + case crossDark: { + return img.crossDark(); + } + case del: { + return img.del(); + } + case emblemImportant: { + return img.emblemImportant(); + } + case emblemSystem: { + return img.emblemSystem(); + } + case error: { + return img.error(); + } + case everybody: { + return img.everybody(); + } + case fullscreen: { + return img.fullscreen(); + } + case gnuFdl: { + return img.gnuFdl(); + } + case groupDefIcon: { + return img.groupDefIcon(); + } + case groupHome: { + return img.groupHome(); + } + case important: { + return img.important(); + } + case info: { + return img.info(); + } + case infoLight: { + return img.infoLight(); + } + case kuneClose: { + return img.kuneClose(); + } + case kuneExternalWindow: { + return img.kuneExternalWindow(); + } + case kuneHelpTranslationIcon: { + return img.kuneHelpTranslationIcon(); + } + case kuneIcon16: { + return img.kuneIcon16(); + } + case kuneLogo16px: { + return img.kuneLogo16px(); + } + case kunePreferences: { + return img.kunePreferences(); + } + case kuneSearchIco: { + return img.kuneSearchIco(); + } + case kuneSearchIcoPush: { + return img.kuneSearchIcoPush(); + } + case language: { + return img.language(); + } + case nobody: { + return img.nobody(); + } + case noCopyleft: { + return img.noCopyleft(); + } + case nt: { + return img.nt(); + } + case opentriangle: { + return img.opentriangle(); + } + case personDef: { + return img.personDef(); + } + case remove: { + return img.remove(); + } + case rssIcon: { + return img.rssIcon(); + } + case searchIco: { + return img.searchIco(); + } + case spinKuneThundGreen: { + return img.spinKuneThundGreen(); + } + case splitterVertBar: { + return img.splitterVertBar(); + } + case star10: { + return img.star10(); + } + case star20: { + return img.star20(); + } + case star30: { + return img.star30(); + } + case star40: { + return img.star40(); + } + case star50: { + return img.star50(); + } + case star60: { + return img.star60(); + } + case star70: { + return img.star70(); + } + case star80: { + return img.star80(); + } + case star90: { + return img.star90(); + } + case starGrey: { + return img.starGrey(); + } + case starSmallYellow: { + return img.starSmallYellow(); + } + case starVsmallYellow: { + return img.starVsmallYellow(); + } + case starYellow: { + return img.starYellow(); + } + case step1: { + return img.step1(); + } + case step2: { + return img.step2(); + } + case step3: { + return img.step3(); + } + case step4: { + return img.step4(); + } + case step5: { + return img.step5(); + } + case themeChoose: { + return img.themeChoose(); + } + case triangle: { + return img.triangle(); + } + default: + return null; + } + } + + public String getImageHtml(final ImageDescriptor imageDescriptor) { + return AbstractImagePrototype.create(getImage(imageDescriptor)).getHTML(); + } +} Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,8 +27,6 @@ import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor; -import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; -import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.ui.KuneWindowUtils; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.notify.msgs.UserNotifyEvent; @@ -118,8 +116,10 @@ action.putValue(Action.NAME, "Test"); final MenuItemDescriptor testMenuItem = new MenuItemDescriptor(OPTIONS_MENU, action); OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); - final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); - final ToolbarSeparatorDescriptor separator2 = new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + // final ToolbarSeparatorDescriptor separator = new + // ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + // final ToolbarSeparatorDescriptor separator2 = new + // ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); final MenuSeparatorDescriptor menuSeparator = new MenuSeparatorDescriptor(OPTIONS_MENU); final AbstractExtendedAction bugsAction = new AbstractExtendedAction() { Added: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,172 @@ +package cc.kune.core.client.sn; + +import cc.kune.common.client.actions.ui.ActionFlowPanel; +import cc.kune.common.client.actions.ui.ActionSimplePanel; +import cc.kune.common.client.actions.ui.IsActionExtensible; +import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.ui.BasicThumb; +import cc.kune.core.client.sn.GroupMembersPresenter.GroupMembersView; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.DeckPanel; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class GroupMembersPanel extends ViewImpl implements GroupMembersView { + + interface GroupMembersPanelUiBinder extends UiBinder<Widget, GroupMembersPanel> { + } + + private static GroupMembersPanelUiBinder uiBinder = GWT.create(GroupMembersPanelUiBinder.class); + private final ActionSimplePanel actions; + @UiField + FlowPanel adminsFlow; + @UiField + Label adminsLabel; + ActionFlowPanel bottomActionsToolbar; + @UiField + FlowPanel bottomPanel; + @UiField + FlowPanel collabsFlow; + @UiField + Label collabsLabel; + @UiField + ScrollPanel collabsScroll; + @UiField + DeckPanel deck; + @UiField + FlowPanel mainPanel; + @UiField + Label mainTitle; + @UiField + FlowPanel membersFlow; + @UiField + Label noMembersVisible; + @UiField + Label orphanProject; + @UiField + FlowPanel pendingsFlow; + @UiField + Label pendingsLabel; + @UiField + ScrollPanel pendingsScroll; + private final Widget widget; + + @Inject + public GroupMembersPanel(final I18nTranslationService i18n, final GuiProvider guiProvider, final WsArmor armor) { + widget = uiBinder.createAndBindUi(this); + mainTitle.setText(i18n.t("Group members")); + mainTitle.setTitle(i18n.t("People and groups collaborating in this group")); + adminsLabel.setText(i18n.t("Admins")); + adminsLabel.setTitle(i18n.t("People that can admin this group")); + collabsLabel.setText(i18n.t("Collaborators")); + collabsLabel.setTitle(i18n.t("Other people that collaborate with this group")); + pendingsLabel.setText(i18n.t("Pending")); + pendingsLabel.setTitle(i18n.t("People pending to be accepted in this group by the admins")); + orphanProject.setText(i18n.t("This is an orphaned project, if you are interested please request to join to work on it")); + noMembersVisible.setText(i18n.t("The members of this group are not public")); + bottomActionsToolbar = new ActionFlowPanel(guiProvider); + actions = new ActionSimplePanel(guiProvider); + bottomPanel.add(bottomActionsToolbar); + armor.getEntityToolsNorth().add(widget); + deck.showWidget(2); + } + + @Override + public void addAdmin(final GroupDTO group, final String avatarUrl, final String tooltip, final String tooltipTitle, + final GuiActionDescCollection menu) { + final BasicThumb thumb = createThumb(group, avatarUrl, tooltip, tooltipTitle, menu); + adminsFlow.add(thumb); + } + + @Override + public void addCollab(final GroupDTO group, final String avatarUrl, final String tooltip, + final String tooltipTitle, final GuiActionDescCollection menu) { + final BasicThumb thumb = createThumb(group, avatarUrl, tooltip, tooltipTitle, menu); + collabsFlow.add(thumb); + } + + @Override + public void addPending(final GroupDTO group, final String avatarUrl, final String tooltip, + final String tooltipTitle, final GuiActionDescCollection menu) { + final BasicThumb thumb = createThumb(group, avatarUrl, tooltip, tooltipTitle, menu); + pendingsFlow.add(thumb); + } + + @Override + public Widget asWidget() { + return widget; + } + + @Override + public void clear() { + pendingsFlow.clear(); + adminsFlow.clear(); + collabsFlow.clear(); + actions.clear(); + } + + private BasicThumb createThumb(final GroupDTO group, final String avatarUrl, final String tooltip, + final String tooltipTitle, final GuiActionDescCollection menuitems) { + final BasicThumb thumb = new BasicThumb(avatarUrl, AVATARSIZE, group.getShortName(), AVATARLABELMAXSIZE, false); + final MenuDescriptor menu = new MenuDescriptor(); + menu.setStandalone(true); + for (final GuiActionDescrip item : menuitems) { + item.setParent(menu); + } + final ClickHandler clickHand = new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + GWT.log("Show event"); + menu.show(thumb); + } + }; + thumb.addClickHandler(clickHand); + actions.add(menu); + actions.add(menuitems); + + thumb.setTooltip(tooltipTitle, tooltip); + thumb.setOnOverLabel(true); + return thumb; + } + + @Override + public IsActionExtensible getBottomToolbar() { + return bottomActionsToolbar; + } + + @Override + public void setVisible(final boolean visible) { + deck.setVisible(visible); + } + + @Override + public void showMemberNotPublic() { + deck.showWidget(0); + } + + @Override + public void showMembers() { + deck.showWidget(2); + } + + @Override + public void showOrphan() { + deck.showWidget(1); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,66 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:style> + .important { + font-weight: bold; + } + </ui:style> + + <g:FlowPanel width="100%" ui:field="mainPanel" + addStyleNames="k-sn-mainpanel"> + <g:Label ui:field="mainTitle" addStyleNames="k-sn-maintitle" /> + <g:DeckPanel ui:field="deck" addStyleNames="k-sn-deck"> + <g:Label ui:field="noMembersVisible" addStyleNames="k-sn-novisible-label" /> + <g:Label ui:field="orphanProject" addStyleNames="k-sn-orphan-label" /> + <g:FlowPanel width="100%" height="100px" ui:field="membersFlow"> + + <g:DockLayoutPanel unit="EM" width="100%" + addStyleNames="k-sn-adminspanel" height="100px"> + <g:north size="2.0"> + <g:Label text="Admins" ui:field="adminsLabel" + addStyleNames="k-sn-adminslabel" /> + </g:north> + <g:center> + <g:ScrollPanel width="100%" addStyleNames="k-sn-adminsscroll"> + <g:FlowPanel width="100%" height="100%" + ui:field="adminsFlow" /> + </g:ScrollPanel> + </g:center> + </g:DockLayoutPanel> + + <g:DockLayoutPanel unit="EM" width="100%" + addStyleNames="k-sn-collabspanel" height="100px"> + <g:north size="2.0"> + <g:Label text="Collabs" ui:field="collabsLabel" + addStyleNames="k-sn-collabslabel" /> + </g:north> + <g:center> + <g:ScrollPanel ui:field="collabsScroll" width="100%" + addStyleNames="k-sn-collabsscroll"> + <g:FlowPanel width="100%" height="100%" + ui:field="collabsFlow" /> + </g:ScrollPanel> + </g:center> + + </g:DockLayoutPanel> + + <g:DockLayoutPanel unit="EM" width="100%" + addStyleNames="k-sn-pendingspanel" height="100px"> + <g:north size="2.0"> + <g:Label text="Pendings" ui:field="pendingsLabel" + addStyleNames="k-sn-pendingslabel" /> + </g:north> + <g:center> + <g:ScrollPanel ui:field="pendingsScroll" + addStyleNames="k-sn-pendingsscroll" width="100%"> + <g:FlowPanel width="100%" height="100%" + ui:field="pendingsFlow" /> + </g:ScrollPanel> + </g:center> + </g:DockLayoutPanel> + </g:FlowPanel> + </g:DeckPanel> + <g:FlowPanel ui:field="bottomPanel" /> + </g:FlowPanel> +</ui:UiBinder> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPanel.ui.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,188 @@ +package cc.kune.core.client.sn; + +import java.util.List; + +import cc.kune.common.client.actions.ui.IsActionExtensible; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.sn.actions.registry.AbstractSocialNetworActionsRegistry; +import cc.kune.core.client.sn.actions.registry.SNAdminsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNCollabsMenuItemsRegistry; +import cc.kune.core.client.sn.actions.registry.SNPendingsMenuItemsRegistry; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SocialNetworkChangedEvent; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.AccessListsDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.proxy.Proxy; +import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; + +public class GroupMembersPresenter extends + Presenter<GroupMembersPresenter.GroupMembersView, GroupMembersPresenter.GroupMembersProxy> { + + @ProxyCodeSplit + public interface GroupMembersProxy extends Proxy<GroupMembersPresenter> { + } + + public interface GroupMembersView extends View { + int AVATARLABELMAXSIZE = 15; + int AVATARSIZE = 32; + String NOAVATAR = ""; + + void addAdmin(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); + + void addCollab(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); + + void addPending(GroupDTO group, String avatarUrl, String tooltip, String tooltipTitle, + GuiActionDescCollection menu); + + void clear(); + + IsActionExtensible getBottomToolbar(); + + void setVisible(boolean b); + + void showMemberNotPublic(); + + void showMembers(); + + void showOrphan(); + } + + private final SNAdminsMenuItemsRegistry adminsMenuItemsRegistry; + private final SNCollabsMenuItemsRegistry collabsMenuItemsRegistry; + + private final Provider<FileDownloadUtils> downloadProvider; + private final SNPendingsMenuItemsRegistry pendingsMenuItemsRegistry; + private final Session session; + + @Inject + public GroupMembersPresenter(final EventBus eventBus, final GroupMembersView view, final GroupMembersProxy proxy, + final StateManager stateManager, final Session session, final Provider<FileDownloadUtils> downloadProvider, + final SNAdminsMenuItemsRegistry adminsMenuItemsRegistry, + final SNCollabsMenuItemsRegistry collabsMenuItemsRegistry, + final SNPendingsMenuItemsRegistry pendingsMenuItemsRegistry) { + super(eventBus, view, proxy); + this.session = session; + this.downloadProvider = downloadProvider; + this.adminsMenuItemsRegistry = adminsMenuItemsRegistry; + this.collabsMenuItemsRegistry = collabsMenuItemsRegistry; + this.pendingsMenuItemsRegistry = pendingsMenuItemsRegistry; + stateManager.onStateChanged(new StateChangedEvent.StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + GroupMembersPresenter.this.onStateChanged(event.getState()); + } + }); + stateManager.onSocialNetworkChanged(new SocialNetworkChangedEvent.SocialNetworkChangedHandler() { + + @Override + public void onSocialNetworkChanged(final SocialNetworkChangedEvent event) { + GroupMembersPresenter.this.onStateChanged(event.getState()); + } + }); + session.onInitDataReceived(new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + // FIXME + } + }); + createActions(); + } + + private void createActions() { + // TODO + } + + private GuiActionDescCollection createMenuItems(final GroupDTO group, + final AbstractSocialNetworActionsRegistry registry) { + final GuiActionDescCollection items = new GuiActionDescCollection(); + for (final Provider<MenuItemDescriptor> provider : registry) { + final MenuItemDescriptor menuItem = provider.get(); + menuItem.setItem(group); + items.add(menuItem); + } + return items; + } + + private String getAvatar(final GroupDTO admin) { + return admin.hasLogo() ? downloadProvider.get().getLogoImageUrl(admin.getStateToken()) : "images/unknown.jpg"; + } + + private void onStateChanged(final StateAbstractDTO state) { + if (state.getGroup().isPersonal()) { + getView().setVisible(false); + } else { + if (state.getSocialNetworkData().isMembersVisible()) { + setGroupMembers(state.getGroupMembers(), state.getGroupRights()); + } else { + getView().clear(); + getView().showMemberNotPublic(); + getView().setVisible(true); + } + } + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) { + final AccessListsDTO accessLists = socialNetwork.getAccessLists(); + + final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); + final List<GroupDTO> collabList = accessLists.getEditors().getList(); + final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); + + final int numAdmins = adminsList.size(); + final int numCollabs = collabList.size(); + final int numPendings = pendingCollabsList.size(); + + if ((numAdmins + numCollabs + numPendings) == 0) { + getView().showOrphan(); + } else { + final boolean userIsAdmin = rights.isAdministrable(); + final boolean userCanView = rights.isVisible(); + + if (userCanView) { + for (final GroupDTO admin : adminsList) { + final String avatar = getAvatar(admin); + getView().addAdmin(admin, avatar, admin.getLongName(), "", + createMenuItems(admin, adminsMenuItemsRegistry)); + + } + for (final GroupDTO collab : collabList) { + final String avatar = getAvatar(collab); + getView().addCollab(collab, avatar, collab.getLongName(), "", + createMenuItems(collab, collabsMenuItemsRegistry)); + } + if (userIsAdmin) { + for (final GroupDTO pendingCollab : pendingCollabsList) { + final String avatar = getAvatar(pendingCollab); + getView().addCollab(pendingCollab, avatar, pendingCollab.getLongName(), "", + createMenuItems(pendingCollab, pendingsMenuItemsRegistry)); + } + } + getView().showMembers(); + } + } + getView().setVisible(true); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/GroupMembersPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,60 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class AcceptJoinGroupAction extends AbstractExtendedAction { + public class AcceptJoinGroupMenuItem extends MenuItemDescriptor { + + @Inject + public AcceptJoinGroupMenuItem(final AcceptJoinGroupAction action) { + super(action); + } + } + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + + private final StateManager stateManager; + + @Inject + public AcceptJoinGroupAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Accept this member")); + putValue(Action.SMALL_ICON, res.accept()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().acceptJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), + ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member accepted")); + stateManager.setSocialNetwork(result); + } + }); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,59 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class ChangeToAdminAction extends AbstractExtendedAction { + public class ChangeToAdminMenuItem extends MenuItemDescriptor { + @Inject + public ChangeToAdminMenuItem(final ChangeToAdminAction action) { + super(action); + } + } + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + + private final StateManager stateManager; + + @Inject + public ChangeToAdminAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Change to admin")); + putValue(Action.SMALL_ICON, res.arrowUpGreen()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), session.getCurrentState().getStateToken(), + ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member type changed")); + stateManager.setSocialNetwork(result); + } + }); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,58 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class ChangeToCollabAction extends AbstractExtendedAction { + public class ChangeToCollabMenuItem extends MenuItemDescriptor { + @Inject + public ChangeToCollabMenuItem(final ChangeToCollabAction action) { + super(action); + } + } + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; + + @Inject + public ChangeToCollabAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Change to collaborator")); + putValue(Action.SMALL_ICON, res.arrowDownGreen()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().setAdminAsCollab(session.getUserHash(), session.getCurrentState().getStateToken(), + ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member type changed")); + stateManager.setSocialNetwork(result); + } + }); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,59 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class DenyJoinGroupAction extends AbstractExtendedAction { + public class DenyJoinGroupMenuItem extends MenuItemDescriptor { + @Inject + public DenyJoinGroupMenuItem(final DenyJoinGroupAction action) { + super(action); + } + } + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + + private final StateManager stateManager; + + @Inject + public DenyJoinGroupAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Reject as member")); + putValue(Action.SMALL_ICON, res.cancel()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().denyJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), + ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member rejected")); + stateManager.setSocialNetwork(result); + } + }); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,36 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class GotoGroupAction extends AbstractExtendedAction { + public class GotoGroupMenuItem extends MenuItemDescriptor { + @Inject + public GotoGroupMenuItem(final GotoGroupAction action) { + super(action); + } + } + + private final StateManager stateManager; + + @Inject + public GotoGroupAction(final StateManager stateManager, final I18nTranslationService i18n, final CoreResources res) { + this.stateManager = stateManager; + putValue(NAME, i18n.t("Visit this group homepage")); + putValue(Action.SMALL_ICON, res.groupHome()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + stateManager.gotoToken(((GroupDTO) event.getSource()).getStateToken()); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,35 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class GotoMemberAction extends AbstractExtendedAction { + public class GotoMemberMenuItem extends MenuItemDescriptor { + @Inject + public GotoMemberMenuItem(final GotoMemberAction action) { + super(action); + } + } + private final StateManager stateManager; + + @Inject + public GotoMemberAction(final StateManager stateManager, final I18nTranslationService i18n, final CoreResources res) { + this.stateManager = stateManager; + putValue(NAME, i18n.t("Visit this member homepage")); + putValue(Action.SMALL_ICON, res.groupHome()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + stateManager.gotoToken(((GroupDTO) event.getSource()).getStateToken()); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,58 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class RemoveMemberAction extends AbstractExtendedAction { + public class RemoveMemberMenuItem extends MenuItemDescriptor { + @Inject + public RemoveMemberMenuItem(final RemoveMemberAction action) { + super(action); + } + } + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; + + @Inject + public RemoveMemberAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Remove this member")); + putValue(Action.SMALL_ICON, res.del()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().deleteMember(session.getUserHash(), session.getCurrentState().getStateToken(), + ((GroupDTO) event.getSource()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member removed")); + stateManager.reload(); + } + }); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,47 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.chat.client.ChatClient; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class StartChatWithUserAction extends AbstractExtendedAction { + public class StartChatWithUserMenuItem extends MenuItemDescriptor { + @Inject + public StartChatWithUserMenuItem(final StartChatWithUserAction action) { + super(action); + } + } + private final Provider<ChatClient> chatClient; + + private final I18nTranslationService i18n; + + @Inject + public StartChatWithUserAction(final I18nTranslationService i18n, final CoreResources res, + final Provider<ChatClient> chatClient) { + this.i18n = i18n; + this.chatClient = chatClient; + putValue(NAME, i18n.t("Start a chat with this member")); + putValue(Action.SMALL_ICON, res.newChat()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + chatClient.get().show(); + if (chatClient.get().isLoggedIn()) { + chatClient.get().chat(XmppURI.jid(((GroupDTO) event.getSource()).getShortName())); + } else { + NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); + } + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/StartChatWithUserAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,60 @@ +package cc.kune.core.client.sn.actions; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.Action; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class UnJoinGroupAction extends AbstractExtendedAction { + public class UnJoinGroupMenuItem extends MenuItemDescriptor { + @Inject + public UnJoinGroupMenuItem(final UnJoinGroupAction action) { + super(action); + } + } + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; + + @Inject + public UnJoinGroupAction(final StateManager stateManager, final Session session, final I18nTranslationService i18n, + final CoreResources res, final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Do not participate anymore in this group")); + putValue(Action.SMALL_ICON, res.del()); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().unJoinGroup(session.getUserHash(), ((GroupDTO) event.getSource()).getStateToken(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Removed as member")); + stateManager.reload(); + // in the future with user info: + // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,25 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class AdministrableGroupWhenLoggedCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public AdministrableGroupWhenLoggedCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (!((GroupDTO) descr.getItem()).isPersonal() && session.isLogged() && session.getContentState().getGroupRights().isAdministrable()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,25 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class AdministrablePersonWhenLoggedCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public AdministrablePersonWhenLoggedCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (((GroupDTO) descr.getItem()).isPersonal() && session.isLogged() && session.getContentState().getGroupRights().isAdministrable()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,25 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class GroupWhenLoggedCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public GroupWhenLoggedCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (!((GroupDTO) descr.getItem()).isPersonal() && session.isLogged()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,24 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsAdministrableCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public IsAdministrableCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (session.getContentState().getGroupRights().isAdministrable()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,21 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsGroupCondition implements GuiAddCondition { + + @Inject + public IsGroupCondition() { + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (!((GroupDTO) descr.getItem()).isPersonal()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsGroupCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,21 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class IsPersonCondition implements GuiAddCondition { + + @Inject + public IsPersonCondition() { + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (((GroupDTO) descr.getItem()).isPersonal()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsPersonCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,25 @@ +package cc.kune.core.client.sn.actions.conditions; + +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.GuiAddCondition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.GroupDTO; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class PersonWhenLoggedCondition implements GuiAddCondition { + + private final Session session; + + @Inject + public PersonWhenLoggedCondition(final Session session) { + this.session = session; + } + + @Override + public boolean mustBeAdded(final GuiActionDescrip descr) { + return (((GroupDTO) descr.getItem()).isPersonal() && session.isLogged()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,10 @@ +package cc.kune.core.client.sn.actions.registry; + +import java.util.ArrayList; + +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; + +import com.google.inject.Provider; + +public abstract class AbstractSocialNetworActionsRegistry extends ArrayList<Provider<MenuItemDescriptor>> { // NOPMD by vjrj on 10/02/11 3:19 +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/AbstractSocialNetworActionsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,71 @@ +package cc.kune.core.client.sn.actions.registry; + +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; +import cc.kune.core.client.sn.actions.ChangeToAdminAction; +import cc.kune.core.client.sn.actions.ChangeToCollabAction; +import cc.kune.core.client.sn.actions.DenyJoinGroupAction; +import cc.kune.core.client.sn.actions.GotoGroupAction; +import cc.kune.core.client.sn.actions.GotoMemberAction; +import cc.kune.core.client.sn.actions.RemoveMemberAction; +import cc.kune.core.client.sn.actions.StartChatWithUserAction; +import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; +import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; +import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class SNAdminsMenuItemsRegistry extends AbstractSocialNetworActionsRegistry { + + @Inject + public SNAdminsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, + final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, + final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, + final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, + final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithUserAction startChatWithUserAction, + final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(changeToCollabAction); + item.setAddCondition(isAdministrableCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(removeMemberAction); + item.setAddCondition(isAdministrableCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction); + item.setAddCondition(isPersonCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction); + item.setAddCondition(isGroupCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); + item.setAddCondition(isPersonCondition); + return item; + } + }); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,71 @@ +package cc.kune.core.client.sn.actions.registry; + +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; +import cc.kune.core.client.sn.actions.ChangeToAdminAction; +import cc.kune.core.client.sn.actions.ChangeToCollabAction; +import cc.kune.core.client.sn.actions.DenyJoinGroupAction; +import cc.kune.core.client.sn.actions.GotoGroupAction; +import cc.kune.core.client.sn.actions.GotoMemberAction; +import cc.kune.core.client.sn.actions.RemoveMemberAction; +import cc.kune.core.client.sn.actions.StartChatWithUserAction; +import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; +import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; +import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class SNCollabsMenuItemsRegistry extends AbstractSocialNetworActionsRegistry { + + @Inject + public SNCollabsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, + final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, + final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, + final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, + final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithUserAction startChatWithUserAction, + final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(changeToAdminAction); + item.setAddCondition(isAdministrableCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(removeMemberAction); + item.setAddCondition(isAdministrableCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction); + item.setAddCondition(isPersonCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction); + item.setAddCondition(isGroupCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); + item.setAddCondition(isPersonCondition); + return item; + } + }); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,71 @@ +package cc.kune.core.client.sn.actions.registry; + +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.core.client.sn.actions.AcceptJoinGroupAction; +import cc.kune.core.client.sn.actions.ChangeToAdminAction; +import cc.kune.core.client.sn.actions.ChangeToCollabAction; +import cc.kune.core.client.sn.actions.DenyJoinGroupAction; +import cc.kune.core.client.sn.actions.GotoGroupAction; +import cc.kune.core.client.sn.actions.GotoMemberAction; +import cc.kune.core.client.sn.actions.RemoveMemberAction; +import cc.kune.core.client.sn.actions.StartChatWithUserAction; +import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition; +import cc.kune.core.client.sn.actions.conditions.IsGroupCondition; +import cc.kune.core.client.sn.actions.conditions.IsPersonCondition; +import cc.kune.core.client.state.Session; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class SNPendingsMenuItemsRegistry extends AbstractSocialNetworActionsRegistry { + + @Inject + public SNPendingsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition, + final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition, + final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction, + final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction, + final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithUserAction startChatWithUserAction, + final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) { + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(acceptJoinGroupAction); + item.setAddCondition(isAdministrableCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(denyJoinGroupAction); + item.setAddCondition(isAdministrableCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction); + item.setAddCondition(isPersonCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction); + item.setAddCondition(isGroupCondition); + return item; + } + }); + add(new Provider<MenuItemDescriptor>() { + @Override + public MenuItemDescriptor get() { + final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction); + item.setAddCondition(isPersonCondition); + return item; + } + }); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -20,7 +20,7 @@ /* * * This file is part of kune. - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -41,6 +41,7 @@ import java.util.Collection; import java.util.List; +import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.I18nCountryDTO; @@ -135,15 +136,21 @@ boolean isNotLogged(); + void onInitDataReceived(AppStartEvent.AppStartHandler handler); + @Deprecated void onInitDataReceived(Listener<InitDataDTO> listener); @Deprecated void onUserSignIn(Listener<UserInfoDTO> listener); + void onUserSignIn(UserSignInEvent.UserSignInHandler handler); + @Deprecated void onUserSignOut(Listener0 listener); + void onUserSignOut(UserSignOutEvent.UserSignOutHandler handler); + void setCurrentLanguage(final I18nLanguageDTO currentLanguage); void setCurrentState(final StateAbstractDTO currentState); Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -24,9 +24,13 @@ import cc.kune.common.client.errors.NotImplementedException; import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.logs.Log; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; +import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.I18nCountryDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; @@ -288,6 +292,11 @@ } @Override + public void onInitDataReceived(final AppStartHandler handler) { + eventBus.addHandler(AppStartEvent.getType(), handler); + } + + @Override public void onInitDataReceived(final Listener<InitDataDTO> listener) { throw new NotImplementedException(); } @@ -298,11 +307,21 @@ } @Override + public void onUserSignIn(final UserSignInHandler handler) { + eventBus.addHandler(UserSignInEvent.getType(), handler); + } + + @Override public void onUserSignOut(final Listener0 listener) { throw new NotImplementedException(); } @Override + public void onUserSignOut(final UserSignOutHandler handler) { + eventBus.addHandler(UserSignOutEvent.getType(), handler); + } + + @Override public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { this.currentLanguage = currentLanguage; } Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -37,18 +37,26 @@ void gotoToken(String newToken); + void onGroupChanged(GroupChangedEvent.GroupChangedHandler handler); + @Deprecated void onGroupChanged(Listener2<String, String> listener); @Deprecated void onSocialNetworkChanged(Listener<StateAbstractDTO> listener); + void onSocialNetworkChanged(SocialNetworkChangedEvent.SocialNetworkChangedHandler handler); + @Deprecated void onStateChanged(Listener<StateAbstractDTO> listener); + void onStateChanged(StateChangedEvent.StateChangedHandler handler); + @Deprecated void onToolChanged(Listener2<String, String> listener); + void onToolChanged(ToolChangedEvent.ToolChangedHandler handler); + void reload(); void removeBeforeStateChangeListener(BeforeActionListener listener); Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,7 +1,7 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -28,6 +28,10 @@ import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; +import cc.kune.core.client.state.SocialNetworkChangedEvent.SocialNetworkChangedHandler; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; +import cc.kune.core.client.state.ToolChangedEvent.ToolChangedHandler; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -126,6 +130,11 @@ } @Override + public void onGroupChanged(final GroupChangedHandler handler) { + eventBus.addHandler(GroupChangedEvent.getType(), handler); + } + + @Override public void onGroupChanged(final Listener2<String, String> listener) { throw new NotImplementedException(); } @@ -168,16 +177,31 @@ } @Override + public void onSocialNetworkChanged(final SocialNetworkChangedHandler handler) { + eventBus.addHandler(SocialNetworkChangedEvent.getType(), handler); + } + + @Override public void onStateChanged(final Listener<StateAbstractDTO> listener) { throw new NotImplementedException(); } @Override + public void onStateChanged(final StateChangedHandler handler) { + eventBus.addHandler(StateChangedEvent.getType(), handler); + } + + @Override public void onToolChanged(final Listener2<String, String> listener) { throw new NotImplementedException(); } @Override + public void onToolChanged(final ToolChangedHandler handler) { + eventBus.addHandler(ToolChangedEvent.getType(), handler); + } + + @Override public void onValueChange(final ValueChangeEvent<String> event) { onHistoryChanged(event.getValue()); } @@ -241,6 +265,5 @@ eventBus.fireEvent(new ProgressHideEvent()); checkGroupAndToolChange(newState); previousToken = newState.getStateToken(); - } } Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialog.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -113,6 +113,11 @@ } @Override + public void setFirstBtnTitle(final String title) { + firstBtn.setTitle(title); + } + + @Override public void setFirstBtnVisible(final boolean visible) { firstBtn.setVisible(visible); } @@ -126,6 +131,11 @@ } @Override + public void setSecondBtnTitle(final String title) { + secondBtn.setTitle(title); + } + + @Override public void setSecondBtnVisible(final boolean visible) { secondBtn.setVisible(visible); } Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialogView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialogView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicDialogView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -40,8 +40,12 @@ HasDirectionalText getTitleText(); + void setFirstBtnTitle(String title); + void setFirstBtnVisible(boolean visible); + void setSecondBtnTitle(String title); + void setSecondBtnVisible(boolean visible); } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,6 +24,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.UIObject; public class BasicTopDialog extends BasicDialog { @@ -58,7 +59,11 @@ } - public void show() { + public void showCentered() { popup.showCentered(); } + + public void showRelativeTo(final UIObject object) { + popup.showRelativeTo(object); + } } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,57 +1,57 @@ @CHARSET "UTF-8"; body { - background-color: white; - color: black; - font-family: 'Ubuntu', Arial; - font-size: small; - margin: 5px; - overflow: hidden; + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + margin: 5px; + overflow: hidden; } * { - font-family: 'Ubuntu', Arial; + font-family: 'Ubuntu', Arial; } body.fontface { - font: 'Ubuntu', Arial; + font: 'Ubuntu', Arial; } a { - color: darkblue; + color: darkblue; } a:visited { - color: darkblue; + color: darkblue; } .gwt-DialogBox { - border: 2px solid #AAAAAA; - background-color: white; + border: 2px solid #AAAAAA; + background-color: white; } .gwt-DialogBox .Caption { - background-image: url(gray_gradient.gif); - background-repeat: repeat-x; - padding: 4px; - padding-bottom: 8px; - font-weight: bold; - cursor: default; + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; } .gwt-MenuBar { - background-color: #C3D9FF; - cursor: default; + background-color: #C3D9FF; + cursor: default; } .gwt-MenuItem { - font-size: 80%; - margin: 1px; - cursor: default; + font-size: 80%; + margin: 1px; + cursor: default; } .gwt-MenuItem-selected { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-Tree { @@ -59,26 +59,26 @@ } .gwt-Tree .gwt-TreeItem { - font-size: 80%; - cursor: default; + font-size: 80%; + cursor: default; } .gwt-Tree .gwt-TreeItem-selected { - background-color: #C3D9FF; + background-color: #C3D9FF; } .gwt-StackPanel { - background-color: white; - border: 1px solid #AAAAAA; - width: 15em; + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; } .gwt-StackPanel .gwt-StackPanelItem { - background-image: url(blue_gradient.gif); - background-repeat: repeat-x; - background-color: #EEEEEE; - cursor: pointer; - cursor: hand; + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; } .gwt-StackPanel .gwt-StackPanelItem-selected { @@ -90,236 +90,236 @@ } .gwt-TabPanelBottom { - border-left: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; } .gwt-TabBar { - font-size: smaller; + font-size: smaller; } .gwt-TabBar .gwt-TabBarFirst { - height: 100%; - border-bottom: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - padding-left: 3px; + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; } .gwt-TabBar .gwt-TabBarRest { - border-bottom: 1px solid #87b3ff; - padding-right: 3px; + border-bottom: 1px solid #87b3ff; + padding-right: 3px; } .gwt-TabBar .gwt-TabBarItem { - border-top: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; - padding: 2px; - cursor: hand; - white-space: nowrap; - border-right: 1px solid #87b3ff; + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; } .gwt-TabBar .gwt-TabBarItem-selected { - font-weight: bold; - background-color: #e8eef7; - border-top: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #e8eef7; - padding: 2px; - cursor: default; - white-space: nowrap; + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; } .gwt-PushButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-RichTextArea { - border: 1px solid black; - background-color: white; + border: 1px solid black; + background-color: white; } .gwt-RichTextToolbar { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-RichTextToolbar .gwt-PushButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-HorizontalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-HorizontalSplitPanel .splitter { - background-color: #C3D9FF; - cursor: move; + background-color: #C3D9FF; + cursor: move; } .gwt-HorizontalSplitPanel .left { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-VerticalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-VerticalSplitPanel .splitter { - background-color: #C3D9FF; - height: 8px; - cursor: move; + background-color: #C3D9FF; + height: 8px; + cursor: move; } .gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-SuggestBoxPopup .item { - padding: 2px; + padding: 2px; } .gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-DisclosurePanel { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-DisclosurePanel .header { - background-color: #e8eef7; - cursor: hand; + background-color: #e8eef7; + cursor: hand; } .gwt-SplitLayoutPanel { @@ -327,62 +327,62 @@ } .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { - background-color: white; - background: none; - cursor: col-resize; + background-color: white; + background: none; + cursor: col-resize; } .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { - background-color: white; - background: none; - cursor: row-resize; + background-color: white; + background: none; + cursor: row-resize; } .kLoadingPanel { - background-color: #FF9999; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; - padding: 0 1px 0 3px; - border-collapse: separate; - border-spacing: 2px; + background-color: #FF9999; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + padding: 0 1px 0 3px; + border-collapse: separate; + border-spacing: 2px; } .kLoadingLabel { - font-size: 14px; - color: white; - font-weight: bold; - padding: 0 5px 0 5px; + font-size: 14px; + color: white; + font-weight: bold; + padding: 0 5px 0 5px; } .k-space-sel { - margin-right: 10px; - background-color: #F2F2F2; + margin-right: 10px; + background-color: #F2F2F2; } .k-space-sel-btn { - padding: 0 1px 0 1px; - margin: 0 0 -2px; + padding: 0 1px 0 1px; + margin: 0 0 -2px; } .k-sitebar-logo { - margin-top: 2px; + margin-top: 2px; } .x-btn button { - font: 18px/27px 'Ubuntu', arial; + font: 18px/27px 'Ubuntu', arial; } .k-btn-sitebar,.k-btn-sitebar button { - font: 13px 'Ubuntu', arial; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; - white-space: nowrap; + font: 13px 'Ubuntu', arial; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; + white-space: nowrap; } .k-btn-sitebar button { - margin-top: -5px; + margin-top: -5px; } .k-sitebar { /* margin-top: -30px; */ @@ -390,247 +390,247 @@ } .k-link { - text-decoration: underline; - color: green; - cursor: pointer; + text-decoration: underline; + color: green; + cursor: pointer; } /* Margins */ .kune-Margin-40-trbl { - margin: 40px; + margin: 40px; } .kune-Margin-40-lr { - margin-left: 40px; - margin-right: 40px; + margin-left: 40px; + margin-right: 40px; } .kune-Margin-40-tl { - margin-top: 40px; - margin-left: 40px; + margin-top: 40px; + margin-left: 40px; } .kune-Margin-40-tb { - margin-top: 40px; - margin-bottom: 40px; + margin-top: 40px; + margin-bottom: 40px; } .kune-Margin-40-t { - margin-top: 40px; + margin-top: 40px; } .kune-Margin-40-r { - margin-right: 40px; + margin-right: 40px; } .kune-Margin-40-l { - margin-left: 40px; + margin-left: 40px; } .kune-Margin-20-trbl { - margin: 20px; + margin: 20px; } .kune-Margin-20-lr { - margin-left: 20px; - margin-right: 20px; + margin-left: 20px; + margin-right: 20px; } .kune-Margin-20-tl { - margin-top: 20px; - margin-left: 20px; + margin-top: 20px; + margin-left: 20px; } .kune-Margin-20-tb { - margin-top: 20px; - margin-bottom: 20px; + margin-top: 20px; + margin-bottom: 20px; } .kune-Margin-20-t { - margin-top: 20px; + margin-top: 20px; } .kune-Margin-20-r { - margin-right: 20px; + margin-right: 20px; } .kune-Margin-20-l { - margin-left: 20px; + margin-left: 20px; } .kune-Margin-Large-trbl { - margin: 10px; + margin: 10px; } .kune-Margin-Large-lr { - margin-left: 10px; - margin-right: 10px; + margin-left: 10px; + margin-right: 10px; } .kune-Margin-Large-tl { - margin-top: 10px; - margin-left: 10px; + margin-top: 10px; + margin-left: 10px; } .kune-Margin-Large-tb { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 10px; } .kune-Margin-Large-t { - margin-top: 10px; + margin-top: 10px; } .kune-Margin-Large-r { - margin-right: 10px; + margin-right: 10px; } .kune-Margin-Large-l { - margin-left: 10px; + margin-left: 10px; } .kune-Margin-7-trbl { - margin: 7px; + margin: 7px; } .kune-Margin-7-lr { - margin-left: 7px; - margin-right: 7px; + margin-left: 7px; + margin-right: 7px; } .kune-Margin-7-tl { - margin-top: 7px; - margin-left: 7px; + margin-top: 7px; + margin-left: 7px; } .kune-Margin-7-tb { - margin-top: 7px; - margin-bottom: 7px; + margin-top: 7px; + margin-bottom: 7px; } .kune-Margin-7-t { - margin-top: 7px; + margin-top: 7px; } .kune-Margin-7-r { - margin-right: 7px; + margin-right: 7px; } .kune-Margin-7-b { - margin-bottom: 7px; + margin-bottom: 7px; } .kune-Margin-7-l { - margin-left: 7px; + margin-left: 7px; } .kune-Margin-Medium-trbl { - margin: 5px; + margin: 5px; } .kune-Margin-Medium-lr { - margin-left: 5px; - margin-right: 5px; + margin-left: 5px; + margin-right: 5px; } .kune-Margin-Medium-tl { - margin-top: 5px; - margin-left: 5px; + margin-top: 5px; + margin-left: 5px; } .kune-Margin-Medium-tb { - margin-top: 5px; - margin-bottom: 5px; + margin-top: 5px; + margin-bottom: 5px; } .kune-Margin-Medium-t { - margin-top: 5px; + margin-top: 5px; } .kune-Margin-Medium-r { - margin-right: 5px; + margin-right: 5px; } .kune-Margin-Medium-b { - margin-bottom: 5px; + margin-bottom: 5px; } .kune-Margin-Medium-l { - margin-left: 5px; + margin-left: 5px; } .kune-Margin-Small-trbl { - margin: 3px; + margin: 3px; } .kune-Margin-Small-lr { - margin-left: 3px; - margin-right: 3px; + margin-left: 3px; + margin-right: 3px; } .kune-Margin-Small-tl { - margin-top: 3px; - margin-left: 3px; + margin-top: 3px; + margin-left: 3px; } .kune-Margin-Small-tb { - margin-top: 3px; - margin-bottom: 3px; + margin-top: 3px; + margin-bottom: 3px; } .kune-Margin-Small-t { - margin-top: 3px; + margin-top: 3px; } .kune-Margin-Small-l { - margin-left: 3px; + margin-left: 3px; } .kune-Margin-Small-r { - margin-right: 3px; + margin-right: 3px; } .kune-Margin-Small-b { - margin-bottom: 3px; + margin-bottom: 3px; } .kune-Margin-Mini-trbl { - margin: 1px; + margin: 1px; } .kune-Margin-Mini-lr { - margin-left: 1px; - margin-right: 1px; + margin-left: 1px; + margin-right: 1px; } .kune-Margin-Mini-tl { - margin-top: 1px; - margin-left: 1px; + margin-top: 1px; + margin-left: 1px; } .kune-Margin-Mini-tb { - margin-top: 1px; - margin-bottom: 1px; + margin-top: 1px; + margin-bottom: 1px; } .kune-Margin-Mini-t { - margin-top: 1px; + margin-top: 1px; } .kune-Margin-Mini-r { - margin-right: 1px; + margin-right: 1px; } .kune-Margin-Mini-b { - margin-bottom: 1px; + margin-bottom: 1px; } .kune-Margin-Mini-l { - margin-left: 1px; + margin-left: 1px; } .k-publicspace-msg { - background-color: #E0E0E0; + background-color: #E0E0E0; } .k-publicspace-mask { /* background-color: #fff !important; @@ -642,100 +642,192 @@ } .k-publicspace-panel { - margin: 5px; - display: table-row; + margin: 5px; + display: table-row; } .k-publicspace-icon { - margin: 3px 3px 3px 0; - float: left; + margin: 3px 3px 3px 0; + float: left; } .k-publicspace-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; } .k-publicspace-description { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-publicspace-actions { - display: inline; + display: inline; } .k-message-panel { - margin: 5px; - display: table-row; + margin: 5px; + display: table-row; } .k-message-icon { - margin: 3px 3px 3px 0; - float: left; + margin: 3px 3px 3px 0; + float: left; } .k-message-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; } .k-message-description { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-error-tb { - background: #FFB380 none repeat scroll 0% 50%; - /* color: #250; */ - padding: 10px; + background: #FFB380 none repeat scroll 0% 50%; + /* color: #250; */ + padding: 10px; } .k-error-tb img { - margin: 0 10px; - float: left; + margin: 0 10px; + float: left; } .k-error-tb div { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-mask { - background-color: #F2F2F2 !important; - /* kfilter: alpha(opacity = 78) !important; */ - -moz-opacity: 0.78 !important; - -khtml-opacity: 0.78 !important; - opacity: 0.78 !important; + background-color: #F2F2F2 !important; + /* kfilter: alpha(opacity = 78) !important; */ + -moz-opacity: 0.78 !important; + -khtml-opacity: 0.78 !important; + opacity: 0.78 !important; } .x-form-item-label { - font-size: 14px; - font-weight: bold; - color: brown; + font-size: 14px; + font-weight: bold; + color: brown; } .x-form-text { - font-size: 14px; + font-size: 14px; } .x-fieldset-header-text,.x-form-group-label,.x-form-cb-label { - font-size: 14px; - font-family: 'Ubuntu', Arial; + font-size: 14px; + font-family: 'Ubuntu', Arial; } .k-form-intro { - font-size: 14px; - margin-bottom: 10px; + font-size: 14px; + margin-bottom: 10px; } .k-form-fieldset { - font-size: 16px; - margin-left: 105px; + font-size: 16px; + margin-left: 105px; +} + +.k-basic-thumb { + background-color: #F2F2F2; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + +.k-basic-thumb img { + margin: 2px 2px 0px 2px; +} + +.k-basic-thumb div { + margin: -3px 0px 0px 0px; + font-weight: normal; + font-size: 12px; +} + +.k-sn-mainpanel { + font-size: 16px; + font-weight: bold; +} + +.k-sn-maintitle { + margin: 5px; +} + +.k-sn-maintitle { + color: #a05a2c; + font-size: 20px; +} + +.k-sn-adminslabel,.k-sn-collabslabel,.k-sn-pendingslabel { + color: #FFF; + text-transform: lowercase; + padding-left: 10px; +} + +.k-sn-adminslabel { + +} + +.k-sn-collabslabel { + +} + +.k-sn-pendingslabel { + +} + +.k-sn-adminspanel { + background-color: #a05a2c; +} + +.k-sn-collabspanel { + +} + +.k-sn-pendingspanel { + +} + +.k-sn-adminsscroll,.k-sn-collabsscroll,.k-sn-pendingsscroll { + padding-left: 10px; +} + +.k-sn-adminsscroll { + +} + +.k-sn-collabsscroll { + +} + +.k-sn-pendingsscroll { + margin: 5px; +} + +.k-userconfirm-label { + width: 300px; + margin: 10px; +} + +.k-sn-deck { + padding: 5px; +} + +.k-sn-novisible-label,.k-sn-orphan-label { + color: #FFF; + font-size: 16px; + font-weight: bold; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-02-10 03:07:28 UTC (rev 1243) @@ -2,170 +2,170 @@ @external .*; .floatLeft { - float: left; + float: left; } .mainPanel { - border-top: 2px solid white; - border-bottom: 7px solid white; - border-right: 7px solid white; - border-left: 7px solid white; + border-top: 2px solid white; + border-bottom: 7px solid white; + border-right: 7px solid white; + border-left: 7px solid white; } .floatRight { - float: right; + float: right; } .siteBar { - overflow: hidden; + overflow: hidden; } .entityHeader { - -webkit-border-top-left-radius: 10px; - -moz-border-radius-topleft: 10px; - border-top-left-radius: 10px; - background-color: #f4e3d7; - overflow: hidden; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; + background-color: #f4e3d7; + overflow: hidden; } .entityFooter { - -webkit-border-bottom-left-radius: 10px; - -moz-border-radius-bottomleft: 10px; - border-top-bottom-radius: 10px; - background-color: #f7ebe3; - padding: 7px 10px 0px 17px; - overflow: hidden; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-top-bottom-radius: 10px; + background-color: #f7ebe3; + padding: 7px 10px 0px 17px; + overflow: hidden; } .entityFooter span { - color: #784421; - font-size: 16px; - font-weight: bold; + color: #784421; + font-size: 16px; + font-weight: bold; } .entityHeader span { - font-size: 56px; - margin-left: 15px; - color: #550000; - font-weight: bold; - font: 'UbuntuBold', Arial; + font-size: 56px; + margin-left: 15px; + color: #550000; + font-weight: bold; + font: 'UbuntuBold', Arial; } .docHeader { - background-color: #c87137; - overflow: hidden; + background-color: #c87137; + overflow: hidden; } .docHeaderArrow { - position: relative; - z-index: 10; - top: -25px; - left: 10px; + position: relative; + z-index: 10; + top: -25px; + left: 10px; } .docHeader span { - color: #FFF; - font-size: 28px; - font-weight: bold; - margin-left: 15px; - font: 'UbuntuBold', Arial; + color: #FFF; + font-size: 28px; + font-weight: bold; + margin-left: 15px; + font: 'UbuntuBold', Arial; } .docSubheader { - background-color: #f7ebe3; - padding: 15px 0 0 15px; - overflow: hidden; + background-color: #f7ebe3; + padding: 15px 0 0 15px; + overflow: hidden; } .docSubheaderLeft { - position: relative; - top: 0; - left: -30px; + position: relative; + top: 0; + left: -30px; } .docSubheader span { - color: #784421; - font-size: 20px; - font-weight: bold; + color: #784421; + font-size: 20px; + font-weight: bold; } .docEditorMargin { - background-color: #f7ebe3; + background-color: #f7ebe3; } .docEditor { - background-color: #FFF; - border-left: 1px solid #959595; - border-right: 1px solid #959595; - border-top: 1px solid #959595; - -webkit-border-top-left-radius: 7px; - -moz-border-radius-topleft: 7px; - border-top-left-radius: 7px; - -webkit-border-top-right-radius: 7px; - -moz-border-radius-topright: 7px; - border-top-right-radius: 7px; - padding: 5px; + background-color: #FFF; + border-left: 1px solid #959595; + border-right: 1px solid #959595; + border-top: 1px solid #959595; + -webkit-border-top-left-radius: 7px; + -moz-border-radius-topleft: 7px; + border-top-left-radius: 7px; + -webkit-border-top-right-radius: 7px; + -moz-border-radius-topright: 7px; + border-top-right-radius: 7px; + padding: 5px; } .docFooter { - border-left: 1px solid #959595; - border-right: 1px solid #959595; - border-bottom: 1px solid #959595; - background-color: #e3dbdb; - -webkit-border-bottom-left-radius: 7px; - -moz-border-radius-bottomleft: 7px; - border-bottom-left-radius: 7px; - -webkit-border-bottom-right-radius: 7px; - -moz-border-radius-bottomright: 7px; - border-bottom-right-radius: 7px; - padding: 7px 7px 0 7px; - overflow: hidden; + border-left: 1px solid #959595; + border-right: 1px solid #959595; + border-bottom: 1px solid #959595; + background-color: #e3dbdb; + -webkit-border-bottom-left-radius: 7px; + -moz-border-radius-bottomleft: 7px; + border-bottom-left-radius: 7px; + -webkit-border-bottom-right-radius: 7px; + -moz-border-radius-bottomright: 7px; + border-bottom-right-radius: 7px; + padding: 7px 7px 0 7px; + overflow: hidden; } .docFooter span { - color: #784421; - font-size: 16px; - font-weight: bold; + color: #784421; + font-size: 16px; + font-weight: bold; } .entityTools { - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topright: 10px; - border-top-right-radius: 10px; - -webkit-border-bottom-right-radius: 10px; - -moz-border-radius-bottomright: 10px; - border-bottom-right-radius: 10px; - background-color: #DEAA87; + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; + background-color: #DEAA87; } .entityToolsNorth { - margin: 10px; + /* margin: 10px; */ } .entityToolsNorth span { - color: #a05a2c; - font-size: 20px; - font-weight: bold; + color: #a05a2c; + font-size: 20px; + font-weight: bold; } .entityToolsCenter { - margin: 10px; + margin: 10px; } .entityToolsCenter span { - color: #FFF; - font-size: 22px; - font-weight: bold; + color: #FFF; + font-size: 22px; + font-weight: bold; } .entityToolsSouth { - border-top: 2px solid #FFF; - padding: 10px; + border-top: 2px solid #FFF; + padding: 10px; } .entityToolsSouth span { - color: #a05a2c; - font-size: 20px; - font-weight: bold; + color: #a05a2c; + font-size: 20px; + font-weight: bold; } Added: trunk/src/main/java/cc/kune/gspace/public/kune-gspace.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/public/kune-gspace.css (rev 0) +++ trunk/src/main/java/cc/kune/gspace/public/kune-gspace.css 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1 @@ +/* TODO: extract wsArmor.css here */ \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/gspace/public/kune-gspace.css ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,694 +1,694 @@ .k-site-traybar { - background: transparent none repeat scroll 0% 50%; + background: transparent none repeat scroll 0% 50%; } .k-blank-toolbar { - background: #FFF none repeat scroll 0% 50%; + background: #FFF none repeat scroll 0% 50%; } .k-sitebar .kune-IconHyperlink { - white-space: nowrap; + white-space: nowrap; } .k-sitebar .kune-IconHyperlink a:link { - cursor: pointer; - text-decoration: underline; - color: #B3B3B3; + cursor: pointer; + text-decoration: underline; + color: #B3B3B3; } .k-sitebar .kune-IconHyperlink a:hover { - text-decoration: underline; + text-decoration: underline; } .k-sitebar .kune-IconHyperlink a:visited { - color: #B3B3B3; + color: #B3B3B3; } .k-sitebar-labellink { - white-space: nowrap; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; + white-space: nowrap; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; } .k-sitebar { - margin-right: 10px; - height: 16px; + margin-right: 10px; + height: 16px; } .k-sitebar .gwt-TextBox { - border: 1px solid #E4A374; - margin: 0 15px 0 3px; - padding-left: 1px; - color: #B3B3B3; - background: transparent; + border: 1px solid #E4A374; + margin: 0 15px 0 3px; + padding-left: 1px; + color: #B3B3B3; + background: transparent; } .k-sitebar .gwt-Hyperlink a { - white-space: nowrap; - color: #B3B3B3; - text-decoration: underline; - cursor: pointer; + white-space: nowrap; + color: #B3B3B3; + text-decoration: underline; + cursor: pointer; } .k-sitebar .gwt-PushButton { - cursor: pointer; + cursor: pointer; } .k-sitebar-LabelLink { - white-space: nowrap; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; + white-space: nowrap; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; } .k-entity-summary { - border-left-color: transparent; - border-left-width: 5px; - border-bottom-color: transparent; - border-bottom-width: 5px; + border-left-color: transparent; + border-left-width: 5px; + border-bottom-color: transparent; + border-bottom-width: 5px; } .k-entitytextlogo-border { - border: 2px solid #F2F2F2; + border: 2px solid #F2F2F2; } .k-entitytextlogo-no-border { - border: none; + border: none; } .k-entitytextlogo { - height: 60px; - margin: 0 0 4px 0; - overflow: hidden; - width: 468px; + height: 60px; + margin: 0 0 4px 0; + overflow: hidden; + width: 468px; } .k-entitytextlogo table { - vertical-align: middle; + vertical-align: middle; } .k-elogo-l-l { - font-size: 272%; + font-size: 272%; } .k-elogo-l-m { - font-size: 167%; + font-size: 167%; } .k-elogo-l-s { - font-size: 108%; + font-size: 108%; } .k-entitytextlogo .gwt-Label { - font-weight: 700; - margin: 5px; - height: 27px; + font-weight: 700; + margin: 5px; + height: 27px; } .k-entitytextlogo-default .gwt-Label { - color: #69312F; + color: #69312F; } .k-entitytextlogo-green .gwt-Label { - color: #250; + color: #250; } .k-entitytextlogo-blue .gwt-Label { - color: #000080; + color: #000080; } .k-entitytextlogo-grey .gwt-Label { - color: #1A1A1A; + color: #1A1A1A; } .k-entitytextlogo-purple .gwt-Label { - color: #440055; + color: #440055; } .k-entitytextlogo-red .gwt-Label { - color: #800000; + color: #800000; } .k-elogo-plink { - color: #CCC; - font-size: 85%; - margin: 5px; - text-decoration: underline; - white-space: nowrap; - background-color: #FFF; + color: #CCC; + font-size: 85%; + margin: 5px; + text-decoration: underline; + white-space: nowrap; + background-color: #FFF; } .k-elogop-expand { - background-color: transparent; + background-color: transparent; } .k-entity-default .x-layout-split,.k-entity-default .x-layout-collapsed - { - background: #DD8A3D none repeat scroll 0% 50%; + { + background: #DD8A3D none repeat scroll 0% 50%; } .k-entity-green .x-layout-split,.k-entity-green .x-layout-collapsed { - background: #5FD35F none repeat scroll 0% 50%; + background: #5FD35F none repeat scroll 0% 50%; } .k-entity-blue .x-layout-split,.k-entity-blue .x-layout-collapsed { - background: #0066FF none repeat scroll 0% 50%; + background: #0066FF none repeat scroll 0% 50%; } .k-entity-grey .x-layout-split,.k-entity-grey .x-layout-collapsed { - background: #4D4D4D none repeat scroll 0% 50%; + background: #4D4D4D none repeat scroll 0% 50%; } .k-entity-purple .x-layout-split,.k-entity-purple .x-layout-collapsed { - background: #660080 none repeat scroll 0% 50%; + background: #660080 none repeat scroll 0% 50%; } .k-entity-red .x-layout-split,.k-entity-red .x-layout-collapsed { - background: #D40000 none repeat scroll 0% 50%; + background: #D40000 none repeat scroll 0% 50%; } .k-entityworkspace .x-layout-split,.k-entityworkspace .x-layout-collapsed - { - background: transparent none repeat scroll 0% 50%; + { + background: transparent none repeat scroll 0% 50%; } .k-entityworkspace-default .x-layout-split,.k-entityworkspace-default .x-layout-collapsed - { - background: #DEAA87 none repeat scroll 0% 50%; + { + background: #DEAA87 none repeat scroll 0% 50%; } .k-entityworkspace-green .x-layout-split,.k-entityworkspace-green .x-layout-collapsed - { - background: #DCE8AB none repeat scroll 0% 50%; + { + background: #DCE8AB none repeat scroll 0% 50%; } .k-entityworkspace-blue .x-layout-split,.k-entityworkspace-blue .x-layout-collapsed - { - background: #D5D5FF none repeat scroll 0% 50%; + { + background: #D5D5FF none repeat scroll 0% 50%; } .k-entityworkspace-grey .x-layout-split,.k-entityworkspace-grey .x-layout-collapsed - { - background: #999999 none repeat scroll 0% 50%; + { + background: #999999 none repeat scroll 0% 50%; } .k-entityworkspace-purple .x-layout-split,.k-entityworkspace-purple .x-layout-collapsed - { - background: #A793AC none repeat scroll 0% 50%; + { + background: #A793AC none repeat scroll 0% 50%; } .k-entityworkspace-red .x-layout-split,.k-entityworkspace-red .x-layout-collapsed - { - background: #FF5555 none repeat scroll 0% 50%; + { + background: #FF5555 none repeat scroll 0% 50%; } .k-entity-title { - border-left-style: solid; - border-left-width: 5px; + border-left-style: solid; + border-left-width: 5px; } .k-entity-title div { - line-height: 22px; - white-space: nowrap; + line-height: 22px; + white-space: nowrap; } .k-entity-subtitle { - + } .k-entity-subtitle div { - line-height: 22px; - white-space: nowrap; + line-height: 22px; + white-space: nowrap; } .k-entity-title-rd-default { - background: #DD8A3D; + background: #DD8A3D; } .k-entity-title-rd-green { - background: #5FD35F; + background: #5FD35F; } .k-entity-title-rd-blue { - background: #0066FF; + background: #0066FF; } .k-entity-title-rd-grey { - background: #4D4D4D; + background: #4D4D4D; } .k-entity-title-rd-purple { - background: #660080; + background: #660080; } .k-entity-title-rd-red { - background: #D40000; + background: #D40000; } .k-entity-title-default { - background: #F1BB59 none repeat scroll 0% 50%; - border-left-color: #DD8A3D; + background: #F1BB59 none repeat scroll 0% 50%; + border-left-color: #DD8A3D; } .k-entity-title-green { - background: #AFA none repeat scroll 0% 50%; - border-left-color: #5FD35F; + background: #AFA none repeat scroll 0% 50%; + border-left-color: #5FD35F; } .k-entity-title-blue { - background: #AFDDE9 none repeat scroll 0% 50%; - border-left-color: #0066FF; + background: #AFDDE9 none repeat scroll 0% 50%; + border-left-color: #0066FF; } .k-entity-title-grey { - background: #CCCCCC none repeat scroll 0% 50%; - border-left-color: #4D4D4D; + background: #CCCCCC none repeat scroll 0% 50%; + border-left-color: #4D4D4D; } .k-entity-title-purple { - background: #DDAFE9 none repeat scroll 0% 50%; - border-left-color: #660080; + background: #DDAFE9 none repeat scroll 0% 50%; + border-left-color: #660080; } .k-entity-title-red { - background: #FF8080 none repeat scroll 0% 50%; - border-left-color: #D40000; + background: #FF8080 none repeat scroll 0% 50%; + border-left-color: #D40000; } .k-entity-title-default div { - color: #69312F; + color: #69312F; } .k-entity-title-green div { - color: #250; + color: #250; } .k-entity-title-blue div { - color: #000080; + color: #000080; } .k-entity-title-grey div { - color: #1A1A1A; + color: #1A1A1A; } .k-entity-title-purple div { - color: #440055; + color: #440055; } .k-entity-title-red div { - color: #800000; + color: #800000; } .k-entity-subtitle-default { - background: #DD8A3D none repeat scroll 0% 50%; + background: #DD8A3D none repeat scroll 0% 50%; } .k-entity-subtitle-green { - background: #5FD35F none repeat scroll 0% 50%; + background: #5FD35F none repeat scroll 0% 50%; } .k-entity-subtitle-blue { - background: #0066FF none repeat scroll 0% 50%; + background: #0066FF none repeat scroll 0% 50%; } .k-entity-subtitle-grey { - background: #4D4D4D none repeat scroll 0% 50%; + background: #4D4D4D none repeat scroll 0% 50%; } .k-entity-subtitle-purple { - background: #660080 none repeat scroll 0% 50%; + background: #660080 none repeat scroll 0% 50%; } .k-entity-subtitle-red { - background: #D40000 none repeat scroll 0% 50%; + background: #D40000 none repeat scroll 0% 50%; } .k-entity-subtitle-default div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-green div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-blue div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-grey div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-purple div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-red div { - color: #FFF; + color: #FFF; } .k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default - { - background: #DD8A3D; + { + background: #DD8A3D; } .k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green - { - background: #5FD35F; + { + background: #5FD35F; } .k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue - { - background: #0066FF; + { + background: #0066FF; } .k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey - { - background: #4D4D4D; + { + background: #4D4D4D; } .k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple - { - background: #660080; + { + background: #660080; } .k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red - { - background: #D40000; + { + background: #D40000; } .k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body - { - background: #FFD09D none repeat scroll 0% 50%; + { + background: #FFD09D none repeat scroll 0% 50%; } .k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body - { - background: #CFA none repeat scroll 0% 50%; + { + background: #CFA none repeat scroll 0% 50%; } .k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body - { - background: #AACCFF none repeat scroll 0% 50%; + { + background: #AACCFF none repeat scroll 0% 50%; } .k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body - { - background: #B3B3B3 none repeat scroll 0% 50%; + { + background: #B3B3B3 none repeat scroll 0% 50%; } .k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body - { - background: #DDAFE9 none repeat scroll 0% 50%; + { + background: #DDAFE9 none repeat scroll 0% 50%; } .k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body { - background: #FFAAAA none repeat scroll 0% 50%; + background: #FFAAAA none repeat scroll 0% 50%; } .k-entity-context-purple .x-tree .x-panel-body { - background: #DDAFE9 none repeat scroll 0% 50%; + background: #DDAFE9 none repeat scroll 0% 50%; } .k-entity-content { - background: #FFF; + background: #FFF; } .k-entity-bottom div { /* line-height: 24px; */ - color: #FFF; + color: #FFF; } .k-toolbar-top-line { - border-top-color: rgb(208, 208, 208); - border-top-style: solid; - border-top-width: 1px; + border-top-color: rgb(208, 208, 208); + border-top-style: solid; + border-top-width: 1px; } .k-toolbar-bottom-line { - border-bottom-color: rgb(208, 208, 208); - border-bottom-style: solid; - border-bottom-width: 1px; + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; } .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label - { - white-space: nowrap; - font: normal 100% arial, sans; - line-height: 19px; + { + white-space: nowrap; + font: normal 100% arial, sans; + line-height: 19px; } .k-toolbar-sep { - padding-top: 4px; - padding-left: 5px; + padding-top: 4px; + padding-left: 5px; } /* Custom gwt-ext styles */ .ytb-sep { - background-image: - url(../js/ext/resources/images/default/grid/grid-split.gif); - background-position: center; - background-repeat: no-repeat; - display: block; - font-size: 1px; - height: 16px; - width: 4px; - overflow: hidden; - cursor: default; - margin: 0 2px 0; - border: 0; + background-image: + url(../js/ext/resources/images/default/grid/grid-split.gif); + background-position: center; + background-repeat: no-repeat; + display: block; + font-size: 1px; + height: 16px; + width: 4px; + overflow: hidden; + cursor: default; + margin: 0 2px 0; + border: 0; } .ytb-spacer { - width: 2px; + width: 2px; } .x-grid-group-hd { - border-bottom: 2px solid grey; - cursor: pointer; - padding-top: 3px; + border-bottom: 2px solid grey; + cursor: pointer; + padding-top: 3px; } /* Drop down */ .k-dropdownouter { - background-color: grey; + background-color: grey; } .k-dropdownouter-members { - + } .k-dropdownouter-members-default { - background-color: #DF5244; + background-color: #DF5244; } .k-dropdownouter-members-green { - background-color: #008000; + background-color: #008000; } .k-dropdownouter-members-blue { - background-color: #5500D4; + background-color: #5500D4; } .k-dropdownouter-members-grey { - background-color: #4D4D4D; + background-color: #4D4D4D; } .k-dropdownouter-members-purple { - background-color: #672178; + background-color: #672178; } .k-dropdownouter-members-red { - background-color: #A02C2C; + background-color: #A02C2C; } .k-dropdownouter-part { - + } .k-dropdownouter-part-default { - background-color: #CA5842; + background-color: #CA5842; } .k-dropdownouter-part-green { - background-color: #00AA00; + background-color: #00AA00; } .k-dropdownouter-part-blue { - background-color: #6600FF; + background-color: #6600FF; } .k-dropdownouter-part-grey { - background-color: #666666; + background-color: #666666; } .k-dropdownouter-part-purple { - background-color: #892CA0; + background-color: #892CA0; } .k-dropdownouter-part-red { - background-color: #C83737; + background-color: #C83737; } .k-dropdownouter-tags { - + } .k-dropdownouter-tags-default { - background-color: #87501E; + background-color: #87501E; } .k-dropdownouter-tags-green { - background-color: #00D400; + background-color: #00D400; } .k-dropdownouter-tags-blue { - background-color: #9955FF; + background-color: #9955FF; } .k-dropdownouter-tags-grey { - background-color: #808080; + background-color: #808080; } .k-dropdownouter-tags-purple { - background-color: #AB37C8; + background-color: #AB37C8; } .k-dropdownouter-tags-red { - background-color: #D35F5F; + background-color: #D35F5F; } .k-dropdownouter-summary { - + } .k-dropdownouter-summary-default { - background-color: #9F734B; + background-color: #9F734B; } .k-dropdownouter-summary-green { - background-color: #4CE14C; + background-color: #4CE14C; } .k-dropdownouter-summary-blue { - background-color: #69A5FF; + background-color: #69A5FF; } .k-dropdownouter-summary-grey { - background-color: #A6A6A6; + background-color: #A6A6A6; } .k-dropdownouter-summary-purple { - background-color: #C473D8; + background-color: #C473D8; } .k-dropdownouter-summary-red { - background-color: #E08F8F; + background-color: #E08F8F; } .k-dropdowninner { - margin: 0 3px 1px 3px; - background: green; - background-color: #FFF; - /* padding: 3px; */ + margin: 0 3px 1px 3px; + background: green; + background-color: #FFF; + /* padding: 3px; */ } .k-dropdownlabel { - color: #FFF; - cursor: pointer; + color: #FFF; + cursor: pointer; } .k-dropdownlabel .gwt-Label { - margin: 0 5px 0 0; - width: 100%; + margin: 0 5px 0 0; + width: 100%; } .k-dropdownlabel img { - margin: 0 3px 0 1px; + margin: 0 3px 0 1px; } /* WsTheme */ .k-wstheme-icon-default { - background: #FF8C00; + background: #FF8C00; } .k-wstheme-icon-green { - background: green; + background: green; } .k-wstheme-icon-blue { - background: blue; + background: blue; } .k-wstheme-icon-grey { - background: grey; + background: grey; } .k-wstheme-icon-purple { - background: purple; + background: purple; } .k-wstheme-icon-red { - background: red; + background: red; } /* Tool selector items */ .k-toolselectoritem { - width: auto; - margin-bottom: 5px; - cursor: pointer; + width: auto; + margin-bottom: 5px; + cursor: pointer; } .k-toolselectoritem-sel { - + } .k-toolselectoritem-notsel-default { - background: #FFE9A5; + background: #FFE9A5; } .k-toolselectoritem-notsel-green { - background: #D6F4D6; + background: #D6F4D6; } .k-toolselectoritem-notsel-blue { - background: #D7D7F4; + background: #D7D7F4; } .k-toolselectoritem-notsel-grey { - background: #E6E6E6; + background: #E6E6E6; } .k-toolselectoritem-notsel-purple { - background: #EED7F4; + background: #EED7F4; } .k-toolselectoritem-notsel-red { - background: #FFD5D5; + background: #FFD5D5; } .k-toolselectoritem-sel a { - color: #FFF; - padding: 0 9px; - text-decoration: none; + color: #FFF; + padding: 0 9px; + text-decoration: none; } .k-toolselectoritem-sel a:hover { - text-decoration: none; + text-decoration: none; } .k-toolselectoritem-notsel { - + } .k-toolselectoritem-notsel a { - color: #0000FF; - padding: 0 9px; - text-decoration: none; + color: #0000FF; + padding: 0 9px; + text-decoration: none; } .k-toolselectoritem-notsel a:hover { - text-decoration: underline; + text-decoration: underline; } /* others */ /* @@ -699,231 +699,231 @@ } */ .x-tree-node .k-ctn-status-normal a span { - + } .x-tree-node .k-ctn-status-deleted a span { - text-decoration: line-through; - color: gray; + text-decoration: line-through; + color: gray; } .x-tree-node .k-ctn-status-rejected a span { - text-decoration: line-through; - /* color: #FF6633; */ - color: #FF3300; + text-decoration: line-through; + /* color: #FF6633; */ + color: #FF3300; } .x-tree-node .k-ctn-status-editing a span { - font-style: italic; - color: gray; + font-style: italic; + color: gray; } .x-tree-node .k-ctn-status-submitted a span { - color: green; + color: green; } .k-info-links { - text-decoration: underline; - color: gray; - cursor: pointer; + text-decoration: underline; + color: gray; + cursor: pointer; } .x-tool-kmenu { - background-position: 0 -75px; + background-position: 0 -75px; } .x-tool-kmenu-over { - background-position: -15px -75px; + background-position: -15px -75px; } .k-border-openbox { - border-bottom: 1px #D0D0D0 solid; - border-right: 1px #D0D0D0 solid; - border-left: 1px #D0D0D0 solid; + border-bottom: 1px #D0D0D0 solid; + border-right: 1px #D0D0D0 solid; + border-left: 1px #D0D0D0 solid; } /* SiteToastMessages */ .k-stm-info-icon { - background-image: url(img/info.gif) !important; + background-image: url(img/info.gif) !important; } .k-stm-imp-icon { - background-image: url(img/alert.gif) !important; + background-image: url(img/alert.gif) !important; } .k-stm-verimp-icon { - background-image: url(img/important.gif) !important; + background-image: url(img/important.gif) !important; } .k-stm-error-icon { - background-image: url(img/error.gif) !important; + background-image: url(img/error.gif) !important; } .k-infod-head { - font-size: 108%; - margin-bottom: 10px; + font-size: 108%; + margin-bottom: 10px; } .gwt-DisclosurePanel { - + } .gwt-DisclosurePanel-open { - + } .gwt-DisclosurePanel-closed { - + } .gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td - { - text-decoration: none; /* Remove underline from header */ - color: black; - cursor: pointer; - cursor: hand; + { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; } .gwt-DisclosurePanel .content { - border-left: 3px solid #e8eef7; - padding: 4px 0px 4px 8px; - margin-left: 6px; + border-left: 3px solid #e8eef7; + padding: 4px 0px 4px 8px; + margin-left: 6px; } .k-basic-thumb { - background: #FAFAFA none repeat scroll 0% 50%; - border: 1px solid #EBEBEB; - padding: 3px; - margin: 3px; + background: #FAFAFA none repeat scroll 0% 50%; + border: 1px solid #EBEBEB; + padding: 3px; + margin: 3px; } .k-basic-thumb td { - padding: 2px 3px 2px 3px; - border: none; + padding: 2px 3px 2px 3px; + border: none; } .k-text-gray { - color: gray; + color: gray; } .k-elp-limg { - margin-top: 4px; - margin-left: 5px; - cursor: pointer; - overflow: hidden; + margin-top: 4px; + margin-left: 5px; + cursor: pointer; + overflow: hidden; } .k-tsp-tag { - float: left; - padding: 3px; - cursor: pointer; - color: #0000FF; + float: left; + padding: 3px; + cursor: pointer; + color: #0000FF; } .k-tsp-cloud { - line-height: 1.5em; - text-align: center; + line-height: 1.5em; + text-align: center; } .k-link-icon { - background-image: url(img/link.gif) !important; + background-image: url(img/link.gif) !important; } .k-options-icon { - background-image: url(img/emblem-system.gif) !important; + background-image: url(img/emblem-system.gif) !important; } .k-copyleft-icon { - background-image: url(img/copyleft.png) !important; + background-image: url(img/copyleft.png) !important; } .k-picture-icon { - background-image: url(img/picture.png) !important; + background-image: url(img/picture.png) !important; } .k-film-icon { - background-image: url(img/film.png) !important; + background-image: url(img/film.png) !important; } .k-specialchars-icon { - background-image: url(img/specialchars.png) !important; + background-image: url(img/specialchars.png) !important; } .k-info-icon { - background-image: url(img/info.gif) !important; + background-image: url(img/info.gif) !important; } .k-newgroup-icon { - background-image: url(img/kune-icon16.png) !important; + background-image: url(img/kune-icon16.png) !important; } .k-colors-icon { - background-image: url(img/colors.gif) !important; + background-image: url(img/colors.gif) !important; } .x-toolbar-body table { /* width: 100%; */ - + } .k-preview-msg { - background: #FFCCAA; + background: #FFCCAA; } .k-preview-msg-lab { - background: #FFCCAA; - padding: 0 5px; + background: #FFCCAA; + padding: 0 5px; } .k-eil-edit { - border: thin solid black; + border: thin solid black; } /* duplicated in rte.css */ .k-rte-comment { - border: 1px dashed #C0C0C0; - line-height: 1.4; - padding: 1px; - background-color: #D7FFD7; + border: 1px dashed #C0C0C0; + line-height: 1.4; + padding: 1px; + background-color: #D7FFD7; } .k-specialchar-grid { - border: 1px solid #ACA899; + border: 1px solid #ACA899; } .k-specialchar-grid table { - + } .k-specialchar-grid div { - line-height: 22px; + line-height: 22px; } .k-specialchar-grid td { - padding: 1px; + padding: 1px; } .k-specialchar-pb { - border: 1px solid #EBE8D7; - cursor: pointer; - font-size: 108% !important; - text-align: center; - vertical-align: middle; - width: 18px; - height: 18px; + border: 1px solid #EBE8D7; + cursor: pointer; + font-size: 108% !important; + text-align: center; + vertical-align: middle; + width: 18px; + height: 18px; } .k-specialchar-pb-up { - + } .k-specialchar-big { - padding: 3px; - line-height: 22px; - font-size: 197% !important; + padding: 3px; + line-height: 22px; + font-size: 197% !important; } .k-specialchar-adv-label { - margin-left: -10px; + margin-left: -10px; } .k-specialchar-popup @@ -1019,79 +1019,79 @@ ; } .k-specialchar-pb-down { - color: #161616; + color: #161616; } .k-specialchar-pb-up-hovering { - border: thin solid #ACA899; + border: thin solid #ACA899; } .k-specialchar-pb-down-hovering { - color: #161616; + color: #161616; } .k-preview-panel { - border: dashed 1px gray; - padding: 5px; + border: dashed 1px gray; + padding: 5px; } .k-rte-changelink { - white-space: nowrap; - color: navy; - cursor: pointer; - text-decoration: underline; - margin: 5px; + white-space: nowrap; + color: navy; + cursor: pointer; + text-decoration: underline; + margin: 5px; } .k-rte-changelink-popup { - border: 1px solid #C0C0C0; - z-index: 9999 !important; - background-color: #ECECEC; + border: 1px solid #C0C0C0; + z-index: 9999 !important; + background-color: #ECECEC; } .e-ui-room { - height: 27px; - line-height: 22px; + height: 27px; + line-height: 22px; } .e-ui-room input { - font-size: 100%; - margin-left: 0px; - margin-top: 0px; + font-size: 100%; + margin-left: 0px; + margin-top: 0px; } .k-def-popup { - z-index: 9999 !important; - background-color: #FFF; - border: 1px solid gray; + z-index: 9999 !important; + background-color: #FFF; + border: 1px solid gray; } #k-mshortcut { - position: absolute; - right: 10px; + position: absolute; + right: 10px; } #k-mshortcut-hidden { - visibility: hidden; + visibility: hidden; } #k-mshortcut a { - text-decoration: none; - color: black; + text-decoration: none; + color: black; } .k-plain-iframe iframe { - border: 1px solid gray; + border: 1px solid gray; } .k-transp .x-panel-body { - background: transparent; + background: transparent; } .k-transp { - background: transparent; + background: transparent; } .k-blank { - background: #FFF; + background: #FFF; } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -25,7 +25,6 @@ import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE; import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; @@ -42,6 +41,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -32,7 +32,6 @@ import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -53,6 +52,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogsMessages.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContent.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContent.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -21,11 +21,11 @@ import org.ourproject.kune.blogs.client.BlogClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -20,13 +20,13 @@ package org.ourproject.kune.blogs.client.cnt; import org.ourproject.kune.blogs.client.BlogClientTool; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContext.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContext.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContext.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoom.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoom.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoom.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -21,13 +21,13 @@ import org.ourproject.kune.chat.client.ChatClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -25,7 +25,6 @@ import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_UPLOADEDFILE; import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; @@ -42,6 +41,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -32,7 +32,6 @@ import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -53,6 +52,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,11 +21,11 @@ import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,13 +20,13 @@ package org.ourproject.kune.docs.client.cnt; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -24,7 +24,6 @@ import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_UPLOADEDFILE; import org.ourproject.kune.gallery.client.cnt.GalleryViewer; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; @@ -41,6 +40,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -32,7 +32,6 @@ import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -53,6 +52,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryMessages.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryMessages.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryMessages.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContent.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContent.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -19,10 +19,10 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.platf.client.ui.BasicThumb; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.common.client.ui.BasicThumb; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -21,12 +21,12 @@ import org.ourproject.kune.gallery.client.GalleryClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageSize; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -20,13 +20,13 @@ package org.ourproject.kune.gallery.client.cnt; import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContext.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContext.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContext.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,165 +0,0 @@ -/* AbstractAction.java -- - Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath 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 -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package org.ourproject.kune.platf.client.actions; - -import java.util.HashMap; - -import com.google.gwt.resources.client.ImageResource; - -/** - * A base class for implementing the {@link Action} interface. - * - * @author Andrew Selkirk - * @author Adapted version for GWT (C) The kune development team - */ -public abstract class AbstractAction extends ChangebleObject implements Action { - - /** - * A flag that indicates whether or not the action is enabled. - */ - protected boolean enabled = true; - - /** - * Creates a new action with no properties set. - */ - public AbstractAction() { - // Nothing to do. - } - - /** - * Copy constructor used as a substitute of clone - */ - @SuppressWarnings("unchecked") - public AbstractAction(final AbstractAction action) { - enabled = action.enabled; - store = (HashMap<String, Object>) action.store.clone(); - } - - /** - * Creates a new action with the specified name. The name is stored as a - * property with the key {@link Action#NAME}, and no other properties are - * initialised. - * - * @param name - * the name (<code>null</code> permitted). - */ - public AbstractAction(final String name) { - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 - // 15:19 - putValue(NAME, name); - } - - /** - * Creates a new action with the specified name and icon. The name is stored - * as a property with the key {@link Action#NAME}, the icon is stored as a - * property with the key {@link Action#SMALL_ICON}, and no other properties - * are initialised. - * - * @param name - * the name (<code>null</code> permitted). - * @param icon - * the icon (<code>null</code> permitted). - */ - public AbstractAction(final String name, final ImageResource icon) { - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 - // 15:19 - putValue(NAME, name); - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 - // 15:19 - putValue(SMALL_ICON, icon); - } - - /** - * Returns the flag that indicates whether or not the action is enabled. - * - * @return The flag. - * - * @see #setEnabled(boolean) - */ - public boolean isEnabled() { - return enabled; - } - - @Override - /** - * Sets the value associated with the specified key and sends a - * {@link java.beans.PropertyChangeEvent} to all registered listeners. The - * standard keys are: - * <ul> - * <li>{@link #NAME}</li> - * <li>{@link #SHORT_DESCRIPTION}</li> - * <li>{@link #LONG_DESCRIPTION}</li> - * <li>{@link #SMALL_ICON}</li> - * <li>{@link #ACTION_COMMAND_KEY}</li> - * <li>{@link #ACCELERATOR_KEY}</li> - * <li>{@link #MNEMONIC_KEY}</li> - * </ul> - * Any existing value associated with the key will be overwritten. - * - * @param key - * the key (not <code>null</code>). - * @param value - * the value (<code>null</code> permitted). - */ - public void putValue(final String key, final Object value) { - // TODO Auto-generated method stub - super.putValue(key, value); - } - - /** - * Sets the flag that indicates whether or not the action is enabled and, if - * the value of the flag changed from the previous setting, sends a - * {@link java.beans.PropertyChangeEvent} to all registered listeners (using - * the property name 'enabled'). - * - * @param enabled - * the new flag value. - * - * @see #isEnabled() - */ - public void setEnabled(final boolean enabled) { - if (enabled != this.enabled) { - this.enabled = enabled; - firePropertyChange(ENABLED, !this.enabled, this.enabled); - } - } - - public void setShortcut(final KeyStroke key) { - putValue(Action.ACCELERATOR_KEY, key); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ import com.google.gwt.resources.client.ImageResource; -public abstract class AbstractExtendedAction extends AbstractAction { +public abstract class AbstractExtendedAction extends OldAbstractAction { public static final String NO_TEXT = null; public static final ImageResource NO_ICON = null; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCollection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCollection.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCollection.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,6 +21,7 @@ import java.util.ArrayList; +@Deprecated public class ActionCollection<T> extends ArrayList<ActionDescriptor<T>> { private static final long serialVersionUID = -3308296009308246636L; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,9 +19,9 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.services.ImageDescriptor; import org.ourproject.kune.platf.client.shortcuts.ShortcutDescriptor; +import cc.kune.core.client.services.ImageDescriptor; import cc.kune.core.shared.dto.AccessRolDTO; import com.calclab.suco.client.events.Listener; @@ -30,59 +30,60 @@ /** * The Class ActionDescriptor. */ +@Deprecated public class ActionDescriptor<T> { public static final int NO_POSITION = -1; - /** The icon url. */ - private String iconUrl; + /** The access rol. */ + private AccessRolDTO accessRol; + /** The must be added condition. */ + private ActionAddCondition<T> addCondition; + + /** The confirmation text. */ + private String confirmationText; + + /** The confirmation title. */ + private String confirmationTitle; + + /** The enable condition. */ + private ActionEnableCondition<T> enableCondition; + /** The icon cls. */ private String iconCls; /** The icon descriptor. */ private ImageDescriptor iconDescriptor; - /** The text description. */ - private String textDescription; + /** The icon url. */ + private String iconUrl; - /** The tool tip. */ - private String toolTip; + /** The id. */ + private String id; + /** The must be authenticated. */ + private boolean mustBeAuthenticated; + /** The must be confirmed. */ private boolean mustBeConfirmed; - /** The confirmation title. */ - private String confirmationTitle; + /** The on not confirmed. */ + private Listener<T> onNotConfirmed; - /** The confirmation text. */ - private String confirmationText; - /** The on perform call. */ private final Listener<T> onPerformCall; - /** The on not confirmed. */ - private Listener<T> onNotConfirmed; + private int position = NO_POSITION; - /** The must be authenticated. */ - private boolean mustBeAuthenticated; + private ShortcutDescriptor shortcut; - /** The access rol. */ - private AccessRolDTO accessRol; + /** The text description. */ + private String textDescription; - /** The enable condition. */ - private ActionEnableCondition<T> enableCondition; + /** The tool tip. */ + private String toolTip; - /** The must be added condition. */ - private ActionAddCondition<T> addCondition; - - /** The id. */ - private String id; - - private ShortcutDescriptor shortcut; - - private int position = NO_POSITION; - public ActionDescriptor(final AccessRolDTO accessRolDTO, final Listener<T> onPerformCall) { this.accessRol = accessRolDTO; this.onPerformCall = onPerformCall; @@ -124,6 +125,7 @@ public ActionDescriptor(final AccessRolDTO accessRolDTO, final Listener0 onPerformCall) { this(accessRolDTO, new Listener<T>() { + @Override public void onEvent(final T parameter) { onPerformCall.onEvent(); } @@ -221,6 +223,10 @@ return accessRol; } + private ActionAddCondition<T> getAddCondition() { + return addCondition; + } + /** * Gets the confirmation text. * @@ -239,6 +245,10 @@ return confirmationTitle; } + private ActionEnableCondition<T> getEnableCondition() { + return enableCondition; + } + public String getIconCls() { return iconCls; } @@ -270,6 +280,14 @@ return id; } + private Listener<T> getOnNotConfirmed() { + return onNotConfirmed; + } + + private Listener<T> getOnPerformCall() { + return onPerformCall; + } + /** * Get the index position where this action will be inserted * @@ -296,6 +314,10 @@ return textDescription; } + private String getTextDescription() { + return textDescription; + } + /** * Gets the tool tip. * @@ -439,6 +461,10 @@ this.mustBeConfirmed = mustBeConfirmed; } + private void setOnNotConfirmed(final Listener<T> onNotConfirmed) { + this.onNotConfirmed = onNotConfirmed; + } + /** * Index position where this action will be inserted * @@ -472,28 +498,4 @@ this.toolTip = toolTip; } - private ActionAddCondition<T> getAddCondition() { - return addCondition; - } - - private ActionEnableCondition<T> getEnableCondition() { - return enableCondition; - } - - private Listener<T> getOnNotConfirmed() { - return onNotConfirmed; - } - - private Listener<T> getOnPerformCall() { - return onPerformCall; - } - - private String getTextDescription() { - return textDescription; - } - - private void setOnNotConfirmed(final Listener<T> onNotConfirmed) { - this.onNotConfirmed = onNotConfirmed; - } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/InputMap.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/InputMap.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/InputMap.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -63,7 +63,7 @@ /** * Storage for the KeyStroke --> Object mappings. */ - private Map<KeyStroke, AbstractAction> inputMap; + private Map<KeyStroke, OldAbstractAction> inputMap; /** * An optional parent map. @@ -122,8 +122,8 @@ * @return The binding associated with the specified keystroke (or * <code>null</code>). */ - public AbstractAction get(final KeyStroke keystroke) { - AbstractAction result = null; + public OldAbstractAction get(final KeyStroke keystroke) { + OldAbstractAction result = null; if (inputMap != null) { result = inputMap.get(keystroke); } @@ -177,12 +177,12 @@ * @param actionMapKey * the action (<code>null</code> permitted). */ - public void put(final KeyStroke keystroke, final AbstractAction actionMapKey) { + public void put(final KeyStroke keystroke, final OldAbstractAction actionMapKey) { if (keystroke == null) { return; } if (inputMap == null) { - inputMap = new HashMap<KeyStroke, AbstractAction>(); + inputMap = new HashMap<KeyStroke, OldAbstractAction>(); } if (actionMapKey == null) { inputMap.remove(keystroke); Copied: trunk/src/main/java/org/ourproject/kune/platf/client/actions/OldAbstractAction.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/OldAbstractAction.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/OldAbstractAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,168 @@ +/* AbstractAction.java -- + Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package org.ourproject.kune.platf.client.actions; + +import java.util.HashMap; + +import com.google.gwt.resources.client.ImageResource; + +/** + * A base class for implementing the {@link Action} interface. + * + * @author Andrew Selkirk + * @author Adapted version for GWT (C) The kune development team + */ +@Deprecated +public abstract class OldAbstractAction extends ChangebleObject implements Action { + + /** + * A flag that indicates whether or not the action is enabled. + */ + protected boolean enabled = true; + + /** + * Creates a new action with no properties set. + */ + public OldAbstractAction() { + // Nothing to do. + } + + /** + * Copy constructor used as a substitute of clone + */ + @SuppressWarnings("unchecked") + public OldAbstractAction(final OldAbstractAction action) { + enabled = action.enabled; + store = (HashMap<String, Object>) action.store.clone(); + } + + /** + * Creates a new action with the specified name. The name is stored as a + * property with the key {@link Action#NAME}, and no other properties are + * initialised. + * + * @param name + * the name (<code>null</code> permitted). + */ + public OldAbstractAction(final String name) { + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 15:19 + putValue(NAME, name); + } + + /** + * Creates a new action with the specified name and icon. The name is stored + * as a property with the key {@link Action#NAME}, the icon is stored as a + * property with the key {@link Action#SMALL_ICON}, and no other properties + * are initialised. + * + * @param name + * the name (<code>null</code> permitted). + * @param icon + * the icon (<code>null</code> permitted). + */ + public OldAbstractAction(final String name, final ImageResource icon) { + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 15:19 + putValue(NAME, name); + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 15:19 + putValue(SMALL_ICON, icon); + } + + /** + * Returns the flag that indicates whether or not the action is enabled. + * + * @return The flag. + * + * @see #setEnabled(boolean) + */ + @Override + public boolean isEnabled() { + return enabled; + } + + @Override + /** + * Sets the value associated with the specified key and sends a + * {@link java.beans.PropertyChangeEvent} to all registered listeners. The + * standard keys are: + * <ul> + * <li>{@link #NAME}</li> + * <li>{@link #SHORT_DESCRIPTION}</li> + * <li>{@link #LONG_DESCRIPTION}</li> + * <li>{@link #SMALL_ICON}</li> + * <li>{@link #ACTION_COMMAND_KEY}</li> + * <li>{@link #ACCELERATOR_KEY}</li> + * <li>{@link #MNEMONIC_KEY}</li> + * </ul> + * Any existing value associated with the key will be overwritten. + * + * @param key + * the key (not <code>null</code>). + * @param value + * the value (<code>null</code> permitted). + */ + public void putValue(final String key, final Object value) { + // TODO Auto-generated method stub + super.putValue(key, value); + } + + /** + * Sets the flag that indicates whether or not the action is enabled and, if + * the value of the flag changed from the previous setting, sends a + * {@link java.beans.PropertyChangeEvent} to all registered listeners (using + * the property name 'enabled'). + * + * @param enabled + * the new flag value. + * + * @see #isEnabled() + */ + @Override + public void setEnabled(final boolean enabled) { + if (enabled != this.enabled) { + this.enabled = enabled; + firePropertyChange(ENABLED, !this.enabled, this.enabled); + } + } + + public void setShortcut(final KeyStroke key) { + putValue(Action.ACCELERATOR_KEY, key); + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractActionExtensiblePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractActionExtensiblePresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractActionExtensiblePresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,16 +21,16 @@ public abstract class AbstractActionExtensiblePresenter implements IsActionExtensible { - public abstract void addAction(final GuiActionDescrip descriptor); + public abstract void addAction(final OldGuiActionDescrip descriptor); public void addActionCollection(final GuiActionDescCollection descriptors) { - for (final GuiActionDescrip descriptor : descriptors) { + for (final OldGuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } - public void addActions(final GuiActionDescrip... descriptors) { - for (final GuiActionDescrip descriptor : descriptors) { + public void addActions(final OldGuiActionDescrip... descriptors) { + for (final OldGuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -36,30 +36,30 @@ protected abstract void add(AbstractGuiItem item); - public void add(final GuiActionDescrip... descriptors) { - for (final GuiActionDescrip descriptor : descriptors) { + public void add(final OldGuiActionDescrip... descriptors) { + for (final OldGuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } - public void addAction(final GuiActionDescrip descriptor) { + public void addAction(final OldGuiActionDescrip descriptor) { getGuiItems().add(descriptor); beforeAddWidget(descriptor); } public void addAll(final GuiActionDescCollection descriptors) { - for (final GuiActionDescrip descriptor : descriptors) { + for (final OldGuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } - public void addAll(final List<GuiActionDescrip> descriptors) { - for (final GuiActionDescrip descriptor : descriptors) { + public void addAll(final List<OldGuiActionDescrip> descriptors) { + for (final OldGuiActionDescrip descriptor : descriptors) { addAction(descriptor); } } - protected void beforeAddWidget(final GuiActionDescrip descrip) { + protected void beforeAddWidget(final OldGuiActionDescrip descrip) { if (descrip.mustBeAdded()) { final GuiBinding binding = bindings.get(descrip.getType()); if (binding == null) { @@ -67,7 +67,7 @@ } else { final AbstractGuiItem item = binding.create(descrip); if (binding.isAttachable()) { - if (descrip.getPosition() == GuiActionDescrip.NO_POSITION) { + if (descrip.getPosition() == OldGuiActionDescrip.NO_POSITION) { add(item); } else { insert(item, descrip.getPosition()); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,7 +20,7 @@ package org.ourproject.kune.platf.client.actions.ui; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; import org.ourproject.kune.platf.client.actions.PropertyChangeListener; @@ -32,9 +32,9 @@ public abstract class AbstractGuiItem extends Composite implements View { - protected final GuiActionDescrip descriptor; + protected final OldGuiActionDescrip descriptor; - public AbstractGuiItem(final GuiActionDescrip descriptor) { + public AbstractGuiItem(final OldGuiActionDescrip descriptor) { super(); this.descriptor = descriptor; } @@ -46,7 +46,7 @@ configure(); } - public AbstractAction getAction() { + public OldAbstractAction getAction() { return descriptor.getAction(); } @@ -70,9 +70,9 @@ private void configureProperties() { setText((String) (descriptor.getValue(Action.NAME))); setIcon(descriptor.getValue(Action.SMALL_ICON)); - setEnabled((Boolean) descriptor.getValue(AbstractAction.ENABLED)); + setEnabled((Boolean) descriptor.getValue(OldAbstractAction.ENABLED)); setToolTipText((String) (descriptor.getValue(Action.SHORT_DESCRIPTION))); - setVisible((Boolean) descriptor.getValue(GuiActionDescrip.VISIBLE)); + setVisible((Boolean) descriptor.getValue(OldGuiActionDescrip.VISIBLE)); } private PropertyChangeListener createActionPropertyChangeListener() { @@ -87,7 +87,7 @@ setIcon(newValue); } else if (event.getPropertyName().equals(Action.SHORT_DESCRIPTION)) { setToolTipText((String) newValue); - } else if (event.getPropertyName().equals(GuiActionDescrip.VISIBLE)) { + } else if (event.getPropertyName().equals(OldGuiActionDescrip.VISIBLE)) { setVisible((Boolean) newValue); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -29,7 +29,7 @@ protected final Menu menu; - public AbstractMenuGui(final GuiActionDescrip descriptor) { + public AbstractMenuGui(final OldGuiActionDescrip descriptor) { super(descriptor); menu = new Menu(); menu.setShadow(true); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractMenuItemGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.KeyStroke; @@ -39,7 +39,7 @@ private Item item; - public AbstractMenuItemGui(final MenuItemDescriptor descriptor) { + public AbstractMenuItemGui(final OldMenuItemDescriptor descriptor) { super(descriptor); if (descriptor instanceof MenuRadioItemDescriptor) { final CheckItem checkItem = createCheckItem(descriptor); @@ -61,7 +61,7 @@ final BaseItemListenerAdapter clickListener = new BaseItemListenerAdapter() { @Override public void onClick(final BaseItem item, final EventObject event) { - final AbstractAction action = getAction(); + final OldAbstractAction action = getAction(); if (action != null) { action.actionPerformed(new ActionEvent(item, event.getBrowserEvent())); } @@ -119,7 +119,7 @@ } } - private void confCheckListener(final MenuItemDescriptor descriptor, final CheckItem checkItem) { + private void confCheckListener(final OldMenuItemDescriptor descriptor, final CheckItem checkItem) { descriptor.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(final PropertyChangeEvent event) { if (event.getPropertyName().equals(MenuCheckItemDescriptor.CHECKED)) { @@ -129,7 +129,7 @@ }); } - private CheckItem createCheckItem(final MenuItemDescriptor descriptor) { + private CheckItem createCheckItem(final OldMenuItemDescriptor descriptor) { final CheckItem checkItem = new CheckItem(); checkItem.setChecked(((MenuCheckItemDescriptor) descriptor).isChecked()); return checkItem; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractSeparatorDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractSeparatorDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractSeparatorDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,13 +19,13 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.ActionEvent; -public abstract class AbstractSeparatorDescriptor extends GuiActionDescrip { +public abstract class AbstractSeparatorDescriptor extends OldGuiActionDescrip { public AbstractSeparatorDescriptor() { - super(new AbstractAction() { + super(new OldAbstractAction() { public void actionPerformed(final ActionEvent event) { // No action } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ActionExtensibleView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ActionExtensibleView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ActionExtensibleView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,6 +23,6 @@ public interface ActionExtensibleView extends View { - void addAction(GuiActionDescrip descriptor); + void addAction(OldGuiActionDescrip descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,13 +19,13 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import com.google.gwt.resources.client.ImageResource; -public class BaseAction extends AbstractAction { +public class BaseAction extends OldAbstractAction { public BaseAction(final String text, final String tooltip) { super(); super.putValue(Action.NAME, text); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BasicGuiBindings.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BasicGuiBindings.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BasicGuiBindings.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -26,7 +26,7 @@ bindings.register(MenuDescriptor.class, new MenuBinding()); bindings.register(MenuRadioItemDescriptor.class, menuItemBinding); bindings.register(MenuCheckItemDescriptor.class, menuItemBinding); - bindings.register(MenuItemDescriptor.class, menuItemBinding); + bindings.register(OldMenuItemDescriptor.class, menuItemBinding); bindings.register(MenuSeparatorDescriptor.class, new MenuSeparatorBinding()); bindings.register(PushButtonDescriptor.class, new PushButtonBinding()); bindings.register(ButtonDescriptor.class, new ButtonBinding()); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,7 +22,7 @@ public class ButtonBinding extends GuiBindingAdapter { @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { + public AbstractGuiItem create(final OldGuiActionDescrip descriptor) { return new ButtonGui((ButtonDescriptor) descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ButtonDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,11 +19,11 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; -public class ButtonDescriptor extends GuiActionDescrip { +public class ButtonDescriptor extends OldGuiActionDescrip { - public ButtonDescriptor(final AbstractAction action) { + public ButtonDescriptor(final OldAbstractAction action) { super(action); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescCollection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescCollection.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescCollection.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,12 +22,12 @@ import java.util.ArrayList; // @PMD:REVIEWED:AtLeastOneConstructor: by vjrj on 26/05/09 12:31 -public class GuiActionDescCollection extends ArrayList<GuiActionDescrip> { +public class GuiActionDescCollection extends ArrayList<OldGuiActionDescrip> { private static final long serialVersionUID = 6759723760404227737L; - public void add(final GuiActionDescrip... descriptors) { - for (GuiActionDescrip descriptor : descriptors) { + public void add(final OldGuiActionDescrip... descriptors) { + for (OldGuiActionDescrip descriptor : descriptors) { super.add(descriptor); } } Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescrip.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescrip.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,186 +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 org.ourproject.kune.platf.client.actions.ui; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractAction; -import org.ourproject.kune.platf.client.actions.Action; -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.ChangebleObject; - -/** - * The Class AbstractUIActionDescriptor. - */ -public abstract class GuiActionDescrip extends ChangebleObject { - - public static final String VISIBLE = "visibleprop"; - - protected static final int NO_POSITION = -1; - protected static final View NO_VIEW = null; - protected static final GuiActionDescrip NO_PARENT = null; - - private GuiAddCondition addCondition = new GuiAddConditionAdapter(); - - protected GuiActionDescrip parent; - - /** The action. */ - private final AbstractAction action; - - /** The position where the item will be inserted. */ - private int position; - - /** The item location. */ - private String location; - - /** The item DOM id. */ - private String id; - - /** - * Instantiates a new abstract ui action descriptor. This is used for - * describe UI button, menus, menu items and so on - * - * @param action - * the action - */ - public GuiActionDescrip(final AbstractAction action) { - this.action = action; - position = NO_POSITION; - parent = NO_PARENT; - } - - public void fire(final ActionEvent event) { - action.actionPerformed(event); - } - - public AbstractAction getAction() { - return action; - } - - public GuiAddCondition getAddCondition() { - return addCondition; - } - - public String getId() { - return id; - } - - /** - * Gets the location, a string used to group actions with locations (top - * bar, bottom bar, user bar...). - * - * @return the location - */ - public String getLocation() { - return location; - } - - public GuiActionDescrip getParent() { - return parent; - } - - /** - * Gets the position. - * - * @return the position - */ - public int getPosition() { - return position; - } - - public abstract Class<?> getType(); - - @Override - /** - * We try to get the gui property (for instance the name) and if it's empty we try to get the same property in actions. This permit to have several gui items with the same action but different gui properties (like text descriptions) if necessary. - */ - public Object getValue(final String key) { - final Object guiValue = super.getValue(key); - if (guiValue == null) { - return action.getValue(key); - } else { - return guiValue; - } - } - - public boolean isChild() { - // @PMD:REVIEWED:CompareObjectsWithEquals: by vjrj on 26/05/09 20:57 - return parent != NO_PARENT; - } - - public boolean mustBeAdded() { - boolean result = false; - if (addCondition != null) { - result = addCondition.mustBeAdded(); - } - return result; - } - - public void setAddCondition(final GuiAddCondition addCondition) { - this.addCondition = addCondition; - } - - public void setEnabled(final boolean enabled) { - action.setEnabled(enabled); - } - - public void setId(final String id) { - this.id = id; - } - - /** - * If we have several toolbars, we can group with the "location" string key - * actions that must be in the same location (ex: top bar, bottom bar, and - * so on). - * - * @param location - * the new location - */ - public void setLocation(final String location) { - this.location = location; - } - - public void setParent(final GuiActionDescrip parent) { - this.parent = parent; - } - - /** - * Sets the position (where the UI element will be positioned, for instance - * in a toolbar or in a menu). - * - * @param position - * the new position - */ - public void setPosition(final int position) { - this.position = position; - } - - public void setVisible(final boolean visible) { - action.putValue(VISIBLE, visible); - } - - @Override - public String toString() { - final String name = (String) getValue(Action.NAME); - final String tooltip = (String) getValue(Action.SHORT_DESCRIPTION); - return "[GuiActionDescrip: " + action.getClass() + (name == null ? "" : " " + name) - + (tooltip == null ? "" : " " + tooltip) + "]"; - } - -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ public interface GuiBinding { - AbstractGuiItem create(GuiActionDescrip descriptor); + AbstractGuiItem create(OldGuiActionDescrip descriptor); boolean isAttachable(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingAdapter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingAdapter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiBindingAdapter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ public class GuiBindingAdapter implements GuiBinding { - public AbstractGuiItem create(final GuiActionDescrip descriptor) { + public AbstractGuiItem create(final OldGuiActionDescrip descriptor) { return null; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/IsActionExtensible.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/IsActionExtensible.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/IsActionExtensible.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,7 +27,7 @@ * @param action * the action */ - void addAction(GuiActionDescrip action); + void addAction(OldGuiActionDescrip action); /** * Adds some action descriptions @@ -43,6 +43,6 @@ * @param action * the action */ - void addActions(GuiActionDescrip... actions); + void addActions(OldGuiActionDescrip... actions); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -28,13 +28,13 @@ private Boolean isSubmenu; @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { + public AbstractGuiItem create(final OldGuiActionDescrip descriptor) { AbstractGuiItem item; if (descriptor.isChild()) { final SubMenuGui submenu = new SubMenuGui(descriptor); final AbstractMenuGui parentMenu = ((AbstractMenuGui) descriptor.getParent().getValue(UI_MENU)); final int position = descriptor.getPosition(); - if (position == GuiActionDescrip.NO_POSITION) { + if (position == OldGuiActionDescrip.NO_POSITION) { parentMenu.add(submenu.getMenuItem()); } else { parentMenu.insert(position, submenu.getMenuItem()); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuCheckItemDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,15 +19,15 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; -public class MenuCheckItemDescriptor extends MenuItemDescriptor { +public class MenuCheckItemDescriptor extends OldMenuItemDescriptor { public static final String CHECKED = "checked"; private boolean checked = false; - public MenuCheckItemDescriptor(final MenuDescriptor parent, final AbstractAction action) { + public MenuCheckItemDescriptor(final MenuDescriptor parent, final OldAbstractAction action) { super(parent, action); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,12 +19,12 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.Action; import com.google.gwt.resources.client.ImageResource; -public class MenuDescriptor extends GuiActionDescrip { +public class MenuDescriptor extends OldGuiActionDescrip { public static final String MENU_HIDE = "hidemenu"; public static final String MENU_SHOW = "showmenu"; @@ -37,11 +37,11 @@ this(new BaseAction(null, null)); } - public MenuDescriptor(final AbstractAction action) { + public MenuDescriptor(final OldAbstractAction action) { this(NO_PARENT, action); } - public MenuDescriptor(final GuiActionDescrip parent, final AbstractAction action) { + public MenuDescriptor(final OldGuiActionDescrip parent, final OldAbstractAction action) { super(action); setParent(parent); action.putValue(MENU_HIDE, false); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,15 +27,15 @@ public class MenuItemBinding extends GuiBindingAdapter { @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { - final MenuItemGui item = new MenuItemGui((MenuItemDescriptor) descriptor); + public AbstractGuiItem create(final OldGuiActionDescrip descriptor) { + final MenuItemGui item = new MenuItemGui((OldMenuItemDescriptor) descriptor); final int position = descriptor.getPosition(); final Item menuItem = (Item) item.getWidget(); final AbstractMenuGui menu = ((AbstractMenuGui) descriptor.getParent().getValue(MenuBinding.UI_MENU)); if (menu == null) { throw new UIException("To add a menu item you need to add the menu before. Item: " + descriptor); } - if (position == GuiActionDescrip.NO_POSITION) { + if (position == OldGuiActionDescrip.NO_POSITION) { menu.add(menuItem); } else { menu.insert(position, menuItem); Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,39 +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 org.ourproject.kune.platf.client.actions.ui; - -import org.ourproject.kune.platf.client.actions.AbstractAction; - -public class MenuItemDescriptor extends GuiActionDescrip { - - public MenuItemDescriptor(final AbstractAction action) { - super(action); - } - - public MenuItemDescriptor(final MenuDescriptor parent, final AbstractAction action) { - super(action); - setParent(parent); - } - - @Override - public Class<?> getType() { - return MenuItemDescriptor.class; - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ public class MenuItemGui extends AbstractMenuItemGui { - public MenuItemGui(final MenuItemDescriptor descriptor) { + public MenuItemGui(final OldMenuItemDescriptor descriptor) { super(descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuRadioItemDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,13 +19,13 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; public class MenuRadioItemDescriptor extends MenuCheckItemDescriptor { private final String group; - public MenuRadioItemDescriptor(final MenuDescriptor parent, final AbstractAction action, final String group) { + public MenuRadioItemDescriptor(final MenuDescriptor parent, final OldAbstractAction action, final String group) { super(parent, action); this.group = group; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,7 +24,7 @@ public class MenuSeparatorBinding extends GuiBindingAdapter { @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { + public AbstractGuiItem create(final OldGuiActionDescrip descriptor) { final AbstractMenuGui menu = ((AbstractMenuGui) descriptor.getParent().getValue(MenuBinding.UI_MENU)); if (menu == null) { throw new UIException("To add a menu separator you need to add the menu before. Item: " + descriptor); Copied: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldGuiActionDescrip.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/GuiActionDescrip.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldGuiActionDescrip.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldGuiActionDescrip.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,186 @@ +/* + * + * 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 org.ourproject.kune.platf.client.actions.ui; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; +import org.ourproject.kune.platf.client.actions.Action; +import org.ourproject.kune.platf.client.actions.ActionEvent; +import org.ourproject.kune.platf.client.actions.ChangebleObject; + +/** + * The Class AbstractUIActionDescriptor. + */ +public abstract class OldGuiActionDescrip extends ChangebleObject { + + public static final String VISIBLE = "visibleprop"; + + protected static final int NO_POSITION = -1; + protected static final View NO_VIEW = null; + protected static final OldGuiActionDescrip NO_PARENT = null; + + private GuiAddCondition addCondition = new GuiAddConditionAdapter(); + + protected OldGuiActionDescrip parent; + + /** The action. */ + private final OldAbstractAction action; + + /** The position where the item will be inserted. */ + private int position; + + /** The item location. */ + private String location; + + /** The item DOM id. */ + private String id; + + /** + * Instantiates a new abstract ui action descriptor. This is used for + * describe UI button, menus, menu items and so on + * + * @param action + * the action + */ + public OldGuiActionDescrip(final OldAbstractAction action) { + this.action = action; + position = NO_POSITION; + parent = NO_PARENT; + } + + public void fire(final ActionEvent event) { + action.actionPerformed(event); + } + + public OldAbstractAction getAction() { + return action; + } + + public GuiAddCondition getAddCondition() { + return addCondition; + } + + public String getId() { + return id; + } + + /** + * Gets the location, a string used to group actions with locations (top + * bar, bottom bar, user bar...). + * + * @return the location + */ + public String getLocation() { + return location; + } + + public OldGuiActionDescrip getParent() { + return parent; + } + + /** + * Gets the position. + * + * @return the position + */ + public int getPosition() { + return position; + } + + public abstract Class<?> getType(); + + @Override + /** + * We try to get the gui property (for instance the name) and if it's empty we try to get the same property in actions. This permit to have several gui items with the same action but different gui properties (like text descriptions) if necessary. + */ + public Object getValue(final String key) { + final Object guiValue = super.getValue(key); + if (guiValue == null) { + return action.getValue(key); + } else { + return guiValue; + } + } + + public boolean isChild() { + // @PMD:REVIEWED:CompareObjectsWithEquals: by vjrj on 26/05/09 20:57 + return parent != NO_PARENT; + } + + public boolean mustBeAdded() { + boolean result = false; + if (addCondition != null) { + result = addCondition.mustBeAdded(); + } + return result; + } + + public void setAddCondition(final GuiAddCondition addCondition) { + this.addCondition = addCondition; + } + + public void setEnabled(final boolean enabled) { + action.setEnabled(enabled); + } + + public void setId(final String id) { + this.id = id; + } + + /** + * If we have several toolbars, we can group with the "location" string key + * actions that must be in the same location (ex: top bar, bottom bar, and + * so on). + * + * @param location + * the new location + */ + public void setLocation(final String location) { + this.location = location; + } + + public void setParent(final OldGuiActionDescrip parent) { + this.parent = parent; + } + + /** + * Sets the position (where the UI element will be positioned, for instance + * in a toolbar or in a menu). + * + * @param position + * the new position + */ + public void setPosition(final int position) { + this.position = position; + } + + public void setVisible(final boolean visible) { + action.putValue(VISIBLE, visible); + } + + @Override + public String toString() { + final String name = (String) getValue(Action.NAME); + final String tooltip = (String) getValue(Action.SHORT_DESCRIPTION); + return "[GuiActionDescrip: " + action.getClass() + (name == null ? "" : " " + name) + + (tooltip == null ? "" : " " + tooltip) + "]"; + } + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldMenuItemDescriptor.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemDescriptor.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldMenuItemDescriptor.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/OldMenuItemDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,39 @@ +/* + * + * 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 org.ourproject.kune.platf.client.actions.ui; + +import org.ourproject.kune.platf.client.actions.OldAbstractAction; + +public class OldMenuItemDescriptor extends OldGuiActionDescrip { + + public OldMenuItemDescriptor(final OldAbstractAction action) { + super(action); + } + + public OldMenuItemDescriptor(final MenuDescriptor parent, final OldAbstractAction action) { + super(action); + setParent(parent); + } + + @Override + public Class<?> getType() { + return OldMenuItemDescriptor.class; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,7 +22,7 @@ public class PushButtonBinding extends GuiBindingAdapter { @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { + public AbstractGuiItem create(final OldGuiActionDescrip descriptor) { return new PushButtonGui((PushButtonDescriptor) descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/PushButtonDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; public class PushButtonDescriptor extends ButtonDescriptor { @@ -27,7 +27,7 @@ protected boolean pushed = false; - public PushButtonDescriptor(final AbstractAction action) { + public PushButtonDescriptor(final OldAbstractAction action) { super(action); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/SubMenuGui.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -25,7 +25,7 @@ private final MenuItem item; - public SubMenuGui(final GuiActionDescrip descriptor) { + public SubMenuGui(final OldGuiActionDescrip descriptor) { super(descriptor); item = new MenuItem(); item.setMenu(menu); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorBinding.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ToolbarSeparatorBinding.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,7 +21,7 @@ public class ToolbarSeparatorBinding extends GuiBindingAdapter { @Override - public AbstractGuiItem create(final GuiActionDescrip descriptor) { + public AbstractGuiItem create(final OldGuiActionDescrip descriptor) { final ToolbarSeparatorDescriptor sepDescrip = (ToolbarSeparatorDescriptor) descriptor; final ComplexToolbar toolbar = (ComplexToolbar) sepDescrip.getToolbar(); switch (sepDescrip.getSeparatorType()) { Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageDescriptor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageDescriptor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,24 +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 org.ourproject.kune.platf.client.services; - -public enum ImageDescriptor { - accept, add, addGreen, alert, anybody, arrowDownBlack, arrowDownGreen, arrowDownWhite, arrowLeftGreen, arrowRightBlack, arrowRightGreen, arrowRightWhite, arrowUpGreen, bulletAdd, bulletBlack, bulletBlue, bulletDelete, bulletGreen, bulletPink, bulletPurple, bulletRed, bulletStar, bulletToggleMinus, bulletTogglePlus, bulletYellow, button15cblue, button15cdark, button15clight, button15cxlight, button15lblue, button15ldark, button15llight, button15lxlight, button15rblue, button15rdark, button15rlight, button15rxlight, button17cblue, button17cdark, button17clight, button17cxlight, button17lblue, button17ldark, button17llight, button17lxlight, button17rblue, button17rdark, button17rlight, button17rxlight, button20cblue, button20cdark, button20clight, button20cxlight, button20lblue, button20ldark, button20llight, button20lxlight, button20rblue, button20rdark, button20rlight, button20rxlight, buttonArrowDown, buttonHelpBlue, buttonHelpDark, buttonHelpLight, buttonSitebarArrowDown, by80x15, bync80x15, byncnd80x15, byncsa80x15, bynd80x15, bysa80x15, cancel, clear, copyleft, cross, crossDark, del, emblemImportant, emblemSystem, error, everybody, fullscreen, gnuFdl, groupDefIcon, groupHome, important, info, infoLight, kuneClose, kuneExternalWindow, kuneHelpTranslationIcon, kuneIcon16, kuneLogo16px, kunePreferences, kuneSearchIco, kuneSearchIcoPush, language, nobody, noCopyleft, nt, opentriangle, personDef, remove, rssIcon, searchIco, spinKuneThundGreen, splitterVertBar, star10, star20, star30, star40, star50, star60, star70, star80, star90, starGrey, starSmallYellow, starVsmallYellow, starYellow, step1, step2, step3, step4, step5, themeChoose, triangle -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/ImageUtils.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,426 +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 org.ourproject.kune.platf.client.services; - -import com.google.gwt.user.client.ui.AbstractImagePrototype; - -public class ImageUtils { - - private final Images img; - - public ImageUtils(Images img) { - this.img = img; - } - - public AbstractImagePrototype getImage(final ImageDescriptor imageDescriptor) { - switch (imageDescriptor) { - case accept: { - return img.accept(); - } - case add: { - return img.add(); - } - case addGreen: { - return img.addGreen(); - } - case alert: { - return img.alert(); - } - case anybody: { - return img.anybody(); - } - case arrowDownBlack: { - return img.arrowDownBlack(); - } - case arrowDownGreen: { - return img.arrowDownGreen(); - } - case arrowDownWhite: { - return img.arrowDownWhite(); - } - case arrowLeftGreen: { - return img.arrowLeftGreen(); - } - case arrowRightBlack: { - return img.arrowRightBlack(); - } - case arrowRightGreen: { - return img.arrowRightGreen(); - } - case arrowRightWhite: { - return img.arrowRightWhite(); - } - case arrowUpGreen: { - return img.arrowUpGreen(); - } - case bulletAdd: { - return img.bulletAdd(); - } - case bulletBlack: { - return img.bulletBlack(); - } - case bulletBlue: { - return img.bulletBlue(); - } - case bulletDelete: { - return img.bulletDelete(); - } - case bulletGreen: { - return img.bulletGreen(); - } - case bulletPink: { - return img.bulletPink(); - } - case bulletPurple: { - return img.bulletPurple(); - } - case bulletRed: { - return img.bulletRed(); - } - case bulletStar: { - return img.bulletStar(); - } - case bulletToggleMinus: { - return img.bulletToggleMinus(); - } - case bulletTogglePlus: { - return img.bulletTogglePlus(); - } - case bulletYellow: { - return img.bulletYellow(); - } - case button15cblue: { - return img.button15cblue(); - } - case button15cdark: { - return img.button15cdark(); - } - case button15clight: { - return img.button15clight(); - } - case button15cxlight: { - return img.button15cxlight(); - } - case button15lblue: { - return img.button15lblue(); - } - case button15ldark: { - return img.button15ldark(); - } - case button15llight: { - return img.button15llight(); - } - case button15lxlight: { - return img.button15lxlight(); - } - case button15rblue: { - return img.button15rblue(); - } - case button15rdark: { - return img.button15rdark(); - } - case button15rlight: { - return img.button15rlight(); - } - case button15rxlight: { - return img.button15rxlight(); - } - case button17cblue: { - return img.button17cblue(); - } - case button17cdark: { - return img.button17cdark(); - } - case button17clight: { - return img.button17clight(); - } - case button17cxlight: { - return img.button17cxlight(); - } - case button17lblue: { - return img.button17lblue(); - } - case button17ldark: { - return img.button17ldark(); - } - case button17llight: { - return img.button17llight(); - } - case button17lxlight: { - return img.button17lxlight(); - } - case button17rblue: { - return img.button17rblue(); - } - case button17rdark: { - return img.button17rdark(); - } - case button17rlight: { - return img.button17rlight(); - } - case button17rxlight: { - return img.button17rxlight(); - } - case button20cblue: { - return img.button20cblue(); - } - case button20cdark: { - return img.button20cdark(); - } - case button20clight: { - return img.button20clight(); - } - case button20cxlight: { - return img.button20cxlight(); - } - case button20lblue: { - return img.button20lblue(); - } - case button20ldark: { - return img.button20ldark(); - } - case button20llight: { - return img.button20llight(); - } - case button20lxlight: { - return img.button20lxlight(); - } - case button20rblue: { - return img.button20rblue(); - } - case button20rdark: { - return img.button20rdark(); - } - case button20rlight: { - return img.button20rlight(); - } - case button20rxlight: { - return img.button20rxlight(); - } - case buttonArrowDown: { - return img.buttonArrowDown(); - } - case buttonHelpBlue: { - return img.buttonHelpBlue(); - } - case buttonHelpDark: { - return img.buttonHelpDark(); - } - case buttonHelpLight: { - return img.buttonHelpLight(); - } - case buttonSitebarArrowDown: { - return img.buttonSitebarArrowDown(); - } - case by80x15: { - return img.by80x15(); - } - case bync80x15: { - return img.bync80x15(); - } - case byncnd80x15: { - return img.byncnd80x15(); - } - case byncsa80x15: { - return img.byncsa80x15(); - } - case bynd80x15: { - return img.bynd80x15(); - } - case bysa80x15: { - return img.bysa80x15(); - } - case cancel: { - return img.cancel(); - } - case clear: { - return img.clear(); - } - case copyleft: { - return img.copyleft(); - } - case cross: { - return img.cross(); - } - case crossDark: { - return img.crossDark(); - } - case del: { - return img.del(); - } - case emblemImportant: { - return img.emblemImportant(); - } - case emblemSystem: { - return img.emblemSystem(); - } - case error: { - return img.error(); - } - case everybody: { - return img.everybody(); - } - case fullscreen: { - return img.fullscreen(); - } - case gnuFdl: { - return img.gnuFdl(); - } - case groupDefIcon: { - return img.groupDefIcon(); - } - case groupHome: { - return img.groupHome(); - } - case important: { - return img.important(); - } - case info: { - return img.info(); - } - case infoLight: { - return img.infoLight(); - } - case kuneClose: { - return img.kuneClose(); - } - case kuneExternalWindow: { - return img.kuneExternalWindow(); - } - case kuneHelpTranslationIcon: { - return img.kuneHelpTranslationIcon(); - } - case kuneIcon16: { - return img.kuneIcon16(); - } - case kuneLogo16px: { - return img.kuneLogo16px(); - } - case kunePreferences: { - return img.kunePreferences(); - } - case kuneSearchIco: { - return img.kuneSearchIco(); - } - case kuneSearchIcoPush: { - return img.kuneSearchIcoPush(); - } - case language: { - return img.language(); - } - case nobody: { - return img.nobody(); - } - case noCopyleft: { - return img.noCopyleft(); - } - case nt: { - return img.nt(); - } - case opentriangle: { - return img.opentriangle(); - } - case personDef: { - return img.personDef(); - } - case remove: { - return img.remove(); - } - case rssIcon: { - return img.rssIcon(); - } - case searchIco: { - return img.searchIco(); - } - case spinKuneThundGreen: { - return img.spinKuneThundGreen(); - } - case splitterVertBar: { - return img.splitterVertBar(); - } - case star10: { - return img.star10(); - } - case star20: { - return img.star20(); - } - case star30: { - return img.star30(); - } - case star40: { - return img.star40(); - } - case star50: { - return img.star50(); - } - case star60: { - return img.star60(); - } - case star70: { - return img.star70(); - } - case star80: { - return img.star80(); - } - case star90: { - return img.star90(); - } - case starGrey: { - return img.starGrey(); - } - case starSmallYellow: { - return img.starSmallYellow(); - } - case starVsmallYellow: { - return img.starVsmallYellow(); - } - case starYellow: { - return img.starYellow(); - } - case step1: { - return img.step1(); - } - case step2: { - return img.step2(); - } - case step3: { - return img.step3(); - } - case step4: { - return img.step4(); - } - case step5: { - return img.step5(); - } - case themeChoose: { - return img.themeChoose(); - } - case triangle: { - return img.triangle(); - } - default: - return null; - } - } - - public String getImageHtml(final ImageDescriptor imageDescriptor) { - return getImage(imageDescriptor).getHTML(); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -26,7 +26,6 @@ import org.ourproject.kune.platf.client.i18n.Resources; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.QuickTipsHelper; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalettePanel; @@ -100,6 +99,8 @@ import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageUtils; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -161,19 +162,19 @@ return null; // new ErrorHandler(i(Session.class), i18n, p(StateManager.class)); } }); +// +// register(Singleton.class, new Factory<Images>(Images.class) { +// @Override +// public Images create() { +// return Images.App.getInstance(); +// } +// }, new Factory<ImageUtils>(ImageUtils.class) { +// @Override +// public ImageUtils create() { +// return new ImageUtils(i(Images.class)); +// } +// }); - register(Singleton.class, new Factory<Images>(Images.class) { - @Override - public Images create() { - return Images.App.getInstance(); - } - }, new Factory<ImageUtils>(ImageUtils.class) { - @Override - public ImageUtils create() { - return new ImageUtils(i(Images.class)); - } - }); - //AsyncCallbackSimple.init(i(ErrorHandler.class)); // register(Singleton.class, new Factory<AppStarter>(AppStarter.class) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.shortcuts; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ChangebleObject; import org.ourproject.kune.platf.client.actions.InputMap; @@ -45,7 +45,7 @@ if (nativeEventPrev.getTypeInt() == Event.ONKEYDOWN) { final NativeEvent nativeEvent = nativeEventPrev.getNativeEvent(); final Event event = Event.as(nativeEvent); - final AbstractAction action = get(Shortcut.getShortcut(event.getCtrlKey(), event.getAltKey(), + final OldAbstractAction action = get(Shortcut.getShortcut(event.getCtrlKey(), event.getAltKey(), event.getShiftKey(), event.getShiftKey(), (char) event.getKeyCode())); if (action != null) { Log.debug("Not propagating event"); @@ -69,7 +69,7 @@ } @Override - public void put(final KeyStroke keystroke, final AbstractAction action) { + public void put(final KeyStroke keystroke, final OldAbstractAction action) { final ChangebleObject previous = super.get(keystroke); if (previous != null) { Log.warn("Shortcut already registed by: " + previous + "(overriding)"); Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/BasicThumb.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,89 +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 org.ourproject.kune.platf.client.ui; - -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.gwtext.client.util.Format; - -// http://en.wikipedia.org/wiki/Thumbnail - -public class BasicThumb extends Composite { - private static final int NOSIZE = -1; - private final Image thumbImg; - private final Label thumbLabel; - - public BasicThumb(final String imageUrl, final int imgSize, final String text, final int textMaxLenght, - final boolean crop, final ClickHandler clickHandler) { - super(); - final VerticalPanel vpanel = new VerticalPanel(); - if (imgSize == NOSIZE) { - thumbImg = new Image(imageUrl); - } else { - if (crop) { - thumbImg = new Image(imageUrl, 0, 0, imgSize, imgSize); - } else { - thumbImg = new Image(imageUrl); - thumbImg.setPixelSize(imgSize, imgSize); - } - } - final String title = textMaxLenght == NOSIZE ? text : Format.ellipsis(text, textMaxLenght); - thumbLabel = new Label(title); - vpanel.add(thumbImg); - vpanel.add(thumbLabel); - vpanel.addStyleName("k-basic-thumb"); - vpanel.addStyleName("kune-Margin-Small-trbl"); - vpanel.addStyleName("kune-pointer"); - vpanel.addStyleName("kune-floatleft"); - thumbLabel.addClickHandler(clickHandler); - vpanel.setCellHorizontalAlignment(thumbLabel, VerticalPanel.ALIGN_CENTER); - thumbImg.addClickHandler(clickHandler); - initWidget(vpanel); - } - - public BasicThumb(final String imageUrl, final String thumText, final ClickHandler clickHandler) { - this(imageUrl, NOSIZE, thumText, NOSIZE, false, clickHandler); - } - - public BasicThumb(final String imageUrl, final String text, final int textMaxLenght, final ClickHandler clickHandler) { - this(imageUrl, NOSIZE, text, textMaxLenght, false, clickHandler); - } - - public void setText(final String text) { - thumbLabel.setText(text); - } - - public void setThumbUrl(final String url) { - thumbImg.setUrl(url); - } - - public void setTooltip(final String tip) { - KuneUiUtils.setQuickTip(thumbImg, tip); - KuneUiUtils.setQuickTip(thumbLabel, tip); - } - - public void setTooltip(final String tipTitle, final String tip) { - KuneUiUtils.setQuickTip(thumbImg, tip, tipTitle); - KuneUiUtils.setQuickTip(thumbLabel, tip, tipTitle); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,39 +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 org.ourproject.kune.platf.client.ui.download; - -public final class FileConstants { - - public final static String HASH = "hash"; - public final static String TOKEN = "token"; - public final static String DOWNLOAD = "download"; - public final static String IMGSIZE = "imgsize"; - public final static String FILENAME = "filename"; - public final static String TYPE_ID = "typeid"; - public final static String USER_LOGO_FIELD = "k-ulogov-ff"; - public final static String GROUP_LOGO_FIELD = "k-glogov-ff"; - public final static int LOGO_DEF_HEIGHT = 60; - public final static int LOGO_DEF_WIDTH = 468; - public final static int LOGO_MIN_HEIGHT = 28; - public final static int LOGO_MIN_WIDTH = 468; - - private FileConstants() { - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,94 +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 org.ourproject.kune.platf.client.ui.download; - -import org.ourproject.kune.platf.client.services.ImageDescriptor; -import org.ourproject.kune.platf.client.services.ImageUtils; - -import cc.kune.common.client.utils.Url; -import cc.kune.common.client.utils.UrlParam; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.domain.utils.StateToken; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.RootPanel; - -public class FileDownloadUtils { - - private static final String DOWNLOADSERVLET = "servlets/FileDownloadManager"; - private static final String LOGODOWNLOADSERVLET = "servlets/EntityLogoDownloadManager"; - - private final Session session; - private final ImageUtils imageUtils; - - public FileDownloadUtils(final Session session, final ImageUtils imageUtils) { - this.session = session; - this.imageUtils = imageUtils; - } - - public void downloadFile(final StateToken token) { - final String url = calculateUrl(token, true, true); - DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url); - } - - public String getImageResizedUrl(final StateToken token, final ImageSize imageSize) { - return calculateUrl(token, false, true) + "&" + new UrlParam(FileConstants.IMGSIZE, imageSize.toString()); - } - - public String getImageUrl(final StateToken token) { - return calculateUrl(token, false, true); - } - - public String getLogoAvatarHtml(final StateToken groupToken, final boolean groupHasLogo, final boolean isPersonal, - final int size, final int hvspace) { - if (groupHasLogo) { - return "<img hspace='" + hvspace + "' vspace='" + hvspace + "' align='left' style='width: " + size - + "px; height: " + size + "px;' src='" + getLogoImageUrl(groupToken) + "'>"; - } else { - return isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) - : imageUtils.getImageHtml(ImageDescriptor.groupDefIcon); - } - } - - public String getLogoImageUrl(final StateToken token) { - return new Url(GWT.getModuleBaseURL() + LOGODOWNLOADSERVLET, - new UrlParam(FileConstants.TOKEN, token.toString())).toString(); - } - - public String getUrl(final StateToken token) { - return calculateUrl(token, false, false); - } - - private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { - final Url url = new Url(GWT.getModuleBaseURL() + DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, - token.toString())); - if (download) { - url.add(new UrlParam(FileConstants.DOWNLOAD, download)); - } - if (useHash) { - final String hash = session.getUserHash(); - if (hash != null) { - url.add(new UrlParam(FileConstants.HASH, hash)); - } - } - return url.toString(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/ImageSize.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,24 +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 org.ourproject.kune.platf.client.ui.download; - -public enum ImageSize { - sized, thumb, ico -} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ActionItem; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.platf.client.ui.dialogs.AbstractPopupPanel; @@ -53,7 +53,7 @@ hpanel.add(close); } - public void add(final GuiActionDescrip item) { + public void add(final OldGuiActionDescrip item) { final Label actionLabel = new Label(); actionLabel.setText((String) item.getValue(Action.NAME)); actionLabel.addStyleName("k-rte-changelink"); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,9 +20,9 @@ package org.ourproject.kune.platf.client.ui.rte.basic; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.KeyStroke; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.GuiAddCondition; import org.ourproject.kune.platf.client.actions.ui.IsActionExtensible; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; @@ -36,19 +36,19 @@ public interface RTEditor extends IsActionExtensible { /** - * The TOPBAR location used in {@link GuiActionDescrip#setLocation(String)} + * The TOPBAR location used in {@link OldGuiActionDescrip#setLocation(String)} * for put the actions in the correct position */ String TOPBAR = "rte-topbar"; /** - * The SNDBAR location used in {@link GuiActionDescrip#setLocation(String)} + * The SNDBAR location used in {@link OldGuiActionDescrip#setLocation(String)} * for put the actions in the correct position */ String SNDBAR = "rte-sndbar"; /** - * The LINKCTX location used in {@link GuiActionDescrip#setLocation(String)} + * The LINKCTX location used in {@link OldGuiActionDescrip#setLocation(String)} * for put the actions in the links context menu */ String LINKCTX = "rte-linkctx"; @@ -168,7 +168,7 @@ * @param action * the action */ - void setActionShortcut(KeyStroke key, AbstractAction action); + void setActionShortcut(KeyStroke key, OldAbstractAction action); /** * Sets some action shortcut, some principal, other similar (used when some @@ -181,7 +181,7 @@ * @param actions * the actions */ - void setActionShortcut(KeyStroke key, AbstractAction mainAction, AbstractAction... actions); + void setActionShortcut(KeyStroke key, OldAbstractAction mainAction, OldAbstractAction... actions); /** * Sets that editor must be extended type (if browser permit it). @@ -216,7 +216,7 @@ * @param descripts * the descripts */ - void setLocation(String location, GuiActionDescrip... descripts); + void setLocation(String location, OldGuiActionDescrip... descripts); /** * Sets the text of the editor. Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,12 +23,12 @@ import org.cobogw.gwt.user.client.CSS; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.InputMap; import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; @@ -90,7 +90,7 @@ setHeight("100%"); } - public void addAction(final GuiActionDescrip item) { + public void addAction(final OldGuiActionDescrip item) { final String location = item.getLocation(); if (location == null) { throw new UIException("Unknown location in action item: " + item); @@ -315,8 +315,8 @@ break; case Event.ONKEYPRESS: final KeyStroke keystroke = KeyStroke.getKeyStrokeForEvent(event); - final AbstractAction rtaActionItem = inputMap.get(keystroke); - final AbstractAction actionItem = rtaActionItem == null ? globalShortcutReg.get(keystroke) : rtaActionItem; + final OldAbstractAction rtaActionItem = inputMap.get(keystroke); + final OldAbstractAction actionItem = rtaActionItem == null ? globalShortcutReg.get(keystroke) : rtaActionItem; if (actionItem == null) { super.onBrowserEvent(event); updateStatus(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -28,7 +28,7 @@ import java.util.Map; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.InputMap; @@ -37,11 +37,11 @@ import org.ourproject.kune.platf.client.actions.ui.AbstractActionExtensiblePresenter; import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; import org.ourproject.kune.platf.client.actions.ui.GuiActionDescCollection; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.GuiAddCondition; import org.ourproject.kune.platf.client.actions.ui.MenuCheckItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuRadioItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor; import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor; @@ -786,7 +786,7 @@ } @Override - public void addAction(final GuiActionDescrip descriptor) { + public void addAction(final OldGuiActionDescrip descriptor) { actions.add(descriptor); checkForMenus(descriptor); } @@ -810,12 +810,12 @@ } private void attachActions() { - for (final GuiActionDescrip descriptor : actions) { + for (final OldGuiActionDescrip descriptor : actions) { view.addAction(descriptor); } } - private void checkForMenus(final GuiActionDescrip descriptor) { + private void checkForMenus(final OldGuiActionDescrip descriptor) { if (descriptor instanceof MenuDescriptor) { menus.add((MenuDescriptor) descriptor); } @@ -833,7 +833,7 @@ final SelectAllAction selectAllAction = new SelectAllAction(i18n.t("Select all"), AbstractExtendedAction.NO_TEXT, imgResources.selectall()); - final MenuItemDescriptor select = new MenuItemDescriptor(editMenu, selectAllAction); + final OldMenuItemDescriptor select = new OldMenuItemDescriptor(editMenu, selectAllAction); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('A')), selectAllAction); final BoldAction boldAction = new BoldAction(NO_TEXT, i18n.t("Bold"), imgResources.bold()); @@ -851,12 +851,12 @@ final SubscriptAction subscriptAction = new SubscriptAction(i18n.t("Subscript"), NO_TEXT, imgResources.subscript()); - final MenuItemDescriptor subscript = new MenuItemDescriptor(formatMenu, subscriptAction); + final OldMenuItemDescriptor subscript = new OldMenuItemDescriptor(formatMenu, subscriptAction); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf(',')), subscriptAction); final SuperscriptAction superscriptAction = new SuperscriptAction(i18n.t("Superscript"), NO_TEXT, imgResources.superscript()); - final MenuItemDescriptor superscript = new MenuItemDescriptor(formatMenu, superscriptAction); + final OldMenuItemDescriptor superscript = new OldMenuItemDescriptor(formatMenu, superscriptAction); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('.')), superscriptAction); final JustifyLeftAction jfyLeftAction = new JustifyLeftAction(NO_TEXT, i18n.t("Left Justify"), @@ -876,49 +876,49 @@ final UndoAction undoAction = new UndoAction(i18n.t("Undo"), NO_TEXT, imgResources.undo()); final UndoAction undoActionBtn = new UndoAction(NO_TEXT, i18n.t("Undo"), imgResources.undo()); - final MenuItemDescriptor undo = new MenuItemDescriptor(editMenu, undoAction); + final OldMenuItemDescriptor undo = new OldMenuItemDescriptor(editMenu, undoAction); final ButtonDescriptor undoBtn = new ButtonDescriptor(undoActionBtn); undoBtn.setPosition(0); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('Z')), undoAction); final RedoAction redoAction = new RedoAction(i18n.t("Redo"), NO_TEXT, imgResources.redo()); final RedoAction redoActionBtn = new RedoAction(NO_TEXT, i18n.t("Redo"), imgResources.redo()); - final MenuItemDescriptor redo = new MenuItemDescriptor(editMenu, redoAction); + final OldMenuItemDescriptor redo = new OldMenuItemDescriptor(editMenu, redoAction); final ButtonDescriptor redoBtn = new ButtonDescriptor(redoActionBtn); redoBtn.setPosition(1); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('Y')), redoAction); final CopyAction copyAction = new CopyAction(i18n.t("Copy"), NO_TEXT, imgResources.copy()); - final MenuItemDescriptor copy = new MenuItemDescriptor(editMenu, copyAction); + final OldMenuItemDescriptor copy = new OldMenuItemDescriptor(editMenu, copyAction); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('C')), copyAction); final CutAction cutAction = new CutAction(i18n.t("Cut"), NO_TEXT, imgResources.cut()); - final MenuItemDescriptor cut = new MenuItemDescriptor(editMenu, cutAction); + final OldMenuItemDescriptor cut = new OldMenuItemDescriptor(editMenu, cutAction); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('X')), cutAction); final PasteAction pasteAction = new PasteAction(i18n.t("Paste"), NO_TEXT, imgResources.paste()); - final MenuItemDescriptor paste = new MenuItemDescriptor(editMenu, pasteAction); + final OldMenuItemDescriptor paste = new OldMenuItemDescriptor(editMenu, pasteAction); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('V')), pasteAction); final EditHtmlAction editHtmlAction = new EditHtmlAction(i18n.t("Edit HTML"), NO_TEXT, imgResources.edithtml()); - final MenuItemDescriptor editHtml = new MenuItemDescriptor(editMenu, editHtmlAction); + final OldMenuItemDescriptor editHtml = new OldMenuItemDescriptor(editMenu, editHtmlAction); editHtml.setAddCondition(extendedAddCond); final CommentAction commentAction = new CommentAction(i18n.t("Comment"), NO_TEXT, NO_ICON); - final MenuItemDescriptor comment = new MenuItemDescriptor(insertMenu, commentAction); + final OldMenuItemDescriptor comment = new OldMenuItemDescriptor(insertMenu, commentAction); comment.setAddCondition(extendedAddCond); setActionShortcut(Shortcut.getShortcut(true, Character.valueOf('M')), commentAction); final HrAction hlineAction = new HrAction(i18n.t("Horizontal line"), NO_TEXT, imgResources.hfixedline()); final HrAction hlineBtnAction = new HrAction(NO_TEXT, i18n.t("Horizontal line"), imgResources.hfixedline()); - final MenuItemDescriptor hline = new MenuItemDescriptor(insertMenu, hlineAction); + final OldMenuItemDescriptor hline = new OldMenuItemDescriptor(insertMenu, hlineAction); final ButtonDescriptor hlineBtn = new ButtonDescriptor(hlineBtnAction); hline.setAddCondition(extendedAddCond); hlineBtn.setAddCondition(extendedAddCond); setActionShortcut(Shortcut.getShortcut(true, true, Character.valueOf(' ')), hlineAction); final BlockquoteAction blockquoteAction = new BlockquoteAction(i18n.t("Block Quotation"), NO_TEXT, NO_ICON); - final MenuItemDescriptor blockquote = new MenuItemDescriptor(formatMenu, blockquoteAction); + final OldMenuItemDescriptor blockquote = new OldMenuItemDescriptor(formatMenu, blockquoteAction); blockquote.setAddCondition(extendedAddCond); final StrikethroughAction strikeAction = new StrikethroughAction(NO_TEXT, i18n.t("Strikethrough"), @@ -948,14 +948,14 @@ final ImgAction imgAction = new ImgAction(i18n.t("Image..."), NO_TEXT, imgResources.images()); final ImgAction imgBtnAction = new ImgAction(NO_TEXT, i18n.t("Insert Image"), imgResources.images()); - final MenuItemDescriptor img = new MenuItemDescriptor(insertMenu, imgAction); + final OldMenuItemDescriptor img = new OldMenuItemDescriptor(insertMenu, imgAction); final ButtonDescriptor imgBtn = new ButtonDescriptor(imgBtnAction); img.setAddCondition(extendedAddCond); imgBtn.setAddCondition(extendedAddCond); final InsertMediaAction insertMediaAction = new InsertMediaAction(i18n.t("Audio/Video..."), NO_TEXT, imgResources.film()); - final MenuItemDescriptor insertMedia = new MenuItemDescriptor(insertMenu, insertMediaAction); + final OldMenuItemDescriptor insertMedia = new OldMenuItemDescriptor(insertMenu, insertMediaAction); insertMedia.setAddCondition(extendedAddCond); final CreateOrEditLinkAction editLinkAction = new CreateOrEditLinkAction(i18n.t("Link..."), NO_TEXT, @@ -964,8 +964,8 @@ i18n.t("Create or Edit Link"), imgResources.link()); final CreateOrEditLinkAction editLinkCtxAction = new CreateOrEditLinkAction(i18n.t("Change"), NO_TEXT, imgResources.link()); - final MenuItemDescriptor editLink = new MenuItemDescriptor(insertMenu, editLinkAction); - final MenuItemDescriptor editLinkCtx = new MenuItemDescriptor(linkCtxMenu, editLinkCtxAction); + final OldMenuItemDescriptor editLink = new OldMenuItemDescriptor(insertMenu, editLinkAction); + final OldMenuItemDescriptor editLinkCtx = new OldMenuItemDescriptor(linkCtxMenu, editLinkCtxAction); final ButtonDescriptor editLinkBtn = new ButtonDescriptor(editLinkBtnAction); editLink.setAddCondition(extendedAddCond); editLinkBtn.setAddCondition(extendedAddCond); @@ -977,7 +977,7 @@ imgResources.linkbreak()); final RemoveLinkAction delLinkCtxAction = new RemoveLinkAction(i18n.t("Remove"), NO_TEXT, imgResources.linkbreak()); - final MenuItemDescriptor removeLinkCtx = new MenuItemDescriptor(linkCtxMenu, delLinkCtxAction); + final OldMenuItemDescriptor removeLinkCtx = new OldMenuItemDescriptor(linkCtxMenu, delLinkCtxAction); final ButtonDescriptor removeLinkBtn = new ButtonDescriptor(delLinkBtnAction); removeLinkBtn.setAddCondition(extendedAddCond); removeLinkCtx.setAddCondition(extendedAddCond); @@ -987,7 +987,7 @@ imgResources.removeFormat()); final RemoveFormatAction remFormatBtnAc = new RemoveFormatAction(NO_TEXT, i18n.t("Clear Formatting..."), imgResources.removeFormat()); - final MenuItemDescriptor removeFormat = new MenuItemDescriptor(formatMenu, remFormatAction); + final OldMenuItemDescriptor removeFormat = new OldMenuItemDescriptor(formatMenu, remFormatAction); final ButtonDescriptor removeFormatBtn = new ButtonDescriptor(remFormatBtnAc); removeFormat.setAddCondition(extendedAddCond); removeFormatBtn.setAddCondition(extendedAddCond); @@ -995,14 +995,14 @@ final InsertSpecialCharAction insCharAction = new InsertSpecialCharAction(i18n.t("Special characters..."), NO_TEXT, imgResources.specialchars()); - final MenuItemDescriptor insertSpecialChar = new MenuItemDescriptor(insertMenu, insCharAction); + final OldMenuItemDescriptor insertSpecialChar = new OldMenuItemDescriptor(insertMenu, insCharAction); insertSpecialChar.setAddCondition(extendedAddCond); final InsertTableAction insTableAction = new InsertTableAction(i18n.t("Table..."), NO_TEXT, imgResources.inserttable()); final InsertTableAction insTableBtnAction = new InsertTableAction(NO_TEXT, i18n.t("Insert Table"), imgResources.inserttable()); - final MenuItemDescriptor insertTable = new MenuItemDescriptor(insertMenu, insTableAction); + final OldMenuItemDescriptor insertTable = new OldMenuItemDescriptor(insertMenu, insTableAction); final ButtonDescriptor insertTableBtn = new ButtonDescriptor(insTableBtnAction); insertTable.setAddCondition(extendedAddCond); insertTableBtn.setAddCondition(extendedAddCond); @@ -1019,7 +1019,7 @@ final DevInfoAction devInfoAction = new DevInfoAction(i18n.t("Developers info"), NO_TEXT, imgResources.specialchars()); - final MenuItemDescriptor devInfo = new MenuItemDescriptor(formatMenu, devInfoAction); + final OldMenuItemDescriptor devInfo = new OldMenuItemDescriptor(formatMenu, devInfoAction); devInfo.setAddCondition(extendedAddCond); setActionShortcut(Shortcut.getShortcut(false, true, false, false, Character.valueOf('I')), devInfoAction); @@ -1033,15 +1033,15 @@ fontColor, backgroundColor, fontSizeMenu, fontMenu, editLinkCtx, removeLinkCtx); // actions.add(devInfo); - setLocation(TOPBAR, new GuiActionDescrip[] { fileMenu, editMenu, insertMenu, formatMenu, editMenuSep, + setLocation(TOPBAR, new OldGuiActionDescrip[] { fileMenu, editMenu, insertMenu, formatMenu, editMenuSep, subscript, superscript, undo, redo, editMenuSep, copy, cut, paste, editMenuSep, select, editMenuSep, editHtml, comment, hline, blockquote, img, insertTable, insertMedia, editLink, removeFormat, formatMenuSep, insertMenuSep, insertSpecialChar, insertTable, devInfo }); - setLocation(SNDBAR, new GuiActionDescrip[] { undoBtn, redoBtn, sndbarSep, sndbarSepExt, bold, italic, + setLocation(SNDBAR, new OldGuiActionDescrip[] { undoBtn, redoBtn, sndbarSep, sndbarSepExt, bold, italic, underline, strikethrough, justifyLeft, justifyCentre, justifyRight, undoBtn, redoBtn, hlineBtn, decreaseIndent, increaseIndent, olist, ulist, hlineBtn, imgBtn, editLinkBtn, removeLinkBtn, removeFormatBtn, insertTableBtn, fontColor, backgroundColor, fontMenu, fontSizeMenu }); - setLocation(LINKCTX, new GuiActionDescrip[] { removeLinkCtx, editLinkCtx }); + setLocation(LINKCTX, new OldGuiActionDescrip[] { removeLinkCtx, editLinkCtx }); for (final String fontName : FONT_NAMES) { createFontAction(fontMenu, fontName); @@ -1203,15 +1203,15 @@ } @Override - public void setActionShortcut(final KeyStroke key, final AbstractAction action) { + public void setActionShortcut(final KeyStroke key, final OldAbstractAction action) { inputMap.put(key, action); action.setShortcut(key); } @Override - public void setActionShortcut(final KeyStroke key, final AbstractAction mainAction, final AbstractAction... actions) { + public void setActionShortcut(final KeyStroke key, final OldAbstractAction mainAction, final OldAbstractAction... actions) { setActionShortcut(key, mainAction); - for (final AbstractAction action : actions) { + for (final OldAbstractAction action : actions) { action.setShortcut(key); } } @@ -1233,8 +1233,8 @@ } @Override - public void setLocation(final String location, final GuiActionDescrip... descripts) { - for (final GuiActionDescrip descript : descripts) { + public void setLocation(final String location, final OldGuiActionDescrip... descripts) { + for (final OldGuiActionDescrip descript : descripts) { descript.setLocation(location); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,9 +19,9 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,7 +27,7 @@ import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuCheckItemDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.shortcuts.Keyboard; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor; @@ -192,7 +192,7 @@ saveBtn.setLocation(RTEditor.SNDBAR); saveMenuAction = new SaveAction(i18n.t("Save"),NO_TEXT, imgResources.save()); - final MenuItemDescriptor saveMenu = new MenuItemDescriptor(super.getFileMenu(), saveMenuAction); + final OldMenuItemDescriptor saveMenu = new OldMenuItemDescriptor(super.getFileMenu(), saveMenuAction); saveMenu.setPosition(0); saveMenu.setLocation(RTEditor.TOPBAR); @@ -207,11 +207,11 @@ autoSaveItem.setLocation(RTEditor.TOPBAR); final CloseAction closeAction = new CloseAction(i18n.t("Close"), NO_TEXT, NO_ICON); - final MenuItemDescriptor closeItem = new MenuItemDescriptor(super.getFileMenu(), closeAction); + final OldMenuItemDescriptor closeItem = new OldMenuItemDescriptor(super.getFileMenu(), closeAction); closeItem.setLocation(RTEditor.TOPBAR); final SaveCloseAction saveCloseAction = new SaveCloseAction(i18n.t("Save & Close"), NO_TEXT, NO_ICON); - final MenuItemDescriptor saveClose = new MenuItemDescriptor(super.getFileMenu(), saveCloseAction); + final OldMenuItemDescriptor saveClose = new OldMenuItemDescriptor(super.getFileMenu(), saveCloseAction); final ButtonDescriptor saveCloseBtn = new ButtonDescriptor(saveCloseAction); saveClose.setLocation(RTEditor.TOPBAR); saveCloseBtn.setLocation(RTEditor.TOPBAR); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -83,34 +83,29 @@ groupManager.reIndex(); final Content defaultContent = siteGroup.getDefaultContent(); - contentManager.save( - user, - defaultContent, - "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " - + "align=\"right\">This a initial demo of " - + "<a href=\"http://kune.ourproject.org\">kune</a>." - + "<br><div style=\"text-align: right;\"><br></div>" - + "Kune is currently under initial development.<br>" - + "<br>To test it, <a href=\"#signin\">sign in registering an user</a>, " - + "but take into account that:<br><ul><li>kune is not optimized yet, " - + "then the initial load and other operations maybe are slow.</li>" - + "<li>Don\'t use passwords that you are using in other sites " - + "(kune isn\'t secure yet storing passwords).</li>" - + "<li>The site is divided in two main areas: the public " - + "space and the workspace:</li><ul>" - + "<li>The workspace is the most important part of kune, " - + "because is where users collaborate and communicates which each others. " - + "This part is the most dynamic and we are using modern " - + "(and sometimes experimental) web technologies to improve the end user " - + "experience. I heavily under development.<br></li>" - + "<li>The public space is currently lest developed. " - + "Our main goal is to offer customs and configurable styles " - + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" - + "We need your feedback<br><br></font>Please help us to improve this software " - + "reporting <a href=\"http://ourproject.org/tracker/?atid=139&group_id=407&func=browse\">bugs and/or " - + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " - + "into other languages.<br><br>Thank you,<br>" - + "<br>--<br><span style=\"font-style: italic;\">" + "The kune development team</span><br><br>"); + contentManager.save(user, defaultContent, "<img src=\"http://kune.ourproject.org/kimages/logo-header.png\" " + + "align=\"right\">This a initial demo of " + "<a href=\"http://kune.ourproject.org\">kune</a>." + + "<br><div style=\"text-align: right;\"><br></div>" + + "Kune is currently under initial development.<br>" + + "<br>To test it, <a href=\"#signin\">sign in registering an user</a>, " + + "but take into account that:<br><ul><li>kune is not optimized yet, " + + "then the initial load and other operations maybe are slow.</li>" + + "<li>Don\'t use passwords that you are using in other sites " + + "(kune isn\'t secure yet storing passwords).</li>" + + "<li>The site is divided in two main areas: the public " + "space and the workspace:</li><ul>" + + "<li>The workspace is the most important part of kune, " + + "because is where users collaborate and communicates which each others. " + + "This part is the most dynamic and we are using modern " + + "(and sometimes experimental) web technologies to improve the end user " + + "experience. I heavily under development.<br></li>" + + "<li>The public space is currently lest developed. " + + "Our main goal is to offer customs and configurable styles " + + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" + + "We need your feedback<br><br></font>Please help us to improve this software " + + "reporting <a href=\"http://kune.ourproject.org/issues/\">bugs and/or " + + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " + + "into other languages.<br><br>Thank you,<br>" + "<br>--<br><span style=\"font-style: italic;\">" + + "The kune development team</span><br><br>"); contentManager.renameContent(user, defaultContent.getId(), "Welcome to kune demo"); contentManager.setStatus(defaultContent.getId(), ContentStatus.publishedOnline); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,9 +27,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.server.manager.GroupManager; +import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Group; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -29,12 +29,12 @@ import magick.MagickException; import org.apache.commons.fileupload.FileItem; -import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; import org.ourproject.kune.platf.server.manager.GroupManager; +import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -31,8 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.client.ui.download.FileConstants; -import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; @@ -41,6 +39,8 @@ import org.ourproject.kune.platf.server.properties.KuneProperties; import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.client.services.ImageSize; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.BasicMimeType; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -26,7 +26,6 @@ import net.sf.json.JSONObject; import org.apache.commons.fileupload.FileItem; -import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessService; import org.ourproject.kune.platf.server.auth.ActionLevel; @@ -38,6 +37,7 @@ import org.ourproject.kune.platf.server.properties.KuneProperties; import org.ourproject.kune.platf.server.utils.StringW; +import cc.kune.core.client.services.ImageSize; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -37,9 +37,9 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.server.properties.KuneProperties; +import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.domain.utils.StateToken; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -24,7 +24,6 @@ import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_UPLOADEDFILE; import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_WIKIPAGE; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.wiki.client.cnt.WikiViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -42,6 +41,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -22,7 +22,6 @@ import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.cnt.WikiFolderContent; import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPanel; @@ -53,6 +52,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContent.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContent.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -20,12 +20,12 @@ package org.ourproject.kune.wiki.client.cnt; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -19,7 +19,6 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; @@ -27,6 +26,7 @@ import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContext.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContext.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContext.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -31,7 +31,6 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContent; @@ -51,6 +50,7 @@ import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.ContentStatus; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,38 +20,32 @@ package org.ourproject.kune.workspace.client; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.workspace.client.socialnet.ParticipateAction; -import org.ourproject.kune.workspace.client.socialnet.UnjoinAction; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.NoDecoration; -import com.calclab.suco.client.ioc.module.Factory; - public class ActionsModule extends AbstractExtendedModule { @Override protected void onInstall() { - register(NoDecoration.class, new Factory<ParticipateAction>(ParticipateAction.class) { - @Override - public ParticipateAction create() { - return new ParticipateAction(i(Session.class), p(SocialNetworkServiceAsync.class), - i(StateManager.class), i(AccessRightsClientManager.class), i(I18nTranslationService.class), - i(IconResources.class)); - } - }); + // register(NoDecoration.class, new + // Factory<ParticipateAction>(ParticipateAction.class) { + // @Override + // public ParticipateAction create() { + // return new ParticipateAction(i(Session.class), + // p(SocialNetworkServiceAsync.class), + // i(StateManager.class), i(AccessRightsClientManager.class), + // i(I18nTranslationService.class), + // i(IconResources.class)); + // } + // }); + // + // register(NoDecoration.class, new + // Factory<UnjoinAction>(UnjoinAction.class) { + // @Override + // public UnjoinAction create() { + // return new UnjoinAction(i(Session.class), + // p(SocialNetworkServiceAsync.class), i(StateManager.class), + // i(AccessRightsClientManager.class), i(I18nTranslationService.class), + // i(IconResources.class)); + // } + // }); - register(NoDecoration.class, new Factory<UnjoinAction>(UnjoinAction.class) { - @Override - public UnjoinAction create() { - return new UnjoinAction(i(Session.class), p(SocialNetworkServiceAsync.class), i(StateManager.class), - i(AccessRightsClientManager.class), i(I18nTranslationService.class), i(IconResources.class)); - } - }); - } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -40,8 +40,8 @@ import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.socialnet.GroupActionRegistry; -import org.ourproject.kune.workspace.client.socialnet.UserActionRegistry; +import org.ourproject.kune.workspace.client.oldsn.GroupActionRegistry; +import org.ourproject.kune.workspace.client.oldsn.UserActionRegistry; import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -31,10 +31,8 @@ import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.registry.RenamableRegistry; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.services.ImageUtils; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialog; @@ -105,6 +103,13 @@ import org.ourproject.kune.workspace.client.nohomepage.NoHomePage; import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePanel; import org.ourproject.kune.workspace.client.nohomepage.NoHomePagePresenter; +import org.ourproject.kune.workspace.client.oldsn.other.AddAsBuddieHeaderButton; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbar; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbarPresenter; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbar; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbarPresenter; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationSummaryToolbarPresenter; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationToolbar; import org.ourproject.kune.workspace.client.options.GroupOptions; import org.ourproject.kune.workspace.client.options.GroupOptionsPanel; import org.ourproject.kune.workspace.client.options.GroupOptionsPresenter; @@ -177,26 +182,6 @@ import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptionsPresenter; import org.ourproject.kune.workspace.client.skel.ActionCntCtxToolbarPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.socialnet.BuddiesSummary; -import org.ourproject.kune.workspace.client.socialnet.BuddiesSummaryPanel; -import org.ourproject.kune.workspace.client.socialnet.BuddiesSummaryPresenter; -import org.ourproject.kune.workspace.client.socialnet.GroupActionRegistry; -import org.ourproject.kune.workspace.client.socialnet.GroupMembersSummary; -import org.ourproject.kune.workspace.client.socialnet.GroupMembersSummaryPanel; -import org.ourproject.kune.workspace.client.socialnet.GroupMembersSummaryPresenter; -import org.ourproject.kune.workspace.client.socialnet.GroupMembersSummaryView; -import org.ourproject.kune.workspace.client.socialnet.ParticipationSummary; -import org.ourproject.kune.workspace.client.socialnet.ParticipationSummaryPanel; -import org.ourproject.kune.workspace.client.socialnet.ParticipationSummaryPresenter; -import org.ourproject.kune.workspace.client.socialnet.ParticipationSummaryView; -import org.ourproject.kune.workspace.client.socialnet.UserActionRegistry; -import org.ourproject.kune.workspace.client.socialnet.other.AddAsBuddieHeaderButton; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbar; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbarPresenter; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionGroupSummaryToolbar; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionGroupSummaryToolbarPresenter; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionParticipationSummaryToolbarPresenter; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionParticipationToolbar; import org.ourproject.kune.workspace.client.tags.TagsSummary; import org.ourproject.kune.workspace.client.tags.TagsSummaryPanel; import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenter; @@ -236,7 +221,7 @@ import cc.kune.core.client.rpcservices.SocialNetworkService; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.HistoryTokenCallback; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteCommonTokens; @@ -536,22 +521,28 @@ } }); - register(ApplicationComponentGroup.class, new Factory<GroupMembersSummary>(GroupMembersSummary.class) { - @Override - public GroupMembersSummary create() { - final GroupMembersSummaryPresenter presenter = new GroupMembersSummaryPresenter( - i(I18nUITranslationService.class), i(StateManager.class), i(ImageUtils.class), - i(Session.class), p(SocialNetworkServiceAsync.class), p(GroupServiceAsync.class), - p(GroupLiveSearcher.class), p(ChatEngine.class), i(GroupActionRegistry.class), - i(ActionGroupSummaryToolbar.class), p(FileDownloadUtils.class), - i(AccessRightsClientManager.class), i(IconResources.class)); - final GroupMembersSummaryView view = new GroupMembersSummaryPanel(presenter, - i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( - ActionGroupSummaryToolbar.class).getView()); - presenter.init(view); - return presenter; - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<GroupMembersSummary>(GroupMembersSummary.class) { + // @Override + // public GroupMembersSummary create() { + // final GroupMembersSummaryPresenter presenter = new + // GroupMembersSummaryPresenter( + // i(I18nUITranslationService.class), i(StateManager.class), + // i(ImageUtils.class), + // i(Session.class), p(SocialNetworkServiceAsync.class), + // p(GroupServiceAsync.class), + // p(GroupLiveSearcher.class), p(ChatEngine.class), + // i(GroupActionRegistry.class), + // i(ActionGroupSummaryToolbar.class), p(FileDownloadUtils.class), + // i(AccessRightsClientManager.class), i(IconResources.class)); + // final GroupMembersSummaryView view = new + // GroupMembersSummaryPanel(presenter, + // i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( + // ActionGroupSummaryToolbar.class).getView()); + // presenter.init(view); + // return presenter; + // } + // }); register(ApplicationComponentGroup.class, new Factory<AddAsBuddieHeaderButton>(AddAsBuddieHeaderButton.class) { @Override @@ -561,37 +552,49 @@ } }); - register(ApplicationComponentGroup.class, new Factory<BuddiesSummary>(BuddiesSummary.class) { - @Override - public BuddiesSummary create() { - final BuddiesSummaryPresenter presenter = new BuddiesSummaryPresenter(i(StateManager.class), - i(Session.class), p(UserServiceAsync.class), i(UserActionRegistry.class), - i(I18nTranslationService.class), p(ChatEngine.class), i(ActionBuddiesSummaryToolbar.class), - p(FileDownloadUtils.class), i(ImageUtils.class), p(SocialNetworkServiceAsync.class), - i(GroupActionRegistry.class), i(AccessRightsClientManager.class), i(IconResources.class)); - final BuddiesSummaryPanel panel = new BuddiesSummaryPanel(presenter, i(WorkspaceSkeleton.class), - i(I18nTranslationService.class), i(ActionManager.class), - i(ActionBuddiesSummaryToolbar.class).getView()); - presenter.init(panel); - return presenter; - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<BuddiesSummary>(BuddiesSummary.class) { + // @Override + // public BuddiesSummary create() { + // final BuddiesSummaryPresenter presenter = new + // BuddiesSummaryPresenter(i(StateManager.class), + // i(Session.class), p(UserServiceAsync.class), + // i(UserActionRegistry.class), + // i(I18nTranslationService.class), p(ChatEngine.class), + // i(ActionBuddiesSummaryToolbar.class), + // p(FileDownloadUtils.class), i(ImageUtils.class), + // p(SocialNetworkServiceAsync.class), + // i(GroupActionRegistry.class), i(AccessRightsClientManager.class), + // i(IconResources.class)); + // final BuddiesSummaryPanel panel = new BuddiesSummaryPanel(presenter, + // i(WorkspaceSkeleton.class), + // i(I18nTranslationService.class), i(ActionManager.class), + // i(ActionBuddiesSummaryToolbar.class).getView()); + // presenter.init(panel); + // return presenter; + // } + // }); - register(ApplicationComponentGroup.class, new Factory<ParticipationSummary>(ParticipationSummary.class) { - @Override - public ParticipationSummary create() { - final ParticipationSummaryPresenter presenter = new ParticipationSummaryPresenter( - i(I18nUITranslationService.class), i(StateManager.class), i(ImageUtils.class), - i(Session.class), p(SocialNetworkServiceAsync.class), i(GroupActionRegistry.class), - i(ActionParticipationToolbar.class), p(FileDownloadUtils.class), - i(AccessRightsClientManager.class), i(IconResources.class)); - final ParticipationSummaryView view = new ParticipationSummaryPanel(presenter, - i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( - ActionParticipationToolbar.class).getView()); - presenter.init(view); - return presenter; - } - }); + // register(ApplicationComponentGroup.class, new + // Factory<ParticipationSummary>(ParticipationSummary.class) { + // @Override + // public ParticipationSummary create() { + // final ParticipationSummaryPresenter presenter = new + // ParticipationSummaryPresenter( + // i(I18nUITranslationService.class), i(StateManager.class), + // i(ImageUtils.class), + // i(Session.class), p(SocialNetworkServiceAsync.class), + // i(GroupActionRegistry.class), + // i(ActionParticipationToolbar.class), p(FileDownloadUtils.class), + // i(AccessRightsClientManager.class), i(IconResources.class)); + // final ParticipationSummaryView view = new + // ParticipationSummaryPanel(presenter, + // i(I18nUITranslationService.class), i(WorkspaceSkeleton.class), i( + // ActionParticipationToolbar.class).getView()); + // presenter.init(view); + // return presenter; + // } + // }); register(ApplicationComponentGroup.class, new Factory<TagsSummary>(TagsSummary.class) { @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,11 +21,11 @@ import org.ourproject.kune.platf.client.actions.ActionItemCollection; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageSize; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.AccessRights; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -28,14 +28,14 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.ui.KuneUiUtils; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry; import org.ourproject.kune.workspace.client.cxt.ActionContextBottomToolbar; import org.ourproject.kune.workspace.client.title.RenameAction; import org.ourproject.kune.workspace.client.upload.FileUploader; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageSize; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.ContentStatus; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,7 +27,7 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.shortcuts.Keyboard; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor; @@ -152,7 +152,7 @@ private void addContentActions() { final RenameAction renameAction = new RenameAction(i18n.t("Rename"), NO_TEXT, NO_ICON); - final MenuItemDescriptor renameItem = new MenuItemDescriptor(super.getFileMenu(), renameAction); + final OldMenuItemDescriptor renameItem = new OldMenuItemDescriptor(super.getFileMenu(), renameAction); renameItem.setLocation(RTEditor.TOPBAR); final KeyStroke key = KeyStroke.getKeyStroke(Keyboard.KEY_F2, 0); renameAction.putValue(Action.ACCELERATOR_KEY, key); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,10 +20,10 @@ package org.ourproject.kune.workspace.client.editor.insertlocalimg; import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,11 +20,11 @@ package org.ourproject.kune.workspace.client.editor.insertlocallink; import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.StateTokenUtils; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,10 +20,10 @@ package org.ourproject.kune.workspace.client.editor.insertlocalmedia; import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.LinkDTO; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeader.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,11 +20,11 @@ package org.ourproject.kune.workspace.client.entityheader; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; public interface EntityHeader { - void addAction(GuiActionDescrip descriptor); + void addAction(OldGuiActionDescrip descriptor); void addWidget(View widget); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,14 +23,14 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.ui.download.FileConstants; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; @@ -66,7 +66,7 @@ wskel.addToEntityMainHeader(this); } - public void addAction(final GuiActionDescrip descriptor) { + public void addAction(final OldGuiActionDescrip descriptor) { toolbar.add(descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,7 +20,7 @@ package org.ourproject.kune.workspace.client.entityheader; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemeManager; @@ -52,7 +52,7 @@ }); } - public void addAction(final GuiActionDescrip descriptor) { + public void addAction(final OldGuiActionDescrip descriptor) { view.addAction(descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,7 +20,7 @@ package org.ourproject.kune.workspace.client.entityheader; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.workspace.client.themes.WsTheme; import cc.kune.core.shared.domain.utils.StateToken; @@ -28,7 +28,7 @@ public interface EntityHeaderView { - void addAction(GuiActionDescrip descriptor); + void addAction(OldGuiActionDescrip descriptor); void addWidget(View view); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.Shortcut; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; @@ -70,9 +70,9 @@ private final GlobalShortcutRegister shortcutReg; - private MenuItemDescriptor maximizeButton; + private OldMenuItemDescriptor maximizeButton; - private MenuItemDescriptor minimizeButton; + private OldMenuItemDescriptor minimizeButton; private final SiteOptions siteOptions; public MaxMinWorkspacePresenter(final GlobalShortcutRegister shortcutReg, final IconResources images, @@ -107,13 +107,13 @@ final MaximizeAction maximizeAction = new MaximizeAction(i18n.t("Maximize the workspace"), images.maximize()); maximizeAction.setShortcut(shortcut); - maximizeButton = new MenuItemDescriptor(maximizeAction); + maximizeButton = new OldMenuItemDescriptor(maximizeAction); maximizeButton.setPosition(0); maximizeButton.setId(MAX_ICON); final MinimizeAction minimizeAction = new MinimizeAction(i18n.t("Minimize the workspace"), images.minimize()); minimizeAction.setShortcut(shortcut); - minimizeButton = new MenuItemDescriptor(minimizeAction); + minimizeButton = new OldMenuItemDescriptor(minimizeAction); minimizeButton.setPosition(1); minimizeButton.setVisible(false); minimizeButton.setId(MIN_ICON); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,14 +20,14 @@ package org.ourproject.kune.workspace.client.hello; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.Shortcut; import org.ourproject.kune.platf.client.actions.ui.MenuCheckItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuRadioItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor; import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor; @@ -121,15 +121,15 @@ // recommended the use in real code final MenuDescriptor menu = new MenuDescriptor(i18n.t("HelloWorldMenu"), "File menu tooltip"); - final MenuItemDescriptor menuitem = new MenuItemDescriptor(menu, action); - final MenuItemDescriptor menuitem2 = new MenuItemDescriptor(menu, action); + final OldMenuItemDescriptor menuitem = new OldMenuItemDescriptor(menu, action); + final OldMenuItemDescriptor menuitem2 = new OldMenuItemDescriptor(menu, action); // A submenu final MenuDescriptor submenu = new MenuDescriptor("Options", "Submenu tooltip"); submenu.setParent(menu); // A menu check item - final MenuItemDescriptor menuitem3 = new MenuItemDescriptor(submenu, action); + final OldMenuItemDescriptor menuitem3 = new OldMenuItemDescriptor(submenu, action); final MenuCheckItemDescriptor menuitem4 = new MenuCheckItemDescriptor(submenu, action); menuitem4.setChecked(true); @@ -206,7 +206,7 @@ void showMessage(); } - static class HelloWorldAction extends AbstractAction { + static class HelloWorldAction extends OldAbstractAction { public HelloWorldAction(final IconResources img) { super(); super.putValue(Action.NAME, "helloworld"); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,10 +19,10 @@ */ package org.ourproject.kune.workspace.client.i18n; -import org.ourproject.kune.platf.client.actions.AbstractAction; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; import cc.kune.core.client.resources.icons.IconResources; @@ -30,7 +30,7 @@ import com.calclab.suco.client.ioc.Provider; -public class SiteOptionsI18nTranslatorAction extends AbstractAction { +public class SiteOptionsI18nTranslatorAction extends OldAbstractAction { private final Provider<I18nTranslator> translator; public SiteOptionsI18nTranslatorAction(final SiteOptions siteOptions, final I18nTranslationService i18n, @@ -39,7 +39,7 @@ this.translator = translator; putValue(Action.NAME, i18n.t("Help with the translation")); putValue(Action.SMALL_ICON, img.language()); - final MenuItemDescriptor item = new MenuItemDescriptor(this); + final OldMenuItemDescriptor item = new OldMenuItemDescriptor(this); item.setPosition(1); siteOptions.addAction(item); } Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummary.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,24 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + + +public interface BuddiesSummary { +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,133 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.ActionItem; +import org.ourproject.kune.platf.client.actions.ActionItemCollection; +import org.ourproject.kune.platf.client.actions.ActionManager; +import org.ourproject.kune.platf.client.actions.MenuItemsContainer; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; +import org.ourproject.kune.platf.client.ui.AbstractToolbar; +import org.ourproject.kune.workspace.client.skel.SummaryPanel; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import cc.kune.common.client.ui.BasicThumb; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.events.Listener; +import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.widgets.menu.Menu; + +public class BuddiesSummaryPanel extends SummaryPanel implements BuddiesSummaryView { + + private final MenuItemsContainer<UserSimpleDTO> menuItemsContainer; + private final FlowPanel flowPanel; + private final Label otherBuddiesLabel; + private final I18nTranslationService i18n; + private final ActionManager actionManager; + private final AbstractToolbar toolbar; + private final Label noBuddiesPublic; + + public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, + final I18nTranslationService i18n, final ActionManager actionManager, + final ActionToolbarView<UserSimpleDTO> actionToolbarView) { + super(i18n.t("Buddies"), i18n.t("This user buddies"), ws); + this.actionManager = actionManager; + menuItemsContainer = new MenuItemsContainer<UserSimpleDTO>(); + this.i18n = i18n; + final VerticalPanel vp = new VerticalPanel(); + flowPanel = new FlowPanel(); + otherBuddiesLabel = new Label(); + otherBuddiesLabel.addStyleName("kune-Margin-Small-trbl"); + vp.add(flowPanel); + vp.add(otherBuddiesLabel); + toolbar = ((ActionToolbarPanel<UserSimpleDTO>) actionToolbarView).getToolbar(); + toolbar.setBlankStyle(); + vp.add((Widget) toolbar); + super.add(vp); + addInSummary(); + noBuddiesPublic = new Label(i18n.t(CoreMessages.BUDDIES_NOT_PUBLIC)); + noBuddiesPublic.addStyleName("kune-Margin-7-trbl"); + noBuddiesPublic.addStyleName("k-text-gray"); + } + + public void addBuddie(final UserSimpleDTO user, final ActionItemCollection<UserSimpleDTO> actionCollection, + final String avatarUrl, final String tooltipTitle, final String tooltip) { + final ClickHandler listener = new ClickHandler() { + public void onClick(final ClickEvent event) { + final Element sender = event.getRelativeElement(); + final Menu menu = menuItemsContainer.get(user.getShortName()); + if (menu.getItems().length > 0) { + menu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 5); + } + } + }; + menuItemsContainer.createItemMenu(user.getShortName(), actionCollection, + new Listener<ActionItem<UserSimpleDTO>>() { + public void onEvent(final ActionItem<UserSimpleDTO> actionItem) { + doAction(actionItem); + } + }); + + final BasicThumb thumb = new BasicThumb(avatarUrl.equals(NOAVATAR) ? "images/persons/person2-32.png" + : avatarUrl, AVATARSIZE, user.getShortName(), AVATARLABELMAXSIZE, false, listener); + thumb.setTooltip(tooltipTitle, tooltip); + flowPanel.add(thumb); + } + + @Override + public void clear() { + flowPanel.clear(); + clearOtherUsers(); + menuItemsContainer.clear(); + toolbar.removeAll(); + super.doLayoutIfNeeded(); + } + + public void clearOtherUsers() { + otherBuddiesLabel.setText(""); + } + + public void setNoBuddies() { + otherBuddiesLabel.setText(i18n.t("This user has no buddies")); + } + + public void setOtherUsers(final String text) { + otherBuddiesLabel.setText(text); + } + + public void showBuddiesNotVisible() { + flowPanel.add(noBuddiesPublic); + super.doLayoutIfNeeded(); + } + + private void doAction(final ActionItem<UserSimpleDTO> actionItem) { + actionManager.doAction(actionItem); + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,241 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import java.util.List; + +import org.ourproject.kune.chat.client.ChatEngine; +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.actions.ActionEnableCondition; +import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; +import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbar; + +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageUtils; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.UserBuddiesVisibility; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.UserBuddiesDataDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.events.Listener; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class BuddiesSummaryPresenter extends SocialNetworkPresenter implements BuddiesSummary { + + public static final String BUDDIES_VISIBILITY_GROUP = "k-bsp-bud-visib"; + + private final UserActionRegistry actionRegistry; + private final Provider<ChatEngine> chatEngineProvider; + private final Provider<FileDownloadUtils> fileDownUtilsProvider; + private final I18nTranslationService i18n; + private final Session session; + private final StateManager stateManager; + private final ActionBuddiesSummaryToolbar toolbar; + private final Provider<UserServiceAsync> userServiceAsync; + private BuddiesSummaryView view; + + @Inject + public BuddiesSummaryPresenter(final StateManager stateManager, final Session session, + final Provider<UserServiceAsync> userServiceAsync, final UserActionRegistry actionRegistry, + final I18nTranslationService i18n, final Provider<ChatEngine> chatEngineProvider, + final ActionBuddiesSummaryToolbar toolbar, final Provider<FileDownloadUtils> fileDownUtilsProvider, + final ImageUtils imageUtils, final Provider<SocialNetworkServiceAsync> snServiceAsync, + final GroupActionRegistry groupActionRegistry, final AccessRightsClientManager accessRightManager, + final IconResources img) { + super(i18n, stateManager, accessRightManager, session, snServiceAsync, groupActionRegistry, + fileDownUtilsProvider, img); + this.stateManager = stateManager; + this.session = session; + this.userServiceAsync = userServiceAsync; + this.actionRegistry = actionRegistry; + this.i18n = i18n; + this.chatEngineProvider = chatEngineProvider; + this.toolbar = toolbar; + this.fileDownUtilsProvider = fileDownUtilsProvider; + stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + @Override + public void onEvent(final StateAbstractDTO state) { + setState(state); + } + }); + stateManager.onSocialNetworkChanged(new Listener<StateAbstractDTO>() { + @Override + public void onEvent(final StateAbstractDTO state) { + setState(state); + } + }); + registerActions(); + } + + private void createAddNewBuddiesAction() { + final ActionToolbarMenuDescriptor<UserSimpleDTO> addNewBuddiesAction = new ActionToolbarMenuDescriptor<UserSimpleDTO>( + AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { + @Override + public void onEvent(final UserSimpleDTO parameter) { + NotifyUser.info("In development"); + } + }); + addNewBuddiesAction.setTextDescription(i18n.t("Add a new buddy")); + addNewBuddiesAction.setParentMenuTitle(i18n.t("Options")); + addNewBuddiesAction.setIconUrl("images/add-green.gif"); + actionRegistry.addAction(addNewBuddiesAction); + } + + private void createSetBuddiesVisibilityAction(final String textDescription, final UserBuddiesVisibility visibility) { + final ActionToolbarMenuRadioDescriptor<UserSimpleDTO> buddiesVisibilityAction = new ActionToolbarMenuRadioDescriptor<UserSimpleDTO>( + AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { + @Override + public void onEvent(final UserSimpleDTO parameter) { + userServiceAsync.get().setBuddiesVisibility(session.getUserHash(), + session.getCurrentState().getGroup().getStateToken(), visibility, + new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + NotifyUser.info(i18n.t("Buddies visibility changed")); + } + }); + } + }, BUDDIES_VISIBILITY_GROUP, new RadioMustBeChecked() { + @Override + public boolean mustBeChecked() { + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState.getGroup().isPersonal()) { + final SocialNetworkDataDTO socialNetworkData = currentState.getSocialNetworkData(); + return socialNetworkData.getUserBuddiesVisibility().equals(visibility); + } + return false; + } + }); + buddiesVisibilityAction.setTextDescription(textDescription); + buddiesVisibilityAction.setParentMenuTitle(i18n.t("Options")); + buddiesVisibilityAction.setParentSubMenuTitle(i18n.t("Those who can view your buddies list")); + actionRegistry.addAction(buddiesVisibilityAction); + } + + public View getView() { + return view; + } + + public void init(final BuddiesSummaryView view) { + this.view = view; + } + + private void registerActions() { + final ActionMenuItemDescriptor<UserSimpleDTO> addAsBuddie = new ActionMenuItemDescriptor<UserSimpleDTO>( + AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { + @Override + public void onEvent(final UserSimpleDTO user) { + chatEngineProvider.get().addNewBuddie(user.getShortName()); + } + }); + addAsBuddie.setMustBeAuthenticated(true); + addAsBuddie.setTextDescription(i18n.t("Add as a buddie")); + addAsBuddie.setIconUrl("images/add-green.png"); + addAsBuddie.setEnableCondition(new ActionEnableCondition<UserSimpleDTO>() { + @Override + public boolean mustBeEnabled(final UserSimpleDTO user) { + return !chatEngineProvider.get().isBuddie(user.getShortName()); + } + }); + actionRegistry.addAction(addAsBuddie); + + final ActionMenuItemDescriptor<UserSimpleDTO> go = new ActionMenuItemDescriptor<UserSimpleDTO>( + AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { + @Override + public void onEvent(final UserSimpleDTO user) { + stateManager.gotoToken(user.getShortName()); + } + }); + go.setMustBeAuthenticated(false); + go.setTextDescription(i18n.t("Visit this user's homepage")); + go.setIconUrl("images/group-home.gif"); + actionRegistry.addAction(go); + + createAddNewBuddiesAction(); + createSetBuddiesVisibilityAction(i18n.t("anyone"), UserBuddiesVisibility.anyone); + createSetBuddiesVisibilityAction(i18n.t("only your buddies"), UserBuddiesVisibility.yourbuddies); + createSetBuddiesVisibilityAction(i18n.t("only you"), UserBuddiesVisibility.onlyyou); + } + + protected void setState(final StateAbstractDTO state) { + if (state.getGroup().isPersonal()) { + view.clear(); + final UserBuddiesDataDTO userBuddies = state.getUserBuddies(); + if (state.getSocialNetworkData().isBuddiesVisible()) { + final List<UserSimpleDTO> buddies = userBuddies.getBuddies(); + for (final UserSimpleDTO user : buddies) { + final String avatarUrl = user.hasLogo() ? fileDownUtilsProvider.get().getLogoImageUrl( + user.getStateToken()) : BuddiesSummaryView.NOAVATAR; + final String tooltip = super.createTooltipWithLogo(user.getShortName(), user.getStateToken(), + user.hasLogo(), true); + view.addBuddie(user, actionRegistry.getCurrentActions(user, session.isLogged(), new AccessRights( + true, true, true), false), avatarUrl, user.getName(), tooltip); + } + final boolean hasLocalBuddies = buddies.size() > 0; + final int numExtBuddies = userBuddies.getOtherExtBuddies(); + if (numExtBuddies > 0) { + if (hasLocalBuddies) { + // i18n: plural + view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "and [%d] external user" + : "and [%d] external users", numExtBuddies)); + } else { + view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "[%d] external user" : "[%d] external users", + numExtBuddies)); + } + } else { + if (hasLocalBuddies) { + view.clearOtherUsers(); + } else { + view.setNoBuddies(); + } + } + toolbar.disableMenusAndClearButtons(); + toolbar.addActions( + actionRegistry.getCurrentActions(session.getCurrentUser(), session.isLogged(), + state.getGroupRights(), true), ActionToolbar.IN_ANY); + toolbar.attach(); + view.show(); + } else { + view.showBuddiesNotVisible(); + view.show(); + } + } else { + view.hide(); + } + } + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,49 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.actions.ActionItemCollection; + +import cc.kune.core.shared.dto.UserSimpleDTO; + +public interface BuddiesSummaryView extends View { + + String NOAVATAR = ""; + int AVATARSIZE = 32; + int AVATARLABELMAXSIZE = 15; + + void addBuddie(UserSimpleDTO user, ActionItemCollection<UserSimpleDTO> actionCollection, String avatarUrl, + String tooltipTitle, String tooltip); + + void clear(); + + void clearOtherUsers(); + + void hide(); + + void setNoBuddies(); + + void setOtherUsers(String text); + + void show(); + + void showBuddiesNotVisible(); +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupActionRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,30 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.ActionRegistry; + +import cc.kune.core.shared.domain.utils.StateToken; + +/** + * The Class GroupActionRegistry stores actions over groups (mainly used in SN) + */ +public class GroupActionRegistry extends ActionRegistry<StateToken> { +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummary.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,36 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.ui.MenuItem; + +import cc.kune.core.shared.dto.GroupDTO; + +public interface GroupMembersSummary { + + void addGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); + + void addUserOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); + + void removeGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); + + void removeUserOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,139 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; +import org.ourproject.kune.platf.client.ui.AbstractToolbar; +import org.ourproject.kune.platf.client.ui.gridmenu.GridDragConfiguration; +import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; +import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; +import org.ourproject.kune.workspace.client.skel.SummaryPanel; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; + +import com.calclab.suco.client.events.Listener; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.widgets.BoxComponent; +import com.gwtext.client.widgets.MessageBox; +import com.gwtext.client.widgets.event.ContainerListenerAdapter; + +public class GroupMembersSummaryPanel extends SummaryPanel implements GroupMembersSummaryView { + // private static final int MAX_HEIGHT = 110; + private final GridMenuPanel<GroupDTO> gridMenuPanel; + private final I18nUITranslationService i18n; + private final Label noMembersPublic; + private final GroupMembersSummaryPresenter presenter; + private final AbstractToolbar toolbar; + + public GroupMembersSummaryPanel(final GroupMembersSummaryPresenter presenter, final I18nUITranslationService i18n, + final WorkspaceSkeleton ws, final ActionToolbarView<StateToken> actionToolbarView) { + super(i18n.t("Group members"), i18n.t("People and groups collaborating in this group"), ws); + this.presenter = presenter; + this.i18n = i18n; + + final GridDragConfiguration dragConf = new GridDragConfiguration("kk", + i18n.t("Drop into the chat area to start a chat.") + "<br/>" + + i18n.t("Drop into a room to invite the user to join the chat room")); + gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " + + "please request to join to work on it"), dragConf, true, true, false, true, false); + final Listener<String> go = new Listener<String>() { + @Override + public void onEvent(final String groupShortName) { + presenter.onDoubleClick(groupShortName); + } + }; + // gridMenuPanel.onClick(go); + gridMenuPanel.onDoubleClick(go); + gridMenuPanel.getBottomBar().setCls("k-blank-toolbar"); + super.add(gridMenuPanel); + + noMembersPublic = new Label(i18n.t(CoreMessages.MEMBERS_NOT_PUBLIC)); + noMembersPublic.addStyleName("kune-Margin-7-trbl"); + noMembersPublic.addStyleName("k-text-gray"); + noMembersPublic.setVisible(false); + super.add(noMembersPublic); + + toolbar = ((ActionToolbarPanel<StateToken>) actionToolbarView).getToolbar(); + toolbar.setBlankStyle(); + super.add((Widget) toolbar); + super.addInSummary(); + ws.addListenerInEntitySummary(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + gridMenuPanel.setWidth(adjWidth); + } + }); + } + + @Override + public void addItem(final GridItem<GroupDTO> gridItem) { + gridMenuPanel.setVisible(true); + gridMenuPanel.addItem(gridItem); + doLayoutIfNeeded(); + } + + @Override + public void clear() { + gridMenuPanel.removeAll(); + toolbar.removeAll(); + noMembersPublic.setVisible(false); + doLayoutIfNeeded(); + } + + @Override + public void confirmAddCollab(final String groupShortName, final String groupLongName) { + final String groupName = groupLongName + " (" + groupShortName + ")"; + MessageBox.confirm(i18n.t("Confirm member joining"), i18n.t("Add [%s] as a member?", groupName), + new MessageBox.ConfirmCallback() { + @Override + public void execute(final String btnID) { + if (btnID.equals("yes")) { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + presenter.addCollab(groupShortName); + } + }); + } + } + }); + } + + @Override + public void setDraggable(final boolean draggable) { + // gridMenuPanel.setDraggable(draggable); + } + + @Override + public void showMembersNotVisible() { + noMembersPublic.setVisible(true); + gridMenuPanel.setVisible(false); + doLayoutIfNeeded(); + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,294 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import java.util.List; + +import org.ourproject.kune.chat.client.ChatEngine; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; +import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; +import org.ourproject.kune.platf.client.ui.MenuItem; +import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbar; +import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; + +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageDescriptor; +import cc.kune.core.client.services.ImageUtils; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.AccessListsDTO; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.dto.SocialNetworkDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; + +import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; +import com.calclab.suco.client.events.Listener; +import com.google.inject.Provider; + +public class GroupMembersSummaryPresenter extends SocialNetworkPresenter implements GroupMembersSummary { + + public static final String MEMBERS_VISIBILITY_GROUP = "k-gmsp-memb-visib"; + public static final String NEW_MEMBERS_POLICY_GROUP = "k-gmsp-new-memb-pol"; + + private final GridGroup adminCategory; + private final GridGroup collabCategory; + private final GroupActionRegistry groupActionRegistry; + private final Provider<GroupServiceAsync> groupServiceProvider; + private final I18nUITranslationService i18n; + private final Provider<GroupLiveSearcher> liveSearcherProvider; + private final GridGroup pendigCategory; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; + private GroupMembersSummaryView view; + + public GroupMembersSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, + final ImageUtils imageUtils, final Session session, + final Provider<SocialNetworkServiceAsync> snServiceProvider, + final Provider<GroupServiceAsync> groupServiceProvider, + final Provider<GroupLiveSearcher> liveSearcherProvider, final Provider<ChatEngine> chatEngineProvider, + final GroupActionRegistry groupActionRegistry, final ActionGroupSummaryToolbar toolbar, + final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, + final IconResources img) { + super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, + downloadProvider, img); + this.i18n = i18n; + this.stateManager = stateManager; + this.session = session; + this.snServiceProvider = snServiceProvider; + this.groupServiceProvider = groupServiceProvider; + this.liveSearcherProvider = liveSearcherProvider; + this.groupActionRegistry = groupActionRegistry; + final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { + @Override + public void onEvent(final StateAbstractDTO state) { + setState(state); + toolbar.disableMenusAndClearButtons(); + toolbar.addActions(groupActionRegistry.getCurrentActions(state.getGroup().getStateToken(), + session.isLogged(), state.getGroupRights(), true), ActionToolbar.IN_ANY); + toolbar.attach(); + } + }; + stateManager.onStateChanged(setStateListener); + stateManager.onSocialNetworkChanged(setStateListener); + session.onInitDataReceived(new Listener<InitDataDTO>() { + @Override + public void onEvent(final InitDataDTO initData) { + addUserOperation(new MenuItem<GroupDTO>("images/new-chat.gif", i18n.t("Start a chat with this member"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO group) { + chatEngineProvider.get().show(); + if (chatEngineProvider.get().isLoggedIn()) { + chatEngineProvider.get().chat( + XmppURI.jid(group.getShortName() + "@" + initData.getChatDomain())); + } else { + NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); + } + } + }), true); + } + }); + final String adminsTitle = i18n.t("Admins"); + final String collabsTitle = i18n.t("Collaborators"); + final String pendingTitle = i18n.t("Pending"); + adminCategory = new GridGroup(adminsTitle, adminsTitle, i18n.t("People that can admin this group"), true); + collabCategory = new GridGroup(collabsTitle, collabsTitle, + i18n.t("Other people that collaborate with this group"), true); + pendigCategory = new GridGroup(pendingTitle, pendingTitle, + i18n.t("People pending to be accepted in this group by the admins"), + imageUtils.getImageHtml(ImageDescriptor.alert), true); + super.addGroupOperation(gotoGroupMenuItem, false); + super.addUserOperation(gotoMemberMenuItem, false); + createActions(); + } + + public void addCollab(final String groupShortName) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(), + groupShortName, new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member added as collaborator")); + stateManager.setSocialNetwork(result); + } + + }); + } + + private void createActions() { + final ActionToolbarMenuDescriptor<StateToken> addMember = new ActionToolbarMenuDescriptor<StateToken>( + AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken parameter) { + liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { + @Override + public void onEvent(final LinkDTO link) { + view.confirmAddCollab(link.getShortName(), link.getLongName()); + } + }); + liveSearcherProvider.get().show(); + } + }); + addMember.setIconUrl("images/add-green.gif"); + addMember.setTextDescription(i18n.t("Add member")); + addMember.setToolTip(i18n.t("Add an user or a group as member of this group")); + addMember.setParentMenuTitle(i18n.t("Options")); + + groupActionRegistry.addAction(addMember); + // groupActionRegistry.addAction(unJoin); + + // groupActionRegistry.addAction(participate); + createSetMembersVisibilityAction(i18n.t("anyone"), SocialNetworkVisibility.anyone); + createSetMembersVisibilityAction(i18n.t("only members"), SocialNetworkVisibility.onlymembers); + createSetMembersVisibilityAction(i18n.t("only admins"), SocialNetworkVisibility.onlyadmins); + createNewMembersPolicyAction(i18n.t("moderate request to join"), AdmissionType.Moderated); + createNewMembersPolicyAction(i18n.t("auto accept request to join"), AdmissionType.Open); + } + + private void createNewMembersPolicyAction(final String textDescription, final AdmissionType admissionPolicy) { + final ActionToolbarMenuRadioDescriptor<StateToken> newMembersPolicy = new ActionToolbarMenuRadioDescriptor<StateToken>( + AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken parameter) { + groupServiceProvider.get().setGroupNewMembersJoiningPolicy(session.getUserHash(), + session.getCurrentState().getGroup().getStateToken(), admissionPolicy, + new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + NotifyUser.info(i18n.t("Members joining policy changed")); + } + }); + } + }, NEW_MEMBERS_POLICY_GROUP, new RadioMustBeChecked() { + @Override + public boolean mustBeChecked() { + final StateAbstractDTO currentState = session.getCurrentState(); + return currentState.getGroup().getAdmissionType().equals(admissionPolicy); + } + }); + newMembersPolicy.setTextDescription(textDescription); + newMembersPolicy.setParentMenuTitle(i18n.t("Options")); + newMembersPolicy.setParentSubMenuTitle(i18n.t("New members policy")); + groupActionRegistry.addAction(newMembersPolicy); + } + + private void createSetMembersVisibilityAction(final String textDescription, final SocialNetworkVisibility visibility) { + final ActionToolbarMenuRadioDescriptor<StateToken> showMembers = new ActionToolbarMenuRadioDescriptor<StateToken>( + AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { + @Override + public void onEvent(final StateToken parameter) { + groupServiceProvider.get().setSocialNetworkVisibility(session.getUserHash(), + session.getCurrentState().getGroup().getStateToken(), visibility, + new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + NotifyUser.info(i18n.t("Members visibility changed")); + } + }); + } + }, MEMBERS_VISIBILITY_GROUP, new RadioMustBeChecked() { + @Override + public boolean mustBeChecked() { + final StateAbstractDTO currentState = session.getCurrentState(); + if (!currentState.getGroup().isPersonal()) { + final SocialNetworkDataDTO socialNetworkData = currentState.getSocialNetworkData(); + return socialNetworkData.getSocialNetworkVisibility().equals(visibility); + } + return false; + } + }); + showMembers.setTextDescription(textDescription); + showMembers.setParentMenuTitle(i18n.t("Options")); + showMembers.setParentSubMenuTitle(i18n.t("Those who can view this member list")); + groupActionRegistry.addAction(showMembers); + } + + public void init(final GroupMembersSummaryView view) { + this.view = view; + } + + @SuppressWarnings("unchecked") + private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) { + final AccessListsDTO accessLists = socialNetwork.getAccessLists(); + + final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); + final List<GroupDTO> collabList = accessLists.getEditors().getList(); + final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); + + // final int numAdmins = adminsList.size(); + + final boolean userIsAdmin = rights.isAdministrable(); + final boolean userCanView = rights.isVisible(); + + view.clear(); + + view.setDraggable(session.isLogged()); + + if (userCanView) { + for (final GroupDTO admin : adminsList) { + view.addItem(createGridItem(adminCategory, admin, rights, changeToCollabMenuItem, removeMemberMenuItem)); + } + for (final GroupDTO collab : collabList) { + view.addItem(createGridItem(collabCategory, collab, rights, changeToAdminMenuItem, removeMemberMenuItem)); + } + if (userIsAdmin) { + for (final GroupDTO pendingCollab : pendingCollabsList) { + view.addItem(createGridItem(pendigCategory, pendingCollab, rights, acceptJoinGroupMenuItem, + denyJoinGroupMenuItem)); + } + } + } + view.setVisible(true); + } + + private void setState(final StateAbstractDTO state) { + if (state.getGroup().isPersonal()) { + view.setVisible(false); + } else { + if (state.getSocialNetworkData().isMembersVisible()) { + setGroupMembers(state.getGroupMembers(), state.getGroupRights()); + } else { + view.clear(); + view.showMembersNotVisible(); + view.setVisible(true); + } + } + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,40 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; + +import cc.kune.core.shared.dto.GroupDTO; + +public interface GroupMembersSummaryView { + + void addItem(GridItem<GroupDTO> gridItem); + + void clear(); + + void confirmAddCollab(String groupShortName, String groupLongName); + + void setDraggable(boolean draggable); + + void setVisible(boolean visible); + + void showMembersNotVisible(); + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,75 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.ActionEvent; + +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Provider; + +public class ParticipateAction extends RolAction { + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + + public ParticipateAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, + final StateManager stateManager, final AccessRightsClientManager rightsManager, + final I18nTranslationService i18n, final IconResources imgResources) { + super(session, stateManager, rightsManager, i18n, AccessRolDTO.Viewer, i18n.t("Participate"), + i18n.t("Request to participate in this group"), imgResources.addGreen()); + this.snServiceProvider = snServiceProvider; + super.setVisible(false, true); + super.setMustBeAuthenticated(false); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().requestJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), + new AsyncCallbackSimple<SocialNetworkRequestResult>() { + @Override + public void onSuccess(final SocialNetworkRequestResult result) { + NotifyUser.hideProgress(); + switch ((result)) { + case accepted: + NotifyUser.info(i18n.t("You are now member of this group")); + stateManager.reload(); + break; + case denied: + NotifyUser.important(i18n.t("Sorry this is a closed group")); + break; + case moderated: + NotifyUser.info(i18n.t("Membership requested. Waiting for admins decision")); + break; + default: + NotifyUser.info(i18n.t("Programatic error in ParticipateAction")); + } + } + }); + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummary.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,24 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +public interface ParticipationSummary { + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,80 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; +import org.ourproject.kune.platf.client.ui.AbstractToolbar; +import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; +import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; +import org.ourproject.kune.workspace.client.skel.SummaryPanel; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.events.Listener; +import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.widgets.BoxComponent; +import com.gwtext.client.widgets.event.ContainerListenerAdapter; + +public class ParticipationSummaryPanel extends SummaryPanel implements ParticipationSummaryView { + + private final GridMenuPanel<GroupDTO> gridMenuPanel; + private final AbstractToolbar toolbar; + + public ParticipationSummaryPanel(final ParticipationSummaryPresenter presenter, final I18nTranslationService i18n, + final WorkspaceSkeleton ws, final ActionToolbarView<StateToken> actionToolbarView) { + super(i18n.t("Participates in"), i18n.t("Groups in which the user participates"), ws); + gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user does not belong to any group"), false, false, + false, false, false); + final Listener<String> go = new Listener<String>() { + public void onEvent(final String groupShortName) { + presenter.onDoubleClick(groupShortName); + } + }; + // gridMenuPanel.onClick(go); + gridMenuPanel.onDoubleClick(go); + super.add(gridMenuPanel); + toolbar = ((ActionToolbarPanel<StateToken>) actionToolbarView).getToolbar(); + toolbar.setBlankStyle(); + super.add((Widget) toolbar); + addInSummary(); + ws.addListenerInEntitySummary(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + gridMenuPanel.setWidth(adjWidth); + } + }); + } + + public void addItem(final GridItem<GroupDTO> gridItem) { + gridMenuPanel.addItem(gridItem); + } + + @Override + public void clear() { + gridMenuPanel.removeAll(); + toolbar.removeAll(); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,105 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import java.util.List; + +import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; +import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionParticipationToolbar; + +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageUtils; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.ParticipationDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; + +import com.calclab.suco.client.events.Listener; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class ParticipationSummaryPresenter extends SocialNetworkPresenter implements ParticipationSummary { + + private final GridGroup adminCategory; + private GridGroup collabCategory; + private final GridGroup collabOnlyCategory; + private ParticipationSummaryView view; + + @Inject + public ParticipationSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, + final ImageUtils imageUtils, final Session session, + final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, + final ActionParticipationToolbar actionParticipationToolbar, + final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, + final IconResources img) { + super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, + downloadProvider, img); + adminCategory = new GridGroup("admin in:", " ", i18n.tWithNT("Administrate these groups", + "talking about a person"), false); + collabCategory = new GridGroup(i18n.t("and as collaborator in:"), " ", i18n.t("Collaborate in these groups"), + false); + collabOnlyCategory = new GridGroup(i18n.t("collaborator in:"), " ", i18n.t("Collaborate in these groups"), + false); + super.addGroupOperation(gotoGroupMenuItem, false); + final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { + @Override + public void onEvent(final StateAbstractDTO state) { + setState(state); + } + }; + stateManager.onStateChanged(setStateListener); + stateManager.onSocialNetworkChanged(setStateListener); + } + + public void init(final ParticipationSummaryView view) { + this.view = view; + } + + @SuppressWarnings("unchecked") + private void setState(final StateAbstractDTO state) { + final ParticipationDataDTO participation = state.getParticipation(); + final AccessRights rights = state.getGroupRights(); + view.clear(); + final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); + final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); + final int numAdmins = groupsIsAdmin.size(); + final int numCollaborators = groupsIsCollab.size(); + if (numAdmins == 0) { + collabCategory = collabOnlyCategory; + } + for (final GroupDTO group : groupsIsAdmin) { + view.addItem(createGridItem(adminCategory, group, rights, unJoinMenuItem)); + } + for (final GroupDTO group : groupsIsCollab) { + view.addItem(createGridItem(collabCategory, group, rights, unJoinMenuItem)); + } + if (numAdmins > 0 || numCollaborators > 0) { + view.setVisible(true); + } else { + view.setVisible(false); + } + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipationSummaryView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,35 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; + +import cc.kune.core.shared.dto.GroupDTO; + +public interface ParticipationSummaryView extends View { + + void addItem(GridItem<GroupDTO> createGridItem); + + void clear(); + + void setVisible(boolean b); + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,96 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; + +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.events.Listener2; +import com.google.gwt.resources.client.ImageResource; + +public abstract class RolAction extends AbstractExtendedAction { + + public static UIStatus refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, + final boolean isLogged, final boolean visibleForMembers, final boolean visibleForNonMemb, + final AccessRights newRights) { + boolean newVisibility = false; + boolean newEnabled = false; + if (authNeed && !isLogged) { + newVisibility = newEnabled = false; + } else { + // Auth ok + newEnabled = RolComparator.isEnabled(rolRequired, newRights); + if (newEnabled) { + final boolean isMember = RolComparator.isMember(newRights); + newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb; + } else { + newVisibility = false; + } + } + return new UIStatus(newVisibility, newEnabled); + } + + protected final Session session; + protected final StateManager stateManager; + protected final I18nTranslationService i18n; + private boolean visibleForNonMemb; + private boolean visibleForMembers; + private boolean authNeed; + + public RolAction(final Session session, final StateManager stateManager, + final AccessRightsClientManager rightsManager, final I18nTranslationService i18n, + final AccessRolDTO rolRequired, final String text, final String tooltip, final ImageResource icon) { + super(text, tooltip, icon); + this.session = session; + this.stateManager = stateManager; + this.i18n = i18n; + this.visibleForMembers = true; + this.visibleForNonMemb = true; + this.authNeed = false; + rightsManager.onRightsChanged(new Listener2<AccessRights, AccessRights>() { + public void onEvent(final AccessRights prevRights, final AccessRights newRights) { + setStatus(refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, + visibleForNonMemb, newRights)); + } + + }); + } + + public void setMustBeAuthenticated(final boolean authNeed) { + this.authNeed = authNeed; + } + + public void setVisible(final boolean forMembers, final boolean forNonMembers) { + this.visibleForMembers = forMembers; + this.visibleForNonMemb = forNonMembers; + } + + private void setStatus(final UIStatus refreshStatus) { + setEnabled(refreshStatus.isEnabled()); + putValue(OldGuiActionDescrip.VISIBLE, refreshStatus.isVisible()); + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/RolComparator.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,45 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.dto.AccessRolDTO; + +public final class RolComparator { + + public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRights rights) { + switch (rolRequired) { + case Administrator: + return rights.isAdministrable(); + case Editor: + return rights.isEditable(); + case Viewer: + return rights.isVisible(); + } + return false; + } + + public static boolean isMember(final AccessRights newRights) { + return newRights.isAdministrable() || newRights.isEditable(); + } + + private RolComparator() { + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,329 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; +import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; +import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; +import org.ourproject.kune.platf.client.ui.MenuItem; +import org.ourproject.kune.platf.client.ui.MenuItemCollection; +import org.ourproject.kune.platf.client.ui.gridmenu.CustomMenu; +import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; +import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; + +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.events.Listener; +import com.google.inject.Provider; + +public class SocialNetworkPresenter { + + private static final String MEMBERS_BOTTON = "members_bottom"; + + protected MenuItem<GroupDTO> acceptJoinGroupMenuItem; + protected final ActionToolbarPosition buddiesBottom = new ActionToolbarPosition("sn-bottomtoolbar"); + protected MenuItem<GroupDTO> changeToAdminMenuItem; + protected MenuItem<GroupDTO> changeToCollabMenuItem; + protected MenuItem<GroupDTO> denyJoinGroupMenuItem; + private final Provider<FileDownloadUtils> downloadProvider; + protected MenuItem<GroupDTO> gotoGroupMenuItem; + protected MenuItem<GroupDTO> gotoMemberMenuItem; + private final I18nTranslationService i18n; + private final IconResources imgResources; + protected final ActionToolbarPosition membersBottom = new ActionToolbarPosition("sn-bottomtoolbar"); + private MenuDescriptor menuOptions; + private final MenuItemCollection<GroupDTO> otherLoggedOperations; + private final MenuItemCollection<GroupDTO> otherLoggedOperationsUsers; + private final MenuItemCollection<GroupDTO> otherOperations; + private final MenuItemCollection<GroupDTO> otherOperationsUsers; + protected ActionToolbarButtonDescriptor<StateToken> participate; + protected MenuItem<GroupDTO> removeMemberMenuItem; + private final AccessRightsClientManager rightsManager; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; + protected ActionToolbarMenuDescriptor<StateToken> unJoin; + + protected MenuItem<GroupDTO> unJoinMenuItem; + + public SocialNetworkPresenter(final I18nTranslationService i18n, final StateManager stateManager, + final AccessRightsClientManager rightsManager, final Session session, + final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, + final Provider<FileDownloadUtils> downloadProvider, final IconResources imgResources) { + this.i18n = i18n; + this.stateManager = stateManager; + this.rightsManager = rightsManager; + this.session = session; + this.snServiceProvider = snServiceProvider; + this.downloadProvider = downloadProvider; + this.imgResources = imgResources; + createButtons(); + createMenuActions(); + otherOperationsUsers = new MenuItemCollection<GroupDTO>(); + otherLoggedOperationsUsers = new MenuItemCollection<GroupDTO>(); + otherOperations = new MenuItemCollection<GroupDTO>(); + otherLoggedOperations = new MenuItemCollection<GroupDTO>(); + } + + public void addGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperations : otherOperations; + collection.add(operation); + } + + public void addUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; + collection.add(operation); + } + + private void createButtons() { + final ParticipateAction participateAction = new ParticipateAction(session, snServiceProvider, stateManager, + rightsManager, i18n, imgResources); + final ButtonDescriptor participateBtn = new ButtonDescriptor(participateAction); + participateBtn.setLocation(MEMBERS_BOTTON); + + menuOptions = new MenuDescriptor(i18n.t("Options")); + + final UnjoinButtonAction unjoinAction = new UnjoinButtonAction(session, snServiceProvider, stateManager, rightsManager, + i18n, imgResources) { + @Override + public String getGroupName() { + return session.getContainerState().getGroup().getShortName(); + } + }; + + final OldMenuItemDescriptor unjoinBtn = new OldMenuItemDescriptor(menuOptions, unjoinAction); + unjoinBtn.setLocation(MEMBERS_BOTTON); + } + + private GridItem<GroupDTO> createDefMemberMenu(final GroupDTO group, final GridGroup gridGroup) { + final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); + final String longName = group.getLongName(); + final boolean hasLogo = group.hasLogo(); + final String toolTip = createTooltipWithLogo(group.getShortName(), group.getStateToken(), hasLogo, + group.isPersonal()); + final String imageHtml = downloadProvider.get().getLogoAvatarHtml(group.getStateToken(), hasLogo, + group.isPersonal(), session.getImgIconsize(), 0); + final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, + longName, longName, " ", longName, toolTip, menu); + if (!group.isPersonal()) { + menu.addMenuItemList(otherOperations); + } + if (session.isLogged() && !group.isPersonal()) { + menu.addMenuItemList(otherLoggedOperations); + } + if (group.isPersonal()) { + menu.addMenuItemList(otherOperationsUsers); + } + if (session.isLogged() && group.isPersonal()) { + menu.addMenuItemList(otherLoggedOperationsUsers); + } + + return gridItem; + } + + protected GridItem<GroupDTO> createGridItem(final GridGroup groupCategory, final GroupDTO group, + final AccessRights rights, final MenuItem<GroupDTO>... gridMenuItems) { + final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); + final CustomMenu<GroupDTO> menu = gridItem.getMenu(); + if (rights.isAdministrable()) { + for (final MenuItem<GroupDTO> item : gridMenuItems) { + menu.addMenuItem(item); + } + } + return gridItem; + } + + private void createMenuActions() { + gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO groupDTO) { + stateManager.gotoToken(groupDTO.getShortName()); + } + }); + gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO groupDTO) { + stateManager.gotoToken(groupDTO.getShortName()); + } + }); + + unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Do not participate anymore in this group"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO groupDTO) { + removeMemberAction(groupDTO); + } + }); + changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", + i18n.t("Change to collaborator"), new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO group) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().setAdminAsCollab(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member type changed")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO group) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().deleteMember(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member removed")); + stateManager.reload(); + // in the + // future, + // only if + // I cannot + // be + // affected: + // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); + } + }); + changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO group) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member type changed")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO group) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().acceptJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member accepted")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Reject this member"), + new Listener<GroupDTO>() { + @Override + public void onEvent(final GroupDTO group) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().denyJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member rejected")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + } + + protected String createTooltipWithLogo(final String shortName, final StateToken token, final boolean hasLogo, + final boolean isPersonal) { + return "<table><tr><td>" + + (hasLogo ? downloadProvider.get().getLogoAvatarHtml(token, hasLogo, isPersonal, + FileConstants.LOGO_DEF_HEIGHT, 3) : "") + "</td><td>" + + i18n.t(isPersonal ? "Nickname: [%s]" : "Group short name: [%s]", shortName) + "</td></tr></table>"; + } + + public void onDoubleClick(final String groupShortName) { + stateManager.gotoToken(groupShortName); + } + + public void removeGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperations : otherOperations; + collection.remove(operation); + } + + private void removeMemberAction(final GroupDTO groupDTO) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Removed as member")); + stateManager.reload(); + // in the future with user + // info: + // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); + } + + public void removeUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; + collection.remove(operation); + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UIStatus.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UIStatus.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,82 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +public class UIStatus { + + private boolean visible; + private boolean enabled; + + public UIStatus(final boolean visible, final boolean enabled) { + this.visible = visible; + this.enabled = enabled; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final UIStatus other = (UIStatus) obj; + if (enabled != other.enabled) { + return false; + } + if (visible != other.visible) { + return false; + } + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (enabled ? 1231 : 1237); + result = prime * result + (visible ? 1231 : 1237); + return result; + } + + public boolean isEnabled() { + return enabled; + } + + public boolean isVisible() { + return visible; + } + + public void setEnabled(final boolean enabled) { + this.enabled = enabled; + } + + public void setVisible(final boolean visible) { + this.visible = visible; + } + + @Override + public String toString() { + return "(v: " + visible + ", e:" + enabled + ")"; + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,82 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.ActionEvent; + +import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.AccessRightsClientManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Provider; + +public class UnjoinButtonAction extends RolAction { + private String groupName; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + + public UnjoinButtonAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, + final StateManager stateManager, final AccessRightsClientManager rightsManager, + final I18nTranslationService i18n, final IconResources imgResources) { + super(session, stateManager, rightsManager, i18n, AccessRolDTO.Editor, i18n.t("Leave this group"), + i18n.t("Do not participate anymore in this group"), imgResources.delGreen()); + this.snServiceProvider = snServiceProvider; + super.setVisible(true, false); + super.setMustBeAuthenticated(true); + } + + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.askConfirmation(i18n.t("Leave this group"), i18n.t("Are you sure?"), new OnAcceptCallback() { + @Override + public void onSuccess() { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(getGroupName()), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Removed as member")); + stateManager.reload(); + // in the future with user info: + // stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); + } + }); + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(final String groupName) { + this.groupName = groupName; + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java (from rev 1239, trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UserActionRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,33 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn; + +import org.ourproject.kune.platf.client.actions.ActionRegistry; + +import cc.kune.core.shared.dto.UserSimpleDTO; + +/** + * The Class UserActionRegistry. + * + * List of actions over a user (initially used for buddies actions) + * + */ +public class UserActionRegistry extends ActionRegistry<UserSimpleDTO> { +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,103 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn.other; + +import org.ourproject.kune.chat.client.ChatEngine; +import org.ourproject.kune.platf.client.actions.OldAbstractAction; +import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; +import org.ourproject.kune.platf.client.actions.Action; +import org.ourproject.kune.platf.client.actions.ActionEvent; +import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; +import org.ourproject.kune.platf.client.actions.PropertyChangeListener; +import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; +import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import org.ourproject.kune.workspace.client.entityheader.EntityHeader; + +import cc.kune.core.client.resources.icons.IconConstants; +import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.ioc.Provider; + +public class AddAsBuddieHeaderButton { + + public static class AddAsBuddieAction extends AbstractExtendedAction { + private final Provider<ChatEngine> chatEngine; + private final Session session; + + public AddAsBuddieAction(final Provider<ChatEngine> chatEngine, final Session session, + final StateManager stateManager, final I18nTranslationService i18n, final IconResources img) { + super(); + this.chatEngine = chatEngine; + this.session = session; + stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + public void onEvent(final StateAbstractDTO state) { + setState(state); + } + }); + chatEngine.get().addOnRosterChanged(new Listener0() { + public void onEvent() { + setState(session.getCurrentState()); + } + }); + putValue(Action.NAME, i18n.t("Add as a buddie")); + putValue(Action.SMALL_ICON, IconConstants.toPath(img.addGreen())); + } + + public void actionPerformed(final ActionEvent event) { + chatEngine.get().addNewBuddie(session.getCurrentState().getGroup().getShortName()); + NotifyUser.info("Added as buddie. Waiting buddie response"); + setEnabled(false); + } + + private void setState(final StateAbstractDTO state) { + final String groupName = state.getGroup().getShortName(); + final boolean isPersonal = state.getGroup().isPersonal(); + final boolean isLogged = session.isLogged(); + if (isLogged && isPersonal && (!chatEngine.get().isBuddie(groupName)) + && (!session.getCurrentUser().getShortName().equals(groupName))) { + setEnabled(true); + } else { + setEnabled(false); + } + } + } + + public AddAsBuddieHeaderButton(final Provider<ChatEngine> chatEngine, final Session session, + final StateManager stateManager, final I18nTranslationService i18n, final IconResources img, + final EntityHeader entityHeader) { + final AddAsBuddieAction buddieAction = new AddAsBuddieAction(chatEngine, session, stateManager, i18n, img); + final ButtonDescriptor button = new ButtonDescriptor(buddieAction); + button.setVisible(false); + buddieAction.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(final PropertyChangeEvent event) { + if (event.getPropertyName().equals(OldAbstractAction.ENABLED)) { + button.setVisible((Boolean) event.getNewValue()); + } + } + }); + entityHeader.addAction(button); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/other/AddAsBuddieHeaderButton.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbar.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbar.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,28 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn.toolbar; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; + +import cc.kune.core.shared.dto.UserSimpleDTO; + +public interface ActionBuddiesSummaryToolbar extends ActionToolbar<UserSimpleDTO> { + +} Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbarPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbarPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,34 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn.toolbar; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; + +import cc.kune.core.shared.dto.UserSimpleDTO; + +public class ActionBuddiesSummaryToolbarPresenter extends ActionToolbarPresenter<UserSimpleDTO> implements + ActionBuddiesSummaryToolbar { + + public ActionBuddiesSummaryToolbarPresenter(ActionToolbarView<UserSimpleDTO> toolbar) { + super(toolbar); + } + +} Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionBuddiesSummaryToolbarPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbar.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbar.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,28 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn.toolbar; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; + +import cc.kune.core.shared.domain.utils.StateToken; + +public interface ActionGroupSummaryToolbar extends ActionToolbar<StateToken> { + +} Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbarPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbarPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,33 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn.toolbar; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; + +import cc.kune.core.shared.domain.utils.StateToken; + +public class ActionGroupSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements + ActionGroupSummaryToolbar { + + public ActionGroupSummaryToolbarPresenter(ActionToolbarView<StateToken> toolbar) { + super(toolbar); + } +} Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionGroupSummaryToolbarPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationSummaryToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationSummaryToolbarPresenter.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationSummaryToolbarPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,34 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn.toolbar; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; + +import cc.kune.core.shared.domain.utils.StateToken; + +public class ActionParticipationSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements + ActionParticipationToolbar { + + public ActionParticipationSummaryToolbarPresenter(ActionToolbarView<StateToken> toolbar) { + super(toolbar); + } + +} Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationSummaryToolbarPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationToolbar.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationToolbar.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -0,0 +1,28 @@ +/* + * + * 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 org.ourproject.kune.workspace.client.oldsn.toolbar; + +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; + +import cc.kune.core.shared.domain.utils.StateToken; + +public interface ActionParticipationToolbar extends ActionToolbar<StateToken> { + +} Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/toolbar/ActionParticipationToolbar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.workspace.client.options; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.app.GroupOptionsCollection; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; @@ -47,7 +47,7 @@ } @Override - public void addAction(final GuiActionDescrip descriptor) { + public void addAction(final OldGuiActionDescrip descriptor) { entityHeader.addAction(descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,10 +19,10 @@ */ package org.ourproject.kune.workspace.client.options; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; public interface GroupOptionsView extends EntityOptionsView { - void addAction(GuiActionDescrip descriptor); + void addAction(OldGuiActionDescrip descriptor); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions; @@ -73,7 +73,7 @@ }; userPrefsAction.putValue(Action.NAME, i18n.t("Your preferences")); userPrefsAction.putValue(Action.SMALL_ICON, img.prefs()); - final MenuItemDescriptor prefsItem = new MenuItemDescriptor(userPrefsAction); + final OldMenuItemDescriptor prefsItem = new OldMenuItemDescriptor(userPrefsAction); prefsItem.setPosition(1); userOptions.addAction(prefsItem); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,12 +20,12 @@ package org.ourproject.kune.workspace.client.options.logo; import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; -import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.options.EntityOptionsView; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.i18n.I18nTranslationService; import com.gwtext.client.core.Connection; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,9 +19,9 @@ */ package org.ourproject.kune.workspace.client.options.logo; -import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.i18n.I18nTranslationService; public class GroupOptionsLogoPanel extends EntityOptionsLogoPanel { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,9 +19,9 @@ */ package org.ourproject.kune.workspace.client.options.logo; -import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.services.FileConstants; import cc.kune.core.shared.i18n.I18nTranslationService; public class UserOptionsLogoPanel extends EntityOptionsLogoPanel { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,15 +19,15 @@ */ package org.ourproject.kune.workspace.client.options.pscape; -import org.ourproject.kune.platf.client.ui.BasicThumb; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.options.EntityOptionsView; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeSelector; +import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.ImageSize; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -21,8 +21,8 @@ import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.i18n.I18nTranslationService; public class GroupLiveSearchPanel extends EntityLiveSearcherPanel { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.i18n.I18nTranslationService; public class UserLiveSearcherPanel extends EntityLiveSearcherPanel { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -24,9 +24,9 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.AbstractActionExtensiblePresenter; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor; import cc.kune.common.client.ui.KuneWindowUtils; @@ -49,7 +49,7 @@ } @Override - public void addAction(final GuiActionDescrip descriptor) { + public void addAction(final OldGuiActionDescrip descriptor) { descriptor.setParent(menuDescriptor); view.addAction(descriptor); } @@ -76,7 +76,7 @@ }; bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems")); bugsAction.putValue(Action.SMALL_ICON, img.bug()); - final MenuItemDescriptor item = new MenuItemDescriptor(bugsAction); + final OldMenuItemDescriptor item = new OldMenuItemDescriptor(bugsAction); addAction(item); // final KeyStroke shortcut = Shortcut.getShortcut(true, true, false, @@ -90,6 +90,6 @@ aboutAction.putValue(Action.SMALL_ICON, img.kuneIcon16()); // aboutAction.setShortcut(shortcut); // shortcutReg.put(shortcut, aboutAction); - addAction(new MenuItemDescriptor(aboutAction)); + addAction(new OldMenuItemDescriptor(aboutAction)); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -27,13 +27,13 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.common.GotoGroupAction; import org.ourproject.kune.platf.client.actions.ui.AbstractActionExtensiblePresenter; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; +import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.icons.IconResources; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; @@ -80,7 +80,7 @@ } @Override - public void addAction(final GuiActionDescrip descriptor) { + public void addAction(final OldGuiActionDescrip descriptor) { descriptor.setParent(menuDescriptor); view.addAction(descriptor); } @@ -99,7 +99,7 @@ : "images/group-def-icon.gif"; final GotoGroupAction gotoGroupAction = new GotoGroupAction(logoImageUrl, group.getShortName(), group.getLongName(), stateManager); - view.addAction(new MenuItemDescriptor(partiMenu, gotoGroupAction)); + view.addAction(new OldMenuItemDescriptor(partiMenu, gotoGroupAction)); } private void createActions() { @@ -118,7 +118,7 @@ }; userHomeAction.putValue(Action.NAME, i18n.t(CoreMessages.YOUR_HOMEPAGE)); userHomeAction.putValue(Action.SMALL_ICON, img.groupHome()); - final MenuItemDescriptor item = new MenuItemDescriptor(userHomeAction); + final OldMenuItemDescriptor item = new OldMenuItemDescriptor(userHomeAction); item.setPosition(0); addAction(item); } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummary.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,24 +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 org.ourproject.kune.workspace.client.socialnet; - - -public interface BuddiesSummary { -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,133 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.ActionItem; -import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import org.ourproject.kune.platf.client.actions.ActionManager; -import org.ourproject.kune.platf.client.actions.MenuItemsContainer; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.platf.client.ui.BasicThumb; -import org.ourproject.kune.workspace.client.skel.SummaryPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.google.gwt.dom.client.Element; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.widgets.menu.Menu; - -public class BuddiesSummaryPanel extends SummaryPanel implements BuddiesSummaryView { - - private final MenuItemsContainer<UserSimpleDTO> menuItemsContainer; - private final FlowPanel flowPanel; - private final Label otherBuddiesLabel; - private final I18nTranslationService i18n; - private final ActionManager actionManager; - private final AbstractToolbar toolbar; - private final Label noBuddiesPublic; - - public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, - final I18nTranslationService i18n, final ActionManager actionManager, - final ActionToolbarView<UserSimpleDTO> actionToolbarView) { - super(i18n.t("Buddies"), i18n.t("This user buddies"), ws); - this.actionManager = actionManager; - menuItemsContainer = new MenuItemsContainer<UserSimpleDTO>(); - this.i18n = i18n; - final VerticalPanel vp = new VerticalPanel(); - flowPanel = new FlowPanel(); - otherBuddiesLabel = new Label(); - otherBuddiesLabel.addStyleName("kune-Margin-Small-trbl"); - vp.add(flowPanel); - vp.add(otherBuddiesLabel); - toolbar = ((ActionToolbarPanel<UserSimpleDTO>) actionToolbarView).getToolbar(); - toolbar.setBlankStyle(); - vp.add((Widget) toolbar); - super.add(vp); - addInSummary(); - noBuddiesPublic = new Label(i18n.t(CoreMessages.BUDDIES_NOT_PUBLIC)); - noBuddiesPublic.addStyleName("kune-Margin-7-trbl"); - noBuddiesPublic.addStyleName("k-text-gray"); - } - - public void addBuddie(final UserSimpleDTO user, final ActionItemCollection<UserSimpleDTO> actionCollection, - final String avatarUrl, final String tooltipTitle, final String tooltip) { - final ClickHandler listener = new ClickHandler() { - public void onClick(final ClickEvent event) { - final Element sender = event.getRelativeElement(); - final Menu menu = menuItemsContainer.get(user.getShortName()); - if (menu.getItems().length > 0) { - menu.showAt(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 5); - } - } - }; - menuItemsContainer.createItemMenu(user.getShortName(), actionCollection, - new Listener<ActionItem<UserSimpleDTO>>() { - public void onEvent(final ActionItem<UserSimpleDTO> actionItem) { - doAction(actionItem); - } - }); - - final BasicThumb thumb = new BasicThumb(avatarUrl.equals(NOAVATAR) ? "images/persons/person2-32.png" - : avatarUrl, AVATARSIZE, user.getShortName(), AVATARLABELMAXSIZE, false, listener); - thumb.setTooltip(tooltipTitle, tooltip); - flowPanel.add(thumb); - } - - @Override - public void clear() { - flowPanel.clear(); - clearOtherUsers(); - menuItemsContainer.clear(); - toolbar.removeAll(); - super.doLayoutIfNeeded(); - } - - public void clearOtherUsers() { - otherBuddiesLabel.setText(""); - } - - public void setNoBuddies() { - otherBuddiesLabel.setText(i18n.t("This user has no buddies")); - } - - public void setOtherUsers(final String text) { - otherBuddiesLabel.setText(text); - } - - public void showBuddiesNotVisible() { - flowPanel.add(noBuddiesPublic); - super.doLayoutIfNeeded(); - } - - private void doAction(final ActionItem<UserSimpleDTO> actionItem) { - actionManager.doAction(actionItem); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,239 +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 org.ourproject.kune.workspace.client.socialnet; - -import java.util.List; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ActionEnableCondition; -import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; -import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.services.ImageUtils; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbar; - -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.rpcservices.UserServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.UserBuddiesVisibility; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.UserBuddiesDataDTO; -import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; - -public class BuddiesSummaryPresenter extends SocialNetworkPresenter implements BuddiesSummary { - - public static final String BUDDIES_VISIBILITY_GROUP = "k-bsp-bud-visib"; - - private BuddiesSummaryView view; - private final StateManager stateManager; - private final UserActionRegistry actionRegistry; - private final I18nTranslationService i18n; - private final Provider<ChatEngine> chatEngineProvider; - private final Session session; - private final ActionBuddiesSummaryToolbar toolbar; - private final Provider<UserServiceAsync> userServiceAsync; - private final Provider<FileDownloadUtils> fileDownUtilsProvider; - - public BuddiesSummaryPresenter(final StateManager stateManager, final Session session, - final Provider<UserServiceAsync> userServiceAsync, final UserActionRegistry actionRegistry, - final I18nTranslationService i18n, final Provider<ChatEngine> chatEngineProvider, - final ActionBuddiesSummaryToolbar toolbar, final Provider<FileDownloadUtils> fileDownUtilsProvider, - final ImageUtils imageUtils, final Provider<SocialNetworkServiceAsync> snServiceAsync, - final GroupActionRegistry groupActionRegistry, final AccessRightsClientManager accessRightManager, - final IconResources img) { - super(i18n, stateManager, accessRightManager, session, snServiceAsync, groupActionRegistry, - fileDownUtilsProvider, img); - this.stateManager = stateManager; - this.session = session; - this.userServiceAsync = userServiceAsync; - this.actionRegistry = actionRegistry; - this.i18n = i18n; - this.chatEngineProvider = chatEngineProvider; - this.toolbar = toolbar; - this.fileDownUtilsProvider = fileDownUtilsProvider; - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }); - stateManager.onSocialNetworkChanged(new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }); - registerActions(); - } - - public View getView() { - return view; - } - - public void init(final BuddiesSummaryView view) { - this.view = view; - } - - protected void setState(final StateAbstractDTO state) { - if (state.getGroup().isPersonal()) { - view.clear(); - final UserBuddiesDataDTO userBuddies = state.getUserBuddies(); - if (state.getSocialNetworkData().isBuddiesVisible()) { - final List<UserSimpleDTO> buddies = userBuddies.getBuddies(); - for (final UserSimpleDTO user : buddies) { - final String avatarUrl = user.hasLogo() ? fileDownUtilsProvider.get().getLogoImageUrl( - user.getStateToken()) : BuddiesSummaryView.NOAVATAR; - final String tooltip = super.createTooltipWithLogo(user.getShortName(), user.getStateToken(), - user.hasLogo(), true); - view.addBuddie(user, actionRegistry.getCurrentActions(user, session.isLogged(), new AccessRights( - true, true, true), false), avatarUrl, user.getName(), tooltip); - } - final boolean hasLocalBuddies = buddies.size() > 0; - final int numExtBuddies = userBuddies.getOtherExtBuddies(); - if (numExtBuddies > 0) { - if (hasLocalBuddies) { - // i18n: plural - view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "and [%d] external user" - : "and [%d] external users", numExtBuddies)); - } else { - view.setOtherUsers(i18n.t(numExtBuddies == 1 ? "[%d] external user" : "[%d] external users", - numExtBuddies)); - } - } else { - if (hasLocalBuddies) { - view.clearOtherUsers(); - } else { - view.setNoBuddies(); - } - } - toolbar.disableMenusAndClearButtons(); - toolbar.addActions( - actionRegistry.getCurrentActions(session.getCurrentUser(), session.isLogged(), - state.getGroupRights(), true), ActionToolbar.IN_ANY); - toolbar.attach(); - view.show(); - } else { - view.showBuddiesNotVisible(); - view.show(); - } - } else { - view.hide(); - } - } - - private void createAddNewBuddiesAction() { - final ActionToolbarMenuDescriptor<UserSimpleDTO> addNewBuddiesAction = new ActionToolbarMenuDescriptor<UserSimpleDTO>( - AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO parameter) { - NotifyUser.info("In development"); - } - }); - addNewBuddiesAction.setTextDescription(i18n.t("Add a new buddy")); - addNewBuddiesAction.setParentMenuTitle(i18n.t("Options")); - addNewBuddiesAction.setIconUrl("images/add-green.gif"); - actionRegistry.addAction(addNewBuddiesAction); - } - - private void createSetBuddiesVisibilityAction(final String textDescription, final UserBuddiesVisibility visibility) { - final ActionToolbarMenuRadioDescriptor<UserSimpleDTO> buddiesVisibilityAction = new ActionToolbarMenuRadioDescriptor<UserSimpleDTO>( - AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO parameter) { - userServiceAsync.get().setBuddiesVisibility(session.getUserHash(), - session.getCurrentState().getGroup().getStateToken(), visibility, - new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.info(i18n.t("Buddies visibility changed")); - } - }); - } - }, BUDDIES_VISIBILITY_GROUP, new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - final StateAbstractDTO currentState = session.getCurrentState(); - if (currentState.getGroup().isPersonal()) { - final SocialNetworkDataDTO socialNetworkData = currentState.getSocialNetworkData(); - return socialNetworkData.getUserBuddiesVisibility().equals(visibility); - } - return false; - } - }); - buddiesVisibilityAction.setTextDescription(textDescription); - buddiesVisibilityAction.setParentMenuTitle(i18n.t("Options")); - buddiesVisibilityAction.setParentSubMenuTitle(i18n.t("Those who can view your buddies list")); - actionRegistry.addAction(buddiesVisibilityAction); - } - - private void registerActions() { - final ActionMenuItemDescriptor<UserSimpleDTO> addAsBuddie = new ActionMenuItemDescriptor<UserSimpleDTO>( - AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO user) { - chatEngineProvider.get().addNewBuddie(user.getShortName()); - } - }); - addAsBuddie.setMustBeAuthenticated(true); - addAsBuddie.setTextDescription(i18n.t("Add as a buddie")); - addAsBuddie.setIconUrl("images/add-green.png"); - addAsBuddie.setEnableCondition(new ActionEnableCondition<UserSimpleDTO>() { - @Override - public boolean mustBeEnabled(final UserSimpleDTO user) { - return !chatEngineProvider.get().isBuddie(user.getShortName()); - } - }); - actionRegistry.addAction(addAsBuddie); - - final ActionMenuItemDescriptor<UserSimpleDTO> go = new ActionMenuItemDescriptor<UserSimpleDTO>( - AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { - @Override - public void onEvent(final UserSimpleDTO user) { - stateManager.gotoToken(user.getShortName()); - } - }); - go.setMustBeAuthenticated(false); - go.setTextDescription(i18n.t("Visit this user's homepage")); - go.setIconUrl("images/group-home.gif"); - actionRegistry.addAction(go); - - createAddNewBuddiesAction(); - createSetBuddiesVisibilityAction(i18n.t("anyone"), UserBuddiesVisibility.anyone); - createSetBuddiesVisibilityAction(i18n.t("only your buddies"), UserBuddiesVisibility.yourbuddies); - createSetBuddiesVisibilityAction(i18n.t("only you"), UserBuddiesVisibility.onlyyou); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,49 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.ActionItemCollection; - -import cc.kune.core.shared.dto.UserSimpleDTO; - -public interface BuddiesSummaryView extends View { - - String NOAVATAR = ""; - int AVATARSIZE = 32; - int AVATARLABELMAXSIZE = 15; - - void addBuddie(UserSimpleDTO user, ActionItemCollection<UserSimpleDTO> actionCollection, String avatarUrl, - String tooltipTitle, String tooltip); - - void clear(); - - void clearOtherUsers(); - - void hide(); - - void setNoBuddies(); - - void setOtherUsers(String text); - - void show(); - - void showBuddiesNotVisible(); -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,30 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.ActionRegistry; - -import cc.kune.core.shared.domain.utils.StateToken; - -/** - * The Class GroupActionRegistry stores actions over groups (mainly used in SN) - */ -public class GroupActionRegistry extends ActionRegistry<StateToken> { -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,36 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.ui.MenuItem; - -import cc.kune.core.shared.dto.GroupDTO; - -public interface GroupMembersSummary { - - void addGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - - void addUserOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - - void removeGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - - void removeUserOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,139 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.platf.client.ui.gridmenu.GridDragConfiguration; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; -import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; -import org.ourproject.kune.workspace.client.skel.SummaryPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.CoreMessages; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; - -import com.calclab.suco.client.events.Listener; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.widgets.BoxComponent; -import com.gwtext.client.widgets.MessageBox; -import com.gwtext.client.widgets.event.ContainerListenerAdapter; - -public class GroupMembersSummaryPanel extends SummaryPanel implements GroupMembersSummaryView { - // private static final int MAX_HEIGHT = 110; - private final GridMenuPanel<GroupDTO> gridMenuPanel; - private final I18nUITranslationService i18n; - private final Label noMembersPublic; - private final GroupMembersSummaryPresenter presenter; - private final AbstractToolbar toolbar; - - public GroupMembersSummaryPanel(final GroupMembersSummaryPresenter presenter, final I18nUITranslationService i18n, - final WorkspaceSkeleton ws, final ActionToolbarView<StateToken> actionToolbarView) { - super(i18n.t("Group members"), i18n.t("People and groups collaborating in this group"), ws); - this.presenter = presenter; - this.i18n = i18n; - - final GridDragConfiguration dragConf = new GridDragConfiguration("kk", - i18n.t("Drop into the chat area to start a chat.") + "<br/>" - + i18n.t("Drop into a room to invite the user to join the chat room")); - gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " - + "please request to join to work on it"), dragConf, true, true, false, true, false); - final Listener<String> go = new Listener<String>() { - @Override - public void onEvent(final String groupShortName) { - presenter.onDoubleClick(groupShortName); - } - }; - // gridMenuPanel.onClick(go); - gridMenuPanel.onDoubleClick(go); - gridMenuPanel.getBottomBar().setCls("k-blank-toolbar"); - super.add(gridMenuPanel); - - noMembersPublic = new Label(i18n.t(CoreMessages.MEMBERS_NOT_PUBLIC)); - noMembersPublic.addStyleName("kune-Margin-7-trbl"); - noMembersPublic.addStyleName("k-text-gray"); - noMembersPublic.setVisible(false); - super.add(noMembersPublic); - - toolbar = ((ActionToolbarPanel<StateToken>) actionToolbarView).getToolbar(); - toolbar.setBlankStyle(); - super.add((Widget) toolbar); - super.addInSummary(); - ws.addListenerInEntitySummary(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - gridMenuPanel.setWidth(adjWidth); - } - }); - } - - @Override - public void addItem(final GridItem<GroupDTO> gridItem) { - gridMenuPanel.setVisible(true); - gridMenuPanel.addItem(gridItem); - doLayoutIfNeeded(); - } - - @Override - public void clear() { - gridMenuPanel.removeAll(); - toolbar.removeAll(); - noMembersPublic.setVisible(false); - doLayoutIfNeeded(); - } - - @Override - public void confirmAddCollab(final String groupShortName, final String groupLongName) { - final String groupName = groupLongName + " (" + groupShortName + ")"; - MessageBox.confirm(i18n.t("Confirm member joining"), i18n.t("Add [%s] as a member?", groupName), - new MessageBox.ConfirmCallback() { - @Override - public void execute(final String btnID) { - if (btnID.equals("yes")) { - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - presenter.addCollab(groupShortName); - } - }); - } - } - }); - } - - @Override - public void setDraggable(final boolean draggable) { - // gridMenuPanel.setDraggable(draggable); - } - - @Override - public void showMembersNotVisible() { - noMembersPublic.setVisible(true); - gridMenuPanel.setVisible(false); - doLayoutIfNeeded(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,294 +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 org.ourproject.kune.workspace.client.socialnet; - -import java.util.List; - -import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; -import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.services.ImageDescriptor; -import org.ourproject.kune.platf.client.services.ImageUtils; -import org.ourproject.kune.platf.client.ui.MenuItem; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionGroupSummaryToolbar; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.AdmissionType; -import cc.kune.core.shared.domain.SocialNetworkVisibility; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.AccessListsDTO; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.InitDataDTO; -import cc.kune.core.shared.dto.LinkDTO; -import cc.kune.core.shared.dto.SocialNetworkDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; - -import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; - -public class GroupMembersSummaryPresenter extends SocialNetworkPresenter implements GroupMembersSummary { - - public static final String MEMBERS_VISIBILITY_GROUP = "k-gmsp-memb-visib"; - public static final String NEW_MEMBERS_POLICY_GROUP = "k-gmsp-new-memb-pol"; - - private GroupMembersSummaryView view; - private final I18nUITranslationService i18n; - private final GridGroup adminCategory; - private final GridGroup collabCategory; - private final GridGroup pendigCategory; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; - private final GroupActionRegistry groupActionRegistry; - private final Provider<GroupLiveSearcher> liveSearcherProvider; - private final Provider<GroupServiceAsync> groupServiceProvider; - - public GroupMembersSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, - final Provider<GroupLiveSearcher> liveSearcherProvider, final Provider<ChatEngine> chatEngineProvider, - final GroupActionRegistry groupActionRegistry, final ActionGroupSummaryToolbar toolbar, - final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, - final IconResources img) { - super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, - downloadProvider, img); - this.i18n = i18n; - this.stateManager = stateManager; - this.session = session; - this.snServiceProvider = snServiceProvider; - this.groupServiceProvider = groupServiceProvider; - this.liveSearcherProvider = liveSearcherProvider; - this.groupActionRegistry = groupActionRegistry; - final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - toolbar.disableMenusAndClearButtons(); - toolbar.addActions(groupActionRegistry.getCurrentActions(state.getGroup().getStateToken(), - session.isLogged(), state.getGroupRights(), true), ActionToolbar.IN_ANY); - toolbar.attach(); - } - }; - stateManager.onStateChanged(setStateListener); - stateManager.onSocialNetworkChanged(setStateListener); - session.onInitDataReceived(new Listener<InitDataDTO>() { - @Override - public void onEvent(final InitDataDTO initData) { - addUserOperation(new MenuItem<GroupDTO>("images/new-chat.gif", i18n.t("Start a chat with this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - chatEngineProvider.get().show(); - if (chatEngineProvider.get().isLoggedIn()) { - chatEngineProvider.get().chat( - XmppURI.jid(group.getShortName() + "@" + initData.getChatDomain())); - } else { - NotifyUser.important(i18n.t("To start a chat you need to be 'online'")); - } - } - }), true); - } - }); - final String adminsTitle = i18n.t("Admins"); - final String collabsTitle = i18n.t("Collaborators"); - final String pendingTitle = i18n.t("Pending"); - adminCategory = new GridGroup(adminsTitle, adminsTitle, i18n.t("People that can admin this group"), true); - collabCategory = new GridGroup(collabsTitle, collabsTitle, - i18n.t("Other people that collaborate with this group"), true); - pendigCategory = new GridGroup(pendingTitle, pendingTitle, - i18n.t("People pending to be accepted in this group by the admins"), - imageUtils.getImageHtml(ImageDescriptor.alert), true); - super.addGroupOperation(gotoGroupMenuItem, false); - super.addUserOperation(gotoMemberMenuItem, false); - createActions(); - } - - public void addCollab(final String groupShortName) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(), - groupShortName, new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member added as collaborator")); - stateManager.setSocialNetwork(result); - } - - }); - } - - public void init(final GroupMembersSummaryView view) { - this.view = view; - } - - private void createActions() { - final ActionToolbarMenuDescriptor<StateToken> addMember = new ActionToolbarMenuDescriptor<StateToken>( - AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken parameter) { - liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { - @Override - public void onEvent(final LinkDTO link) { - view.confirmAddCollab(link.getShortName(), link.getLongName()); - } - }); - liveSearcherProvider.get().show(); - } - }); - addMember.setIconUrl("images/add-green.gif"); - addMember.setTextDescription(i18n.t("Add member")); - addMember.setToolTip(i18n.t("Add an user or a group as member of this group")); - addMember.setParentMenuTitle(i18n.t("Options")); - - groupActionRegistry.addAction(addMember); - // groupActionRegistry.addAction(unJoin); - - // groupActionRegistry.addAction(participate); - createSetMembersVisibilityAction(i18n.t("anyone"), SocialNetworkVisibility.anyone); - createSetMembersVisibilityAction(i18n.t("only members"), SocialNetworkVisibility.onlymembers); - createSetMembersVisibilityAction(i18n.t("only admins"), SocialNetworkVisibility.onlyadmins); - createNewMembersPolicyAction(i18n.t("moderate request to join"), AdmissionType.Moderated); - createNewMembersPolicyAction(i18n.t("auto accept request to join"), AdmissionType.Open); - } - - private void createNewMembersPolicyAction(final String textDescription, final AdmissionType admissionPolicy) { - final ActionToolbarMenuRadioDescriptor<StateToken> newMembersPolicy = new ActionToolbarMenuRadioDescriptor<StateToken>( - AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken parameter) { - groupServiceProvider.get().setGroupNewMembersJoiningPolicy(session.getUserHash(), - session.getCurrentState().getGroup().getStateToken(), admissionPolicy, - new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.info(i18n.t("Members joining policy changed")); - } - }); - } - }, NEW_MEMBERS_POLICY_GROUP, new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - final StateAbstractDTO currentState = session.getCurrentState(); - return currentState.getGroup().getAdmissionType().equals(admissionPolicy); - } - }); - newMembersPolicy.setTextDescription(textDescription); - newMembersPolicy.setParentMenuTitle(i18n.t("Options")); - newMembersPolicy.setParentSubMenuTitle(i18n.t("New members policy")); - groupActionRegistry.addAction(newMembersPolicy); - } - - private void createSetMembersVisibilityAction(final String textDescription, final SocialNetworkVisibility visibility) { - final ActionToolbarMenuRadioDescriptor<StateToken> showMembers = new ActionToolbarMenuRadioDescriptor<StateToken>( - AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken parameter) { - groupServiceProvider.get().setSocialNetworkVisibility(session.getUserHash(), - session.getCurrentState().getGroup().getStateToken(), visibility, - new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.info(i18n.t("Members visibility changed")); - } - }); - } - }, MEMBERS_VISIBILITY_GROUP, new RadioMustBeChecked() { - @Override - public boolean mustBeChecked() { - final StateAbstractDTO currentState = session.getCurrentState(); - if (!currentState.getGroup().isPersonal()) { - final SocialNetworkDataDTO socialNetworkData = currentState.getSocialNetworkData(); - return socialNetworkData.getSocialNetworkVisibility().equals(visibility); - } - return false; - } - }); - showMembers.setTextDescription(textDescription); - showMembers.setParentMenuTitle(i18n.t("Options")); - showMembers.setParentSubMenuTitle(i18n.t("Those who can view this member list")); - groupActionRegistry.addAction(showMembers); - } - - @SuppressWarnings("unchecked") - private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) { - final AccessListsDTO accessLists = socialNetwork.getAccessLists(); - - final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); - final List<GroupDTO> collabList = accessLists.getEditors().getList(); - final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); - - // final int numAdmins = adminsList.size(); - - final boolean userIsAdmin = rights.isAdministrable(); - final boolean userCanView = rights.isVisible(); - - view.clear(); - - view.setDraggable(session.isLogged()); - - if (userCanView) { - for (final GroupDTO admin : adminsList) { - view.addItem(createGridItem(adminCategory, admin, rights, changeToCollabMenuItem, removeMemberMenuItem)); - } - for (final GroupDTO collab : collabList) { - view.addItem(createGridItem(collabCategory, collab, rights, changeToAdminMenuItem, removeMemberMenuItem)); - } - if (userIsAdmin) { - for (final GroupDTO pendingCollab : pendingCollabsList) { - view.addItem(createGridItem(pendigCategory, pendingCollab, rights, acceptJoinGroupMenuItem, - denyJoinGroupMenuItem)); - } - } - } - view.setVisible(true); - } - - private void setState(final StateAbstractDTO state) { - if (state.getGroup().isPersonal()) { - view.setVisible(false); - } else { - if (state.getSocialNetworkData().isMembersVisible()) { - setGroupMembers(state.getGroupMembers(), state.getGroupRights()); - } else { - view.clear(); - view.showMembersNotVisible(); - view.setVisible(true); - } - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,40 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; - -import cc.kune.core.shared.dto.GroupDTO; - -public interface GroupMembersSummaryView { - - void addItem(GridItem<GroupDTO> gridItem); - - void clear(); - - void confirmAddCollab(String groupShortName, String groupLongName); - - void setDraggable(boolean draggable); - - void setVisible(boolean visible); - - void showMembersNotVisible(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,73 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; - -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.SocialNetworkRequestResult; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.Provider; - -public class ParticipateAction extends RolAction { - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - - public ParticipateAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, - final StateManager stateManager, final AccessRightsClientManager rightsManager, - final I18nTranslationService i18n, final IconResources imgResources) { - super(session, stateManager, rightsManager, i18n, AccessRolDTO.Viewer, i18n.t("Participate"), - i18n.t("Request to participate in this group"), imgResources.addGreen()); - this.snServiceProvider = snServiceProvider; - super.setVisible(false, true); - super.setMustBeAuthenticated(false); - } - - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().requestJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), - new AsyncCallbackSimple<SocialNetworkRequestResult>() { - public void onSuccess(final SocialNetworkRequestResult result) { - NotifyUser.hideProgress(); - switch ((result)) { - case accepted: - NotifyUser.info(i18n.t("You are now member of this group")); - stateManager.reload(); - break; - case denied: - NotifyUser.important(i18n.t("Sorry this is a closed group")); - break; - case moderated: - NotifyUser.info(i18n.t("Membership requested. Waiting for admins decision")); - break; - default: - NotifyUser.info(i18n.t("Programatic error in ParticipateAction")); - } - } - }); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummary.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,24 +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 org.ourproject.kune.workspace.client.socialnet; - -public interface ParticipationSummary { - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,80 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.ui.AbstractToolbar; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; -import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; -import org.ourproject.kune.workspace.client.skel.SummaryPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.widgets.BoxComponent; -import com.gwtext.client.widgets.event.ContainerListenerAdapter; - -public class ParticipationSummaryPanel extends SummaryPanel implements ParticipationSummaryView { - - private final GridMenuPanel<GroupDTO> gridMenuPanel; - private final AbstractToolbar toolbar; - - public ParticipationSummaryPanel(final ParticipationSummaryPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws, final ActionToolbarView<StateToken> actionToolbarView) { - super(i18n.t("Participates in"), i18n.t("Groups in which the user participates"), ws); - gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user does not belong to any group"), false, false, - false, false, false); - final Listener<String> go = new Listener<String>() { - public void onEvent(final String groupShortName) { - presenter.onDoubleClick(groupShortName); - } - }; - // gridMenuPanel.onClick(go); - gridMenuPanel.onDoubleClick(go); - super.add(gridMenuPanel); - toolbar = ((ActionToolbarPanel<StateToken>) actionToolbarView).getToolbar(); - toolbar.setBlankStyle(); - super.add((Widget) toolbar); - addInSummary(); - ws.addListenerInEntitySummary(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - gridMenuPanel.setWidth(adjWidth); - } - }); - } - - public void addItem(final GridItem<GroupDTO> gridItem) { - gridMenuPanel.addItem(gridItem); - } - - @Override - public void clear() { - gridMenuPanel.removeAll(); - toolbar.removeAll(); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,103 +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 org.ourproject.kune.workspace.client.socialnet; - -import java.util.List; - -import org.ourproject.kune.platf.client.services.ImageUtils; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionParticipationToolbar; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.ParticipationDataDTO; -import cc.kune.core.shared.dto.StateAbstractDTO; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; - -public class ParticipationSummaryPresenter extends SocialNetworkPresenter implements ParticipationSummary { - - private ParticipationSummaryView view; - private final GridGroup adminCategory; - private GridGroup collabCategory; - private final GridGroup collabOnlyCategory; - - public ParticipationSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, - final ActionParticipationToolbar actionParticipationToolbar, - final Provider<FileDownloadUtils> downloadProvider, final AccessRightsClientManager accessRightsManager, - final IconResources img) { - super(i18n, stateManager, accessRightsManager, session, snServiceProvider, groupActionRegistry, - downloadProvider, img); - adminCategory = new GridGroup("admin in:", " ", i18n.tWithNT("Administrate these groups", - "talking about a person"), false); - collabCategory = new GridGroup(i18n.t("and as collaborator in:"), " ", i18n.t("Collaborate in these groups"), - false); - collabOnlyCategory = new GridGroup(i18n.t("collaborator in:"), " ", i18n.t("Collaborate in these groups"), - false); - super.addGroupOperation(gotoGroupMenuItem, false); - final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { - @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); - } - }; - stateManager.onStateChanged(setStateListener); - stateManager.onSocialNetworkChanged(setStateListener); - } - - public void init(final ParticipationSummaryView view) { - this.view = view; - } - - @SuppressWarnings("unchecked") - private void setState(final StateAbstractDTO state) { - final ParticipationDataDTO participation = state.getParticipation(); - final AccessRights rights = state.getGroupRights(); - view.clear(); - final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); - final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); - final int numAdmins = groupsIsAdmin.size(); - final int numCollaborators = groupsIsCollab.size(); - if (numAdmins == 0) { - collabCategory = collabOnlyCategory; - } - for (final GroupDTO group : groupsIsAdmin) { - view.addItem(createGridItem(adminCategory, group, rights, unJoinMenuItem)); - } - for (final GroupDTO group : groupsIsCollab) { - view.addItem(createGridItem(collabCategory, group, rights, unJoinMenuItem)); - } - if (numAdmins > 0 || numCollaborators > 0) { - view.setVisible(true); - } else { - view.setVisible(false); - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,35 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; - -import cc.kune.core.shared.dto.GroupDTO; - -public interface ParticipationSummaryView extends View { - - void addItem(GridItem<GroupDTO> createGridItem); - - void clear(); - - void setVisible(boolean b); - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,96 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; -import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; - -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener2; -import com.google.gwt.resources.client.ImageResource; - -public abstract class RolAction extends AbstractExtendedAction { - - public static UIStatus refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, - final boolean isLogged, final boolean visibleForMembers, final boolean visibleForNonMemb, - final AccessRights newRights) { - boolean newVisibility = false; - boolean newEnabled = false; - if (authNeed && !isLogged) { - newVisibility = newEnabled = false; - } else { - // Auth ok - newEnabled = RolComparator.isEnabled(rolRequired, newRights); - if (newEnabled) { - final boolean isMember = RolComparator.isMember(newRights); - newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb; - } else { - newVisibility = false; - } - } - return new UIStatus(newVisibility, newEnabled); - } - - protected final Session session; - protected final StateManager stateManager; - protected final I18nTranslationService i18n; - private boolean visibleForNonMemb; - private boolean visibleForMembers; - private boolean authNeed; - - public RolAction(final Session session, final StateManager stateManager, - final AccessRightsClientManager rightsManager, final I18nTranslationService i18n, - final AccessRolDTO rolRequired, final String text, final String tooltip, final ImageResource icon) { - super(text, tooltip, icon); - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; - this.visibleForMembers = true; - this.visibleForNonMemb = true; - this.authNeed = false; - rightsManager.onRightsChanged(new Listener2<AccessRights, AccessRights>() { - public void onEvent(final AccessRights prevRights, final AccessRights newRights) { - setStatus(refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, - visibleForNonMemb, newRights)); - } - - }); - } - - public void setMustBeAuthenticated(final boolean authNeed) { - this.authNeed = authNeed; - } - - public void setVisible(final boolean forMembers, final boolean forNonMembers) { - this.visibleForMembers = forMembers; - this.visibleForNonMemb = forNonMembers; - } - - private void setStatus(final UIStatus refreshStatus) { - setEnabled(refreshStatus.isEnabled()); - putValue(GuiActionDescrip.VISIBLE, refreshStatus.isVisible()); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,45 +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 org.ourproject.kune.workspace.client.socialnet; - -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRolDTO; - -public final class RolComparator { - - public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRights rights) { - switch (rolRequired) { - case Administrator: - return rights.isAdministrable(); - case Editor: - return rights.isEditable(); - case Viewer: - return rights.isVisible(); - } - return false; - } - - public static boolean isMember(final AccessRights newRights) { - return newRights.isAdministrable() || newRights.isEditable(); - } - - private RolComparator() { - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,329 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; -import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.ui.MenuItem; -import org.ourproject.kune.platf.client.ui.MenuItemCollection; -import org.ourproject.kune.platf.client.ui.download.FileConstants; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.gridmenu.CustomMenu; -import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; -import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; - -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; - -public class SocialNetworkPresenter { - - private static final String MEMBERS_BOTTON = "members_bottom"; - - protected final ActionToolbarPosition membersBottom = new ActionToolbarPosition("sn-bottomtoolbar"); - protected final ActionToolbarPosition buddiesBottom = new ActionToolbarPosition("sn-bottomtoolbar"); - protected MenuItem<GroupDTO> changeToCollabMenuItem; - protected MenuItem<GroupDTO> removeMemberMenuItem; - protected MenuItem<GroupDTO> changeToAdminMenuItem; - protected MenuItem<GroupDTO> acceptJoinGroupMenuItem; - protected MenuItem<GroupDTO> denyJoinGroupMenuItem; - protected MenuItem<GroupDTO> gotoMemberMenuItem; - protected MenuItem<GroupDTO> gotoGroupMenuItem; - protected MenuItem<GroupDTO> unJoinMenuItem; - private final I18nTranslationService i18n; - private final StateManager stateManager; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final Session session; - private final MenuItemCollection<GroupDTO> otherOperations; - private final MenuItemCollection<GroupDTO> otherLoggedOperations; - private final MenuItemCollection<GroupDTO> otherOperationsUsers; - private final MenuItemCollection<GroupDTO> otherLoggedOperationsUsers; - protected ActionToolbarMenuDescriptor<StateToken> unJoin; - protected ActionToolbarButtonDescriptor<StateToken> participate; - private final Provider<FileDownloadUtils> downloadProvider; - private final AccessRightsClientManager rightsManager; - private final IconResources imgResources; - - private MenuDescriptor menuOptions; - - public SocialNetworkPresenter(final I18nTranslationService i18n, final StateManager stateManager, - final AccessRightsClientManager rightsManager, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, final GroupActionRegistry groupActionRegistry, - final Provider<FileDownloadUtils> downloadProvider, final IconResources imgResources) { - this.i18n = i18n; - this.stateManager = stateManager; - this.rightsManager = rightsManager; - this.session = session; - this.snServiceProvider = snServiceProvider; - this.downloadProvider = downloadProvider; - this.imgResources = imgResources; - createButtons(); - createMenuActions(); - otherOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherLoggedOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherOperations = new MenuItemCollection<GroupDTO>(); - otherLoggedOperations = new MenuItemCollection<GroupDTO>(); - } - - public void addGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.add(operation); - } - - public void addUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.add(operation); - } - - public void onDoubleClick(final String groupShortName) { - stateManager.gotoToken(groupShortName); - } - - public void removeGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.remove(operation); - } - - public void removeUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.remove(operation); - } - - protected GridItem<GroupDTO> createGridItem(final GridGroup groupCategory, final GroupDTO group, - final AccessRights rights, final MenuItem<GroupDTO>... gridMenuItems) { - final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); - final CustomMenu<GroupDTO> menu = gridItem.getMenu(); - if (rights.isAdministrable()) { - for (final MenuItem<GroupDTO> item : gridMenuItems) { - menu.addMenuItem(item); - } - } - return gridItem; - } - - protected String createTooltipWithLogo(final String shortName, final StateToken token, final boolean hasLogo, - final boolean isPersonal) { - return "<table><tr><td>" - + (hasLogo ? downloadProvider.get().getLogoAvatarHtml(token, hasLogo, isPersonal, - FileConstants.LOGO_DEF_HEIGHT, 3) : "") + "</td><td>" - + i18n.t(isPersonal ? "Nickname: [%s]" : "Group short name: [%s]", shortName) + "</td></tr></table>"; - } - - private void createButtons() { - final ParticipateAction participateAction = new ParticipateAction(session, snServiceProvider, stateManager, - rightsManager, i18n, imgResources); - final ButtonDescriptor participateBtn = new ButtonDescriptor(participateAction); - participateBtn.setLocation(MEMBERS_BOTTON); - - menuOptions = new MenuDescriptor(i18n.t("Options")); - - final UnjoinAction unjoinAction = new UnjoinAction(session, snServiceProvider, stateManager, rightsManager, - i18n, imgResources) { - @Override - public String getGroupName() { - return session.getContainerState().getGroup().getShortName(); - } - }; - - final MenuItemDescriptor unjoinBtn = new MenuItemDescriptor(menuOptions, unjoinAction); - unjoinBtn.setLocation(MEMBERS_BOTTON); - } - - private GridItem<GroupDTO> createDefMemberMenu(final GroupDTO group, final GridGroup gridGroup) { - final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); - final String longName = group.getLongName(); - final boolean hasLogo = group.hasLogo(); - final String toolTip = createTooltipWithLogo(group.getShortName(), group.getStateToken(), hasLogo, - group.isPersonal()); - final String imageHtml = downloadProvider.get().getLogoAvatarHtml(group.getStateToken(), hasLogo, - group.isPersonal(), session.getImgIconsize(), 0); - final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, - longName, longName, " ", longName, toolTip, menu); - if (!group.isPersonal()) { - menu.addMenuItemList(otherOperations); - } - if (session.isLogged() && !group.isPersonal()) { - menu.addMenuItemList(otherLoggedOperations); - } - if (group.isPersonal()) { - menu.addMenuItemList(otherOperationsUsers); - } - if (session.isLogged() && group.isPersonal()) { - menu.addMenuItemList(otherLoggedOperationsUsers); - } - - return gridItem; - } - - private void createMenuActions() { - gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoToken(groupDTO.getShortName()); - } - }); - gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoToken(groupDTO.getShortName()); - } - }); - - unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Do not participate anymore in this group"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO groupDTO) { - removeMemberAction(groupDTO); - } - }); - changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", - i18n.t("Change to collaborator"), new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().setAdminAsCollab(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member type changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().deleteMember(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member removed")); - stateManager.reload(); - // in the - // future, - // only if - // I cannot - // be - // affected: - // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } - }); - changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member type changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().acceptJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member accepted")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Reject this member"), - new Listener<GroupDTO>() { - @Override - public void onEvent(final GroupDTO group) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().denyJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member rejected")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - } - - private void removeMemberAction(final GroupDTO groupDTO) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user - // info: - // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UIStatus.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UIStatus.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UIStatus.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,82 +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 org.ourproject.kune.workspace.client.socialnet; - -public class UIStatus { - - private boolean visible; - private boolean enabled; - - public UIStatus(final boolean visible, final boolean enabled) { - this.visible = visible; - this.enabled = enabled; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final UIStatus other = (UIStatus) obj; - if (enabled != other.enabled) { - return false; - } - if (visible != other.visible) { - return false; - } - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (enabled ? 1231 : 1237); - result = prime * result + (visible ? 1231 : 1237); - return result; - } - - public boolean isEnabled() { - return enabled; - } - - public boolean isVisible() { - return visible; - } - - public void setEnabled(final boolean enabled) { - this.enabled = enabled; - } - - public void setVisible(final boolean visible) { - this.visible = visible; - } - - @Override - public String toString() { - return "(v: " + visible + ", e:" + enabled + ")"; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,79 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; - -import cc.kune.core.client.resources.icons.IconResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; -import cc.kune.core.client.state.AccessRightsClientManager; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; - -public class UnjoinAction extends RolAction { - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private String groupName; - - public UnjoinAction(final Session session, final Provider<SocialNetworkServiceAsync> snServiceProvider, - final StateManager stateManager, final AccessRightsClientManager rightsManager, - final I18nTranslationService i18n, final IconResources imgResources) { - super(session, stateManager, rightsManager, i18n, AccessRolDTO.Editor, i18n.t("Leave this group"), - i18n.t("Do not participate anymore in this group"), imgResources.delGreen()); - this.snServiceProvider = snServiceProvider; - super.setVisible(true, false); - super.setMustBeAuthenticated(true); - } - - public void actionPerformed(final ActionEvent event) { - NotifyUser.askConfirmation(i18n.t("Leave this group"), i18n.t("Are you sure?"), new Listener0() { - public void onEvent() { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(getGroupName()), - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user info: - // stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } - }); - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(final String groupName) { - this.groupName = groupName; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,33 +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 org.ourproject.kune.workspace.client.socialnet; - -import org.ourproject.kune.platf.client.actions.ActionRegistry; - -import cc.kune.core.shared.dto.UserSimpleDTO; - -/** - * The Class UserActionRegistry. - * - * List of actions over a user (initially used for buddies actions) - * - */ -public class UserActionRegistry extends ActionRegistry<UserSimpleDTO> { -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -20,8 +20,8 @@ package org.ourproject.kune.workspace.client.themes; import org.cobogw.gwt.user.client.CSS; -import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.domain.utils.StateToken; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -26,7 +26,7 @@ import org.ourproject.kune.platf.client.actions.ui.ActionExtensibleView; import org.ourproject.kune.platf.client.actions.ui.CssStyleDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; -import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; +import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.InitDataDTO; @@ -95,7 +95,7 @@ private void createTheme(final String theme) { final ThemeAction action = new ThemeAction(theme); - final MenuItemDescriptor themeItem = new MenuItemDescriptor(menu, action); + final OldMenuItemDescriptor themeItem = new OldMenuItemDescriptor(menu, action); // selectItemInUI.add(new Listener<String>() { // public void onEvent(final String themeToSelect) { // if (theme.equals(themeToSelect)) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/AbstractUploader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/AbstractUploader.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/AbstractUploader.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.workspace.client.upload; -import org.ourproject.kune.platf.client.ui.download.FileConstants; +import cc.kune.core.client.services.FileConstants; + import com.gwtext.client.core.UrlParam; public class AbstractUploader { Modified: trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css =================================================================== --- trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/basic.css 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,7 +1,38 @@ +html { + background-color: #DD8A3D; +} -html {background-color: #DD8A3D;} +body { + color: black; + font-family: 'Ubuntu', Arial; + font-size: 18px, +} -.page {width: 60em; height: 30em; margin: 2em auto; padding: 1em; background-color: #fff; overflow: hidden;} -.page h1 {color: black; letter-spacing:-0.05em; line-height:1em; margin:1em 0 0.5em 4em; } -.page .menu {float: left; padding: 1em; width: 9em; background-color: #efefef; margin-right: 1em;} -.page .content {} \ No newline at end of file +.page { + width: 800px; + margin: 2em auto; + padding: 1em; + background-color: #fff; + overflow: hidden; +} + +.page h1 { + color: black; + letter-spacing: -0.05em; + line-height: 1em; + margin: 1em 0 0.5em 4em; + padding: 20px 20px 20px 50px; + font-size: 26px; +} + +.page .menu { + float: left; + padding: 1em; + width: 9em; + background-color: #efefef; + margin-right: 1em; +} + +.page .content { + display: table-cell +} \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/docs.liquid.html =================================================================== --- trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/docs.liquid.html 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/main/webapp/WEB-INF/publicspace/public/templates/basic/docs.liquid.html 2011-02-10 03:07:28 UTC (rev 1243) @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" -"http://www.w3.org/TR/html4/strict.dtd"> + "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> @@ -11,13 +11,27 @@ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js" type="text/javascript"></script> <link rel="stylesheet" type="text/css" href="{{ 'basic.css' | asset }}">  + <script defer type="text/javascript" src="js/pngfix.js"></script> + <![endif]--> + <script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script> + <script> + WebFont.load({ + google : { + families : [ 'Ubuntu' ] + } + }); + </script> + <link + href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + rel='stylesheet' type='text/css'> + <link type="text/css" rel="stylesheet" + href="/ws/fontface/ubuntufontface.css"> + <link type="text/css" rel="stylesheet" href="/ws/ws.css"> </head> <body> <div class="page"> <h1>{{ content.title }}</h1> - <div class="menu">Here the container</div> + <div class="menu"> </div> <div class="content">{{ content.body }}</div> </div> </body> Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -30,10 +30,10 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.properties.KuneProperties; +import cc.kune.core.client.services.ImageSize; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Content; Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,6 +23,8 @@ import org.junit.Before; import org.junit.Test; +import org.ourproject.kune.workspace.client.oldsn.RolAction; +import org.ourproject.kune.workspace.client.oldsn.UIStatus; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO; Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2011-02-08 16:36:26 UTC (rev 1242) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2011-02-10 03:07:28 UTC (rev 1243) @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.ourproject.kune.workspace.client.oldsn.RolComparator; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO;

1 0

r1242 - in trunk/src/main/java: cc/kune/core/client/auth cc/kune/core/client/errors cc/kune/core/client/groups/newgroup cc/kune/core/client/resources cc/kune/core/client/ui cc/kune/core/client/ui/dialogs cc/kune/core/public cc/kune/wave/server org/ourproject/kune/workspace/client
by Vicente J. Ruiz Jurado 08 Feb '11

08 Feb '11

Author: vjrj_ Date: 2011-02-08 17:36:26 +0100 (Tue, 08 Feb 2011) New Revision: 1242 Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/ Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java Log: New Group refactorized Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -24,9 +24,9 @@ import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.KuneUiUtils; +import cc.kune.core.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.extjs.gxt.ui.client.widget.VerticalPanel; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.inject.Inject; @@ -50,13 +50,12 @@ super(REGISTER_DIALOG, mask, i18n, i18n.t(CoreMessages.REGISTER_TITLE), true, true, true, 400, 420, "", i18n.t(CoreMessages.REGISTER_TITLE), REGISTER_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, images, ERRMSG, 5); - final VerticalPanel panel = new VerticalPanel(); - // panel.setBorder(false); registerForm = new RegisterForm(i18n, session); registerForm.setWidth(370); - panel.add(registerForm.getFormPanel()); - super.getInnerPanel().add(panel); - panel.setId(REGISTER_FORM); + registerForm.getFormPanel().setId(REGISTER_FORM); + messageErrorBar = new MessageToolbar(images, errorLabelId); + registerForm.add(messageErrorBar); + super.getInnerPanel().add(registerForm.getFormPanel()); } @Override Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -25,6 +25,7 @@ import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.UserRegistrationException; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.msgs.UserNotifyEvent; @@ -146,6 +147,9 @@ getView().setErrorMessage(i18n.t(CoreMessages.EMAIL_IN_USE), NotifyLevel.error); } else if (caught instanceof GroupNameInUseException) { getView().setErrorMessage(i18n.t(CoreMessages.NAME_IN_USE), NotifyLevel.error); + } else if (caught instanceof UserRegistrationException) { + getView().setErrorMessage(i18n.t("Error during registration. " + caught.getMessage()), + NotifyLevel.error); } else { getView().setErrorMessage(i18n.t("Error during registration."), NotifyLevel.error); throw new UIException("Other kind of exception in user registration", caught); Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -36,11 +36,11 @@ public abstract class SignInAbstractPanel extends ViewImpl { private final BasicTopDialog dialog; - private final String errorLabelId; + protected final String errorLabelId; protected final I18nTranslationService i18n; - private final NotifyLevelImages images; + protected final NotifyLevelImages images; private final MaskWidgetView mask; - private MessageToolbar messageErrorBar; + protected MessageToolbar messageErrorBar; public SignInAbstractPanel(final String dialogId, final MaskWidgetView mask, final I18nTranslationService i18n, final String title, final boolean autohide, final boolean modal, final boolean autoscroll, final int width, @@ -60,14 +60,6 @@ return dialog; } - private void createMessageErrorIfNeeded() { - if (messageErrorBar == null) { - messageErrorBar = new MessageToolbar(images, errorLabelId); - messageErrorBar.setHeight("50px"); - dialog.getBottomPanel().add(messageErrorBar); - } - } - public HasCloseHandlers<PopupPanel> getClose() { return dialog.getClose(); } @@ -91,7 +83,6 @@ } public void hideMessages() { - createMessageErrorIfNeeded(); messageErrorBar.hideErrorMessage(); } @@ -104,7 +95,6 @@ } public void setErrorMessage(final String message, final NotifyLevel level) { - createMessageErrorIfNeeded(); messageErrorBar.setErrorMessage(message, level); } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -23,6 +23,7 @@ import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.KuneUiUtils; +import cc.kune.core.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.VerticalPanel; @@ -48,12 +49,12 @@ i18n.t(CoreMessages.SIGN_IN_TITLE), SIGN_IN_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, images, ERROR_MSG, 102); - final VerticalPanel panel = new VerticalPanel(); signInForm = new SignInForm(i18n); signInForm.setWidth(370); - panel.add(signInForm.getFormPanel()); - panel.add(createNoAccountRegister()); - super.getInnerPanel().add(panel); + signInForm.add(createNoAccountRegister()); + messageErrorBar = new MessageToolbar(images, errorLabelId); + signInForm.add(messageErrorBar); + super.getInnerPanel().add(signInForm.getFormPanel()); } private VerticalPanel createNoAccountRegister() { Modified: trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -32,9 +32,10 @@ public DefaultException(final int statusCode, final String message) { super(statusCode + " " + message); + } public DefaultException(final String message) { - this(0, message); + super(message); } } Modified: trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -36,7 +36,9 @@ import com.extjs.gxt.ui.client.widget.form.TextArea; import com.extjs.gxt.ui.client.widget.form.TextField; import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; @@ -78,14 +80,14 @@ @Inject public NewGroupPanel(final I18nTranslationService i18n, final NotifyLevelImages img, final MaskWidgetView mask) { dialog = new BasicTopDialog(NEWGROUP_WIZARD, CoreMessages.REGISTER_A_NEW_GROUP_TITLE, true, true, true, 450, - 420, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); + 360, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); this.i18n = i18n; this.mask = mask; // Field.setMsgTarget("side"); form = createNewGroupInitialDataForm(); messageErrorBar = new MessageToolbar(img, ERROR_MSG_BAR); - dialog.getBottomPanel().add(messageErrorBar); + form.add(messageErrorBar); dialog.getInnerPanel().add(form); } @@ -98,6 +100,7 @@ public void clearData() { form.reset(); shortNameField.focus(); + messageErrorBar.hideErrorMessage(); } private FormPanel createNewGroupInitialDataForm() { @@ -202,9 +205,12 @@ shortNameField.focus(); } + public HasCloseHandlers<PopupPanel> getClose() { + return dialog.getClose(); + } + @Override public HasClickHandlers getFirstBtn() { - return dialog.getFirstBtn(); } Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -24,6 +24,7 @@ import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; @@ -39,8 +40,11 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.logical.shared.CloseEvent; +import com.google.gwt.event.logical.shared.CloseHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.inject.Inject; import com.google.inject.Provider; import com.gwtplatform.mvp.client.Presenter; @@ -122,12 +126,19 @@ } }); getView().getSecondBtn().addClickHandler(new ClickHandler() { - @Override public void onClick(final ClickEvent event) { onCancel(); } }); + getView().getClose().addCloseHandler(new CloseHandler<PopupPanel>() { + + @Override + public void onClose(final CloseEvent<PopupPanel> event) { + Log.debug("Closing register presenter"); + NewGroupPresenter.this.onCancel(); + } + }); } public void onCancel() { Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -22,6 +22,8 @@ import cc.kune.common.client.noti.NotifyLevel; import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.logical.shared.HasCloseHandlers; +import com.google.gwt.user.client.ui.PopupPanel; import com.gwtplatform.mvp.client.View; public interface NewGroupView extends View { @@ -30,6 +32,8 @@ void focusOnShorName(); + HasCloseHandlers<PopupPanel> getClose(); + HasClickHandlers getFirstBtn(); String getLongName(); Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -24,7 +24,7 @@ public final static String EMAIL_IN_USE = "This email address is being used by another user. Please, try with another one"; public final static String ENT_LOGO_SELECTOR_NORMAL_TITLE = "Logo"; public final static String ENT_LOGO_SELECTOR_PERSON_TITLE = "Avatar"; - public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers"; + public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters and numbers"; public final static String GROUP_OPTIONS_DIALOG_TITLE = "Group options"; public final static String INCORRECT_NICKNAME_EMAIL_OR_PASSWORD = "The nickname/email/password is incorrect"; public final static String MEMBERS_NOT_PUBLIC = "The members of this group are not public"; Modified: trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -32,6 +32,7 @@ import com.extjs.gxt.ui.client.widget.form.FieldSet; import com.extjs.gxt.ui.client.widget.form.FormPanel; import com.extjs.gxt.ui.client.widget.form.FormPanel.LabelAlign; +import com.google.gwt.user.client.ui.Widget; public class DefaultForm { @@ -79,6 +80,10 @@ form.add(label); } + public void add(final Widget widget) { + form.add(widget); + } + public void addButton(final Button button) { form.addButton(button); } Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -26,18 +26,18 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.Label; public class MessageToolbar extends Composite { private final Image errorIcon; - private final InlineLabel errorLabel; + private final Label errorLabel; private final NotifyLevelImages images; private final FlowPanel toolbar; public MessageToolbar(final NotifyLevelImages images, final String errorLabelId) { this.images = images; toolbar = new FlowPanel(); - errorLabel = new InlineLabel(""); + errorLabel = new Label(""); errorLabel.setWordWrap(true); errorLabel.ensureDebugId(errorLabelId); errorIcon = new Image(); Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-08 16:36:26 UTC (rev 1242) @@ -694,17 +694,17 @@ .k-error-tb { background: #FFB380 none repeat scroll 0% 50%; /* color: #250; */ - margin: 0 20px 0 10px; + padding: 10px; } .k-error-tb img { - margin: 15px 5px 5px 15px; + margin: 0 10px; + float: left; } -.k-error-tb span { - position: relative; - top: -7px; - left: 9px; +.k-error-tb div { + font-size: 14px; + display: table-cell; } .k-mask { Modified: trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -129,7 +129,7 @@ try { if (accountStore.getAccount(id) != null) { - return "Account already exists"; + return "An account with this name already exists"; } } catch (final PersistenceException e) { LOG.severe("Failed to retreive account data for " + id, e);

1 0

r1241 - in trunk: . src/main/java/cc/kune/core/client/auth src/main/java/cc/kune/core/client/groups/newgroup src/main/java/cc/kune/core/client/ui src/main/java/cc/kune/core/client/ui/dialogs src/main/java/cc/kune/core/public src/main/java/cc/kune/wave/client src/main/java/cc/kune/wave/server src/main/java/org/ourproject/kune/app/server src/main/java/org/ourproject/kune/rack src/main/webapp/WEB-INF
by Vicente J. Ruiz Jurado 08 Feb '11

08 Feb '11

Author: vjrj_ Date: 2011-02-08 15:17:50 +0100 (Tue, 08 Feb 2011) New Revision: 1241 Added: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java trunk/src/main/java/cc/kune/wave/server/CustomWaveClientServlet.java Modified: trunk/TODO trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/wave/server/WaveStarter.java trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java trunk/src/main/java/org/ourproject/kune/app/server/KuneApplicationListener.java trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/app/server/NotInObject.java trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java trunk/src/main/webapp/WEB-INF/web.xml Log: WIAB integration updated Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/TODO 2011-02-08 14:17:50 UTC (rev 1241) @@ -11,6 +11,8 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** TODO WIAB under proxies +https://groups.google.com/group/wave-protocol/browse_thread/thread/202dee4bfdbdeee6 ** TODO StateManager #signin while already signed in NPE ** TODO Testing Presenters via juckito: https://code.google.com/p/gwt-platform/wiki/UnitTesting @@ -255,6 +257,9 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** TODO start/stop init scripts +https://groups.google.com/group/wave-protocol/browse_thread/thread/d9cdcea0d5393eda +./platforms/ubuntu/server-wrapper.sh ** TODO registration/general mask ** TODO sigin forms to uibinder (intro sing-in) ** TODO Use google-guice guicepersist (in 3.0) instead of warp-persist Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -36,6 +36,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.wave.client.WaveClientTester; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -59,18 +60,20 @@ private final Provider<Register> registerProvider; private final TimerWrapper timer; private final UserServiceAsync userService; + private final WaveClientTester waveClientTester; @Inject public SignInPresenter(final EventBus eventBus, final SignInView view, final SignInProxy proxy, final Session session, final StateManager stateManager, final I18nUITranslationService i18n, final UserServiceAsync userService, final Provider<Register> registerProvider, final CookiesManager cookiesManager, final UserPassAutocompleteManager autocomplete, - final TimerWrapper timeWrapper) { + final TimerWrapper timeWrapper, final WaveClientTester waveClientTester) { super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, autocomplete); this.eventBus = eventBus; this.userService = userService; this.registerProvider = registerProvider; this.timer = timeWrapper; + this.waveClientTester = waveClientTester; } @Override @@ -175,8 +178,10 @@ public void onSuccess(final UserInfoDTO userInfoDTO) { onSignIn(userInfoDTO); stateManager.restorePreviousToken(); + // waveClientTester.doLogin(nickOrEmail, passwd); getView().hide(); getView().unMask(); + } }; userService.login(user.getShortName(), user.getPassword(), callback); Modified: trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -41,7 +41,7 @@ @Override public String getNickOrEmail() { - return getElementValue("username"); + return getElementValue("address"); } @Override @@ -51,7 +51,7 @@ @Override public void setNickOrEmail(final String username) { - DOM.getElementById("username").setAttribute(VALUE, username); + DOM.getElementById("address").setAttribute(VALUE, username); } @Override Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -77,8 +77,8 @@ @Inject public NewGroupPanel(final I18nTranslationService i18n, final NotifyLevelImages img, final MaskWidgetView mask) { - dialog = new BasicTopDialog(NEWGROUP_WIZARD, CoreMessages.REGISTER_A_NEW_GROUP_TITLE, true, true, false, 450, - 430, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); + dialog = new BasicTopDialog(NEWGROUP_WIZARD, CoreMessages.REGISTER_A_NEW_GROUP_TITLE, true, true, true, 450, + 420, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); this.i18n = i18n; this.mask = mask; // Field.setMsgTarget("side"); @@ -91,7 +91,6 @@ @Override public Widget asWidget() { - // TODO Auto-generated method stub return null; } @@ -106,14 +105,15 @@ form.setFrame(true); form.setPadding(10); form.setBorders(false); - form.setWidth(420); + form.setWidth(360); form.setLabelWidth(LABEL_WIDTH); form.setLabelAlign(LabelAlign.RIGHT); form.setButtonAlign(HorizontalAlignment.RIGHT); + form.setHeaderVisible(false); final Label intro = new Label(); - intro.setText(i18n.t("Please fill this form to register a new group:")); // + - // DefaultFormUtils.brbr()); + intro.setText(i18n.t("Please fill this form to register a new group:")); + intro.setStyleName("k-form-intro"); form.add(intro); shortNameField = new TextField<String>(); @@ -167,11 +167,9 @@ final FieldSet groupTypeFieldSet = new FieldSet(); groupTypeFieldSet.setHeading(i18n.t("Group type")); - groupTypeFieldSet.setCollapsible(false); - groupTypeFieldSet.setStyleName(MARGIN_LEFT_105PX); - groupTypeFieldSet.setWidth(BIG_FIELD_WIDTH); - // groupTypeFieldSet.setFrame(false); - groupTypeFieldSet.setCollapsible(false); + groupTypeFieldSet.addStyleName("k-form-fieldset"); + groupTypeFieldSet.setCollapsible(true); + groupTypeFieldSet.setWidth("210px"); groupTypeFieldSet.setAutoHeight(true); form.add(groupTypeFieldSet); @@ -200,6 +198,11 @@ } @Override + public void focusOnShorName() { + shortNameField.focus(); + } + + @Override public HasClickHandlers getFirstBtn() { return dialog.getFirstBtn(); Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -91,6 +91,7 @@ if (session.isLogged()) { NotifyUser.showProgressProcessing(); getView().show(); + getView().focusOnShorName(); NotifyUser.hideProgress(); } else { // stateManager.restorePreviousToken(); Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -28,6 +28,8 @@ void clearData(); + void focusOnShorName(); + HasClickHandlers getFirstBtn(); String getLongName(); Modified: trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -44,7 +44,7 @@ private final FormPanel form; public DefaultForm() { - this(HorizontalAlignment.RIGHT); + this(HorizontalAlignment.LEFT); } public DefaultForm(final HorizontalAlignment buttonAlign) { @@ -53,13 +53,13 @@ form.setPadding(10); form.setBorders(false); form.setLabelWidth(DEF_FIELD_LABEL_WITH); - form.setLabelAlign(LabelAlign.RIGHT); + form.setLabelAlign(LabelAlign.LEFT); form.setButtonAlign(buttonAlign); form.setHeaderVisible(false); } public DefaultForm(final String title) { - this(title, HorizontalAlignment.RIGHT); + this(title, HorizontalAlignment.LEFT); } public DefaultForm(final String title, final HorizontalAlignment buttonAlign) { Modified: trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/ui/DefaultFormUtils.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -35,6 +35,7 @@ if (radioTip != null) { radio.setTitle(radioTip); + radio.setBoxLabel(radioLabel); // radio.setBoxLabel(KuneUiUtils.genQuickTipLabel(radioLabel, null, // radioTip)); // ToolTip tooltip = new ToolTip(); Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,726 +1,741 @@ @CHARSET "UTF-8"; body { - background-color: white; - color: black; - font-family: 'Ubuntu', Arial; - font-size: small; - margin: 5px; - overflow: hidden; + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + margin: 5px; + overflow: hidden; } * { - font-family: 'Ubuntu', Arial; + font-family: 'Ubuntu', Arial; } body.fontface { - font: 'Ubuntu', Arial; + font: 'Ubuntu', Arial; } a { - color: darkblue; + color: darkblue; } a:visited { - color: darkblue; + color: darkblue; } .gwt-DialogBox { - border: 2px solid #AAAAAA; - background-color: white; + border: 2px solid #AAAAAA; + background-color: white; } .gwt-DialogBox .Caption { - background-image: url(gray_gradient.gif); - background-repeat: repeat-x; - padding: 4px; - padding-bottom: 8px; - font-weight: bold; - cursor: default; + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; } .gwt-MenuBar { - background-color: #C3D9FF; - cursor: default; + background-color: #C3D9FF; + cursor: default; } .gwt-MenuItem { - font-size: 80%; - margin: 1px; - cursor: default; + font-size: 80%; + margin: 1px; + cursor: default; } .gwt-MenuItem-selected { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-Tree { - + } .gwt-Tree .gwt-TreeItem { - font-size: 80%; - cursor: default; + font-size: 80%; + cursor: default; } .gwt-Tree .gwt-TreeItem-selected { - background-color: #C3D9FF; + background-color: #C3D9FF; } .gwt-StackPanel { - background-color: white; - border: 1px solid #AAAAAA; - width: 15em; + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; } .gwt-StackPanel .gwt-StackPanelItem { - background-image: url(blue_gradient.gif); - background-repeat: repeat-x; - background-color: #EEEEEE; - cursor: pointer; - cursor: hand; + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; } .gwt-StackPanel .gwt-StackPanelItem-selected { - + } .gwt-TabPanel { - + } .gwt-TabPanelBottom { - border-left: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; } .gwt-TabBar { - font-size: smaller; + font-size: smaller; } .gwt-TabBar .gwt-TabBarFirst { - height: 100%; - border-bottom: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - padding-left: 3px; + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; } .gwt-TabBar .gwt-TabBarRest { - border-bottom: 1px solid #87b3ff; - padding-right: 3px; + border-bottom: 1px solid #87b3ff; + padding-right: 3px; } .gwt-TabBar .gwt-TabBarItem { - border-top: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; - padding: 2px; - cursor: hand; - white-space: nowrap; - border-right: 1px solid #87b3ff; + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; } .gwt-TabBar .gwt-TabBarItem-selected { - font-weight: bold; - background-color: #e8eef7; - border-top: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #e8eef7; - padding: 2px; - cursor: default; - white-space: nowrap; + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; } .gwt-PushButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-RichTextArea { - border: 1px solid black; - background-color: white; + border: 1px solid black; + background-color: white; } .gwt-RichTextToolbar { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-RichTextToolbar .gwt-PushButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) - rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) - rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-HorizontalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-HorizontalSplitPanel .splitter { - background-color: #C3D9FF; - cursor: move; + background-color: #C3D9FF; + cursor: move; } .gwt-HorizontalSplitPanel .left { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-VerticalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-VerticalSplitPanel .splitter { - background-color: #C3D9FF; - height: 8px; - cursor: move; + background-color: #C3D9FF; + height: 8px; + cursor: move; } .gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-SuggestBoxPopup .item { - padding: 2px; + padding: 2px; } .gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-DisclosurePanel { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-DisclosurePanel .header { - background-color: #e8eef7; - cursor: hand; + background-color: #e8eef7; + cursor: hand; } .gwt-SplitLayoutPanel { - + } .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { - background-color: white; - background: none; - cursor: col-resize; + background-color: white; + background: none; + cursor: col-resize; } .gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { - background-color: white; - background: none; - cursor: row-resize; + background-color: white; + background: none; + cursor: row-resize; } .kLoadingPanel { - background-color: #FF9999; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; - padding: 0 1px 0 3px; - border-collapse: separate; - border-spacing: 2px; + background-color: #FF9999; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + padding: 0 1px 0 3px; + border-collapse: separate; + border-spacing: 2px; } .kLoadingLabel { - font-size: 14px; - color: white; - font-weight: bold; - padding: 0 5px 0 5px; + font-size: 14px; + color: white; + font-weight: bold; + padding: 0 5px 0 5px; } .k-space-sel { - margin-right: 10px; - background-color: #F2F2F2; + margin-right: 10px; + background-color: #F2F2F2; } .k-space-sel-btn { - padding: 0 1px 0 1px; - margin: 0 0 -2px; + padding: 0 1px 0 1px; + margin: 0 0 -2px; } .k-sitebar-logo { - margin-top: 2px; + margin-top: 2px; } .x-btn button { - font: 18px/27px 'Ubuntu', arial; + font: 18px/27px 'Ubuntu', arial; } -.k-btn-sitebar, .k-btn-sitebar button { - font: 13px 'Ubuntu', arial; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; - white-space: nowrap; +.k-btn-sitebar,.k-btn-sitebar button { + font: 13px 'Ubuntu', arial; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; + white-space: nowrap; } .k-btn-sitebar button { - margin-top: -5px; + margin-top: -5px; } .k-sitebar { /* margin-top: -30px; */ - + } .k-link { - text-decoration: underline; - color: green; - cursor: pointer; + text-decoration: underline; + color: green; + cursor: pointer; } /* Margins */ .kune-Margin-40-trbl { - margin: 40px; + margin: 40px; } .kune-Margin-40-lr { - margin-left: 40px; - margin-right: 40px; + margin-left: 40px; + margin-right: 40px; } .kune-Margin-40-tl { - margin-top: 40px; - margin-left: 40px; + margin-top: 40px; + margin-left: 40px; } .kune-Margin-40-tb { - margin-top: 40px; - margin-bottom: 40px; + margin-top: 40px; + margin-bottom: 40px; } .kune-Margin-40-t { - margin-top: 40px; + margin-top: 40px; } .kune-Margin-40-r { - margin-right: 40px; + margin-right: 40px; } .kune-Margin-40-l { - margin-left: 40px; + margin-left: 40px; } .kune-Margin-20-trbl { - margin: 20px; + margin: 20px; } .kune-Margin-20-lr { - margin-left: 20px; - margin-right: 20px; + margin-left: 20px; + margin-right: 20px; } .kune-Margin-20-tl { - margin-top: 20px; - margin-left: 20px; + margin-top: 20px; + margin-left: 20px; } .kune-Margin-20-tb { - margin-top: 20px; - margin-bottom: 20px; + margin-top: 20px; + margin-bottom: 20px; } .kune-Margin-20-t { - margin-top: 20px; + margin-top: 20px; } .kune-Margin-20-r { - margin-right: 20px; + margin-right: 20px; } .kune-Margin-20-l { - margin-left: 20px; + margin-left: 20px; } .kune-Margin-Large-trbl { - margin: 10px; + margin: 10px; } .kune-Margin-Large-lr { - margin-left: 10px; - margin-right: 10px; + margin-left: 10px; + margin-right: 10px; } .kune-Margin-Large-tl { - margin-top: 10px; - margin-left: 10px; + margin-top: 10px; + margin-left: 10px; } .kune-Margin-Large-tb { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 10px; } .kune-Margin-Large-t { - margin-top: 10px; + margin-top: 10px; } .kune-Margin-Large-r { - margin-right: 10px; + margin-right: 10px; } .kune-Margin-Large-l { - margin-left: 10px; + margin-left: 10px; } .kune-Margin-7-trbl { - margin: 7px; + margin: 7px; } .kune-Margin-7-lr { - margin-left: 7px; - margin-right: 7px; + margin-left: 7px; + margin-right: 7px; } .kune-Margin-7-tl { - margin-top: 7px; - margin-left: 7px; + margin-top: 7px; + margin-left: 7px; } .kune-Margin-7-tb { - margin-top: 7px; - margin-bottom: 7px; + margin-top: 7px; + margin-bottom: 7px; } .kune-Margin-7-t { - margin-top: 7px; + margin-top: 7px; } .kune-Margin-7-r { - margin-right: 7px; + margin-right: 7px; } .kune-Margin-7-b { - margin-bottom: 7px; + margin-bottom: 7px; } .kune-Margin-7-l { - margin-left: 7px; + margin-left: 7px; } .kune-Margin-Medium-trbl { - margin: 5px; + margin: 5px; } .kune-Margin-Medium-lr { - margin-left: 5px; - margin-right: 5px; + margin-left: 5px; + margin-right: 5px; } .kune-Margin-Medium-tl { - margin-top: 5px; - margin-left: 5px; + margin-top: 5px; + margin-left: 5px; } .kune-Margin-Medium-tb { - margin-top: 5px; - margin-bottom: 5px; + margin-top: 5px; + margin-bottom: 5px; } .kune-Margin-Medium-t { - margin-top: 5px; + margin-top: 5px; } .kune-Margin-Medium-r { - margin-right: 5px; + margin-right: 5px; } .kune-Margin-Medium-b { - margin-bottom: 5px; + margin-bottom: 5px; } .kune-Margin-Medium-l { - margin-left: 5px; + margin-left: 5px; } .kune-Margin-Small-trbl { - margin: 3px; + margin: 3px; } .kune-Margin-Small-lr { - margin-left: 3px; - margin-right: 3px; + margin-left: 3px; + margin-right: 3px; } .kune-Margin-Small-tl { - margin-top: 3px; - margin-left: 3px; + margin-top: 3px; + margin-left: 3px; } .kune-Margin-Small-tb { - margin-top: 3px; - margin-bottom: 3px; + margin-top: 3px; + margin-bottom: 3px; } .kune-Margin-Small-t { - margin-top: 3px; + margin-top: 3px; } .kune-Margin-Small-l { - margin-left: 3px; + margin-left: 3px; } .kune-Margin-Small-r { - margin-right: 3px; + margin-right: 3px; } .kune-Margin-Small-b { - margin-bottom: 3px; + margin-bottom: 3px; } .kune-Margin-Mini-trbl { - margin: 1px; + margin: 1px; } .kune-Margin-Mini-lr { - margin-left: 1px; - margin-right: 1px; + margin-left: 1px; + margin-right: 1px; } .kune-Margin-Mini-tl { - margin-top: 1px; - margin-left: 1px; + margin-top: 1px; + margin-left: 1px; } .kune-Margin-Mini-tb { - margin-top: 1px; - margin-bottom: 1px; + margin-top: 1px; + margin-bottom: 1px; } .kune-Margin-Mini-t { - margin-top: 1px; + margin-top: 1px; } .kune-Margin-Mini-r { - margin-right: 1px; + margin-right: 1px; } .kune-Margin-Mini-b { - margin-bottom: 1px; + margin-bottom: 1px; } .kune-Margin-Mini-l { - margin-left: 1px; + margin-left: 1px; } .k-publicspace-msg { - background-color: #E0E0E0; + background-color: #E0E0E0; } .k-publicspace-mask { /* background-color: #fff !important; - kfilter: alpha(opacity = 68) !important; - -moz-opacity: 0.68 !important; - -khtml-opacity: 0.68 !important; - opacity: 0.68 !important;*/ - + kfilter: alpha(opacity = 68) !important; + -moz-opacity: 0.68 !important; + -khtml-opacity: 0.68 !important; + opacity: 0.68 !important;*/ + } .k-publicspace-panel { - margin: 5px; - display: table-row; + margin: 5px; + display: table-row; } .k-publicspace-icon { - margin: 3px 3px 3px 0; - float: left; + margin: 3px 3px 3px 0; + float: left; } .k-publicspace-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; } .k-publicspace-description { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-publicspace-actions { - display: inline; + display: inline; } .k-message-panel { - margin: 5px; - display: table-row; + margin: 5px; + display: table-row; } .k-message-icon { - margin: 3px 3px 3px 0; - float: left; + margin: 3px 3px 3px 0; + float: left; } .k-message-title { - font-weight: bold; - display: block; - margin-bottom: 5px; - font-size: 16px; - display: table-caption; + font-weight: bold; + display: block; + margin-bottom: 5px; + font-size: 16px; + display: table-caption; } .k-message-description { - font-size: 14px; - display: table-cell; + font-size: 14px; + display: table-cell; } .k-error-tb { - background: #FFB380 none repeat scroll 0% 50%; - /* color: #250; */ - margin: 0 20px 0 10px; + background: #FFB380 none repeat scroll 0% 50%; + /* color: #250; */ + margin: 0 20px 0 10px; } .k-error-tb img { - margin: 15px 5px 5px 15px; + margin: 15px 5px 5px 15px; } .k-error-tb span { - position: relative; - top: -7px; - left: 9px; + position: relative; + top: -7px; + left: 9px; } .k-mask { - background-color: #F2F2F2 !important; - /* kfilter: alpha(opacity = 78) !important; */ - -moz-opacity: 0.78 !important; - -khtml-opacity: 0.78 !important; - opacity: 0.78 !important; + background-color: #F2F2F2 !important; + /* kfilter: alpha(opacity = 78) !important; */ + -moz-opacity: 0.78 !important; + -khtml-opacity: 0.78 !important; + opacity: 0.78 !important; } .x-form-item-label { - font-size: 16px; - font-weight: bold; + font-size: 14px; + font-weight: bold; + color: brown; } .x-form-text { - font-size: 14px; + font-size: 14px; } - \ No newline at end of file + +.x-fieldset-header-text,.x-form-group-label,.x-form-cb-label { + font-size: 14px; + font-family: 'Ubuntu', Arial; +} + +.k-form-intro { + font-size: 14px; + margin-bottom: 10px; +} + +.k-form-fieldset { + font-size: 16px; + margin-left: 105px; +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-08 14:17:50 UTC (rev 1241) @@ -4,7 +4,7 @@ <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <title>Kune</title> <script type="text/javascript" language="javascript" - src="/ws/ws.nocache.js"></script> + src="/ws/ws.nocache.js"></script> <meta name="emite.httpBase" content="/http-bind/" /> <meta name="emite.host" content="localhost" /> <meta name="emite.searchHost" content="search.localhost" /> @@ -25,52 +25,52 @@ <meta name="hablar.height" content="300px" /> <link rel="shortcut icon" href="favicon.ico" /> <link rel="stylesheet" type="text/css" - href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css"> + href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css">  <script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script> <script> - WebFont.load({ - google : { - families : [ 'Ubuntu' ] - } - }); + WebFont.load({ + google : { + families : [ 'Ubuntu' ] + } + }); </script>  <script type="text/javascript" language="javascript"> - var __session = { - "id" : "TK8O7UyqvT", - "address" : "vjrj(a)kune.beta.iepala.es", - "domain" : "kune.beta.iepala.es" - }; - var __client_flags = {}; - var __useSocketIO = true; + var __session = { + "id" : "TK8O7UyqvT", + "address" : "vjrj(a)kune.beta.iepala.es", + "domain" : "kune.beta.iepala.es" + }; + var __client_flags = {}; + var __useSocketIO = true; </script> <link - href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' - rel='stylesheet' type='text/css'> + href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + rel='stylesheet' type='text/css'>  + rel='stylesheet' type='text/css'> --> <link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css"> <link type="text/css" rel="stylesheet" href="gxt/css/gxt-gray.css"> <link type="text/css" rel="stylesheet" href="kune-hablar.css"> <link type="text/css" rel="stylesheet" href="kune-chat.css"> <link type="text/css" rel="stylesheet" href="kune-common.css"> <link type="text/css" rel="stylesheet" - href="fontface/ubuntufontface.css"> + href="fontface/ubuntufontface.css"> <link type="text/css" rel="stylesheet" href="kune-message.css"> <link type="text/css" rel="stylesheet" href="ws.css"> <style type="text/css"> body { - background-color: white; - color: black; - font-family: 'Ubuntu', Arial; - font-size: small; - margin: 5px; - overflow: hidden; + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + margin: 5px; + overflow: hidden; } .banner { - margin: 30px; + margin: 30px; } </style>  <form method="post" action="javascript:void(0)" style="display: none"> -<input type="text" id="username" name="username" value="" /> <input - type="password" id="password" name="password" value="" /> <input - type="submit" value="Login" id="login" /></form> +<input type="text" id="address" name="address" value="" /> <input + type="password" id="password" name="password" value="" /> <input + type="submit" value="Login" id="login" /> + <input type="submit" class="wiab le button" name="signIn" id="signIn" value="Sign in"> + </form>  <noscript> <div - style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> + style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> Your web browser must have JavaScript enabled in order for this application to display correctly.</div> </noscript> Added: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -0,0 +1,43 @@ +package cc.kune.wave.client; + +import cc.kune.common.client.noti.NotifyUser; + +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; + +public class WaveClientTester { + + public WaveClientTester() { + } + + public void doLogin(final String userWithoutDomain, final String passwd) { + final RequestBuilder request = new RequestBuilder(RequestBuilder.POST, "/auth/signin/"); + final StringBuffer params = new StringBuffer(); + params.append("address="); + params.append(URL.encodeQueryString(userWithoutDomain)); + params.append("&password="); + params.append(URL.encodeQueryString(passwd)); + params.append("&signIn="); + params.append(URL.encodeQueryString("Sign in")); + try { + request.setHeader("Content-Type", "application/x-www-form-urlencoded"); + request.sendRequest(params.toString(), new RequestCallback() { + @Override + public void onError(final Request request, final Throwable exception) { + NotifyUser.error(exception.getStackTrace().toString(), true); + } + + @Override + public void onResponseReceived(final Request request, final Response response) { + NotifyUser.info(response.getText()); + } + }); + } catch (final RequestException e) { + NotifyUser.error(e.getStackTrace().toString(), true); + } + } +} Property changes on: trunk/src/main/java/cc/kune/wave/client/WaveClientTester.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/wave/server/CustomWaveClientServlet.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomWaveClientServlet.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/server/CustomWaveClientServlet.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -0,0 +1,188 @@ +/** + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package cc.kune.wave.server; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.Enumeration; +import java.util.HashMap; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.json.JSONException; +import org.json.JSONObject; +import org.waveprotocol.box.common.SessionConstants; +import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.authentication.SessionManager; +import org.waveprotocol.box.server.gxp.TopBar; +import org.waveprotocol.box.server.gxp.WaveClientPage; +import org.waveprotocol.box.server.rpc.BaseUrlHelper; +import org.waveprotocol.box.server.util.RandomBase64Generator; +import org.waveprotocol.wave.client.util.ClientFlagsBase; +import org.waveprotocol.wave.common.bootstrap.FlagConstants; +import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.util.logging.Log; + +import com.google.common.collect.Maps; +import com.google.gxp.base.GxpContext; +import com.google.inject.Inject; +import com.google.inject.name.Named; + +/** + * The HTTP servlet for serving a wave client along with content generated on + * the server. + * + * @author kalman(a)google.com (Benjamin Kalman) + */ +public class CustomWaveClientServlet extends HttpServlet { + + private static final HashMap<String, String> FLAG_MAP = Maps.newHashMap(); + + private static final Log LOG = Log.get(CustomWaveClientServlet.class); + static { + // __NAME_MAPPING__ is a map of name to obfuscated id + for (int i = 0; i < FlagConstants.__NAME_MAPPING__.length; i += 2) { + FLAG_MAP.put(FlagConstants.__NAME_MAPPING__[i], FlagConstants.__NAME_MAPPING__[i + 1]); + } + } + + private final String baseUrl; + private final String domain; + private final SessionManager sessionManager; + private final Boolean useSocketIO; + + /** + * Creates a servlet for the wave client. + */ + @Inject + public CustomWaveClientServlet((a)Named(CoreSettings.WAVE_SERVER_DOMAIN) final String domain, + @Named(CoreSettings.USE_SOCKETIO) final Boolean useSocketIO, + @Named(CoreSettings.HTTP_BASE_URL) final String baseUrl, final SessionManager sessionManager) { + this.domain = domain; + this.useSocketIO = useSocketIO; + this.baseUrl = BaseUrlHelper.removeLastSlash(baseUrl); + this.sessionManager = sessionManager; + } + + @Override + protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException { + final ParticipantId id = sessionManager.getLoggedInUser(request.getSession(false)); + + // Eventually, it would be nice to show users who aren't logged in the + // public waves. + // However, public waves aren't implemented yet. For now, we'll just + // redirect users + // who haven't signed in to the sign in page. + // COMMENTED (vjrj) + if (id == null) { + response.sendRedirect(baseUrl + sessionManager.getLoginUrl(baseUrl + "/")); + return; + } + + String username = null; + String userDomain = null; + if (id != null) { + final String[] parts = id.getAddress().split("@"); + username = parts[0]; + userDomain = id.getDomain(); + } + + try { + WaveClientPage.write(response.getWriter(), new GxpContext(request.getLocale()), + getSessionJson(request.getSession(false)), getClientFlags(request), + TopBar.getGxpClosure(username, userDomain, baseUrl), useSocketIO, baseUrl); + } catch (final IOException e) { + LOG.warning("Failed to write GXP for request " + request, e); + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + return; + } + + response.setContentType("text/html"); + response.setStatus(HttpServletResponse.SC_OK); + } + + private JSONObject getClientFlags(final HttpServletRequest request) { + try { + final JSONObject ret = new JSONObject(); + + final Enumeration<?> iter = request.getParameterNames(); + while (iter.hasMoreElements()) { + final String name = (String) iter.nextElement(); + final String value = request.getParameter(name); + + if (FLAG_MAP.containsKey(name)) { + // Set using the correct type of data in the json using + // reflection + try { + final Method getter = ClientFlagsBase.class.getMethod(name); + final Class<?> retType = getter.getReturnType(); + + if (retType.equals(String.class)) { + ret.put(FLAG_MAP.get(name), value); + } else if (retType.equals(Integer.class)) { + ret.put(FLAG_MAP.get(name), Integer.parseInt(value)); + } else if (retType.equals(Boolean.class)) { + ret.put(FLAG_MAP.get(name), Boolean.parseBoolean(value)); + } else if (retType.equals(Float.class)) { + ret.put(FLAG_MAP.get(name), Float.parseFloat(value)); + } else if (retType.equals(Double.class)) { + ret.put(FLAG_MAP.get(name), Double.parseDouble(value)); + } else { + // Flag exists, but its type is unknown, so it can + // not be + // properly encoded in JSON. + LOG.warning("Ignoring flag [" + name + "] with unknown return type: " + retType); + } + + // Ignore the flag on any exception + } catch (final SecurityException ex) { + } catch (final NoSuchMethodException ex) { + LOG.warning("Failed to find the flag [" + name + "] in ClientFlagsBase."); + } catch (final NumberFormatException ex) { + } + } + } + + return ret; + } catch (final JSONException ex) { + LOG.severe("Failed to create flags JSON"); + return new JSONObject(); + } + } + + private JSONObject getSessionJson(final HttpSession session) { + try { + final ParticipantId user = sessionManager.getLoggedInUser(session); + final String address = (user != null) ? user.getAddress() : null; + + // TODO(zdwang): Figure out a proper session id rather than + // generating a + // random number + final String sessionId = (new RandomBase64Generator()).next(10); + + return new JSONObject().put(SessionConstants.DOMAIN, domain).putOpt(SessionConstants.ADDRESS, address).putOpt( + SessionConstants.ID_SEED, sessionId); + } catch (final JSONException e) { + LOG.severe("Failed to create session JSON"); + return new JSONObject(); + } + } +} Property changes on: trunk/src/main/java/cc/kune/wave/server/CustomWaveClientServlet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/wave/server/WaveStarter.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveStarter.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/cc/kune/wave/server/WaveStarter.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -45,7 +45,6 @@ import org.waveprotocol.box.server.rpc.FetchServlet; import org.waveprotocol.box.server.rpc.ServerRpcProvider; import org.waveprotocol.box.server.rpc.SignOutServlet; -import org.waveprotocol.box.server.rpc.WaveClientServlet; import org.waveprotocol.box.server.waveserver.WaveBus; import org.waveprotocol.box.server.waveserver.WaveServerException; import org.waveprotocol.box.server.waveserver.WaveletProvider; @@ -140,7 +139,7 @@ final ServletHolder proxyServletHolder = server.addServlet("/gadgets/*", proxyServlet); proxyServletHolder.setInitParameter("HostHeader", gadgetServerHostname); - server.addServlet("/", injector.getInstance(WaveClientServlet.class)); + server.addServlet("/", injector.getInstance(CustomWaveClientServlet.class)); } public WaveStarter() { Modified: trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneApplicationListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneApplicationListener.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneApplicationListener.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneContainerListener.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 @@ -99,12 +99,8 @@ builder.exclude("/javascripts/.*"); builder.exclude("/templates/.*"); - /* Wave with context '/wiab/' */ - // builder.exclude("/wiab.*"); - // builder.exclude("/socket.*"); - /* Wave with context '/' */ - builder.exclude("/"); + // builder.exclude("/*"); builder.exclude("/attachment/.*"); builder.exclude("/auth/signin"); builder.exclude("/auth/signout"); Modified: trunk/src/main/java/org/ourproject/kune/app/server/NotInObject.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/NotInObject.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/org/ourproject/kune/app/server/NotInObject.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * 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 Modified: trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-02-08 14:17:50 UTC (rev 1241) @@ -90,7 +90,6 @@ throws IOException, ServletException { final String relative = RackHelper.getRelativeURL(request); - LOG.debug("REQUEST: " + relative); for (final RequestMatcher matcher : excludes) { if (matcher.matches(relative)) { LOG.info("Excluded (from Guice): " + relative); @@ -98,7 +97,7 @@ return; } } - + LOG.debug("REQUEST: " + relative); final FilterChain newChain = new DockChain(docks.iterator()); newChain.doFilter(request, response); } Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-02-07 21:14:53 UTC (rev 1240) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-02-08 14:17:50 UTC (rev 1241) @@ -18,7 +18,6 @@ <welcome-file-list> <welcome-file>ws.html</welcome-file> </welcome-file-list> -  <filter> <filter-name>JettyContinuationFilter</filter-name> @@ -26,6 +25,23 @@ </filter> <filter-mapping> <filter-name>JettyContinuationFilter</filter-name> + <servlet-name>Wiab</servlet-name> +  + </filter-mapping> + <servlet> + <servlet-name>Wiab</servlet-name> + <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> + <init-param> + <param-name>ProxyTo</param-name> + <param-value>http://127.0.0.1:9898/</param-value> + </init-param> + <init-param> + <param-name>Prefix</param-name> + <param-value>/</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Wiab</servlet-name> <url-pattern>/attachment/*</url-pattern> <url-pattern>/auth/signin</url-pattern> <url-pattern>/auth/signout</url-pattern> @@ -43,8 +59,8 @@ <url-pattern>/static/*</url-pattern> <url-pattern>/webclient/*</url-pattern>  - </filter-mapping> - +  + </servlet-mapping>   <context-param> @@ -84,7 +100,6 @@ <listener> <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class> </listener> -    @@ -123,278 +138,6 @@ <url-pattern>/http-bind/ </url-pattern> </servlet-mapping> -  - <servlet> - <servlet-name>WiabAttachs</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabAttachs</servlet-name> - <url-pattern>/attachment/*</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabSignIn</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabSignIn</servlet-name> - <url-pattern>/auth/signin</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabSignOut</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabSignOut</servlet-name> - <url-pattern>/auth/signout</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabRegister</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabRegister</servlet-name> - <url-pattern>/auth/register</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabFetch</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabFetch</servlet-name> - <url-pattern>/fetch/*</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabRobotDataApi</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabRobotDataApi</servlet-name> - <url-pattern>/robot/dataapi</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabRobotDataApiOauth</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabRobotDataApiOauth</servlet-name> - <url-pattern>/robot/dataapi/oauth/*</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabRobotDataApiRpc</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabRobotDataApiRpc</servlet-name> - <url-pattern>/robot/dataapi/rpc</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabRobotRegister</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabRobotRegister</servlet-name> - <url-pattern>/robot/register/*</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabRobotRpc</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabRobotRpc</servlet-name> - <url-pattern>/robot/rpc</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabGadgets</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabGadgets</servlet-name> - <url-pattern>/gadgets</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabGadgetsAst</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabGadgetsAst</servlet-name> - <url-pattern>/gadgets/*</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabSocketIO</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabSocketIO</servlet-name> - <url-pattern>/socket.io/*</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabSocket</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabSocket</servlet-name> - <url-pattern>/socket</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabStatic</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabStatic</servlet-name> - <url-pattern>/static/*</url-pattern> - </servlet-mapping> -  - <servlet> - <servlet-name>WiabWebClient</servlet-name> - <servlet-class>org.eclipse.jetty.servlets.ProxyServlet$Transparent</servlet-class> - <init-param> - <param-name>ProxyTo</param-name> - <param-value>http://127.0.0.1:9898/</param-value> - </init-param> - <init-param> - <param-name>Prefix</param-name> - <param-value>/</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>WiabWebClient</servlet-name> - <url-pattern>/webclient/*</url-pattern> - </servlet-mapping>  <filter> <filter-name>rack</filter-name>

1 0

r1240 - in trunk: . src/main/java/cc/kune/core/client/errors src/main/java/cc/kune/wave/client src/main/java/cc/kune/wave/server src/main/java/org/ourproject/kune/platf/server/manager/impl src/main/java/org/ourproject/kune/rack src/main/resources src/main/webapp/WEB-INF
by Vicente J. Ruiz Jurado 07 Feb '11

07 Feb '11

Author: vjrj_ Date: 2011-02-07 22:14:53 +0100 (Mon, 07 Feb 2011) New Revision: 1240 Added: trunk/src/main/java/cc/kune/core/client/errors/UserRegistrationException.java Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/server/WaveStarter.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java trunk/src/main/resources/wave-server.properties trunk/src/main/webapp/WEB-INF/web.xml Log: WIAB integration updated Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/.classpath 2011-02-07 21:14:53 UTC (rev 1240) @@ -6,7 +6,7 @@ <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/appengine/appengine-api-1.0-sdk/1.3.1/appengine-api-1.0-sdk-1.3.1.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/pom.xml 2011-02-07 21:14:53 UTC (rev 1240) @@ -71,7 +71,7 @@ <id>cobogw</id> <name>Cobogw repository at googlecode</name> <url>http://cobogw.googlecode.com/svn/maven2</url> - </repository> + </repository> <repository> <id>gwt-repo</id> <url>http://google-web-toolkit.googlecode.com/svn/2.1.0/gwt/maven/</url> @@ -164,7 +164,7 @@ </snapshots> </pluginRepository>  -  <pluginRepository> <id>Codehaus Snapshots</id> @@ -248,7 +248,7 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> <groupId>org.adamtacy</groupId> @@ -297,7 +297,7 @@ <artifactId>dozer</artifactId> <version>4.0</version> </dependency> -  <dependency> <groupId>jmagick</groupId> @@ -394,16 +394,16 @@ <artifactId>hibernate-tools</artifactId> <version>3.2.3.GA</version> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-c3p0</artifactId> - <version>3.3.1.GA</version> - </dependency> -  + </dependency> --> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -501,7 +501,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>provided</scope> </dependency>  @@ -732,7 +732,7 @@ <configuration> <source>1.6</source> <target>1.6</target> -  </configuration> </plugin> @@ -755,7 +755,7 @@ <exclude>**/*_Roo_*</exclude> </excludes> <forkMode>pertest</forkMode> -  <skip>true</skip> </configuration> @@ -846,11 +846,11 @@    -   <plugin> @@ -882,11 +882,11 @@ </execution> </executions> </plugin> -  <plugin> <groupId>org.liquibase</groupId> @@ -904,7 +904,7 @@ <password>db4kune</password> <verbose>true</verbose> </configuration> -  <goals> <goal>update</goal> @@ -983,9 +983,9 @@    -  </plugins>  Added: trunk/src/main/java/cc/kune/core/client/errors/UserRegistrationException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserRegistrationException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/UserRegistrationException.java 2011-02-07 21:14:53 UTC (rev 1240) @@ -0,0 +1,32 @@ +/* + * + * 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.core.client.errors; + +public class UserRegistrationException extends DefaultException { + private static final long serialVersionUID = -4530874249465164135L; + + public UserRegistrationException() { + super(); + } + + public UserRegistrationException(final String msg) { + super(msg); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/errors/UserRegistrationException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-02-07 21:14:53 UTC (rev 1240) @@ -279,7 +279,7 @@ HistorySupport.init(); - websocket = new WaveWebSocketClient(useSocketIO(), getWebSocketBaseUrl(GWT.getModuleBaseURL() + "/wiab/")); + websocket = new WaveWebSocketClient(useSocketIO(), getWebSocketBaseUrl(GWT.getModuleBaseURL())); websocket.connect(); if (Session.get().isLoggedIn()) { Modified: trunk/src/main/java/cc/kune/wave/server/WaveStarter.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveStarter.java 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/src/main/java/cc/kune/wave/server/WaveStarter.java 2011-02-07 21:14:53 UTC (rev 1240) @@ -45,7 +45,6 @@ import org.waveprotocol.box.server.rpc.FetchServlet; import org.waveprotocol.box.server.rpc.ServerRpcProvider; import org.waveprotocol.box.server.rpc.SignOutServlet; -import org.waveprotocol.box.server.rpc.UserRegistrationServlet; import org.waveprotocol.box.server.rpc.WaveClientServlet; import org.waveprotocol.box.server.waveserver.WaveBus; import org.waveprotocol.box.server.waveserver.WaveServerException; @@ -58,6 +57,7 @@ import org.waveprotocol.wave.model.version.HashedVersionFactory; import org.waveprotocol.wave.util.settings.SettingsBinder; +import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; @@ -121,7 +121,7 @@ server.addServlet(SessionManager.SIGN_IN_URL, injector.getInstance(AuthenticationServlet.class)); server.addServlet("/auth/signout", injector.getInstance(SignOutServlet.class)); - server.addServlet("/auth/register", injector.getInstance(UserRegistrationServlet.class)); + server.addServlet("/auth/register", injector.getInstance(CustomUserRegistrationServlet.class)); server.addServlet("/fetch/*", injector.getInstance(FetchServlet.class)); @@ -146,10 +146,9 @@ public WaveStarter() { } - public Injector run(final Module coreSettings, final Injector parentInjector) throws PersistenceException, - ConfigurationException, WaveServerException { - // Injector settingsInjector = Guice.createInjector(coreSettings); - Injector settingsInjector = parentInjector.createChildInjector(coreSettings); + public Injector run(final Module coreSettings) throws PersistenceException, ConfigurationException, + WaveServerException { + Injector settingsInjector = Guice.createInjector(coreSettings); final boolean enableFederation = settingsInjector.getInstance(Key.get(Boolean.class, Names.named(CoreSettings.ENABLE_FEDERATION))); @@ -179,10 +178,10 @@ return injector; } - public Injector runMain(final Injector settingsInjector) { + public Injector runMain() { try { final Module coreSettings = CustomSettingsBinder.bindSettings(PROPERTIES_FILE_KEY, CoreSettings.class); - return run(coreSettings, settingsInjector); + return run(coreSettings); } catch (final PersistenceException e) { LOG.error("PersistenceException when running server:", e); } catch (final ConfigurationException e) { @@ -190,6 +189,6 @@ } catch (final WaveServerException e) { LOG.error("WaveServerException when running server:", e); } - return settingsInjector; + return null; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2011-02-07 21:14:53 UTC (rev 1240) @@ -41,6 +41,7 @@ import org.waveprotocol.box.server.authentication.PasswordDigest; import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.client.errors.UserRegistrationException; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.I18nCountry; import cc.kune.domain.I18nLanguage; @@ -93,7 +94,10 @@ } final PasswordDigest passwdDigest = new PasswordDigest(passwd.toCharArray()); - waveUserRegister.tryCreateUser(shortName, passwdDigest); + final String msg = waveUserRegister.tryCreateUser(shortName, passwdDigest); + if (msg != null) { + throw new UserRegistrationException(msg); + } // if (userPropGroup == null) { // userPropGroup = propGroupManager.find(User.PROPS_ID); // } Modified: trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java 2011-02-07 21:14:53 UTC (rev 1240) @@ -38,7 +38,6 @@ import cc.kune.wave.server.WaveStarter; -import com.google.inject.Guice; import com.google.inject.Injector; public class RackServletFilter implements Filter { @@ -130,9 +129,8 @@ final RackBuilder builder = new RackBuilder(); module.configure(builder); final Rack rack = builder.getRack(); - final Injector parentInjector = Guice.createInjector(); final WaveStarter waveStarter = new WaveStarter(); - final Injector waveChildInjector = waveStarter.runMain(parentInjector); + final Injector waveChildInjector = waveStarter.runMain(); final Injector kuneChildInjector = installInjector(filterConfig, rack, waveChildInjector); startContainerListeners(rack.getListeners(), kuneChildInjector); docks = rack.getDocks(); Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/src/main/resources/wave-server.properties 2011-02-07 21:14:53 UTC (rev 1240) @@ -9,7 +9,7 @@ http_frontend_public_address = localhost:9898 http_frontend_addresses = ${http_frontend_public_address} http_baseurl = / -resource_base = ./target/kune-0.0.7/ +resource_base = ../kune-0.0.7/ ### Server-specific variables ### Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-02-07 17:33:32 UTC (rev 1239) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-02-07 21:14:53 UTC (rev 1240) @@ -18,6 +18,33 @@ <welcome-file-list> <welcome-file>ws.html</welcome-file> </welcome-file-list> + +  + <filter> + <filter-name>JettyContinuationFilter</filter-name> + <filter-class>org.eclipse.jetty.continuation.ContinuationFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>JettyContinuationFilter</filter-name> + <url-pattern>/attachment/*</url-pattern> + <url-pattern>/auth/signin</url-pattern> + <url-pattern>/auth/signout</url-pattern> + <url-pattern>/auth/register</url-pattern> + <url-pattern>/fetch/*</url-pattern> + <url-pattern>/robot/dataapi</url-pattern> + <url-pattern>/robot/dataapi/oauth/*</url-pattern> + <url-pattern>/robot/dataapi/rpc</url-pattern> + <url-pattern>/robot/register/*</url-pattern> + <url-pattern>/robot/rpc</url-pattern> + <url-pattern>/gadgets</url-pattern> + <url-pattern>/gadgets/*</url-pattern> + <url-pattern>/socket.io/*</url-pattern> + <url-pattern>/socket</url-pattern> + <url-pattern>/static/*</url-pattern> + <url-pattern>/webclient/*</url-pattern> +  + </filter-mapping> +   <context-param>

1 0