May 2012 - kune-commits - lists.ourproject.org

[kune issues] #266: Events (in document) delete menu option
by kune issues 02 May '12

02 May '12

#266: Events (in document) delete menu option --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Group space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ And then remove this: #kune.events.11.794 -- Ticket URL: <http://kune.ourproject.org/issues/ticket/266> kune issues <http://kune.ourproject.org/issues/>

1 0

r1863 - in trunk/src/main: java/cc/kune/core/public java/cc/kune/gspace/client/armor java/cc/kune/gspace/client/armor/resources java/cc/kune/gspace/client/viewers webapp/others/splash/style
by Vicente J. Ruiz Jurado 02 May '12

02 May '12

Author: vjrj_ Date: 2012-05-02 14:50:59 +0200 (Wed, 02 May 2012) New Revision: 1863 Removed: trunk/src/main/java/cc/kune/gspace/client/armor/impl/ Modified: trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java trunk/src/main/webapp/others/splash/style/main.css Log: CLOSED - # 263: Improve style of Breadcrumb http://kune.ourproject.org/issues/ticket/263 CLOSED - # 264: Document header reorganization http://kune.ourproject.org/issues/ticket/264 Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 12:50:59 UTC (rev 1863) @@ -1004,6 +1004,14 @@ opacity: 0.50 !important; } +button.k-button-right, button.k-button-right, button.k-button-alone { + kfilter: alpha(opacity = + 100) !important; + -moz-opacity: 1 !important; + -khtml-opacity: 1 !important; + opacity: 1 !important; +} + button.k-optionsborder img.k-iconlabel-left { border: 1px solid #ACACAC; -webkit-border-radius: 3px; Modified: trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java 2012-05-02 12:50:59 UTC (rev 1863) @@ -38,7 +38,6 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.TabLayoutPanel; -import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.google.inject.Provider; @@ -54,7 +53,7 @@ private static GSpaceArmorDefaultUiBinder uiBinder = GWT.create(GSpaceArmorDefaultUiBinder.class); @UiField - VerticalPanel centerNorth; + FlowPanel centerNorth; @UiField GSpaceCenterPanel centerPanel; @UiField Modified: trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml 2012-05-02 12:50:59 UTC (rev 1863) @@ -42,22 +42,18 @@ <g:center size="1.0"> <g:DockLayoutPanel unit="PX" ui:field="splitCenter" styleName="{res.style.entityCentralContainer}"> - <g:north size="153"> - <g:VerticalPanel width="100%" - ui:field="centerNorth" height="153px"> + <g:north size="135"> + <g:FlowPanel width="100%" ui:field="centerNorth" + height="135px"> <g:FlowPanel height="70px" width="100%" styleName="{res.style.entityHeader}" ui:field="entityHeader">  </g:FlowPanel> - <g:FlowPanel width="100%" height="38px" - styleName="{res.style.docHeader}" ui:field="docHeader"> - </g:FlowPanel> - <g:HTMLPanel ui:field="arrow" - styleName="{res.style.docSubheaderArrow}"/> - <g:FlowPanel width="100%" height="45px" - styleName="{res.style.docSubheader}" ui:field="docSubheader"> - </g:FlowPanel> - </g:VerticalPanel> + <g:FlowPanel width="100%" height="30px" + styleName="{res.style.docSubheader}" ui:field="docSubheader"/> + <g:FlowPanel width="100%" height="35px" + styleName="{res.style.docHeader}" ui:field="docHeader"/> + </g:FlowPanel> </g:north> <g:center> <g:DockLayoutPanel unit="PX" @@ -68,6 +64,10 @@ <g:east size="10"> <g:SimplePanel/> </g:east> + <g:north size="10"> + <g:HTMLPanel ui:field="arrow" + styleName="{res.style.docSubheaderArrow}"/> + </g:north> <g:center> <kg:GSpaceCenterPanel ui:field="centerPanel"/> Modified: trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css 2012-05-02 12:50:59 UTC (rev 1863) @@ -69,8 +69,8 @@ .docHeaderArrow { position: relative; - z-index: 10; - top: -25px; + z-index: 1000; + top: -20px; left: 10px; } @@ -79,7 +79,7 @@ font-weight: bold; margin-left: 15px; font: 'UbuntuBold', Arial; - line-height: 36px; + line-height: 32px; } .docHeader input { @@ -89,14 +89,14 @@ .docHeader img { float: left; - margin: 10px -10px 0 10px; + margin: 8px -10px 0 10px; } .docSubheader { overflow: hidden; border-collapse: separate; - margin: -14px 0 0; - padding: 10px 0 0; + margin: -5px 0 0; + padding: 5px 0 0; } .docSubheader button.k-fr { @@ -224,8 +224,8 @@ border-width: 7px; height: 0; width: 0; - position: relative; - bottom: 0px; + position: relative; + bottom: 1px; left: 36px; } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java 2012-05-02 12:50:59 UTC (rev 1863) @@ -20,7 +20,7 @@ package cc.kune.gspace.client.viewers; public class ToolbarStyles { - public static final String CSSBTN = "k-button, k-fl"; + public static final String CSSBTN = "k-button, k-button-alone, k-fl"; public static final String CSSBTNC = "k-button, k-button-center, k-fl"; public static final String CSSBTNL = "k-button, k-button-left, k-fl"; public static final String CSSBTNR = "k-button, k-button-right, k-fl"; Modified: trunk/src/main/webapp/others/splash/style/main.css =================================================================== --- trunk/src/main/webapp/others/splash/style/main.css 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/webapp/others/splash/style/main.css 2012-05-02 12:50:59 UTC (rev 1863) @@ -29,7 +29,7 @@ background-color: #ffffff; color: #000000; line-height: 1.4; - font-family: Helvetica, Arial, sans-serif; + /* font-family: Helvetica, Arial, sans-serif; */ font-size: 12px; } @@ -52,7 +52,7 @@ input, select, table, textarea { font-size: 100%; - font-family: Arial, Helvetica, sans-serif; + /* font-family: Arial, Helvetica, sans-serif; */ } /* MAIN --------------------------------------------------------------------- */

1 0

[kune issues] #264: Document header reorganization
by kune issues 02 May '12

02 May '12

#264: Document header reorganization --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: User space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ -- Ticket URL: <http://kune.ourproject.org/issues/ticket/264> kune issues <http://kune.ourproject.org/issues/>

1 1

r1862 - in trunk/src/main/java/cc/kune: common/client/actions/gwtui common/client/actions/ui/descrip common/client/ui core/public gspace/client/viewers
by Vicente J. Ruiz Jurado 02 May '12

02 May '12

Author: vjrj_ Date: 2012-05-02 13:16:45 +0200 (Wed, 02 May 2012) New Revision: 1862 Added: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java Removed: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java Log: CLOSED - # 263: Improve style of Breadcrumb http://kune.ourproject.org/issues/ticket/263 Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -29,80 +29,80 @@ public class GwtComplexToolbar extends Composite implements IsWidget { - private enum FlowDir { - left, right - } - private FlowDir currentFlow; - private final FlowToolbar toolbar; + private enum FlowDir { + left, right + } + private FlowDir currentFlow; + private final FlowToolbar toolbar; - public GwtComplexToolbar() { - toolbar = new FlowToolbar(); - currentFlow = FlowDir.left; - initWidget(toolbar); - } + public GwtComplexToolbar() { + toolbar = new FlowToolbar(); + currentFlow = FlowDir.left; + initWidget(toolbar); + } - protected void add(final AbstractGuiItem item) { - item.addStyleName(getFlow()); - toolbar.add(item); - } + protected void add(final AbstractGuiItem item) { + item.addStyleName(getFlow()); + toolbar.add(item); + } - public void add(final UIObject uiObject) { - uiObject.addStyleName(getFlow()); - toolbar.add((Widget) uiObject); - } + public void add(final UIObject uiObject) { + uiObject.addStyleName(getFlow()); + toolbar.add((Widget) uiObject); + } - public Widget addFill() { - currentFlow = FlowDir.right; - return toolbar.addFill(); - } + public Widget addFill() { + currentFlow = FlowDir.right; + return toolbar.addFill(); + } - public Widget addSeparator() { - return toolbar.addSeparator(); - } + public Widget addSeparator() { + return toolbar.addSeparator(); + } - public Widget addSpacer() { - return toolbar.addSpacer(); - } + public Widget addSpacer() { + return toolbar.addSpacer(); + } - private String getFlow() { - switch (currentFlow) { - case left: - return "oc-floatleft"; - case right: - default: - return "oc-floatright"; - } + private String getFlow() { + switch (currentFlow) { + case left: + return "oc-floatleft"; + case right: + default: + return "oc-floatright"; } + } - protected void insert(final AbstractGuiItem item, final int position) { - item.addStyleName(getFlow()); - toolbar.insert(item, position); - } + protected void insert(final AbstractGuiItem item, final int position) { + item.addStyleName(getFlow()); + toolbar.insert(item, position); + } - public void insert(final UIObject uiObject, final int position) { - uiObject.addStyleName(getFlow()); - toolbar.insert((Widget) uiObject, position); - } + public void insert(final UIObject uiObject, final int position) { + uiObject.addStyleName(getFlow()); + toolbar.insert((Widget) uiObject, position); + } - /** - * Set the blank style - */ - public void setCleanStyle() { - toolbar.setBlankStyle(); - } + /** + * Set the blank style + */ + public void setCleanStyle() { + toolbar.setBlankStyle(); + } - /** - * Set the normal grey style - */ - public void setNormalStyle() { - toolbar.setNormalStyle(); - } + /** + * Set the normal grey style + */ + public void setNormalStyle() { + toolbar.setNormalStyle(); + } - /** - * Set the blank style - */ - public void setTranspStyle() { - toolbar.setTranspStyle(); - } + /** + * Set the blank style + */ + public void setTranspStyle() { + toolbar.setTranspStyle(); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.GuiProvider; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; +import cc.kune.common.client.actions.ui.descrip.LabelDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; @@ -38,26 +39,29 @@ public class GwtGuiProvider { - @Inject - public GwtGuiProvider(final GuiProvider guiProvider, final Provider<GwtSubMenuGui> gwtSubMenuGui, - final Provider<GwtMenuGui> gwtMenuGui, final Provider<GwtMenuItemGui> gwtMenuItemGui, - final Provider<GwtMenuSeparatorGui> gwtMenuSeparatorGui, final Provider<GwtPushButtonGui> gwtPushButtonGui, - final Provider<GwtButtonGui> gwtButtonGui, final Provider<GwtIconLabelGui> gwtIconLabelGui, - final Provider<GwtToolbarGui> gwtToolbarGui, final Provider<GwtToolbarSeparatorGui> gwtToolbarSeparatorGui, - final Provider<GwtMenuTitleItemGui> gwtMenuTitleItemGui) { + @Inject + public GwtGuiProvider(final GuiProvider guiProvider, final Provider<GwtSubMenuGui> gwtSubMenuGui, + final Provider<GwtMenuGui> gwtMenuGui, final Provider<GwtMenuItemGui> gwtMenuItemGui, + final Provider<GwtMenuSeparatorGui> gwtMenuSeparatorGui, + final Provider<GwtPushButtonGui> gwtPushButtonGui, final Provider<GwtButtonGui> gwtButtonGui, + final Provider<GwtLabelGui> gwtLabelGui, final Provider<GwtIconLabelGui> gwtIconLabelGui, + final Provider<GwtToolbarGui> gwtToolbarGui, + final Provider<GwtToolbarSeparatorGui> gwtToolbarSeparatorGui, + final Provider<GwtMenuTitleItemGui> gwtMenuTitleItemGui) { - guiProvider.register(SubMenuDescriptor.class, gwtSubMenuGui); - guiProvider.register(MenuDescriptor.class, gwtMenuGui); - guiProvider.register(MenuRadioItemDescriptor.class, gwtMenuItemGui); - guiProvider.register(MenuCheckItemDescriptor.class, gwtMenuItemGui); - guiProvider.register(MenuTitleItemDescriptor.class, gwtMenuTitleItemGui); - guiProvider.register(MenuItemDescriptor.class, gwtMenuItemGui); - guiProvider.register(MenuSeparatorDescriptor.class, gwtMenuSeparatorGui); - guiProvider.register(PushButtonDescriptor.class, gwtPushButtonGui); - guiProvider.register(ButtonDescriptor.class, gwtButtonGui); - guiProvider.register(IconLabelDescriptor.class, gwtIconLabelGui); - guiProvider.register(ToolbarDescriptor.class, gwtToolbarGui); - guiProvider.register(ToolbarSeparatorDescriptor.class, gwtToolbarSeparatorGui); - } + guiProvider.register(SubMenuDescriptor.class, gwtSubMenuGui); + guiProvider.register(MenuDescriptor.class, gwtMenuGui); + guiProvider.register(MenuRadioItemDescriptor.class, gwtMenuItemGui); + guiProvider.register(MenuCheckItemDescriptor.class, gwtMenuItemGui); + guiProvider.register(MenuTitleItemDescriptor.class, gwtMenuTitleItemGui); + guiProvider.register(MenuItemDescriptor.class, gwtMenuItemGui); + guiProvider.register(MenuSeparatorDescriptor.class, gwtMenuSeparatorGui); + guiProvider.register(PushButtonDescriptor.class, gwtPushButtonGui); + guiProvider.register(ButtonDescriptor.class, gwtButtonGui); + guiProvider.register(IconLabelDescriptor.class, gwtIconLabelGui); + guiProvider.register(LabelDescriptor.class, gwtLabelGui); + guiProvider.register(ToolbarDescriptor.class, gwtToolbarGui); + guiProvider.register(ToolbarSeparatorDescriptor.class, gwtToolbarSeparatorGui); + } } Added: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -0,0 +1,82 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.actions.gwtui; + +import cc.kune.common.client.actions.ui.AbstractGuiItem; +import cc.kune.common.client.actions.ui.ParentWidget; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; + +import com.google.gwt.user.client.ui.Label; + +public class GwtLabelGui extends AbstractGuiItem { + private Label label; + + @Override + protected void addStyle(final String style) { + label.addStyleName(style); + } + + @Override + protected void clearStyles() { + label.setStyleName("k-none"); + } + + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + label = new Label(""); + descriptor.putValue(ParentWidget.PARENT_UI, this); + final String id = descriptor.getId(); + if (id != null) { + label.ensureDebugId(id); + } + initWidget(label); + configureItemFromProperties(); + return this; + } + + @Override + public void setEnabled(final boolean enabled) { + super.setVisible(enabled); + } + + @Override + protected void setIconBackground(final String backgroundColor) { + } + + @Override + protected void setIconStyle(final String style) { + } + + @Override + public void setIconUrl(final String url) { + } + + @Override + public void setText(final String text) { + label.setText(text, descriptor.getDirection()); + } + + @Override + public boolean shouldBeAdded() { + return true; + } + +} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -1,58 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.common.client.actions.ui.descrip; - -import cc.kune.common.client.actions.AbstractAction; -import cc.kune.common.client.actions.BaseAction; - -import com.google.gwt.resources.client.ImageResource; - -public class ImageLabelDescriptor extends AbstractGuiActionDescrip { - - public ImageLabelDescriptor(final AbstractAction action) { - super(action); - } - - public ImageLabelDescriptor(final String text) { - this(new BaseAction(text, null)); - } - - public ImageLabelDescriptor(final String text, final ImageResource icon) { - this(new BaseAction(text, null, icon)); - } - - public ImageLabelDescriptor(final String text, final String tooltip) { - this(new BaseAction(text, tooltip)); - } - - public ImageLabelDescriptor(final String text, final String tooltip, final ImageResource icon) { - this(new BaseAction(text, tooltip, icon)); - } - - public ImageLabelDescriptor(final String text, final String tooltip, final String icon) { - this(new BaseAction(text, tooltip, icon)); - } - - @Override - public Class<?> getType() { - return ImageLabelDescriptor.class; - } - -} \ No newline at end of file Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -0,0 +1,43 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.actions.ui.descrip; + +import cc.kune.common.client.actions.BaseAction; + +public class LabelDescriptor extends AbstractGuiActionDescrip { + + public LabelDescriptor() { + super(new BaseAction("", null)); + } + + public LabelDescriptor(final String text) { + super(new BaseAction(text, null)); + } + + public LabelDescriptor(final String text, final String tooltip) { + super(new BaseAction(text, tooltip)); + } + + @Override + public Class<?> getType() { + return LabelDescriptor.class; + } + +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -29,129 +29,129 @@ public class FlowToolbar extends Composite implements AbstractToolbar, ForIsWidget { - private final FlowPanel childPanel; + private final FlowPanel childPanel; - public FlowToolbar() { - super(); - childPanel = new FlowPanel(); - initWidget(childPanel); - } + public FlowToolbar() { + super(); + childPanel = new FlowPanel(); + initWidget(childPanel); + } - @Override - public void add(final Widget widget) { - childPanel.add(widget); - } + @Override + public void add(final Widget widget) { + childPanel.add(widget); + } - @Override - public void add(final Widget widget, final VerticalAlignmentConstant valign) { - childPanel.add(widget); - } + @Override + public void add(final Widget widget, final VerticalAlignmentConstant valign) { + childPanel.add(widget); + } - @Override - public Widget addFill() { - final Label emptyLabel = new Label(""); - emptyLabel.addStyleName("oc-floatright"); - // emptyLabel.setWidth("100%"); - this.add(emptyLabel); - return emptyLabel; - } + @Override + public Widget addFill() { + final Label emptyLabel = new Label(""); + emptyLabel.addStyleName("oc-floatright"); + // emptyLabel.setWidth("100%"); + this.add(emptyLabel); + return emptyLabel; + } - @Override - public Widget addSeparator() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("k-tb-sep"); - emptyLabel.addStyleName("oc-tb-sep"); - emptyLabel.addStyleName("oc-floatleft"); - this.add(emptyLabel); - return emptyLabel; - } + @Override + public Widget addSeparator() { + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("k-tb-sep"); + emptyLabel.addStyleName("oc-tb-sep"); + emptyLabel.addStyleName("oc-floatleft"); + this.add(emptyLabel); + return emptyLabel; + } - @Override - public Widget addSpacer() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("oc-tb-spacer"); - emptyLabel.addStyleName("oc-floatleft"); - this.add(emptyLabel); - return emptyLabel; - } + @Override + public Widget addSpacer() { + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("oc-tb-spacer"); + emptyLabel.addStyleName("oc-floatleft"); + this.add(emptyLabel); + return emptyLabel; + } - public void clear() { - childPanel.clear(); - } + public void clear() { + childPanel.clear(); + } - @Override - public Widget getWidget(final int index) { - return childPanel.getWidget(index); - } + @Override + public Widget getWidget(final int index) { + return childPanel.getWidget(index); + } - @Override - public int getWidgetCount() { - return childPanel.getWidgetCount(); - } + @Override + public int getWidgetCount() { + return childPanel.getWidgetCount(); + } - @Override - public int getWidgetIndex(final IsWidget child) { - return childPanel.getWidgetIndex(child); - } + @Override + public int getWidgetIndex(final IsWidget child) { + return childPanel.getWidgetIndex(child); + } - @Override - public int getWidgetIndex(final Widget child) { - return childPanel.getWidgetIndex(child); - } + @Override + public int getWidgetIndex(final Widget child) { + return childPanel.getWidgetIndex(child); + } - @Override - public void insert(final Widget widget, final int position) { - childPanel.insert(widget, position); - } + @Override + public void insert(final Widget widget, final int position) { + childPanel.insert(widget, position); + } - @Override - public boolean remove(final int index) { - return childPanel.remove(index); - } + @Override + public boolean remove(final int index) { + return childPanel.remove(index); + } - @Override - public boolean remove(final Widget widget) { - return childPanel.remove(widget); - } + @Override + public boolean remove(final Widget widget) { + return childPanel.remove(widget); + } - @Override - public void removeAll() { - childPanel.clear(); - } + @Override + public void removeAll() { + childPanel.clear(); + } - private void setBasicStyle() { - setStyleName("x-toolbar-FIXME"); - addStyleName("x-panel-FIXME"); - } + private void setBasicStyle() { + setStyleName("x-toolbar-FIXME"); + addStyleName("x-panel-FIXME"); + } - /** - * Set the blank style - */ - @Override - public void setBlankStyle() { - setBasicStyle(); - addStyleName("oc-blank-toolbar"); - } + /** + * Set the blank style + */ + @Override + public void setBlankStyle() { + setBasicStyle(); + addStyleName("oc-blank-toolbar"); + } - @Override - public void setHeight(final String height) { - childPanel.setHeight(height); - } + @Override + public void setHeight(final String height) { + childPanel.setHeight(height); + } - /** - * Set the normal grey style - */ - @Override - public void setNormalStyle() { - setBasicStyle(); - addStyleName("oc-tb-bottom-line"); - } + /** + * Set the normal grey style + */ + @Override + public void setNormalStyle() { + setBasicStyle(); + addStyleName("oc-tb-bottom-line"); + } - /** - * Set the transparent style - */ - public void setTranspStyle() { - setBasicStyle(); - addStyleName("oc-transp"); - } + /** + * Set the transparent style + */ + public void setTranspStyle() { + setBasicStyle(); + addStyleName("oc-transp"); + } } \ 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 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 11:16:45 UTC (rev 1862) @@ -1,5 +1,5 @@ -GCHARSET "UTF-8 "; - body { +GCHARSET "UTF-8 + "; body { background-color: transparent; color: black; font-family: "Ubuntu Beta", UbuntuBeta, Ubuntu, "Bitstream Vera Sans", @@ -932,6 +932,28 @@ margin-right: 0px !important; } +/* Derived from: from http://jonrohan.me/guide/css/creating-triangles-in-css/ */ +.k-button-arrow { + border-color: transparent transparent transparent #DDDDDD; + border-style: solid; + border-width: 5px; + bottom: -7px; + float: left; + height: 0; + left: -1px; + margin-right: -10px; + position: relative; + width: 0; +} + +/* IE6 */ +.k-button-arrow { + _border-top-color: pink; + _border-bottom-color: pink; + _border-right-color: pink; + _filter: literal("chroma(color=pink)"); +} + .k-button-right { border-left: 1px solid #CCCCCC !important; -webkit-border-top-left-radius: 0px !important; @@ -975,8 +997,8 @@ color: gray !important; border-color: #CCCCCC !important; background: inherits !important; - kfilter: alpha(opacity = - 50) !important; + kfilter: alpha(opacity = + 50) !important; -moz-opacity: 0.50 !important; -khtml-opacity: 0.50 !important; opacity: 0.50 !important; @@ -1268,8 +1290,8 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = - 90); + kfilter: alpha(opacity = + 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -1620,4 +1642,4 @@ padding: 10px; font-style: italic; color: #A05A2C; -} +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -21,6 +21,7 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.LabelDescriptor; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.dnd.FolderContainerDropController; @@ -76,14 +77,18 @@ // for (int i = pathLength - 1; i >= 0; i--) { for (int i = 0; i < pathLength; i++) { final ButtonDescriptor btn = createPathButton(path[i], pathLength, i); + final boolean isNotTheLast = i != pathLength - 1; if (withDrop) { - if (i != pathLength - 1) { + if (isNotTheLast) { final FolderContainerDropController dropTarget = dropController.get(); dropTarget.setTarget(path[i].getStateToken()); btn.setDropTarget(dropTarget); } } actions.add(btn); + if (isNotTheLast) { + actions.add(new LabelDescriptor().withStyles("k-button-arrow")); + } } } return actions;

1 0

[kune issues] #263: Improve style of Breadcrumb
by kune issues 02 May '12

02 May '12

#263: Improve style of Breadcrumb --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: User space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ -- Ticket URL: <http://kune.ourproject.org/issues/ticket/263> kune issues <http://kune.ourproject.org/issues/>

1 1

r1861 - in trunk: debian img/screenshots src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/properties src/main/java/cc/kune/core/server/rack src/main/java/cc/kune/wave/server src/main/java/org/waveprotocol/box/server src/main/java/org/waveprotocol/box/server/waveserver src/main/resources src/test/java/cc/kune/selenium
by Vicente J. Ruiz Jurado 01 May '12

01 May '12

Author: vjrj_ Date: 2012-05-01 15:48:27 +0200 (Tue, 01 May 2012) New Revision: 1861 Added: trunk/src/main/java/org/waveprotocol/box/server/waveserver/ trunk/src/main/java/org/waveprotocol/box/server/waveserver/CustomImportServlet.java Modified: trunk/debian/changelog trunk/debian/files trunk/debian/kune.init trunk/img/screenshots/kune-chat-sele.png trunk/img/screenshots/kune-groupOptions-sele.png trunk/img/screenshots/kune-home-stats-sele.png trunk/img/screenshots/kune-inbox-sele.png trunk/img/screenshots/kune-newgroup-sele.png trunk/img/screenshots/kune-register-sele.png trunk/img/screenshots/kune-social-net-sele.png trunk/img/screenshots/kune-socialNetOptions-sele.png trunk/img/screenshots/kune-tutorials-sele.png trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java trunk/src/main/java/cc/kune/wave/server/WaveMain.java trunk/src/main/resources/kune-production.properties trunk/src/main/resources/kune.properties trunk/src/main/resources/wave-server.properties trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java trunk/src/test/java/cc/kune/selenium/SeleniumConf.java Log: NEW - # 260: Google Wave Import usernames translation http://kune.ourproject.org/issues/ticket/260 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/debian/changelog 2012-05-01 13:48:27 UTC (rev 1861) @@ -1,3 +1,10 @@ +kune (0.2.0+b4) unstable; urgency=low + + * Added some kune.wave.import.usernamespairs param + * Fixed status init function + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Mon, 30 Apr 2012 22:19:50 +0200 + kune (0.2.0+b3) unstable; urgency=low * Init loging fixed. Other minor changes Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/debian/files 2012-05-01 13:48:27 UTC (rev 1861) @@ -1 +1 @@ -kune_0.2.0+b3_all.deb java optional +kune_0.2.0+b4_all.deb java optional Modified: trunk/debian/kune.init =================================================================== --- trunk/debian/kune.init 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/debian/kune.init 2012-05-01 13:48:27 UTC (rev 1861) @@ -131,7 +131,7 @@ esac ;; status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + status_of_proc "$NAME" "$NAME" && exit 0 || exit $? ;; reload|force-reload) # Modified: trunk/img/screenshots/kune-chat-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-groupOptions-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-home-stats-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-inbox-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-newgroup-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-register-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-social-net-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-socialNetOptions-sele.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-tutorials-sele.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-05-01 13:48:27 UTC (rev 1861) @@ -187,7 +187,6 @@ if (!kuneProperties.getBoolean(KuneProperties.SITE_OPENFIRE_IGNORE)) { filter("/*").through(DataSourceOpenfirePersistModule.MY_DATA_SOURCE_TWO_FILTER_KEY); } - super.configureServlets(); } }); Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2012-05-01 13:48:27 UTC (rev 1861) @@ -69,6 +69,7 @@ String SITE_URL = "kune.siteurl"; String SITE_USER_AVAILABLE_TOOLS = "kune.tools.userSiteAvailableTools"; String SITE_USER_REGIST_ENABLED_TOOLS = "kune.tools.userRegisEnabledTools"; + String SITE_WAVE_IMPORT_USERNAME_PAIRS = "kune.wave.import.usernamespairs"; String UI_TRANSLATOR_ENABLED = "kune.ui-translator.enabled"; String UPLOAD_DELAY_FOR_TEST = "kune.upload.delayfortest"; String UPLOAD_GALLERY_PERMITTED_EXTS = "kune.upload.gallerypermittedextensions"; Modified: trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/main/java/cc/kune/core/server/rack/RackServletFilter.java 2012-05-01 13:48:27 UTC (rev 1861) @@ -35,8 +35,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.waveprotocol.box.server.rpc.ServerRpcProvider; +import org.waveprotocol.box.server.waveserver.CustomImportServlet; import cc.kune.core.server.error.ServerException; +import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.server.rack.dock.Dock; import cc.kune.core.server.rack.dock.RequestMatcher; import cc.kune.core.server.rack.utils.RackHelper; @@ -173,6 +175,8 @@ excludes = rack.getExcludes(); initFilters(filterConfig); LOG.debug("INITIALIZATION DONE!"); + kuneChildInjector.getInstance(CustomImportServlet.class).init( + kuneChildInjector.getInstance(KuneProperties.class)); // Uncomment to generate the graph // graph("docs/wave-guice-graph.dot", injector); Modified: trunk/src/main/java/cc/kune/wave/server/WaveMain.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2012-05-01 13:48:27 UTC (rev 1861) @@ -59,7 +59,7 @@ import org.waveprotocol.box.server.rpc.SignOutServlet; import org.waveprotocol.box.server.rpc.UserRegistrationServlet; import org.waveprotocol.box.server.rpc.WaveRefServlet; -import org.waveprotocol.box.server.waveserver.ImportServlet; +import org.waveprotocol.box.server.waveserver.CustomImportServlet; import org.waveprotocol.box.server.waveserver.WaveBus; import org.waveprotocol.box.server.waveserver.WaveServerException; import org.waveprotocol.box.server.waveserver.WaveletProvider; @@ -233,7 +233,7 @@ boolean enableImport = injector .getInstance(Key.get(Boolean.class, Names.named(CoreSettings.ENABLE_IMPORT))); if (enableImport) - server.addServlet("/import", injector.getInstance(ImportServlet.class)); + server.addServlet("/import", injector.getInstance(CustomImportServlet.class)); String gadgetHostName = injector Added: trunk/src/main/java/org/waveprotocol/box/server/waveserver/CustomImportServlet.java =================================================================== --- trunk/src/main/java/org/waveprotocol/box/server/waveserver/CustomImportServlet.java (rev 0) +++ trunk/src/main/java/org/waveprotocol/box/server/waveserver/CustomImportServlet.java 2012-05-01 13:48:27 UTC (rev 1861) @@ -0,0 +1,311 @@ +// @formatter:off +/** + * Copyright 2012 A. Kaplanov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.waveprotocol.box.server.waveserver; + +import cc.kune.core.server.properties.KuneProperties; + +import com.google.gxp.org.apache.xerces.impl.dv.util.Base64; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.google.protobuf.ByteString; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.Reader; +import java.io.StringWriter; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.logging.Level; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.json.JSONArray; +import org.json.JSONObject; +import org.waveprotocol.box.server.persistence.AttachmentStore; +import org.waveprotocol.wave.model.version.HashedVersion; +import org.waveprotocol.wave.model.wave.InvalidParticipantAddress; +import org.waveprotocol.wave.util.logging.Log; +import org.waveprotocol.wave.federation.Proto.ProtocolAppliedWaveletDelta; +import org.waveprotocol.wave.federation.Proto.ProtocolHashedVersion; +import org.waveprotocol.wave.federation.Proto.ProtocolWaveletDelta; +import org.waveprotocol.wave.federation.Proto.ProtocolWaveletOperation; +import org.waveprotocol.wave.model.id.IdURIEncoderDecoder; +import org.waveprotocol.wave.model.id.WaveId; +import org.waveprotocol.wave.model.id.WaveletId; +import org.waveprotocol.wave.model.id.WaveletName; +import org.waveprotocol.wave.model.version.HashedVersionFactory; +import org.waveprotocol.wave.model.version.HashedVersionFactoryImpl; +import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.util.escapers.jvm.JavaUrlCodec; + +/** + * + * @author (akaplanov(a)gmail.com) (Andrew Kaplanov) + */ +@SuppressWarnings("serial") +@Singleton +public class CustomImportServlet extends HttpServlet { + + private static final Log LOG = Log.get(CustomImportServlet.class); + public static final String GWAVE_PUBLIC_DOMAIN = "a.gwave.com"; + public static final String GWAVE_PUBLIC_USER_NAME = "public"; + public static final String WIAB_SHARED_USER_NAME = ""; + private static final IdURIEncoderDecoder URI_CODEC = new IdURIEncoderDecoder(new JavaUrlCodec()); + private static final HashedVersionFactory HASH_FACTORY = new HashedVersionFactoryImpl(URI_CODEC); + private final WaveletProvider waveletProvider; + private final AttachmentStore attachmentStore; + private final WaveMap waveMap; + private KuneProperties kuneProperties; + private static HashMap<String, String> userMap; + + @Inject + private CustomImportServlet(WaveletProvider waveletProvider, AttachmentStore attachmentStore, + WaveMap waveMap) { + this.waveletProvider = waveletProvider; + this.attachmentStore = attachmentStore; + this.waveMap = waveMap; + } + + public void init(KuneProperties kuneProperties ) { + this.kuneProperties = kuneProperties; + if (userMap == null) { + initUserMap(); + } + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + String domain = request.getHeader("domain"); + WaveId waveId = WaveId.deserialise(request.getHeader("waveId")); + WaveletId waveletId = WaveletId.deserialise(request.getHeader("waveletId")); + final StringWriter error = new StringWriter(); + boolean somethingProcessed = false; + boolean somethingSkipped = false; + try { + JSONObject exp = new JSONObject(readToString(request.getReader())); + JSONArray rawDeltas = exp.getJSONObject("data").getJSONArray("rawDeltas"); + if (rawDeltas.length() != 0) { + List<ProtocolAppliedWaveletDelta> deltas = new LinkedList<ProtocolAppliedWaveletDelta>(); + for (int i = 0; i < rawDeltas.length(); i++) { + deltas.add(ProtocolAppliedWaveletDelta.parseFrom(Base64.decode(rawDeltas.getString(i)))); + } + WaveletName waveletName = WaveletName.of(waveId, waveletId); + LocalWaveletContainerImpl wavelet = (LocalWaveletContainerImpl) waveMap.getLocalWavelet(waveletName); + Set<ParticipantId> participants = new HashSet<ParticipantId>(); + if (wavelet != null) { + participants.addAll(wavelet.accessSnapshot().getParticipants()); + } + for (ProtocolAppliedWaveletDelta appliedDelta : deltas) { + ProtocolWaveletDelta delta = ProtocolWaveletDelta.parseFrom( + appliedDelta.getSignedOriginalDelta().getDelta()); + long currentVersion = 0; + if (wavelet != null) { + currentVersion = wavelet.getCurrentVersion().getVersion(); + } + if (currentVersion == delta.getHashedVersion().getVersion()) { + ProtocolWaveletDelta newDelta = convertDelta(delta, domain, wavelet, waveletName, + participants); + + waveletProvider.submitRequest(waveletName, newDelta, + new WaveletProvider.SubmitRequestListener() { + + @Override + public void onSuccess(int operationsApplied, HashedVersion hashedVersionAfterApplication, + long applicationTimestamp) { + } + + @Override + public void onFailure(String errorMessage) { + error.write(errorMessage); + } + }); + if (error.getBuffer().length() != 0) { + break; + } + if (wavelet == null) { + wavelet = (LocalWaveletContainerImpl) waveMap.getLocalWavelet(waveletName); + } + somethingProcessed = true; + } else { + somethingSkipped = true; + } + } + } + } catch (Exception ex) { + LOG.log(Level.SEVERE, "waveId " + waveId.toString() + ", waveletId " + waveletId.toString(), ex); + throw new IOException(ex); + } + response.setStatus(HttpServletResponse.SC_OK); + if (error.getBuffer().length() != 0) { + response.getOutputStream().write(("error : " + error.getBuffer()).getBytes()); + } else if (somethingProcessed && !somethingSkipped) { + response.getOutputStream().write(("imported").getBytes()); + } else if (somethingProcessed && somethingSkipped) { + response.getOutputStream().write(("appended").getBytes()); + } else { + response.getOutputStream().write(("skipped").getBytes()); + } + } + + private void initUserMap() { + userMap = new HashMap<String,String>(); + List<String> list = kuneProperties.getList(KuneProperties.SITE_WAVE_IMPORT_USERNAME_PAIRS); + // response.getOutputStream().write(list.toString().getBytes()); + for (String item : list) { + String[] splitted = item.split("\\|"); + if (splitted.length == 2) { + userMap.put(splitted[0], splitted[1]); + } + } + } + + /** + * Convert delta from GWave to Wiab + * + * @param delta from GWave + * @param domain target domain + * @param wavelet to append delta + * @param waveletName name of wavelet + * @param set participants of wavelet at this moment + * @return delta to import + * @throws InvalidParticipantAddress deserialize of participant error + */ + protected static ProtocolWaveletDelta convertDelta(ProtocolWaveletDelta delta, String domain, + LocalWaveletContainerImpl wavelet, WaveletName waveletName, + Set<ParticipantId> participants) throws InvalidParticipantAddress { + ProtocolWaveletDelta.Builder newDelta = ProtocolWaveletDelta.newBuilder(delta); + ParticipantId creator = null; + if (wavelet != null) { + creator = wavelet.getCreator(); + } + ParticipantId author = makeParticipantId(delta.getAuthor(), domain); + if (!participants.contains(author) && creator != null) { + // Assign the authorship of the delta from internal GWave users + // (panda(a)a.gwave.com, spelly(a)a.gwave.com) or others to the creator of wave. + if (!author.getAddress().endsWith("@" + GWAVE_PUBLIC_DOMAIN)) { + LOG.warning("Unknown participant " + author.getAddress() + + ", wave " + wavelet.getWaveletName().waveId.getId()); + } + author = creator; + } + newDelta.setAuthor(author.getAddress()); + for (int i = 0; i < delta.getOperationCount(); i++) { + ProtocolWaveletOperation op = delta.getOperation(i); + ProtocolWaveletOperation.Builder newOp = ProtocolWaveletOperation.newBuilder(op); + if (op.hasAddParticipant()) { + initAddParticipantOperation(newOp, op, domain, participants); + if (creator == null && newOp.hasAddParticipant()) { + creator = ParticipantId.of(newOp.getAddParticipant()); + } + } else if (op.hasRemoveParticipant()) { + initRemoveParticipantOperation(newOp, op, domain, participants); + } + // TODO (Andrew Kaplanov) import attachments + newDelta.setOperation(i, newOp); + } + if (wavelet == null) { + ProtocolHashedVersion ver = ProtocolHashedVersion.newBuilder(delta.getHashedVersion()). + setHistoryHash(ByteString.copyFrom(HASH_FACTORY.createVersionZero(waveletName).getHistoryHash())). + build(); + newDelta.setHashedVersion(ver); + } else { + ProtocolHashedVersion ver = ProtocolHashedVersion.newBuilder(delta.getHashedVersion()). + setHistoryHash(ByteString.copyFrom(wavelet.getCurrentVersion().getHistoryHash())). + build(); + newDelta.setHashedVersion(ver); + } + return newDelta.build(); + } + + /** + * Convert adding participant operation. + * Skip operation if participant already exists. + */ + private static void initAddParticipantOperation(ProtocolWaveletOperation.Builder newOperation, + ProtocolWaveletOperation operation, String domain, + Set<ParticipantId> participants) throws InvalidParticipantAddress { + ParticipantId participant = makeParticipantId(operation.getAddParticipant(), domain); + if (!participants.contains(participant)) { + newOperation.setAddParticipant(participant.getAddress()); + participants.add(participant); + } else { + newOperation.setNoOp(true); + } + } + + /** + * Convert removal participant operation. + * Skip operation if nothing to remove. + */ + private static void initRemoveParticipantOperation(ProtocolWaveletOperation.Builder newOperation, + ProtocolWaveletOperation operation, String domain, + Set<ParticipantId> participants) throws InvalidParticipantAddress { + ParticipantId participant = makeParticipantId(operation.getRemoveParticipant(), domain); + if (participants.contains(participant)) { + newOperation.setRemoveParticipant(participant.getAddress()); + participants.remove(participant); + } else { + newOperation.setNoOp(true); + } + } + + /** + * Make WIAB participant Id + * + * @param participant in GWave + * @param domain of WIAB server + */ + private static ParticipantId makeParticipantId(String participant, String domain) + throws InvalidParticipantAddress { + int index = participant.indexOf('@'); + if (index != -1) { + if (participant.substring(0, index).equals(GWAVE_PUBLIC_USER_NAME) + && participant.substring(index + 1).equals(GWAVE_PUBLIC_DOMAIN)) { + participant = WIAB_SHARED_USER_NAME + "@" + domain; + } else { + participant = map(participant.substring(0, index)) + "@" + domain; + } + } else { + participant = map(participant); + } + return ParticipantId.of(participant); + } + + private static String map(String participant) { + String newUser = userMap.get(participant); + return newUser == null? participant: newUser; + } + + private static String readToString(Reader reader) throws FileNotFoundException, IOException { + StringBuilder sb = new StringBuilder(); + char buf[] = new char[1000]; + for (;;) { + int ret = reader.read(buf, 0, buf.length); + if (ret == -1) { + break; + } + sb.append(buf, 0, ret); + } + return sb.toString(); + } +} Modified: trunk/src/main/resources/kune-production.properties =================================================================== --- trunk/src/main/resources/kune-production.properties 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/main/resources/kune-production.properties 2012-05-01 13:48:27 UTC (rev 1861) @@ -117,6 +117,9 @@ # The default language in with the /tutorials/ are shown if the user language is not translated kune.tutorial.defaultlang = en +# This is used to change a username to another similar (for instance during the import). Pairs separed by commas, a pair separed by a pipe. +kune.wave.import.usernamespairs = someuser|some_user + ### Workspace enabled themes # This names are also the name of the items in the theme menu and there are translated Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/main/resources/kune.properties 2012-05-01 13:48:27 UTC (rev 1861) @@ -55,7 +55,6 @@ kune.openfire.db.user = kune kune.openfire.db.password = db4kune - ### Licenses kune.default.license = by-sa-v3.0 @@ -118,6 +117,9 @@ # The default language in with the /tutorials/ are shown if the user language is not translated kune.tutorial.defaultlang = en +# This is used to change a username to another similar (for instance during the import). Pairs separed by commas, a pair separed by a pipe. +kune.wave.import.usernamespairs = someuser|some_user + ### Workspace enabled themes # This names are also the name of the items in the theme menu and there are translated Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/main/resources/wave-server.properties 2012-05-01 13:48:27 UTC (rev 1861) @@ -114,4 +114,4 @@ ssl_keystore_password = fafafa # Enable import of waves via /import URL. Default value: false -enable_import = false +enable_import = true Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumTest.java 2012-05-01 13:48:27 UTC (rev 1861) @@ -94,29 +94,19 @@ // FIXME move content? groupSpace.showTutorial(3, 4, 5, 4, 4, 2, -5, 3, 6, 7, 6, 4, 4, 5, 5, 3, 3, 4, 6, 4, 3); - // blogs - groupSpace.blogTool.click(); - showTooltip(groupSpace.blogTool); - sleep(3000); - groupSpace.showTutorial(3, 4, 3, 3, 6, 5, 5, 3, 3); - // groupSpace.openFirtsContent(); - // sleep(2000); - // groupSpace.newContentBtn.click(); - // sleep(1000); - // groupSpace.goParentBtn.click(); - - // chats - groupSpace.chatTool.click(); - showTooltip(groupSpace.chatTool); - sleep(3000); - groupSpace.showTutorial(3, 6, 6, 4, 7, 3, 3); - // groupSpace.openFirtsContent(); - // sleep(2000); - // groupSpace.openRoomBtn.click(); - // sleep(2000); - // chat.chatIcon.click(); - - // lists + // // blogs + // groupSpace.blogTool.click(); + // showTooltip(groupSpace.blogTool); + // sleep(3000); + // groupSpace.showTutorial(3, 4, 3, 3, 6, 5, 5, 3, 3); + // + // // chats + // groupSpace.chatTool.click(); + // showTooltip(groupSpace.chatTool); + // sleep(3000); + // groupSpace.showTutorial(3, 6, 6, 4, 7, 3, 3); + + // lists groupSpace.listTool.click(); showTooltip(groupSpace.listTool); sleep(2000); @@ -152,28 +142,19 @@ sleep(2000); doScreenshot("calendar"); groupSpace.showTutorial(3, 5, 6, 7, 3, 5, 3, 3, 3); - // groupSpace.openFirtsContent(); - // sleep(2000); - // tasks - groupSpace.taskTool.click(); - showTooltip(groupSpace.taskTool); - sleep(2000); - groupSpace.showTutorial(3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 3); - // groupSpace.openFirtsContent(); + // // tasks + // groupSpace.taskTool.click(); + // showTooltip(groupSpace.taskTool); // sleep(2000); - // doScreenshot("tasks"); - // groupSpace.openFirtsContent(); + // groupSpace.showTutorial(3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 3); + // + // // wiki + // groupSpace.wikiTool.click(); + // showTooltip(groupSpace.wikiTool); // sleep(2000); + // groupSpace.showTutorial(3, 5, 3, 3, 3); - // wiki - groupSpace.wikiTool.click(); - showTooltip(groupSpace.wikiTool); - sleep(2000); - groupSpace.showTutorial(3, 5, 3, 3, 3); - // groupSpace.openFirtsContent(); - // sleep(3000); - // // barters // groupSpace.showTutorial(3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3); } Modified: trunk/src/test/java/cc/kune/selenium/SeleniumConf.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-04-26 01:26:03 UTC (rev 1860) +++ trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-05-01 13:48:27 UTC (rev 1861) @@ -30,8 +30,8 @@ } public enum Site { - demo("kune.beta.iepala.es"), eurosur("beta.eurosur.org"), kunecc("kune.cc"), localhost( - "localhost:8888", "&log_level=INFO&gwt.codesvr=127.0.0.1:9997"); + demo("kune.beta.iepala.es"), kunecc("kune.cc"), localhost("localhost:8888", + "&log_level=INFO&gwt.codesvr=127.0.0.1:9997"), socialglobal("social.gloobal.net"); private String domain; private String params; @@ -56,8 +56,8 @@ public static final Driver DRIVER = Driver.firefox; /* Configure this for use other lang, site, or driver */ - public static final Lang LANG = Lang.en; - public static final Site SITE = Site.demo; + public static final Lang LANG = Lang.es; + public static final Site SITE = Site.socialglobal; public static final int TIMEOUT = 25; SeleniumConf() {

1 0

[kune issues] #262: Improve the links between contents
by kune issues 01 May '12

01 May '12

#262: Improve the links between contents --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: Component: User space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ It would be great to link part of instance of one type of object with an instance of other type of object. This could look like following. Imagine that Michael created a document (thread), added some description text and several Chapters inside. Tony read this document, selects 1st chapter (block of text inside of the object instance) and press button\menu "Create and link the selected text with new object, selects Task from the list (Task, Calendar event, discussion etc). System opens a new object, inserts selected part of text from parent object and a link to it. Tony adds some text where he explains what he wants and Peter as participant. In the Peter's "Personal space" or in his Tasks folder new object instance appears. Peters does something with the child object instance and he is able to follow the link to the parent object in order to get the "whole picture". Of cause you can tell me that I have an opportunity to do the described operations manually. But this requires much more time, switching between windows, several copy\paste operations and manual "rights to read" assignment to Peter for the text block of the parent object. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/262> kune issues <http://kune.ourproject.org/issues/>

1 1

[kune issues] #261: Latest activity in your group changed only after I'му reloaded the page
by kune issues 01 May '12

01 May '12

#261: Latest activity in your group changed only after I'му reloaded the page -------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: defect | Status: new Priority: minor | Milestone: Component: User space | Version: Resolution: | Keywords: Blocked By: | Blocking: -------------------------+------------------ I created and changed documents in Group space. I pressed "Home" button in the top left conner of the page. Home page opened. "Latest activity in your group" changed only after I'му reloaded the page. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/261> kune issues <http://kune.ourproject.org/issues/>

1 1