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;