September 2011 - kune-commits - lists.ourproject.org

[kune issues] #120: Close new inbox wave
by kune issues 02 Sep '11

02 Sep '11

#120: Close new inbox wave ------------------------+------------------- Reporter: anonymous | Owner: vjrj Type: defect | Status: new Priority: major | Milestone: Component: User space | Version: Keywords: | Blocked By: Blocking: | ------------------------+------------------- Now there are a button to view wave's inbox. It would be required a button to close this inbox. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/120> kune issues <http://kune.ourproject.org/issues/>

1 1

r1507 - in kune-sandbox: src/cc/kune/sandbox/client war
by Vicente J. Ruiz Jurado 02 Sep '11

02 Sep '11

Author: vjrj_ Date: 2011-09-02 03:01:24 +0200 (Fri, 02 Sep 2011) New Revision: 1507 Modified: kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java kune-sandbox/war/kune-message.css Log: NEW - # 81: Minor CSS issues in chrommium http://kune.ourproject.org/issues/ticket/81 Modified: kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java =================================================================== --- kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-09-02 01:00:47 UTC (rev 1506) +++ kune-sandbox/src/cc/kune/sandbox/client/KuneSandboxEntryPoint.java 2011-09-02 01:01:24 UTC (rev 1507) @@ -2,7 +2,6 @@ import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.common.client.ui.BasicThumb; import cc.kune.common.client.ui.MaskWidget; import cc.kune.common.client.ui.PopupBottomPanel; import cc.kune.common.client.ui.PopupTopPanel; @@ -10,9 +9,8 @@ import cc.kune.common.client.ui.dialogs.PromptTopDialog; import cc.kune.common.client.ui.dialogs.PromptTopDialog.Builder; import cc.kune.common.client.utils.TextUtils; -import cc.kune.core.client.avatar.AvatarDecorator; -import cc.kune.core.client.resources.CoreResources; import cc.kune.gspace.client.GSpaceArmorImpl; +import cc.kune.gspace.client.i18n.I18nTranslatorForm; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.tool.selector.ToolSelectorPanel; import cc.kune.msgs.client.CloseCallback; @@ -21,9 +19,12 @@ import cc.kune.msgs.client.UserMessagesPresenter; import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.BlurEvent; +import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.KeyPressEvent; +import com.google.gwt.event.dom.client.KeyPressHandler; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; @@ -40,203 +41,226 @@ */ public class KuneSandboxEntryPoint implements EntryPoint { - private PopupBottomPanel pop; + private PopupBottomPanel pop; - /** - * This is the entry point method. - */ - @Override - public void onModuleLoad() { - // testUserMessages(); - // testDialogs(); - // testToolpanel(); - // toolSelector.addWidget(new Label("Test")); - // testTooltips(); - //testBarButtons(); + /** + * This is the entry point method. + */ + @Override + public void onModuleLoad() { + testUserMessages(); + // testDialogs(); + // testToolpanel(); + // toolSelector.addWidget(new Label("Test")); + // testTooltips(); + // testBarButtons(); - //testPromptDialog(); + // testPromptDialog(); - //testAvatarDecorators(); - } + // testAvatarDecorators(); + //testI18nForm(); + } - private void testAvatarDecorators() { -// BasicThumb thumb = new BasicThumb("http://kune.beta.iepala.es/others/unknown.jpg", 50, "kk", 50, false, new ClickHandler() { -// @Override -// public void onClick(ClickEvent event) { -// } -// }); -// CoreResources res = GWT.create(CoreResources.class); -// AvatarDecorator avatarDecorator = new AvatarDecorator(res, thumb); -// avatarDecorator.setBusy(); -// RootPanel.get().add(avatarDecorator); - } + private void testI18nForm() { + I18nTranslatorForm form = new I18nTranslatorForm(); + form.setInfo("Translate this ñalsk fañ añlkds añslkdjfa ajalda ", "Take care of puntuation as ñlkasjd", "test"); + form.getBlurTraslation().addBlurHandler(new BlurHandler() { - private void testPromptDialog() { - Builder builder = new PromptTopDialog.Builder("kkj-kk", "Some ask text?", false, true); - builder.width("200px").height("200px").firstButtonTitle("Create").sndButtonTitle("Cancel"); - builder.regex(TextUtils.UNIX_NAME).regexText("The name must contain only characters, numbers and dashes"); - PromptTopDialog diag = builder.build(); - diag.showCentered(); - diag.focusOnTextBox(); - diag.getFirstBtn().addClickHandler(new ClickHandler() { + @Override + public void onBlur(BlurEvent event) { - @Override - public void onClick(ClickEvent event) { - Window.alert("ok"); - } - }); - } + } + }); + form.getKeysTraslation().addKeyPressHandler(new KeyPressHandler() { - private void testBarButtons() { - Button btn1 = new Button("Btn 1"); - Button btn2 = new Button("Btn 2"); - Button btn3 = new Button("Btn 3"); - btn1.addStyleName("k-button"); - btn1.addStyleName("k-button-left"); - btn2.addStyleName("k-button"); - btn2.addStyleName("k-button-center"); - btn3.addStyleName("k-button"); - btn3.addStyleName("k-button-right"); - btn1.addStyleName("kune-Margin-Large-t"); - btn2.addStyleName("kune-Margin-Large-t"); - btn3.addStyleName("kune-Margin-Large-t"); - btn1.addStyleName("k-fl"); - btn2.addStyleName("k-fl"); - btn3.addStyleName("k-fl"); - FlowPanel vp = new FlowPanel(); - vp.add(btn1); - vp.add(btn2); - vp.add(btn3); - RootPanel.get().add(vp); - } + @Override + public void onKeyPress(KeyPressEvent event) { - private void testTooltips() { - final AbsolutePanel panel = new AbsolutePanel(); - final Button button = new Button("Btn 1"); - final Button button2 = new Button("Btn 2"); - final Button button3 = new Button("Btn 3"); - final Button button4 = new Button("Btn 4"); - int clientWidth = Window.getClientWidth(); - int clientHeight = Window.getClientHeight(); - panel.setSize(String.valueOf(clientWidth - 10) + "px", String.valueOf(clientHeight - 10) + "px"); - panel.add(button, 5, 5); - panel.add(button2, clientWidth - 60, 5); - panel.add(button3, 5, clientHeight - 40); - panel.add(button4, clientWidth - 60, clientHeight - 40); - Tooltip.to(button, "Some tooltip"); - Tooltip.to(button2, "Some tooltip"); - Tooltip.to(button3, "Some tooltip"); - Tooltip.to(button4, "Some tooltip"); - // DOM.setElementProperty(button2.getElement(), "position", "relative"); - RootPanel.get().add(panel); - } + } + }); + RootPanel.get().add(form); + } - private void testToolpanel() { - ToolSelectorPanel toolSelector = new ToolSelectorPanel(new GSpaceArmorImpl(null), null); - ToolSelectorItemPanel toolItem1 = new ToolSelectorItemPanel(); - toolItem1.getLabel().setText("documents"); - ToolSelectorItemPanel toolItem2 = new ToolSelectorItemPanel(); - toolItem2.getLabel().setText("something very longgggggg"); - ToolSelectorItemPanel toolItem3 = new ToolSelectorItemPanel(); - toolItem3.getLabel().setText("media"); - toolSelector.addItem(toolItem1); - toolSelector.addItem(toolItem2); - toolSelector.addItem(toolItem3); - toolItem1.setSelected(true); - toolItem2.setSelected(false); - toolItem3.setSelected(false); - toolSelector.asWidget().setWidth("200px"); - RootPanel.get().add(toolSelector.asWidget()); - } + private void testAvatarDecorators() { + // BasicThumb thumb = new + // BasicThumb("http://kune.beta.iepala.es/others/unknown.jpg", 50, "kk", + // 50, false, new ClickHandler() { + // @Override + // public void onClick(ClickEvent event) { + // } + // }); + // CoreResources res = GWT.create(CoreResources.class); + // AvatarDecorator avatarDecorator = new AvatarDecorator(res, thumb); + // avatarDecorator.setBusy(); + // RootPanel.get().add(avatarDecorator); + } - private void postAdd(final PopupBottomPanel pop) { - pop.setCenterPosition(); - } + private void testPromptDialog() { + Builder builder = new PromptTopDialog.Builder("kkj-kk", "Some ask text?", false, true); + builder.width("200px").height("200px").firstButtonTitle("Create").sndButtonTitle("Cancel"); + builder.regex(TextUtils.UNIX_NAME).regexText("The name must contain only characters, numbers and dashes"); + PromptTopDialog diag = builder.build(); + diag.showCentered(); + diag.focusOnTextBox(); + diag.getFirstBtn().addClickHandler(new ClickHandler() { - private void postAdd(final PopupTopPanel pop) { - pop.setCenterPosition(); - } + @Override + public void onClick(ClickEvent event) { + Window.alert("ok"); + } + }); + } - private void testDialogs() { - final PopupTopPanel pop2 = new PopupTopPanel(false, true); - pop2.setGlassEnabled(true); - final BasicDialog dialog = new BasicDialog(); - pop2.add(dialog); + private void testBarButtons() { + Button btn1 = new Button("Btn 1"); + Button btn2 = new Button("Btn 2"); + Button btn3 = new Button("Btn 3"); + btn1.addStyleName("k-button"); + btn1.addStyleName("k-button-left"); + btn2.addStyleName("k-button"); + btn2.addStyleName("k-button-center"); + btn3.addStyleName("k-button"); + btn3.addStyleName("k-button-right"); + btn1.addStyleName("kune-Margin-Large-t"); + btn2.addStyleName("kune-Margin-Large-t"); + btn3.addStyleName("kune-Margin-Large-t"); + btn1.addStyleName("k-fl"); + btn2.addStyleName("k-fl"); + btn3.addStyleName("k-fl"); + FlowPanel vp = new FlowPanel(); + vp.add(btn1); + vp.add(btn2); + vp.add(btn3); + RootPanel.get().add(vp); + } - dialog.getTitleText().setText("Title"); - dialog.setFirstBtnText("Accept"); - dialog.setSecondBtnText("Cancel"); - dialog.setFirstBtnTabIndex(2); - dialog.setSecondBtnTabIndex(3); - final VerticalPanel sPanel = new VerticalPanel(); - sPanel.add(new Label("lo que sea")); - final Button btn = new Button("lo que sea"); - btn.setTabIndex(1); - btn.setFocus(true); - sPanel.add(btn); - sPanel.setSize("300px", "150px"); - dialog.getInnerPanel().add((IsWidget) sPanel); - final Label label = new Label("Test label"); - // final NotifyLevelImages levelImg = - // GWT.create(NotifyLevelImages.class); - // dialog.getBottomPanel().add(new MessagePanel(levelImg, "kk")); - final MaskWidget mask = new MaskWidget(); + private void testTooltips() { + final AbsolutePanel panel = new AbsolutePanel(); + final Button button = new Button("Btn 1"); + final Button button2 = new Button("Btn 2"); + final Button button3 = new Button("Btn 3"); + final Button button4 = new Button("Btn 4"); + int clientWidth = Window.getClientWidth(); + int clientHeight = Window.getClientHeight(); + panel.setSize(String.valueOf(clientWidth - 10) + "px", String.valueOf(clientHeight - 10) + "px"); + panel.add(button, 5, 5); + panel.add(button2, clientWidth - 60, 5); + panel.add(button3, 5, clientHeight - 40); + panel.add(button4, clientWidth - 60, clientHeight - 40); + Tooltip.to(button, "Some tooltip"); + Tooltip.to(button2, "Some tooltip"); + Tooltip.to(button3, "Some tooltip"); + Tooltip.to(button4, "Some tooltip"); + // DOM.setElementProperty(button2.getElement(), "position", "relative"); + RootPanel.get().add(panel); + } - RootPanel.get().add(label); - pop2.showNear(label); - // final String zIndex = DOM.getStyleAttribute(pop2.getElement(), - // "zIndex"); - DOM.setStyleAttribute(pop.getElement(), "zIndex", "10000"); - mask.mask(pop2, "JAarrrrr!"); - } + private void testToolpanel() { + ToolSelectorPanel toolSelector = new ToolSelectorPanel(new GSpaceArmorImpl(null), null); + ToolSelectorItemPanel toolItem1 = new ToolSelectorItemPanel(); + toolItem1.getLabel().setText("documents"); + ToolSelectorItemPanel toolItem2 = new ToolSelectorItemPanel(); + toolItem2.getLabel().setText("something very longgggggg"); + ToolSelectorItemPanel toolItem3 = new ToolSelectorItemPanel(); + toolItem3.getLabel().setText("media"); + toolSelector.addItem(toolItem1); + toolSelector.addItem(toolItem2); + toolSelector.addItem(toolItem3); + toolItem1.setSelected(true); + toolItem2.setSelected(false); + toolItem3.setSelected(false); + toolSelector.asWidget().setWidth("200px"); + RootPanel.get().add(toolSelector.asWidget()); + } - private void testUserMessages() { - final UserMessagesPanel panel = new UserMessagesPanel(); - UserMessage.setFadeMills(3000); - UserMessage.setCloseTitle("Close message"); - panel.setWidth("422px"); - final UserMessagesPresenter presenter = new UserMessagesPresenter(); - presenter.init(panel); + private void postAdd(final PopupBottomPanel pop) { + pop.setCenterPosition(); + } - pop = new PopupBottomPanel(); - final CloseCallback closeCalback = new CloseCallback() { - @Override - public void onClose() { + private void postAdd(final PopupTopPanel pop) { pop.setCenterPosition(); - } - }; - presenter.add(NotifyLevel.info, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", - "", false, closeCalback); - postAdd(pop); - presenter.add(NotifyLevel.error, "Title", - "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", "", false, closeCalback); - pop.add(panel); + } - postAdd(pop); + private void testDialogs() { + final PopupTopPanel pop2 = new PopupTopPanel(false, true); + pop2.setGlassEnabled(true); + final BasicDialog dialog = new BasicDialog(); + pop2.add(dialog); - final Timer time = new Timer() { - @Override - public void run() { - presenter.add( - NotifyLevel.error, - "", - "Lorem <a href='/'>ipsum</a> dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit", - "", true, closeCalback); + dialog.getTitleText().setText("Title"); + dialog.setFirstBtnText("Accept"); + dialog.setSecondBtnText("Cancel"); + dialog.setFirstBtnTabIndex(2); + dialog.setSecondBtnTabIndex(3); + final VerticalPanel sPanel = new VerticalPanel(); + sPanel.add(new Label("lo que sea")); + final Button btn = new Button("lo que sea"); + btn.setTabIndex(1); + btn.setFocus(true); + sPanel.add(btn); + sPanel.setSize("300px", "150px"); + dialog.getInnerPanel().add((IsWidget) sPanel); + final Label label = new Label("Test label"); + // final NotifyLevelImages levelImg = + // GWT.create(NotifyLevelImages.class); + // dialog.getBottomPanel().add(new MessagePanel(levelImg, "kk")); + final MaskWidget mask = new MaskWidget(); + + RootPanel.get().add(label); + pop2.showNear(label); + // final String zIndex = DOM.getStyleAttribute(pop2.getElement(), + // "zIndex"); + DOM.setStyleAttribute(pop.getElement(), "zIndex", "10000"); + mask.mask(pop2, "JAarrrrr!"); + } + + private void testUserMessages() { + final UserMessagesPanel panel = new UserMessagesPanel(); + UserMessage.setFadeMills(3000); + UserMessage.setCloseTitle("Close message"); + panel.setWidth("422px"); + final UserMessagesPresenter presenter = new UserMessagesPresenter(); + presenter.init(panel); + + pop = new PopupBottomPanel(); + final CloseCallback closeCalback = new CloseCallback() { + @Override + public void onClose() { + pop.setCenterPosition(); + } + }; + presenter.add(NotifyLevel.info, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", "", false, + closeCalback); postAdd(pop); - } - }; - final Timer time2 = new Timer() { - @Override - public void run() { - presenter.add(NotifyLevel.important, "", "Lorem ", "", false, closeCalback); + presenter.add(NotifyLevel.error, "Title", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", "", + false, closeCalback); + pop.add(panel); + postAdd(pop); - presenter.add(NotifyLevel.important, "Title", "Lorem ", "", true, closeCalback); - postAdd(pop); - } - }; - time.schedule(1000); - time2.schedule(2000); - pop.show(); - } + final Timer time = new Timer() { + @Override + public void run() { + presenter.add( + NotifyLevel.error, + "", + "Lorem <a href='/'>ipsum</a> dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit", + "", true, closeCalback); + postAdd(pop); + } + }; + final Timer time2 = new Timer() { + @Override + public void run() { + presenter.add(NotifyLevel.important, "", "Lorem ", "", false, closeCalback); + postAdd(pop); + presenter.add(NotifyLevel.important, "Title", "Lorem ", "", true, closeCalback); + postAdd(pop); + } + }; + time.schedule(1000); + time2.schedule(5000); + pop.show(); + + } } Modified: kune-sandbox/war/kune-message.css =================================================================== --- kune-sandbox/war/kune-message.css 2011-09-02 01:00:47 UTC (rev 1506) +++ kune-sandbox/war/kune-message.css 2011-09-02 01:01:24 UTC (rev 1507) @@ -1,33 +1,38 @@ .k-msg-panel { - background-color: #892c00; - border-collapse: separate; - border-spacing: 15px 8px; + background-color: #892c00; + border-collapse: separate !important; } -.k-msg-panel-title { - color: #ffe9da; - font-weight: bold; - margin-bottom: 10px; +.k-msg-panel table { } +.k-msg-panel-bottom { + margin-bottom: 8px; +} + .k-msg { - border: solid 1px #F2F2F2; - background: #fff0e6; - color: #280b0b; - border-collapse: separate; - border-spacing: 0px; + border: solid 1px #F2F2F2; + background: #fff0e6; + color: #280b0b; + margin: 8px 8px 0; + width: 0; } +.k-msg-title { + font-weight: bold; + margin-bottom: 8px; +} + .k-msg-close { - position: relative; - right: -14px; - top: 0px; + position: relative; + right: -14px; + top: 0px; } .k-msg-icon { - padding: 10px 10px 5px; + padding: 10px 10px 5px; } .k-msg-label { - font-size: 17px; + font-size: 16px; } \ No newline at end of file

1 0

r1506 - in trunk/src/main/java/cc/kune: core/client/state wave/client
by Vicente J. Ruiz Jurado 02 Sep '11

02 Sep '11

Author: vjrj_ Date: 2011-09-02 03:00:47 +0200 (Fri, 02 Sep 2011) New Revision: 1506 Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java trunk/src/main/java/cc/kune/wave/client/WebClient.java Log: CLOSED - # 82: Wave Urls like http://kune.beta.iepala.es/ws/#kune.beta.iepala.es/w+1cqwnei66udjsA at startup don't open the Inbox http://kune.ourproject.org/issues/ticket/82 Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-09-02 00:51:34 UTC (rev 1505) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-09-02 01:00:47 UTC (rev 1506) @@ -47,8 +47,6 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener2; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.EventBus; @@ -284,13 +282,8 @@ if (session.isLogged()) { SpaceConfEvent.fire(eventBus, Space.userSpace, newHistoryToken); SpaceSelectEvent.fire(eventBus, Space.userSpace); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - ClientEvents.get().fireEvent( - new WaveSelectionEvent(HistorySupport.waveRefFromHistoryToken(newHistoryToken))); - } - }); + ClientEvents.get().fireEvent( + new WaveSelectionEvent(HistorySupport.waveRefFromHistoryToken(newHistoryToken))); } else { history.newItem(TokenUtils.addRedirect(SiteTokens.SIGNIN, newHistoryToken)); if (startingUp()) { Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-09-02 00:51:34 UTC (rev 1505) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-09-02 01:00:47 UTC (rev 1506) @@ -23,6 +23,7 @@ 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.state.TokenMatcher; import cc.kune.core.client.state.UserSignInEvent; import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.client.state.UserSignOutEvent; @@ -43,7 +44,8 @@ @Inject public WaveClientManager(final Session session, final StateManager stateManager, final EventBus eventBus, final UserServiceAsync userService, final GSpaceArmor wsArmor, - final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount) { + final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount, + final TokenMatcher tokenMatcher) { session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { @@ -61,7 +63,7 @@ if (userSpace.getWidgetCount() > 0) { userSpace.remove(0); } - webClient = new WebClient(eventBus, profiles, inboxCount); + webClient = new WebClient(eventBus, profiles, inboxCount, tokenMatcher); userSpace.add(webClient); } else { webClient.login(); Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-09-02 00:51:34 UTC (rev 1505) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-09-02 01:00:47 UTC (rev 1506) @@ -67,6 +67,7 @@ import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; import cc.kune.core.client.state.SiteTokens; +import cc.kune.core.client.state.TokenMatcher; import cc.kune.wave.client.inboxcount.InboxCountPresenter; import com.google.gwt.core.client.GWT; @@ -243,7 +244,7 @@ * This is the entry point method. */ @Inject - public WebClient(final EventBus eventBus, KuneWaveProfileManager profiles, InboxCountPresenter inboxCount) { + public WebClient(final EventBus eventBus, KuneWaveProfileManager profiles, InboxCountPresenter inboxCount, TokenMatcher tokenMatcher) { this.eventBus = eventBus; this.profiles = profiles; @@ -276,7 +277,8 @@ setupUi(); - // History.fireCurrentHistoryState(); + if (tokenMatcher.isWaveToken(History.getToken())) + History.fireCurrentHistoryState(); LOG.info("SimpleWebClient.onModuleLoad() done"); }

1 0

Re: [kune-commits] [kune issues] #82: Wave Urls like http://kune.beta.iepala.es/ws/#kune.beta.iepala.es/w+1cqwnei66udjsA at startup don't open the Inbox
by kune issues 02 Sep '11

02 Sep '11

#82: Wave Urls like http://kune.beta.iepala.es/ws/#kune.beta.iepala.es/w+1cqwnei66udjsA at startup don't open the Inbox -------------------------+-------------------- Reporter: vjrj | Owner: vjrj Type: defect | Status: closed Priority: major | Milestone: Component: User space | Version: Resolution: fixed | Keywords: Blocked By: | Blocking: -------------------------+-------------------- Changes (by vjrj): * status: new => closed * resolution: => fixed -- Ticket URL: <http://kune.ourproject.org/issues/ticket/82#comment:1> kune issues <http://kune.ourproject.org/issues/>

1 0

r1505 - in trunk/src/main/java/cc/kune: core/client/sitebar/spaces core/client/state wave/client wave/client/inboxcount
by Vicente J. Ruiz Jurado 02 Sep '11

02 Sep '11

Author: vjrj_ Date: 2011-09-02 02:51:34 +0200 (Fri, 02 Sep 2011) New Revision: 1505 Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectEvent.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java Log: CLOSED - # 112: Notify in user space icons new waves, or unread waves http://kune.ourproject.org/issues/ticket/112 Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectEvent.java 2011-09-01 20:02:37 UTC (rev 1504) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectEvent.java 2011-09-02 00:51:34 UTC (rev 1505) @@ -26,74 +26,99 @@ public class SpaceSelectEvent extends GwtEvent<SpaceSelectEvent.SpaceSelectHandler> { - public interface HasSpaceSelectHandlers extends HasHandlers { - HandlerRegistration addSpaceSelectHandler(SpaceSelectHandler handler); - } + public interface HasSpaceSelectHandlers extends HasHandlers { + HandlerRegistration addSpaceSelectHandler(SpaceSelectHandler handler); + } - public interface SpaceSelectHandler extends EventHandler { - public void onSpaceSelect(SpaceSelectEvent event); - } + public interface SpaceSelectHandler extends EventHandler { + public void onSpaceSelect(SpaceSelectEvent event); + } - private static final Type<SpaceSelectHandler> TYPE = new Type<SpaceSelectHandler>(); + private static final Type<SpaceSelectHandler> TYPE = new Type<SpaceSelectHandler>(); - public static void fire(HasHandlers source, cc.kune.core.client.sitebar.spaces.Space space) { - source.fireEvent(new SpaceSelectEvent(space)); - } + public static void fire(final HasHandlers source, final cc.kune.core.client.sitebar.spaces.Space space) { + source.fireEvent(new SpaceSelectEvent(space)); + } - public static Type<SpaceSelectHandler> getType() { - return TYPE; - } + public static void fire(final HasHandlers source, + final cc.kune.core.client.sitebar.spaces.Space space, final boolean restoreToken) { + source.fireEvent(new SpaceSelectEvent(space, restoreToken)); + } - private cc.kune.core.client.sitebar.spaces.Space space; + public static Type<SpaceSelectHandler> getType() { + return TYPE; + } + private boolean restoreToken; - public SpaceSelectEvent(cc.kune.core.client.sitebar.spaces.Space space) { - this.space = space; - } + private cc.kune.core.client.sitebar.spaces.Space space; - protected SpaceSelectEvent() { - // Possibly for serialization. - } + protected SpaceSelectEvent() { + // Possibly for serialization. + } - @Override - public Type<SpaceSelectHandler> getAssociatedType() { - return TYPE; - } + public SpaceSelectEvent(final cc.kune.core.client.sitebar.spaces.Space space) { + this(space, false); + } - public cc.kune.core.client.sitebar.spaces.Space getSpace() { - return space; - } + public SpaceSelectEvent(final cc.kune.core.client.sitebar.spaces.Space space, + final boolean restoreToken) { + this.space = space; + this.setRestoreToken(restoreToken); + } - @Override - protected void dispatch(SpaceSelectHandler handler) { - handler.onSpaceSelect(this); - } + @Override + protected void dispatch(final SpaceSelectHandler handler) { + handler.onSpaceSelect(this); + } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - SpaceSelectEvent other = (SpaceSelectEvent) obj; - if (space == null) { - if (other.space != null) - return false; - } else if (!space.equals(other.space)) - return false; - return true; + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; } - - @Override - public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + (space == null ? 1 : space.hashCode()); - return hashCode; + if (obj == null) { + return false; } + if (getClass() != obj.getClass()) { + return false; + } + final SpaceSelectEvent other = (SpaceSelectEvent) obj; + if (space == null) { + if (other.space != null) { + return false; + } + } else if (!space.equals(other.space)) { + return false; + } + return true; + } - @Override - public String toString() { - return "SpaceSelectEvent[" + space + "]"; - } + @Override + public Type<SpaceSelectHandler> getAssociatedType() { + return TYPE; + } + + public cc.kune.core.client.sitebar.spaces.Space getSpace() { + return space; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (space == null ? 1 : space.hashCode()); + return hashCode; + } + + public void setRestoreToken(final boolean restoreToken) { + this.restoreToken = restoreToken; + } + + public boolean shouldRestoreToken() { + return restoreToken; + } + + @Override + public String toString() { + return "SpaceSelectEvent[" + space + "]"; + } } 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-09-01 20:02:37 UTC (rev 1504) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-09-02 00:51:34 UTC (rev 1505) @@ -113,30 +113,31 @@ view.getHomeBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(homeToken); + restoreToken(homeToken); setDown(Space.homeSpace); } }); view.getUserBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(userToken); + restoreToken(userToken); setDown(Space.userSpace); } }); view.getGroupBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(groupToken); + restoreToken(groupToken); setDown(Space.groupSpace); } }); view.getPublicBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - stateManager.gotoHistoryToken(publicToken); + restoreToken(publicToken); setDown(Space.publicSpace); } + }); eventBus.addHandler(WindowFocusEvent.getType(), new WindowFocusEvent.WindowFocusHandler() { @Override @@ -153,21 +154,24 @@ // showTooltipWithDelay(); } - private void onGroupSpaceSelect() { + private void onGroupSpaceSelect(final boolean shouldRestoreToken) { + restoreToken(shouldRestoreToken, groupToken); armor.selectGroupSpace(); backManager.restoreBackImage(); setDown(Space.groupSpace); currentSpace = Space.groupSpace; } - private void onHomeSpaceSelect() { + private void onHomeSpaceSelect(final boolean shouldRestoreToken) { + restoreToken(shouldRestoreToken, homeToken); armor.selectHomeSpace(); backManager.clearBackImage(); setDown(Space.homeSpace); currentSpace = Space.homeSpace; } - private void onPublicSpaceSelect() { + private void onPublicSpaceSelect(final boolean shouldRestoreToken) { + restoreToken(shouldRestoreToken, userToken); armor.selectPublicSpace(); backManager.restoreBackImage(); setDown(Space.publicSpace); @@ -198,18 +202,19 @@ public void onSpaceSelect(final SpaceSelectEvent event) { final Space space = event.getSpace(); if (space != currentSpace) { + final boolean restoreToken = event.shouldRestoreToken(); switch (space) { case homeSpace: - onHomeSpaceSelect(); + onHomeSpaceSelect(restoreToken); break; case userSpace: - onUserSpaceSelect(); + onUserSpaceSelect(restoreToken); break; case groupSpace: - onGroupSpaceSelect(); + onGroupSpaceSelect(restoreToken); break; case publicSpace: - onPublicSpaceSelect(); + onPublicSpaceSelect(restoreToken); break; default: break; @@ -220,13 +225,14 @@ @ProxyEvent public void onUserSignOut(final UserSignOutEvent event) { if (currentSpace == Space.userSpace) { - stateManager.gotoHistoryToken(homeToken); + restoreToken(homeToken); } userToken = SiteTokens.WAVEINBOX; } - private void onUserSpaceSelect() { + private void onUserSpaceSelect(final boolean shouldRestoreToken) { if (session.isLogged()) { + restoreToken(shouldRestoreToken, userToken); armor.selectUserSpace(); backManager.clearBackImage(); setDown(Space.userSpace); @@ -239,6 +245,16 @@ } } + private void restoreToken(final boolean shouldRestoreToken, final String token) { + if (shouldRestoreToken) { + restoreToken(token); + } + } + + private void restoreToken(final String token) { + stateManager.gotoHistoryToken(token); + } + @Override protected void revealInParent() { RevealRootContentEvent.fire(this, this); Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-09-01 20:02:37 UTC (rev 1504) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-09-02 00:51:34 UTC (rev 1505) @@ -20,6 +20,9 @@ */ package cc.kune.core.client.state; +import org.waveprotocol.box.webclient.client.ClientEvents; +import org.waveprotocol.box.webclient.client.HistorySupport; +import org.waveprotocol.box.webclient.client.events.WaveSelectionEvent; import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; import cc.kune.common.client.actions.BeforeActionCollection; @@ -44,6 +47,8 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener2; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.EventBus; @@ -277,11 +282,19 @@ } } else if (tokenMatcher.isWaveToken(newHistoryToken)) { if (session.isLogged()) { + SpaceConfEvent.fire(eventBus, Space.userSpace, newHistoryToken); SpaceSelectEvent.fire(eventBus, Space.userSpace); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + ClientEvents.get().fireEvent( + new WaveSelectionEvent(HistorySupport.waveRefFromHistoryToken(newHistoryToken))); + } + }); } else { history.newItem(TokenUtils.addRedirect(SiteTokens.SIGNIN, newHistoryToken)); if (startingUp()) { - // Starting application (with Wave url) + // Starting application (with Wave url???) onHistoryChanged(new StateToken(SiteTokens.GROUP_HOME)); } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-09-01 20:02:37 UTC (rev 1504) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-09-02 00:51:34 UTC (rev 1505) @@ -267,7 +267,8 @@ setupConnectionIndicator(); - HistorySupport.init(); + // Done in StateManager + // HistorySupport.init(); //createWebSocket(); Modified: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java 2011-09-01 20:02:37 UTC (rev 1504) +++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java 2011-09-02 00:51:34 UTC (rev 1505) @@ -32,9 +32,10 @@ addDomHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - SpaceSelectEvent.fire(eventBus, Space.userSpace); + SpaceSelectEvent.fire(eventBus, Space.userSpace, true); } }, ClickEvent.getType()); + } @Override Modified: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java 2011-09-01 20:02:37 UTC (rev 1504) +++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java 2011-09-02 00:51:34 UTC (rev 1505) @@ -7,10 +7,13 @@ import org.waveprotocol.box.webclient.search.Search; import org.waveprotocol.box.webclient.search.Search.Listener; +import cc.kune.chat.client.snd.SndClickEvent; +import cc.kune.core.client.events.NewUserRegisteredEvent; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.UserSignInOrSignOutEvent; import cc.kune.core.client.state.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.Timer; import com.google.inject.Inject; @@ -28,6 +31,7 @@ private int currentTotal; private final Map<Integer, Integer> diggests; + private final EventBus eventBus; // protected SimpleSearch search; private final Listener searchListener; private final Session session; @@ -36,9 +40,10 @@ private final InboxCountView view; @Inject - public InboxCountPresenter(final InboxCountView view, final Session session) { + public InboxCountPresenter(final InboxCountView view, final Session session, final EventBus eventBus) { this.view = view; this.session = session; + this.eventBus = eventBus; // this.session = session; diggests = new HashMap<Integer, Integer>(); currentTotal = Search.UNKNOWN_SIZE; @@ -103,18 +108,32 @@ view.showCount(event.isLogged()); } }); + + eventBus.addHandler(NewUserRegisteredEvent.getType(), + new NewUserRegisteredEvent.NewUserRegisteredHandler() { + @Override + public void onNewUserRegistered(final NewUserRegisteredEvent event) { + sendNoticeToUser(); + } + }); + } public Listener getSearchListener() { return searchListener; } + private void sendNoticeToUser() { + view.blink(); + SndClickEvent.fire(eventBus); + } + private void setTotal(final int total) { view.setTotal(total); final boolean show = session.isLogged() && total != Search.UNKNOWN_SIZE && total > 0; view.showCount(show); if (show && total > currentTotal) { - view.blink(); + sendNoticeToUser(); } currentTotal = total; }

1 0

[kune issues] #103: Persist sessions between server restarts
by kune issues 01 Sep '11

01 Sep '11

#103: Persist sessions between server restarts --------------------------+------------------------------------------------- Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Server side | Version: Resolution: | Keywords: Blocking: | Blockedby: --------------------------+------------------------------------------------- http://docs.codehaus.org/display/JETTY/Persisting+Sessions -- Ticket URL: <http://kune.ourproject.org/issues/ticket/103> kune issues <http://kune.ourproject.org/issues/>

1 3

r1504 - trunk/src/main/java/cc/kune/core/public
by Vicente J. Ruiz Jurado 01 Sep '11

01 Sep '11

Author: vjrj_ Date: 2011-09-01 22:02:37 +0200 (Thu, 01 Sep 2011) New Revision: 1504 Added: trunk/src/main/java/cc/kune/core/public/mante.html Log: Maintenance page Added: trunk/src/main/java/cc/kune/core/public/mante.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/mante.html (rev 0) +++ trunk/src/main/java/cc/kune/core/public/mante.html 2011-09-01 20:02:37 UTC (rev 1504) @@ -0,0 +1,167 @@ +<!doctype html> +<html> + <head> + <meta http-equiv="content-type" content="text/html; charset=UTF-8"> + <title>System Down for Maintenance</title> + <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"> +  + <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="kune-common.css"> + <link type="text/css" rel="stylesheet" + href="fontface/ubuntufontface.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; + overflow: hidden; + } + + #k-mante-prewrap { + } + + #k-mante-wrapper { + margin-left: auto; + margin-right: auto; + position: relative; + width: 665px; + min-width: 320px; + } + + #k-mante-ini { + clear: both; + font-size: 28px; + color: #69312f; + text-align: center; + padding: 27px 0; + line-height: 1.3em; + } + + #k-mante-ini a { + color: #803000; + font-weight: bold; + } + + #k-mante-ini strong { + font-weight: bold; + } + + #k-mante-stats { + font-size: 22px; + color: #c87137; + font-weight: bold; + } + + #k-mante-table { + display: table; + border: solid 3px #c87137; + -moz-border-radius: 25px; + -webkit-border-radius: 25px; + border-radius: 25px; + padding: 0px 30px 30px; + margin: 20px; + } + + #k-mante-header { + display: table-row; + } + + #k-mante-logo { + display: table-cell; + margin: 50px 0 22px 0; + float: right; + } + + #k-mante-summary { + display: table-cell; + font-size: 32px; + color: #dd8a3d; + font-weight: bold; + white-space: nowrap; + float: left; + } + + #k-mante-summary li { + padding-left: 41px; + background-repeat: no-repeat; + background-position: 0 .2em; + line-height: 45px; + } + + #k-mante-row { + display: table-row; + } + + #k-mante-left { + display: table-cell; + } + + #k-mante-right { + display: table-cell; + } + + #k-mante-bottom a { + color: black; + font-weight: normal !important; + } + + #k-mante-bottom { + text-align: center; + font-size: 14px; + } + + .banner { + margin: 30px; + } + </style> + </head> + <body> + <div id="k-mante-prewrap"> + <div id="k-mante-wrapper"> + <div id="k-mante-table"> + <div id="k-mante-header"> + <div id="k-mante-logo"> + <img src="logo-big-home.png" alt="" /> + </div> + </div> +  + <div id="k-mante-row"> + <div id="k-mante-left"> + <div id="k-mante-ini"> + <strong> + System Down for Maintenance<br/> + Sorry for the inconveniences<br/> + ~<br/> + Estamos realizando mantenimiento de nuestros equipos. Perdonad las molestias.</strong> + + <span id="k-mante-bottom"> Note: if you need more technical info, + <a href="http://bit.ly/pAxNVB"> + join irc channel #kune on freenode</a></span> + </div> + +  + </div> +  + </div> +  + </div> +  + + </body> +</html>

1 0

r1503 - in trunk: img/icons src/main/java/cc/kune/common/client/ui src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/sitebar/spaces src/main/java/cc/kune/core/public src/main/java/cc/kune/gspace/client/viewers src/main/java/cc/kune/wave/client src/main/java/cc/kune/wave/client/inboxcount
by Vicente J. Ruiz Jurado 01 Sep '11

01 Sep '11

Author: vjrj_ Date: 2011-09-01 21:16:52 +0200 (Thu, 01 Sep 2011) New Revision: 1503 Added: trunk/src/main/java/cc/kune/common/client/ui/BlinkAnimation.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.ui.xml trunk/src/main/java/cc/kune/wave/client/inboxcount/ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java Removed: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.ui.xml Modified: trunk/img/icons/from-private-to-public.svg trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java trunk/src/main/java/cc/kune/wave/client/WaveParts.java trunk/src/main/java/cc/kune/wave/client/WebClient.java Log: CLOSED - # 112: Notify in user space icons new waves, or unread waves http://kune.ourproject.org/issues/ticket/112 Modified: trunk/img/icons/from-private-to-public.svg =================================================================== --- trunk/img/icons/from-private-to-public.svg 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/img/icons/from-private-to-public.svg 2011-09-01 19:16:52 UTC (rev 1503) @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="297.16839" - inkscape:cy="1014" + inkscape:zoom="1.2968783" + inkscape:cx="372.04724" + inkscape:cy="526.18109" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -57,7 +57,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -701,5 +701,25 @@ style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591;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" sodipodi:type="arc" /> </g> + <rect + style="color:#000000;fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0625;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect8831" + width="23.247551" + height="12.313751" + x="24.384661" + y="46.940243" + rx="3.7326424" + ry="3.7326424" /> + <text + xml:space="preserve" + style="font-size:10px;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;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0625;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="24.299999" + y="56.452183" + id="text8833" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan8835" + x="24.299999" + y="56.452183">1234</tspan></text> </g> </svg> Added: trunk/src/main/java/cc/kune/common/client/ui/BlinkAnimation.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/BlinkAnimation.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/BlinkAnimation.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -0,0 +1,85 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.ui.UIObject; + +/** + * Source: + * http://stackoverflow.com/questions/2316590/blink-flash-effect-or-animation + * -in-gwt + */ +/** + * @author vjrj + * + */ +/** + * @author vjrj + * + */ +public class BlinkAnimation { + + private boolean blink; + + private final int interval; + + private int iteration; + + private int stopIter; + + private final Timer timer; + + public BlinkAnimation(final UIObject obj) { + this(obj, 200); + } + + /** + * @param obj + * the object to animate + * @param interval + * between blinks + */ + public BlinkAnimation(final UIObject obj, final int interval) { + this.interval = interval; + + timer = new Timer() { + @Override + public void run() { + if (!blink) { + obj.addStyleDependentName("blink"); + iteration++; + } else { + obj.removeStyleDependentName("blink"); + if (iteration == stopIter) { + timer.cancel(); + } + } + blink = !blink; + } + }; + } + + /** + * Animate till {@link BlinkAnimation#stop() } + */ + public void animate() { + animate(-1); + } + + /** + * @param numTimes + * to blink (3, 4, ... etc) + */ + public void animate(final int numTimes) { + iteration = 0; + stopIter = numTimes; + blink = false; + timer.scheduleRepeating(interval); + } + + /** + * Stop the animation now + */ + public void stop() { + timer.cancel(); + } +} \ 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-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -76,7 +76,7 @@ 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.sitebar.spaces.SpaceSelectorPanel; import cc.kune.core.client.sn.GroupSNPanel; import cc.kune.core.client.sn.GroupSNPresenter; import cc.kune.core.client.sn.UserSNPanel; @@ -148,7 +148,7 @@ bindPresenter(UserNotifierPresenter.class, UserNotifierPresenter.UserNotifierView.class, UserNotifierViewImpl.class, UserNotifierProxy.class); bindPresenter(SpaceSelectorPresenter.class, SpaceSelectorPresenter.SpaceSelectorView.class, - SpaceSelectorViewImpl.class, SpaceSelectorPresenter.SpaceSelectorProxy.class); + SpaceSelectorPanel.class, SpaceSelectorPresenter.SpaceSelectorProxy.class); bindPresenter(SiteLogoPresenter.class, SiteLogoPresenter.SiteLogoView.class, SiteLogoViewImpl.class, SiteLogoPresenter.SiteLogoProxy.class); bindPresenter(SitebarActionsPresenter.class, SitebarActionsPresenter.SitebarActionsView.class, Copied: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java (from rev 1500, trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -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 cc.kune.core.client.sitebar.spaces; + +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.GSpaceArmor; +import cc.kune.gspace.client.resources.GSpaceArmorResources; + +import com.google.gwt.core.client.GWT; +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.ui.FlowPanel; +import com.google.gwt.user.client.ui.ToggleButton; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class SpaceSelectorPanel extends ViewImpl implements SpaceSelectorView { + interface SpaceSelectorPanelUiBinder extends UiBinder<Widget, SpaceSelectorPanel> { + } + private static SpaceSelectorPanelUiBinder uiBinder = GWT.create(SpaceSelectorPanelUiBinder.class); + @UiField + ToggleButton groupButton; + private final Tooltip groupSpaceTooltip; + @UiField + ToggleButton homeButton; + private final Tooltip homeSpaceTooltip; + @UiField + FlowPanel panel; + @UiField + ToggleButton publicButton; + private final Tooltip publicSpaceTooltip; + @UiField + ToggleButton userButton; + private final Tooltip userSpaceTooltip; + + @Inject + public SpaceSelectorPanel(final GSpaceArmor armor, final I18nTranslationService i18n, + final GSpaceArmorResources res) { + armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); + // homeButton.setVisible(false); + homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in this site")); + userSpaceTooltip = Tooltip.to(userButton, + i18n.t("User space: it shows a list of all your documents and contents " + + "in which you participate")); + groupSpaceTooltip = Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create " + + "and publish contents for your personal or group web spaces")); + publicSpaceTooltip = Tooltip.to(publicButton, + i18n.t("Public space: In this space you can see a preview of how the Personal o" + + "r Group Space looks like on the web, outside this site")); + // homeSpaceTooltip.setWidth(0); + userSpaceTooltip.setWidth(190); + groupSpaceTooltip.setWidth(170); + publicSpaceTooltip.setWidth(150); + } + + @Override + public Widget asWidget() { + return panel; + } + + @Override + public HasClickHandlers getGroupBtn() { + return groupButton; + } + + @Override + public HasClickHandlers getHomeBtn() { + return homeButton; + } + + @Override + public HasClickHandlers getPublicBtn() { + return publicButton; + } + + @Override + public HasClickHandlers getUserBtn() { + return userButton; + } + + @Override + public void setGroupBtnDown(final boolean down) { + groupButton.setDown(down); + } + + @Override + public void setHomeBtnDown(final boolean down) { + homeButton.setDown(down); + } + + @Override + public void setPublicBtnDown(final boolean down) { + publicButton.setDown(down); + } + + @Override + public void setUserBtnDown(final boolean down) { + userButton.setDown(down); + } + + @Override + public void showGroupSpaceTooltip() { + groupSpaceTooltip.showTemporally(); + } + + @Override + public void showHomeSpaceTooltip() { + homeSpaceTooltip.showTemporally(); + } + + @Override + public void showPublicSpaceTooltip() { + publicSpaceTooltip.showTemporally(); + } + + @Override + public void showUserSpaceTooltip() { + userSpaceTooltip.showTemporally(); + } +} Copied: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.ui.xml (from rev 1500, trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.ui.xml) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.ui.xml 2011-09-01 19:16:52 UTC (rev 1503) @@ -0,0 +1,24 @@ +<!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:with field='img' + type='cc.kune.gspace.client.resources.GSpaceArmorResources' /> + <g:FlowPanel ui:field="panel" addStyleNames="k-space-sel k-10corners k-floatleft k-pointer" > + <g:ToggleButton ui:field="homeButton" styleName="k-space-sel-btn"> + <g:upFace image='{img.homeSpaceDisabled}' /> + <g:downFace image='{img.homeSpaceEnabled}' /> + </g:ToggleButton> + <g:ToggleButton ui:field="userButton" styleName="k-space-sel-btn"> + <g:upFace image='{img.userSpaceDisabled}' /> + <g:downFace image='{img.userSpaceEnabled}' /> + </g:ToggleButton> + <g:ToggleButton ui:field="groupButton" styleName="k-space-sel-btn"> + <g:upFace image='{img.groupSpaceDisabled}' /> + <g:downFace image='{img.groupSpaceEnabled}' /> + </g:ToggleButton> + <g:ToggleButton ui:field="publicButton" styleName="k-space-sel-btn"> + <g:upFace image='{img.publicSpaceDisabled}' /> + <g:downFace image='{img.publicSpaceEnabled}' /> + </g:ToggleButton> + </g:FlowPanel> +</ui:UiBinder> \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -1,141 +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.spaces; - -import cc.kune.common.client.tooltip.Tooltip; -import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.GSpaceArmor; -import cc.kune.gspace.client.resources.GSpaceArmorResources; - -import com.google.gwt.core.client.GWT; -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.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.ToggleButton; -import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; -import com.gwtplatform.mvp.client.ViewImpl; - -public class SpaceSelectorViewImpl extends ViewImpl implements SpaceSelectorView { - interface SpaceSelectorViewImplUiBinder extends UiBinder<Widget, SpaceSelectorViewImpl> { - } - private static SpaceSelectorViewImplUiBinder uiBinder = GWT.create(SpaceSelectorViewImplUiBinder.class); - @UiField - ToggleButton groupButton; - private final Tooltip groupSpaceTooltip; - @UiField - ToggleButton homeButton; - private final Tooltip homeSpaceTooltip; - @UiField - HorizontalPanel panel; - @UiField - ToggleButton publicButton; - private final Tooltip publicSpaceTooltip; - @UiField - ToggleButton userButton; - private final Tooltip userSpaceTooltip; - - @Inject - public SpaceSelectorViewImpl(final GSpaceArmor armor, final I18nTranslationService i18n, - final GSpaceArmorResources res) { - armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); - // homeButton.setVisible(false); - homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in this site")); - userSpaceTooltip = Tooltip.to(userButton, - i18n.t("User space: it shows a list of all your documents and contents " - + "in which you participate")); - groupSpaceTooltip = Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create " - + "and publish contents for your personal or group web spaces")); - publicSpaceTooltip = Tooltip.to(publicButton, - i18n.t("Public space: In this space you can see a preview of how the Personal o" - + "r Group Space looks like on the web, outside this site")); - // homeSpaceTooltip.setWidth(0); - userSpaceTooltip.setWidth(190); - groupSpaceTooltip.setWidth(170); - publicSpaceTooltip.setWidth(150); - } - - @Override - public Widget asWidget() { - return panel; - } - - @Override - public HasClickHandlers getGroupBtn() { - return groupButton; - } - - @Override - public HasClickHandlers getHomeBtn() { - return homeButton; - } - - @Override - public HasClickHandlers getPublicBtn() { - return publicButton; - } - - @Override - public HasClickHandlers getUserBtn() { - return userButton; - } - - @Override - public void setGroupBtnDown(final boolean down) { - groupButton.setDown(down); - } - - @Override - public void setHomeBtnDown(final boolean down) { - homeButton.setDown(down); - } - - @Override - public void setPublicBtnDown(final boolean down) { - publicButton.setDown(down); - } - - @Override - public void setUserBtnDown(final boolean down) { - userButton.setDown(down); - } - - @Override - public void showGroupSpaceTooltip() { - groupSpaceTooltip.showTemporally(); - } - - @Override - public void showHomeSpaceTooltip() { - homeSpaceTooltip.showTemporally(); - } - - @Override - public void showPublicSpaceTooltip() { - publicSpaceTooltip.showTemporally(); - } - - @Override - public void showUserSpaceTooltip() { - userSpaceTooltip.showTemporally(); - } -} Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.ui.xml 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.ui.xml 2011-09-01 19:16:52 UTC (rev 1503) @@ -1,28 +0,0 @@ -<!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:with field='img' - type='cc.kune.gspace.client.resources.GSpaceArmorResources' /> - <g:HorizontalPanel ui:field="panel" addStyleNames="k-space-sel k-10corners k-floatleft k-pointer" > - <g:ToggleButton ui:field="homeButton" styleName="k-space-sel-btn"> - <g:upFace image='{img.homeSpaceDisabled}' /> - <g:downFace image='{img.homeSpaceEnabled}' /> - - </g:ToggleButton> - <g:ToggleButton ui:field="userButton" styleName="k-space-sel-btn"> - <g:upFace image='{img.userSpaceDisabled}' /> - <g:downFace image='{img.userSpaceEnabled}' /> - - </g:ToggleButton> - <g:ToggleButton ui:field="groupButton" styleName="k-space-sel-btn"> - <g:upFace image='{img.groupSpaceDisabled}' /> - <g:downFace image='{img.groupSpaceEnabled}' /> - - </g:ToggleButton> - <g:ToggleButton ui:field="publicButton" styleName="k-space-sel-btn"> - <g:upFace image='{img.publicSpaceDisabled}' /> - <g:downFace image='{img.publicSpaceEnabled}' /> - - </g:ToggleButton> - </g:HorizontalPanel> -</ui:UiBinder> \ 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-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-09-01 19:16:52 UTC (rev 1503) @@ -1,4 +1,4 @@ -CHARSET "UTF-8 "; body { +CHARSET "UTF-8 "; body { background-color: transparent; color: black; font-family: 'Ubuntu', Arial; @@ -321,8 +321,25 @@ padding: 0 1px 0 1px; margin: 0 0 -2px; outline: 0 none; + float: left; } +.k-space-sel-inbox-count { + border: none 5px #000000; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + background-color: #99BB00; + color: white; + font-size: 10px; + padding: 0 0.5em; + cursor: pointer; +} + +.k-space-sel-inbox-count-blink { + background-color: #ff2a2a; +} + .k-sitebar-logo { margin-top: 2px; } @@ -927,7 +944,7 @@ border-color: #CCCCCC !important; background: inherits !important; kfilter: alpha(opacity = - 60) !important; + 60) !important; -moz-opacity: 0.60 !important; -khtml-opacity: 0.60 !important; opacity: 0.60 !important; @@ -1213,7 +1230,7 @@ -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; kfilter: alpha(opacity = - 90); + 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -1496,7 +1513,7 @@ padding-bottom: 27px !important; } -.k-tabs .gwt-TabLayoutPanel, .k-tabs .gwt-TabLayoutPanelTab { +.k-tabs .gwt-TabLayoutPanel,.k-tabs .gwt-TabLayoutPanelTab { -webkit-border-top-right-radius: 5px; -moz-border-radius-topright: 5px; border-top-right-radius: 5px; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -162,7 +162,6 @@ channel = webClient.getChannel(); profiles = webClient.getProfiles(); idGenerator = ClientIdGenerator.create(); - // loading.addClassName("kune-Margin-40-tb"); } } @@ -202,10 +201,6 @@ webClient.clear(); waveClear(); - if (waveHolder.isAttached()) { - waveHolder.removeFromParent(); - waveHolderParent.remove(waveHolder); - } waveHolderParent.add(waveHolder); // Release the display:none. @@ -243,9 +238,17 @@ private void waveClear() { if (wave != null) { + // try { wave.destroy(); + // } catch (final RuntimeException e) { + // When editing: java.lang.RuntimeException: Component not found: MENU + // } wave = null; } + if (waveHolder != null && waveHolder.isAttached()) { + waveHolder.removeFromParent(); + waveHolderParent.remove(waveHolder); + } } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -21,6 +21,7 @@ import javax.annotation.Nonnull; +import cc.kune.common.client.actions.BeforeActionListener; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.errors.UIException; import cc.kune.common.client.ui.EditEvent; @@ -28,6 +29,7 @@ import cc.kune.common.client.ui.HasEditHandler; import cc.kune.core.client.actions.ActionRegistryByType; 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; @@ -92,8 +94,9 @@ @Inject public ContentViewerPresenter(final EventBus eventBus, final ContentViewerView view, - final ContentViewerProxy proxy, final Session session, final ActionRegistryByType actionsRegistry, - final Provider<RenameAction> renameAction, final PathToolbarUtils pathToolbarUtils) { + final StateManager stateManager, final ContentViewerProxy proxy, final Session session, + final ActionRegistryByType actionsRegistry, final Provider<RenameAction> renameAction, + final PathToolbarUtils pathToolbarUtils) { super(eventBus, view, proxy); this.session = session; this.actionsRegistry = actionsRegistry; @@ -112,7 +115,13 @@ getView().signIn(); } }); - + stateManager.addBeforeStateChangeListener(new BeforeActionListener() { + @Override + public boolean beforeAction() { + getView().detach(); + return true; + } + }); } @Override Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -29,6 +29,7 @@ import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.shared.dto.WaveClientParams; import cc.kune.gspace.client.GSpaceArmor; +import cc.kune.wave.client.inboxcount.InboxCountPresenter; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsonUtils; @@ -42,7 +43,7 @@ @Inject public WaveClientManager(final Session session, final StateManager stateManager, final EventBus eventBus, final UserServiceAsync userService, final GSpaceArmor wsArmor, - final KuneWaveProfileManager profiles) { + final KuneWaveProfileManager profiles, final InboxCountPresenter inboxCount) { session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { @@ -60,7 +61,7 @@ if (userSpace.getWidgetCount() > 0) { userSpace.remove(0); } - webClient = new WebClient(eventBus, profiles); + webClient = new WebClient(eventBus, profiles, inboxCount); userSpace.add(webClient); } else { webClient.login(); Modified: trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -20,6 +20,9 @@ package cc.kune.wave.client; import cc.kune.common.client.ExtendedGinModule; +import cc.kune.wave.client.inboxcount.InboxCountPanel; +import cc.kune.wave.client.inboxcount.InboxCountPresenter; +import cc.kune.wave.client.inboxcount.InboxCountPresenter.InboxCountView; public class WaveGinModule extends ExtendedGinModule { /* @@ -33,5 +36,7 @@ s(WaveStatusIndicator.class); eagle(WaveParts.class); s(KuneWaveProfileManager.class); + s(InboxCountView.class, InboxCountPanel.class); + s(InboxCountPresenter.class); } } Modified: trunk/src/main/java/cc/kune/wave/client/WaveParts.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveParts.java 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/wave/client/WaveParts.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -22,21 +22,24 @@ import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.state.Session; +import cc.kune.wave.client.inboxcount.InboxCountPresenter; import com.google.inject.Inject; import com.google.inject.Provider; public class WaveParts { - @Inject - public WaveParts(final Session session, final Provider<WaveClientManager> waveClientManager, - final Provider<WaveStatusIndicator> waveOnlineStatus) { - session.onAppStart(true, new AppStartHandler() { - @Override - public void onAppStart(final AppStartEvent event) { - waveClientManager.get(); - waveOnlineStatus.get(); - } - }); - } + @Inject + public WaveParts(final Session session, final Provider<WaveClientManager> waveClientManager, + final Provider<WaveStatusIndicator> waveOnlineStatus, + final Provider<InboxCountPresenter> inboxCount) { + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + waveClientManager.get(); + waveOnlineStatus.get(); + inboxCount.get(); + } + }); + } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-09-01 11:38:59 UTC (rev 1502) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -67,6 +67,7 @@ import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; import cc.kune.core.client.state.SiteTokens; +import cc.kune.wave.client.inboxcount.InboxCountPresenter; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; @@ -236,15 +237,17 @@ private IdGenerator idGenerator; private RemoteViewServiceMultiplexer channel; + private final InboxCountPresenter inboxCount; /** * This is the entry point method. */ @Inject - public WebClient(final EventBus eventBus, KuneWaveProfileManager profiles) { + public WebClient(final EventBus eventBus, KuneWaveProfileManager profiles, InboxCountPresenter inboxCount) { this.eventBus = eventBus; this.profiles = profiles; + this.inboxCount = inboxCount; searchPanel = new SearchPanelWidget(new SearchPanelRenderer(profiles)); ErrorHandler.install(); @@ -439,6 +442,7 @@ } }; Search search = SimpleSearch.create(RemoteSearchService.create(), waveStore); + search.addListener(inboxCount.getSearchListener()); SearchPresenter.create(search, searchPanel, selectHandler, profiles); } Added: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPanel.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -0,0 +1,67 @@ +package cc.kune.wave.client.inboxcount; + +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.ui.BlinkAnimation; +import cc.kune.core.client.sitebar.spaces.Space; +import cc.kune.core.client.sitebar.spaces.SpaceSelectEvent; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.wave.client.inboxcount.InboxCountPresenter.InboxCountView; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.inject.Inject; + +public class InboxCountPanel extends PopupPanel implements InboxCountView { + + private final BlinkAnimation blinkAnimation; + private final InlineLabel count; + private final I18nTranslationService i18n; + private final Tooltip tooltip; + + @Inject + public InboxCountPanel(final I18nTranslationService i18n, final EventBus eventBus) { + this.i18n = i18n; + count = new InlineLabel(); + setStylePrimaryName("k-space-sel-inbox-count"); + super.setWidget(count); + blinkAnimation = new BlinkAnimation(this, 400); + tooltip = Tooltip.to(this, "Nothing"); + addDomHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + SpaceSelectEvent.fire(eventBus, Space.userSpace); + } + }, ClickEvent.getType()); + } + + @Override + public void blink() { + blinkAnimation.animate(4); + } + + @Override + public void setTotal(final int total) { + count.setText(String.valueOf(total)); + tooltip.setText(total == 1 ? i18n.t("One conversation unread") : i18n.t("[%d] conversations unread", + total)); + } + + @Override + public void showCount(final boolean show) { + if (show) { + super.setPopupPositionAndShow(new PositionCallback() { + @Override + public void setPosition(final int offsetWidth, final int offsetHeight) { + // user inbox icon is at 38px to the right, then we center the popup + // down the icon + setPopupPosition(38 - offsetWidth / 2, 20); + } + }); + } else { + super.hide(); + } + } +} Added: trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/inboxcount/InboxCountPresenter.java 2011-09-01 19:16:52 UTC (rev 1503) @@ -0,0 +1,129 @@ +package cc.kune.wave.client.inboxcount; + +import java.util.HashMap; +import java.util.Map; + +import org.waveprotocol.box.webclient.search.Digest; +import org.waveprotocol.box.webclient.search.Search; +import org.waveprotocol.box.webclient.search.Search.Listener; + +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.UserSignInOrSignOutEvent; +import cc.kune.core.client.state.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; + +import com.google.gwt.user.client.Timer; +import com.google.inject.Inject; + +public class InboxCountPresenter { + + public interface InboxCountView { + + void blink(); + + void setTotal(int total); + + void showCount(boolean show); + + } + + private int currentTotal; + private final Map<Integer, Integer> diggests; + // protected SimpleSearch search; + private final Listener searchListener; + private final Session session; + // private final Session session; + private final Timer updateTimer; + private final InboxCountView view; + + @Inject + public InboxCountPresenter(final InboxCountView view, final Session session) { + this.view = view; + this.session = session; + // this.session = session; + diggests = new HashMap<Integer, Integer>(); + currentTotal = Search.UNKNOWN_SIZE; + + updateTimer = new Timer() { + @Override + public void run() { + update(); + } + }; + + searchListener = new Listener() { + private void log(final int index, final Digest diggest, final String msg) { + // Log.info(msg + index + " - " + diggest.getTitle() + ": unread: " + + // diggest.getUnreadCount()); + } + + @Override + public void onDigestAdded(final int index, final Digest diggest) { + log(index, diggest, "Diggest added: "); + updateDigest(index, diggest); + shouldUpdate(); + } + + @Override + public void onDigestReady(final int index, final Digest diggest) { + log(index, diggest, "Diggest ready: "); + updateDigest(index, diggest); + shouldUpdate(); + } + + @Override + public void onDigestRemoved(final int index, final Digest diggest) { + log(index, diggest, "Diggest removed: "); + updateDigest(index, diggest); + shouldUpdate(); + } + + @Override + public void onStateChanged() { + shouldUpdate(); + // diggests.clear(); + } + + @Override + public void onTotalChanged(final int total) { + shouldUpdate(); + } + + private void shouldUpdate() { + updateTimer.schedule(3000); + } + + private void updateDigest(final int index, final Digest diggest) { + diggests.put(Integer.valueOf(index), Integer.valueOf(diggest.getUnreadCount())); + } + }; + + session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() { + @Override + public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) { + view.showCount(event.isLogged()); + } + }); + } + + public Listener getSearchListener() { + return searchListener; + } + + private void setTotal(final int total) { + view.setTotal(total); + final boolean show = session.isLogged() && total != Search.UNKNOWN_SIZE && total > 0; + view.showCount(show); + if (show && total > currentTotal) { + view.blink(); + } + currentTotal = total; + } + + private void update() { + int total = 0; + for (final Integer unread : diggests.values()) { + total += unread; + } + setTotal(total); + } +}

1 0

[kune issues] #112: Notify in user space icons new waves, or unread waves
by kune issues 01 Sep '11

01 Sep '11

#112: Notify in user space icons new waves, or unread waves --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: Component: User space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Blinking or with a number -- Ticket URL: <http://kune.ourproject.org/issues/ticket/112> kune issues <http://kune.ourproject.org/issues/>

1 1

r1502 - in trunk: . src/main/java/cc/kune/core/shared/dto src/main/java/cc/kune/domain src/main/java/cc/kune/msgs/client
by Vicente J. Ruiz Jurado 01 Sep '11

01 Sep '11

Author: vjrj_ Date: 2011-09-01 13:38:59 +0200 (Thu, 01 Sep 2011) New Revision: 1502 Modified: trunk/TODO trunk/pom.xml trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java trunk/src/main/java/cc/kune/domain/GroupList.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java Log: CLOSED - # 111: Rights problems in user space http://kune.ourproject.org/issues/ticket/111 Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/TODO 2011-09-01 11:38:59 UTC (rev 1502) @@ -376,19 +376,6 @@ http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/e8e1… Also autocomplete user/passwordi (for browser store): http://groups.google.fr/group/Google-Web-Toolkit/browse_thread/thread/2b2ce… -** vjrj <v> kune debian package: - Study fat jar + deb package: - http://anydoby.com/fatjar/ - Currently we are testing this snapshot: - http://mojo.codehaus.org/deb-maven-plugin/ - with: mvn package -Dmaven.test.skip=true - generates a deb with big (and not very accute) dependencies: - dpkg -X trunk/org.ourproject-kune-0.0.5-0.deb - dpkg -I trunk/org.ourproject-kune-0.0.5-0.deb - Other possibility: - http://vafer.org/blog/20070918215154 - Related info: - http://java.debian.net/building.html *** steps **** create user kune **** create /var/lib/kune/uploads and give permissions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/pom.xml 2011-09-01 11:38:59 UTC (rev 1502) @@ -81,23 +81,14 @@ <id>dyndns-repo</id> <url>http://maven.dyndns.org/2</url> </repository> +  +  <repository> - <id>google-maven-snapshot-repository</id> - <name>Google Maven Snapshot Repository</name> - <url>https://oss.sonatype.org/content/repositories/google-snapshots/ - </url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>gwtplatform.snapshot.repo</id> - <name>Gwtplatform snapshot repository</name> - <url>https://oss.sonatype.org/content/repositories/snapshots/ - </url> - <layout>default</layout> - </repository> - <repository> <id>openqa.org</id> <name>Openqa Release Repository</name> <url>http://archiva.openqa.org/repository/releases</url> @@ -795,7 +786,7 @@ <systemProperty> <key>kune.server.config</key> <value>src/main/resources/kune.properties</value> -  +  </systemProperty> <systemProperty> <key>wave.server.config</key> Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -121,12 +121,7 @@ public int hashCode() { final int prime = 31; int result = 1; - // result = prime * result + (defaultLicense == null ? 0 : - // defaultLicense.hashCode()); - // result = prime * result + (id == null ? 0 : id.hashCode()); - // result = prime * result + (longName == null ? 0 : longName.hashCode()); result = prime * result + (shortName == null ? 0 : shortName.hashCode()); - // result = prime * result + (groupType == null ? 0 : groupType.hashCode()); return result; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -38,17 +38,6 @@ this.list = list; } - public boolean checkIfIncludes(final GroupDTO group, final String mode) { - if (mode.equals(NOBODY)) { - return false; - } - if (mode.equals(EVERYONE)) { - return true; - } - boolean contains = list.contains(group); - return contains; - } - public Set<GroupDTO> getList() { return list; } @@ -58,7 +47,15 @@ } public boolean includes(final GroupDTO group) { - return checkIfIncludes(group, mode); + // Duplicate code in GroupList + if (mode.equals(NOBODY)) { + return false; + } + if (mode.equals(EVERYONE)) { + return true; + } + final boolean contains = list.contains(group); + return contains; } public void setList(final Set<GroupDTO> list) { Modified: trunk/src/main/java/cc/kune/domain/GroupList.java =================================================================== --- trunk/src/main/java/cc/kune/domain/GroupList.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/domain/GroupList.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -75,20 +75,6 @@ } } - public boolean checkIfIncludes(final Group group, final Set<Group> list, final GroupListMode mode) { - switch (mode) { - case NOBODY: - return false; - case EVERYONE: - return true; - default: - // Workaround for: - // http://www.timo-ernst.net/2011/06/remove-and-contains-not-working-on-your-j… - return new HashSet<Group>(list).contains(group); - // return list.contains(group); - } - } - public void clear() { list.clear(); } @@ -110,7 +96,18 @@ } public boolean includes(final Group group) { - return checkIfIncludes(group, this.list, mode); + // Duplicate code in GroupListDTO + switch (mode) { + case NOBODY: + return false; + case EVERYONE: + return true; + default: + // Workaround for: + // http://www.timo-ernst.net/2011/06/remove-and-contains-not-working-on-your-j… + return new HashSet<Group>(list).contains(group); + // return list.contains(group); + } } public boolean isEmpty() { Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -52,7 +52,7 @@ final boolean closeable, final CloseCallback closeCallback) { final UserMessage msg = new UserMessage(level, title, message, id, closeable, closeCallback); panel.add(msg); - if (panel.getWidgetCount() == 2) { + if (panel.getWidgetCount() == 1) { bottom.setVisible(true); } msg.addAttachHandler(new Handler() {

1 0