[kune-commits] r1636 - in trunk/src/main: java/cc/kune/chat/client/actions java/cc/kune/common/client/notify java/cc/kune/core/client/auth java/cc/kune/core/client/groups/newgroup java/cc/kune/core/client/sitebar/search java/cc/kune/core/client/sitebar/spaces java/cc/kune/core/client/sn/actions java/cc/kune/core/server/stats java/cc/kune/gspace/client/actions java/cc/kune/gspace/client/licensewizard java/cc/kune/gspace/client/themes java/cc/kune/lists/client/actions java/cc/kune/msgs/client java/cc/kune/msgs/public webapp
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Tue Dec 6 20:55:44 CET 2011
Author: vjrj_
Date: 2011-12-06 20:55:44 +0100 (Tue, 06 Dec 2011)
New Revision: 1636
Modified:
trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java
trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java
trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java
trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java
trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.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/JoinGroupAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java
trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java
trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java
trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java
trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java
trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java
trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java
trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java
trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java
trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java
trunk/src/main/java/cc/kune/msgs/public/kune-message.css
trunk/src/main/webapp/ws.html
Log:
CLOSED - # 151: Add scrolls to user and group stats in home page
http://kune.ourproject.org/issues/ticket/151
CLOSED - # 86: No results in search, don't show any message
http://kune.ourproject.org/issues/ticket/86
CLOSED - # 87: Set browser window title when on Inbox and Home
http://kune.ourproject.org/issues/ticket/87
Modified: trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -88,7 +88,7 @@
@Override
public void onClick(final ClickEvent event) {
if (diag.isValid()) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
final String groupShortName = session.getCurrentState().getGroup().getShortName();
final StateToken parentToken = session.getContainerState().getRootContainer().getStateToken();
contentService.get().addRoom(session.getUserHash(), parentToken,
Modified: trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -145,11 +145,12 @@
}
public static void showProgressLoading() {
+ // Better empty message
eventBus.fireEvent(new ProgressShowEvent());
}
- public static void showProgressProcessing() {
- eventBus.fireEvent(new ProgressShowEvent());
+ public static void showProgressSearching() {
+ eventBus.fireEvent(new ProgressShowEvent(i18n.t("Searching")));
}
public static void veryImportant(final String message) {
Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -102,7 +102,7 @@
public void doRegister() {
signInProvider.get().hide();
if (!session.isLogged()) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
getView().show();
// getView().center();
NotifyUser.hideProgress();
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-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -98,7 +98,7 @@
@Override
public void onSuccess(final Void result) {
if (session.isLogged()) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
getView().show();
getView().focusOnShorName();
NotifyUser.hideProgress();
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/search/MultivalueSuggestBox.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -42,6 +42,8 @@
import java.util.Map;
import cc.kune.common.client.log.Log;
+import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.core.client.i18n.I18nUITranslationService;
import cc.kune.core.shared.SearcherConstants;
import com.google.gwt.event.dom.client.KeyUpEvent;
@@ -309,7 +311,9 @@
if (totSize < 1) {
// if there were no suggestions, then it's an invalid value
updateFormFeedback(FormFeedback.ERROR, "Invalid: " + m_query);
-
+ final OptionSuggestion sugg = new OptionSuggestion(i18n.t("No results"), "#",
+ m_request.getQuery(), m_query);
+ suggs.add(sugg);
} else if (false && totSize == 1) {
// Patch to show always the suggestions
// it's an exact match, so do not bother with showing suggestions,
@@ -420,7 +424,6 @@
if (query.length() > 0 && mvalueMap.get(query) == null) {
// JSUtil.println("getting Suggestions for: " + query);
updateFormFeedback(FormFeedback.LOADING, null);
-
queryOptions(query, mindexFrom, mindexTo, new RestSuggestCallback(mrequest, mcallback, query));
}
}
@@ -447,7 +450,7 @@
mtimer.schedule(DELAY);
}
}
- private static final int DELAY = 1000;
+ private static final int DELAY = 500;
private static final String DISPLAY_SEPARATOR = ", ";
private static final int FIND_EXACT_MATCH_QUERY_LIMIT = 20;
@@ -475,8 +478,10 @@
return str;
}
+ private final I18nUITranslationService i18n;
private final FormFeedback mfeedback;
private final SuggestBox mfield;
+
private int mfindExactMatchesFound = 0;
private final ArrayList<String> mfindExactMatchesNot = new ArrayList<String>();
@@ -488,8 +493,8 @@
private int mindexTo = 0;
private boolean misMultivalued = false;
+ private final String mrestEndpointUrl;
- private final String mrestEndpointUrl;
private final Map<String, String> mvalueMap;
// private final OnExactMatch onExactMatch;
@@ -497,6 +502,8 @@
/**
* Constructor.
*
+ * @param i18n
+ *
* @param the
* URL for the REST endpoint. This URL should accept the parameters q
* (for query), indexFrom and indexTo
@@ -504,8 +511,9 @@
* - true for allowing multiple values
* @param onExactMatch
*/
- public MultivalueSuggestBox(final String restEndpointUrl, final boolean isMultivalued,
- final OnExactMatch onExactMatch) {
+ public MultivalueSuggestBox(final I18nUITranslationService i18n, final String restEndpointUrl,
+ final boolean isMultivalued, final OnExactMatch onExactMatch) {
+ this.i18n = i18n;
mrestEndpointUrl = restEndpointUrl;
misMultivalued = isMultivalued;
// this.onExactMatch = onExactMatch;
@@ -917,8 +925,15 @@
final TextBoxBase textBox = mfield.getTextBox();
if (FormFeedback.LOADING == status) {
+ NotifyUser.showProgressSearching();
// textBox.setEnabled(false);
} else {
+ new Timer() {
+ @Override
+ public void run() {
+ NotifyUser.hideProgress();
+ }
+ }.schedule(1500);
// textBox.setEnabled(true);
textBox.setFocus(false); // Blur then focus b/c of a strange problem with
// the cursor or selection highlights no longer
@@ -927,5 +942,4 @@
textBox.setFocus(true);
}
}
-
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -33,6 +33,7 @@
public static MultivalueSuggestBox create(final I18nUITranslationService i18n,
final boolean searchOnlyUsers, final String id, final OnEntitySelectedInSearch callback) {
final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox(
+ i18n,
searchOnlyUsers ? SearcherConstants.USER_DATA_PROXY_URL : SearcherConstants.GROUP_DATA_PROXY_URL,
false, new OnExactMatch() {
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -31,6 +31,7 @@
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.ToggleButton;
import com.google.gwt.user.client.ui.UIObject;
@@ -154,6 +155,11 @@
}
@Override
+ public void setWindowTitle(final String title) {
+ Window.setTitle(title);
+ }
+
+ @Override
public void showGroupSpaceTooltip() {
groupSpaceTooltip.showTemporally();
}
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -86,6 +86,8 @@
void setUserBtnDown(boolean down);
+ void setWindowTitle(String title);
+
void showGroupSpaceTooltip();
void showHomeSpaceTooltip();
@@ -192,6 +194,7 @@
backManager.clearBackImage();
setDown(Space.homeSpace);
currentSpace = Space.homeSpace;
+ getView().setWindowTitle(i18n.t("Home"));
}
private void onPublicSpaceSelect(final boolean shouldRestoreToken) {
@@ -261,6 +264,7 @@
backManager.clearBackImage();
setDown(Space.userSpace);
currentSpace = Space.userSpace;
+ getView().setWindowTitle(i18n.t("Inbox"));
} else {
signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"),
NotifyLevel.info);
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-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -36,36 +36,37 @@
import com.google.inject.Provider;
public class AcceptJoinGroupAction extends AbstractExtendedAction {
- private final I18nTranslationService i18n;
- private final Session session;
- private final Provider<SocialNetworkServiceAsync> snServiceProvider;
+ private final I18nTranslationService i18n;
+ private final Session session;
+ private final Provider<SocialNetworkServiceAsync> snServiceProvider;
- private final StateManager stateManager;
+ 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());
- }
+ @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.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() {
- @Override
- public void onSuccess(final SocialNetworkDataDTO result) {
- NotifyUser.hideProgress();
- NotifyUser.info(i18n.t("Member accepted"));
- stateManager.setSocialNetwork(result);
- }
- });
- }
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ NotifyUser.showProgress();
+ snServiceProvider.get().acceptJoinGroup(session.getUserHash(),
+ session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).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
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-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -55,7 +55,7 @@
@Override
public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
snServiceProvider.get().setCollabAsAdmin(session.getUserHash(),
session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(),
new AsyncCallbackSimple<SocialNetworkDataDTO>() {
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-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -36,35 +36,36 @@
import com.google.inject.Provider;
public class ChangeToCollabAction extends AbstractExtendedAction {
- private final I18nTranslationService i18n;
- private final Session session;
- private final Provider<SocialNetworkServiceAsync> snServiceProvider;
- private final StateManager stateManager;
+ 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());
- }
+ @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.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() {
- @Override
- public void onSuccess(final SocialNetworkDataDTO result) {
- NotifyUser.hideProgress();
- NotifyUser.info(i18n.t("Member type changed"));
- stateManager.setSocialNetwork(result);
- }
- });
- }
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ NotifyUser.showProgress();
+ snServiceProvider.get().setAdminAsCollab(session.getUserHash(),
+ session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).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
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-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -36,35 +36,36 @@
import com.google.inject.Provider;
public class DenyJoinGroupAction extends AbstractExtendedAction {
- private final I18nTranslationService i18n;
- private final Session session;
- private final Provider<SocialNetworkServiceAsync> snServiceProvider;
- private final StateManager stateManager;
+ 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());
- }
+ @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.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() {
- @Override
- public void onSuccess(final SocialNetworkDataDTO result) {
- NotifyUser.hideProgress();
- NotifyUser.info(i18n.t("Member rejected"));
- stateManager.setSocialNetwork(result);
- }
- });
- }
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ NotifyUser.showProgress();
+ snServiceProvider.get().denyJoinGroup(session.getUserHash(),
+ session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).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
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -70,7 +70,7 @@
@Override
public void onSuccess() {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
snServiceProvider.get().requestJoinGroup(session.getUserHash(),
session.getCurrentState().getStateToken(),
new AsyncCallbackSimple<SocialNetworkRequestResult>() {
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-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -36,35 +36,36 @@
import com.google.inject.Provider;
public class RemoveMemberAction extends AbstractExtendedAction {
- private final I18nTranslationService i18n;
- private final Session session;
- private final Provider<SocialNetworkServiceAsync> snServiceProvider;
- private final StateManager stateManager;
+ 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());
- }
+ @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.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() {
- @Override
- public void onSuccess(final SocialNetworkDataDTO result) {
- NotifyUser.hideProgress();
- NotifyUser.info(i18n.t("Member removed"));
- stateManager.refreshCurrentStateWithoutCache();
- }
- });
- }
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ NotifyUser.showProgress();
+ snServiceProvider.get().deleteMember(session.getUserHash(),
+ session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(),
+ new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
+ public void onSuccess(final SocialNetworkDataDTO result) {
+ NotifyUser.hideProgress();
+ NotifyUser.info(i18n.t("Member removed"));
+ stateManager.refreshCurrentStateWithoutCache();
+ }
+ });
+ }
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -56,7 +56,7 @@
new OnAcceptCallback() {
@Override
public void onSuccess() {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
snServiceProvider.get().unJoinGroup(session.getUserHash(),
session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Void>() {
@Override
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -71,7 +71,7 @@
new OnAcceptCallback() {
@Override
public void onSuccess() {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
snServiceProvider.get().unJoinGroup(session.getUserHash(),
((GroupDTO) event.getTarget()).getStateToken(), new AsyncCallbackSimple<Void>() {
@Override
Modified: trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -30,7 +30,7 @@
public class StatsServiceDefault implements StatsService {
- private static final int LIMIT = 6;
+ private static final int LIMIT = 20; // Before 6
private final ContentFinder contentFinder;
private final GroupFinder groupFinder;
private final UserFinder userFinder;
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -62,7 +62,7 @@
@Override
public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken());
final String newName = (String) getValue(NEW_NAME);
final StateToken parentToken = session.getCurrentStateToken();
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -68,7 +68,7 @@
@Override
public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken());
final String newName = (String) getValue(NEW_NAME);
final StateToken parentToken = session.getCurrentStateToken();
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -60,7 +60,7 @@
@Override
public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
// stateManager.gotoStateToken(((HasContent)
// session.getCurrentState()).getContainer().getStateToken());
final String newName = (String) getValue(NEW_NAME);
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/ParticipateInContentBtn.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -56,7 +56,7 @@
@Override
public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
contentService.get().addParticipant(session.getUserHash(), session.getCurrentStateToken(),
session.getCurrentUser().getShortName(), new AsyncCallbackSimple<Void>() {
@Override
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -56,7 +56,7 @@
@Override
public void actionPerformed(final ActionEvent event) {
final StateToken token = ((AbstractContentSimpleDTO) event.getTarget()).getStateToken();
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
contentService.get().setAsDefaultContent(session.getUserHash(), token,
new AsyncCallbackSimple<ContentSimpleDTO>() {
@Override
Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseChangeAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -53,7 +53,7 @@
public void changeLicense(final StateToken token, final LicenseDTO license,
final SimpleResponseCallback callback) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
groupService.get().changeDefLicense(session.getUserHash(), token, license,
new AsyncCallbackSimple<Void>() {
@Override
Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeManager.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -90,7 +90,7 @@
}
public void changeTheme(final StateToken token, final GSpaceTheme newTheme) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(), token, newTheme.getName(),
new AsyncCallbackSimple<Void>() {
@Override
@@ -104,7 +104,7 @@
}
protected void onChangeGroupWsTheme(final GSpaceTheme newTheme) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
groupServiceProvider.get().changeGroupWsTheme(session.getUserHash(),
session.getCurrentState().getStateToken(), newTheme.getName(), new AsyncCallbackSimple<Void>() {
@Override
Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -88,7 +88,7 @@
@Override
public void onClick(final ClickEvent event) {
if (diag.isValid()) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
diag.hide();
listsService.get().createList(session.getUserHash(), session.getCurrentStateToken(),
diag.getTextFieldValue(), ListsConstants.TYPE_LIST, true,
Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java
===================================================================
--- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -94,7 +94,7 @@
@Override
public void onClick(final ClickEvent event) {
if (diag.isValid()) {
- NotifyUser.showProgressProcessing();
+ NotifyUser.showProgress();
diag.hide();
listsService.get().newPost(session.getUserHash(),
session.getCurrentStateToken().copy().clearDocument(), diag.getTextFieldValue(),
Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java
===================================================================
--- trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/msgs/client/UserMessageWidget.java 2011-12-06 19:55:44 UTC (rev 1636)
@@ -147,7 +147,7 @@
@Override
public void appendMsg(final String message) {
resetTimer();
- label.setHTML(sanitize(label.getHTML() + "<p>" + message + "</p>"));
+ label.setHTML(sanitize(label.getHTML() + "<p class='k-msg-topsep'>" + message + "</p>"));
}
@Override
Modified: trunk/src/main/java/cc/kune/msgs/public/kune-message.css
===================================================================
--- trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-12-06 19:55:44 UTC (rev 1636)
@@ -29,6 +29,10 @@
top: 0px;
}
+.k-msg-topsep {
+ border-top: solid 1px wheat;
+}
+
.k-msg-icon {
padding: 10px 10px 5px;
}
Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html 2011-12-06 02:42:39 UTC (rev 1635)
+++ trunk/src/main/webapp/ws.html 2011-12-06 19:55:44 UTC (rev 1636)
@@ -235,6 +235,9 @@
color: #8a5050;
font-size: 16px;
line-height: 1.5em;
+ height: 120px;
+ overflow-y: auto;
+ overflow-x: hidden;
}
.k-home-em-text {
More information about the kune-commits
mailing list