Author: vjrj_ Date: 2012-03-21 13:25:32 +0100 (Wed, 21 Mar 2012) New Revision: 1774 Added: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java Removed: trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java trunk/src/main/webapp/ws.html trunk/src/test/java/cc/kune/selenium/SeleniumConf.java Log: Fix for remember login saved passwords (tranks to @sembrestels) Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -41,8 +41,8 @@ import cc.kune.core.client.auth.SignInPresenter; import cc.kune.core.client.auth.SignInPresenter.SignInView; import cc.kune.core.client.auth.UserFieldFactory; -import cc.kune.core.client.auth.UserPassAutocompleteManager; -import cc.kune.core.client.auth.UserPassAutocompleteManagerImpl; +import cc.kune.core.client.auth.LoginRememberManager; +import cc.kune.core.client.auth.LoginRememberManagerImpl; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.cookies.CookiesManagerImpl; import cc.kune.core.client.dnd.KuneDragController; @@ -183,7 +183,7 @@ bindPresenter(SubtitlesManager.class, SubtitlesManager.SubtitlesView.class, SubtitlesWidget.class, SubtitlesManager.SubtitlesProxy.class); - bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); + bind(LoginRememberManager.class).to(LoginRememberManagerImpl.class).in(Singleton.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); Copied: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java (from rev 1747, trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -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 cc.kune.core.client.auth; + +public interface LoginRememberManager { + + void clickFormLogin(); + + String getNickOrEmail(); + + String getPassword(); + + void setNickOrEmail(String username); + + void setPassword(String password); + +} Copied: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java (from rev 1747, trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -0,0 +1,67 @@ +/* + * + * 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.auth; + +import com.google.gwt.user.client.DOM; + +/** + * Remember user/pass implementation <a href= + * "http://stackoverflow.com/questions/1245174/is-it-possible-to-implement-cross..." + * >based in this</a> and <a href= + * "http://www.sencha.com/forum/showthread.php?72027-Auto-complete-login-form" + * >this</a>. + */ +public class LoginRememberManagerImpl implements LoginRememberManager { + + /** The login forms are in ws.html **/ + private static final String PASSWORD = "password"; + private static final String USERNAME = "username"; + private static final String VALUE = "value"; + + public static native String getElementValue(String domId) /*-{ + return $doc.getElementById(domId).value; + }-*/; + + @Override + public native void clickFormLogin() /*-{ + $doc.getElementById("login").submit(); + }-*/; + + @Override + public String getNickOrEmail() { + return getElementValue(USERNAME); + } + + @Override + public String getPassword() { + return getElementValue(PASSWORD); + } + + @Override + public void setNickOrEmail(final String username) { + DOM.getElementById(USERNAME).setAttribute(VALUE, username); + } + + @Override + public void setPassword(final String password) { + DOM.getElementById(PASSWORD).setAttribute(VALUE, password); + } + +} Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -94,8 +94,8 @@ public RegisterPresenter(final EventBus eventBus, final RegisterView view, final RegisterProxy proxy, final Session session, final StateManager stateManager, final I18nUITranslationService i18n, final Provider<UserServiceAsync> userServiceProvider, final Provider<SignIn> signInProvider, - final CookiesManager cookiesManager, final UserPassAutocompleteManager autocomplete) { - super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, autocomplete); + final CookiesManager cookiesManager, final LoginRememberManager loginRemember) { + super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, loginRemember); this.userServiceProvider = userServiceProvider; this.signInProvider = signInProvider; } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -36,7 +36,7 @@ public abstract class SignInAbstractPresenter<V extends View, Proxy_ extends Proxy<?>> extends Presenter<View, Proxy<?>> { - protected final UserPassAutocompleteManager autocomplete; + protected final LoginRememberManager loginRemember; protected final CookiesManager cookiesManager; private String gotoTokenOnCancel; protected final I18nUITranslationService i18n; @@ -45,13 +45,13 @@ public SignInAbstractPresenter(final EventBus eventBus, final View view, final Proxy<?> proxy, final Session session, final StateManager stateManager, final I18nUITranslationService i18n, - final CookiesManager cookiesManager, final UserPassAutocompleteManager autocomplete) { + final CookiesManager cookiesManager, final LoginRememberManager loginRemember) { super(eventBus, view, proxy); this.session = session; this.stateManager = stateManager; this.i18n = i18n; this.cookiesManager = cookiesManager; - this.autocomplete = autocomplete; + this.loginRemember = loginRemember; } public String getGotoTokenOnCancel() { @@ -113,9 +113,9 @@ } protected void saveAutocompleteLoginData(final String nickOrEmail, final String password) { - autocomplete.setNickOrEmail(nickOrEmail); - autocomplete.setPassword(password); - autocomplete.clickFormLogin(); + loginRemember.setNickOrEmail(nickOrEmail); + loginRemember.setPassword(password); + loginRemember.clickFormLogin(); } public void setGotoTokenOnCancel(final String gotoTokenOnCancel) { Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -26,10 +26,15 @@ import com.extjs.gxt.ui.client.event.Events; import com.extjs.gxt.ui.client.event.FieldEvent; import com.extjs.gxt.ui.client.event.Listener; +import com.extjs.gxt.ui.client.widget.ComponentHelper; import com.extjs.gxt.ui.client.widget.form.Field; import com.extjs.gxt.ui.client.widget.form.TextField; +import com.google.gwt.dom.client.Document; +import com.google.gwt.user.client.Element; +import com.google.gwt.user.client.ui.RootPanel; public class SignInForm extends DefaultForm { + private static final String LOGIN_ID = "loginrender"; public static final String PASSWORD_FIELD_ID = "kune-sif-psf"; public static final String USER_FIELD_ID = "kune-sif-nkf"; @@ -37,28 +42,56 @@ private final TextField<String> loginPassField; private OnAcceptCallback onAcceptCallback; + /** + * Remember user/pass implementation <a href= + * "http://stackoverflow.com/questions/1245174/is-it-possible-to-implement-cross..." + * >based in this</a> and <a href= + * "http://www.sencha.com/forum/showthread.php?72027-Auto-complete-login-form" + * >this</a>. + */ public SignInForm(final I18nTranslationService i18n) { super.addStyleName("kune-Margin-Large-trbl"); - - loginNickOrEmailField = new TextField<String>(); + loginNickOrEmailField = new TextField<String>() { + @Override + protected void onRender(final Element target, final int index) { + if (el() == null) { + setElement(Document.get().getElementById("usernamerender")); + } + super.onRender(target, index); + } + }; loginNickOrEmailField.setFieldLabel(i18n.t("Username")); loginNickOrEmailField.setName(USER_FIELD_ID); loginNickOrEmailField.setWidth(DEF_SMALL_FIELD_WIDTH); loginNickOrEmailField.setAllowBlank(false); - loginNickOrEmailField.setValidationDelay(1000); + loginNickOrEmailField.setValidationDelay(3000); loginNickOrEmailField.setId(USER_FIELD_ID); loginNickOrEmailField.setTabIndex(100); + loginNickOrEmailField.render(RootPanel.get(LOGIN_ID).getElement()); + ComponentHelper.doAttach(loginNickOrEmailField); super.add(loginNickOrEmailField); - loginPassField = new TextField<String>(); + loginPassField = new TextField<String>() { + @Override + protected void onRender(final Element target, final int index) { + if (el() == null) { + final String elementId = "passwordrender"; + setElement(Document.get().getElementById(elementId)); + } + super.onRender(target, index); + } + }; loginPassField.setFieldLabel(i18n.t("Password")); loginPassField.setName(PASSWORD_FIELD_ID); loginPassField.setWidth(DEF_MEDIUM_FIELD_WIDTH); loginPassField.setPassword(true); loginPassField.setAllowBlank(false); - loginPassField.setValidationDelay(1000); + loginPassField.setValidationDelay(3000); loginPassField.setId(PASSWORD_FIELD_ID); loginPassField.setTabIndex(101); + loginPassField.render(RootPanel.get(LOGIN_ID).getElement()); + ComponentHelper.doAttach(loginPassField); + loginPassField.addListener(Events.OnKeyPress, new Listener<FieldEvent>() { @Override public void handleEvent(final FieldEvent fe) { Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -97,10 +97,10 @@ 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 CookiesManager cookiesManager, final LoginRememberManager loginRemember, final TimerWrapper timeWrapper, final WaveClientSimpleAuthenticator waveClientAuthenticator, final Provider<AskForPasswordResetPanel> askPasswdReset) { - super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, autocomplete); + super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, loginRemember); this.eventBus = eventBus; this.userService = userService; this.registerProvider = registerProvider; @@ -258,8 +258,8 @@ timer.configure(new Executer() { @Override public void execute() { - final String savedLogin = autocomplete.getNickOrEmail(); - final String savedPasswd = autocomplete.getPassword(); + final String savedLogin = loginRemember.getNickOrEmail(); + final String savedPasswd = loginRemember.getPassword(); if (TextUtils.notEmpty(savedLogin)) { getView().setNickOrEmail(savedLogin); getView().setLoginPassword(savedPasswd); Deleted: trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -1,34 +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.auth; - -public interface UserPassAutocompleteManager { - - void clickFormLogin(); - - String getNickOrEmail(); - - String getPassword(); - - void setNickOrEmail(String username); - - void setPassword(String password); - -} Deleted: trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -1,62 +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.auth; - -import com.google.gwt.user.client.DOM; - -/** - * Implementation <a href= - * "http://stackoverflow.com/questions/1245174/is-it-possible-to-implement-cross..." - * >based in this</a> - */ -public class UserPassAutocompleteManagerImpl implements UserPassAutocompleteManager { - - private static final String VALUE = "value"; - - public static native String getElementValue(String domId) /*-{ - return $doc.getElementById(domId).value; - }-*/; - - @Override - public native void clickFormLogin() /*-{ - $doc.getElementById("login").click(); - }-*/; - - @Override - public String getNickOrEmail() { - return getElementValue("address"); - } - - @Override - public String getPassword() { - return getElementValue("password"); - } - - @Override - public void setNickOrEmail(final String username) { - DOM.getElementById("address").setAttribute(VALUE, username); - } - - @Override - public void setPassword(final String password) { - DOM.getElementById("password").setAttribute(VALUE, password); - } - -} Added: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -0,0 +1,219 @@ +package cc.kune.core.server.rpc; + +import java.util.Date; +import java.util.Map; + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.RateResult; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.SocialNetworkSubGroup; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + +public class ContentRPCMock implements ContentService, RPC { + + private final StateContainerDTO containerMock; + private final StateContentDTO contentMock; + + public ContentRPCMock() { + containerMock = new StateContainerDTO(); + contentMock = new StateContentDTO(); + } + + @Override + public void addAuthor(final String userHash, final StateToken token, final String authorShortName) + throws DefaultException { + } + + @Override + public StateContentDTO addContent(final String user, final StateToken parentToken, final String name, + final String typeId) throws DefaultException { + return contentMock; + } + + @Override + public StateContainerDTO addFolder(final String hash, final StateToken parentToken, + final String typeId, final String title) throws DefaultException { + return containerMock; + } + + @Override + public void addGadgetToContent(final String userHash, final StateToken currentStateToken, + final String gadgetName) throws DefaultException { + } + + @Override + public StateContentDTO addNewContentWithGadget(final String userHash, + final StateToken currentStateToken, final String gadgetName, final String typeId, + final String title, final String body) throws DefaultException { + return contentMock; + } + + @Override + public StateContentDTO addNewContentWithGadgetAndState(final String userHash, + final StateToken currentStateToken, final String gadgetName, final String typeId, + final String tile, final String body, final Map<String, String> gadgetState) + throws DefaultException { + return contentMock; + } + + @Override + public Boolean addParticipant(final String userHash, final StateToken token, final String participant) + throws DefaultException { + return true; + } + + @Override + public Boolean addParticipants(final String userHash, final StateToken token, final String groupName, + final SocialNetworkSubGroup subGroup) throws DefaultException { + return true; + } + + @Override + public StateContainerDTO addRoom(final String user, final StateToken parentToken, final String name) + throws DefaultException { + return containerMock; + } + + @Override + public StateContentDTO copyContent(final String userHash, final StateToken parentToken, + final StateToken token) throws DefaultException { + return contentMock; + } + + @Override + public StateContainerDTO delContent(final String userHash, final StateToken token) + throws DefaultException { + return containerMock; + } + + @Override + public StateAbstractDTO getContent(final String userHash, final StateToken token) + throws DefaultException { + return contentMock; + } + + @Override + public TagCloudResult getSummaryTags(final String userHash, final StateToken groupToken) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public StateContainerDTO moveContent(final String userHash, final StateToken contentToken, + final StateToken newContainerToken) throws DefaultException { + return containerMock; + } + + @Override + public RateResult rateContent(final String userHash, final StateToken token, final Double value) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void removeAuthor(final String userHash, final StateToken token, final String authorShortName) + throws DefaultException { + } + + @Override + public StateAbstractDTO renameContainer(final String userHash, final StateToken token, + final String newName) throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public StateAbstractDTO renameContent(final String userHash, final StateToken token, + final String newName) throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void save(final String user, final StateToken token, final String content) + throws DefaultException { + } + + @Override + public String sendFeedback(final String userHash, final String title, final String body) { + return "#fixme"; + } + + @Override + public ContentSimpleDTO setAsDefaultContent(final String userHash, final StateToken token) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setGadgetProperties(final String userHash, final StateToken currentStateToken, + final String gadgetName, final Map<String, String> properties) throws DefaultException { + } + + @Override + public I18nLanguageDTO setLanguage(final String userHash, final StateToken token, + final String languageCode) throws DefaultException { + final I18nLanguageDTO lang = new I18nLanguageDTO(); + + return lang; + } + + @Override + public void setPublishedOn(final String userHash, final StateToken token, final Date date) + throws DefaultException { + // TODO Auto-generated method stub + + } + + @Override + public StateAbstractDTO setStatus(final String userHash, final StateToken stateToken, + final ContentStatus status) { + // TODO Auto-generated method stub + return null; + } + + @Override + public StateAbstractDTO setStatusAsAdmin(final String userHash, final StateToken stateToken, + final ContentStatus status) { + // TODO Auto-generated method stub + return null; + } + + @Override + public TagCloudResult setTags(final String userHash, final StateToken token, final String tags) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String writeTo(final String userHash, final StateToken token, final boolean onlyToAdmins) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String writeTo(final String userHash, final StateToken token, final boolean onlyToAdmins, + final String title, final String message) throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String writeToParticipants(final String userHash, final StateToken token) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + +} Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -28,10 +28,8 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.inject.Inject; -import com.google.inject.Provider; public class DelContainerMenuItem extends MenuItemDescriptor { @@ -40,8 +38,7 @@ private final ContentServiceHelper contentService; @Inject - public DelContainerAction(final Provider<FolderViewerPresenter> presenter, - final ContentServiceHelper contentService) { + public DelContainerAction(final ContentServiceHelper contentService) { super(AccessRolDTO.Editor, true); this.contentService = contentService; } Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/webapp/ws.html 2012-03-21 12:25:32 UTC (rev 1774) @@ -300,13 +300,17 @@ <!-- Banner for wave errors --> <div class="banner" id="banner"></div> - <!-- Autocomplete user/pass --> - <form method="post" action="javascript:void(0)" style="display: none"> - <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"> + <!-- Remember user/pass (this is removed from here and rendered in gxt form) --> + <form id="loginrender" action="javascript:;" style="display: none;"> + <input type="text" id="usernamerender" name="usernamerender" + value="" /> <input type="password" id="passwordrender" + name="passwordrender" value="" /> </form> + <!-- Remember user/pass (this part is used to send the values to the browser) --> + <form id="login" action="javascript:;" style="display: none;"> + <input type="text" id="username" name="username" value="" /> <input + type="password" id="password" name="password" value="" /> + </form> <!-- RECOMMENDED if your web app will not function without JavaScript enabled --> <noscript> <div Modified: trunk/src/test/java/cc/kune/selenium/SeleniumConf.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -56,8 +56,8 @@ public static final Driver DRIVER = Driver.firefox; /* Configure this for use other lang, site, or driver */ - public static final Lang LANG = Lang.en; - public static final Site SITE = Site.kunecc; + public static final Lang LANG = Lang.es; + public static final Site SITE = Site.demo; public static final int TIMEOUT = 25; SeleniumConf() {