Author: vjrj_ Date: 2011-11-04 12:48:28 +0100 (Fri, 04 Nov 2011) New Revision: 1580 Added: trunk/src/main/java/cc/kune/gallery/ trunk/src/main/java/cc/kune/gallery/client/ trunk/src/main/java/cc/kune/gallery/server/ trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/cc/kune/gallery/shared/ trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java trunk/src/main/java/org/ourproject/ trunk/src/main/java/org/ourproject/kune/ trunk/src/main/java/org/ourproject/kune/gallery/ Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml Log: Some fixes (with sizes, group creation, etc) Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -149,11 +149,11 @@ public void onCancel() { getView().hide(); + stateManager.redirectOrRestorePreviousToken(); } public void onClose() { reset(); - stateManager.redirectOrRestorePreviousToken(); } private void onRegister() { @@ -196,14 +196,14 @@ @Override public void onSuccess(final StateAbstractDTO state) { - getView().hide(); + stateManager.setRetrievedStateAndGo(state); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { - stateManager.setRetrievedStateAndGo(state); groupOptions.showTooltip(); } }); + getView().hide(); reset(); getView().unMask(); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -40,14 +40,14 @@ super(); this.stateManager = stateManager; putValue(Action.NAME, i18n.t("Create New Group")); - putValue(Action.TOOLTIP, - i18n.t("Create a new group for your initiative or organization " - + "(NGO, collective, academic group...)")); + putValue(Action.TOOLTIP, i18n.t("Create a new group for your initiative or organization " + + "(NGO, collective, academic group...)")); } @Override public void actionPerformed(final ActionEvent event) { - stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.NEWGROUP); + stateManager.gotoHistoryToken(SiteTokens.NEWGROUP); + // stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.NEWGROUP); } } 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-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.sitebar.spaces; +import cc.kune.common.client.log.Log; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.auth.SignIn; @@ -269,6 +270,7 @@ } private void restoreToken(final String token) { + Log.info("Restoring token from SpaceSelector: " + token); stateManager.gotoHistoryToken(token); } Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -57,6 +57,7 @@ private final static int AVATARLABELMAXSIZE = 4; private final static int AVATARSIZE = 22; private final static String CATEG_HEIGHT = "84px"; + private final static String CATEG_MIN_HEIGHT = "55px"; private static AbstractSNPanelUiBinder uiBinder = GWT.create(AbstractSNPanelUiBinder.class); protected final ActionSimplePanel actions; protected final GSpaceArmor armor; @@ -173,22 +174,22 @@ return bottomActionsToolbar; } - public void setFirstCategoryVisible(final boolean visible) { + public void setFirstCategoryVisible(final boolean visible, final boolean big) { firstCategoryPanel.setVisible(visible); - firstCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + firstCategoryPanel.setHeight(visible ? (big ? CATEG_HEIGHT : CATEG_MIN_HEIGHT) : "0px"); } - public void setSndCategoryVisible(final boolean visible) { + public void setSndCategoryVisible(final boolean visible, final boolean big) { sndCategoryPanel.setVisible(visible); - sndCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + sndCategoryPanel.setHeight(visible ? (big ? CATEG_HEIGHT : CATEG_MIN_HEIGHT) : "0px"); } protected void setTooltip(final Widget widget, final String title) { Tooltip.to(widget, title); } - public void setTrdCategoryVisible(final boolean visible) { + public void setTrdCategoryVisible(final boolean visible, final boolean big) { trdCategoryPanel.setVisible(visible); - trdCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + trdCategoryPanel.setHeight(visible ? (big ? CATEG_HEIGHT : CATEG_MIN_HEIGHT) : "0px"); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -35,6 +35,8 @@ public abstract class AbstractSNPresenter<V extends View, Proxy_ extends Proxy<?>> extends Presenter<View, Proxy<?>> { + private static final int MAX_NUM_AVATAR_IN_A_ROW = 6; + protected final Provider<FileDownloadUtils> downloadProvider; public AbstractSNPresenter(final EventBus eventBus, final View view, final Proxy<?> proxy, @@ -43,6 +45,10 @@ this.downloadProvider = downloadProvider; } + protected boolean areMany(final int numAvatars) { + return numAvatars > MAX_NUM_AVATAR_IN_A_ROW; + } + protected GuiActionDescCollection createMenuItems(final Object target, final AbstractSNMembersActionsRegistry registry, final String title) { final GuiActionDescCollection items = new GuiActionDescCollection(); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -92,13 +92,18 @@ } @Override + public void setAdminsVisible(final boolean visible, final boolean areMany) { + super.setFirstCategoryVisible(visible, areMany); + } + + @Override public void setCollabsCount(final int count) { sndCategoryCount.setText(new StringBuffer("(").append(count).append(")").toString()); } @Override - public void setCollabsVisible(final boolean visible) { - super.setSndCategoryVisible(visible); + public void setCollabsVisible(final boolean visible, final boolean areMany) { + super.setSndCategoryVisible(visible, areMany); } @Override @@ -107,8 +112,8 @@ } @Override - public void setPendingVisible(final boolean visible) { - super.setTrdCategoryVisible(visible); + public void setPendingVisible(final boolean visible, final boolean areMany) { + super.setTrdCategoryVisible(visible, areMany); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -74,13 +74,15 @@ void setAdminsCount(int count); + void setAdminsVisible(boolean visible, boolean big); + void setCollabsCount(int count); - void setCollabsVisible(boolean visible); + void setCollabsVisible(boolean visible, boolean big); void setPendingsCount(int count); - void setPendingVisible(boolean visible); + void setPendingVisible(boolean visible, boolean big); void setVisible(boolean visible); @@ -198,28 +200,28 @@ } else { final boolean userIsAdmin = rights.isAdministrable(); final boolean userCanView = rights.isVisible(); - + getView().setAdminsVisible(true, areMany(numAdmins)); if (userCanView) { for (final GroupDTO admin : adminsList) { final String avatar = getAvatar(admin); getView().addAdmin(admin, avatar, admin.getLongName(), "", createMenuItems(admin, adminsMenuItemsRegistry, admin.getLongName())); } - getView().setCollabsVisible(numCollabs > 0); + getView().setCollabsVisible(numCollabs > 0, areMany(numCollabs)); for (final GroupDTO collab : collabList) { final String avatar = getAvatar(collab); getView().addCollab(collab, avatar, collab.getLongName(), "", createMenuItems(collab, collabsMenuItemsRegistry, collab.getLongName())); } if (userIsAdmin) { - getView().setPendingVisible(numPendings > 0); + getView().setPendingVisible(numPendings > 0, areMany(numPendings)); for (final GroupDTO pendingCollab : pendingCollabsList) { final String avatar = getAvatar(pendingCollab); getView().addPending(pendingCollab, avatar, pendingCollab.getLongName(), "", createMenuItems(pendingCollab, pendingsMenuItemsRegistry, pendingCollab.getLongName())); } } else { - getView().setPendingVisible(false); + getView().setPendingVisible(false, false); } getView().showMembers(); } Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -58,7 +58,7 @@ setTooltip(sndCategoryLabel, i18n.t("Groups which this user Joined")); trdCategoryLabel.setText("NOT USED"); setTooltip(trdCategoryLabel, "NOT USED"); - super.setTrdCategoryVisible(false); + super.setTrdCategoryVisible(false, false); sndDeckLabel.setText("NOT USED"); bottomActionsToolbar = new ActionFlowPanel(guiProvider); bottomPanel.add(bottomActionsToolbar); @@ -94,8 +94,8 @@ } @Override - public void setBuddiesVisible(final boolean visible) { - super.setFirstCategoryVisible(visible); + public void setBuddiesVisible(final boolean visible, final boolean areMany) { + super.setFirstCategoryVisible(visible, areMany); } @Override @@ -109,8 +109,8 @@ } @Override - public void setParticipationVisible(final boolean visible) { - super.setSndCategoryVisible(visible); + public void setParticipationVisible(final boolean visible, final boolean areMany) { + super.setSndCategoryVisible(visible, areMany); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -73,13 +73,13 @@ void setBuddiesCount(int count); - void setBuddiesVisible(boolean visible); + void setBuddiesVisible(boolean visible, boolean areMany); void setNoBuddies(); void setParticipationCount(int count); - void setParticipationVisible(boolean visible); + void setParticipationVisible(boolean visible, boolean areMany); void setVisible(boolean visible); @@ -143,7 +143,8 @@ if (state.getSocialNetworkData().isBuddiesVisible()) { // In fact now we show the user network or not. setBuddiesState(state); - getView().setBuddiesVisible(true); + getView().setBuddiesVisible(true, + areMany(state.getSocialNetworkData().getUserBuddies().getBuddies().size())); // getView().setVisible(buddies + participeIn > 0); } else { getView().showBuddiesNotPublic(); @@ -219,7 +220,7 @@ } final int totalGroups = numAdmins + numCollaborators; // getView().setParticipationCount(totalGroups); - getView().setParticipationVisible(totalGroups > 0); + getView().setParticipationVisible(totalGroups > 0, areMany(totalGroups)); return totalGroups; } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -43,7 +43,7 @@ this.eventBus = eventBus; this.cacheMap = new HashMap<StateToken, StateAbstractDTO>(); // Don't use while we don't check changes in the server - useCache = false; + useCache = true; } @Override Modified: trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -107,7 +107,8 @@ // This is necessary? contentManager.save(newGroup.getDefaultContent()); // contentManager.setTags(user, defContentId, tags); - return contentRPC.getContent(userHash, newGroup.getDefaultContent().getStateToken()); + return contentRPC.getContent(userHash, + newGroup.getDefaultContent().getStateToken().copy().clearDocument()); }; @Override Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -23,7 +23,8 @@ import com.google.inject.Module; public class DocumentServerModule implements Module { - public void configure(final Binder binder) { - binder.bind(DocumentServerTool.class).asEagerSingleton(); - } + @Override + public void configure(final Binder binder) { + binder.bind(DocumentServerTool.class).asEagerSingleton(); + } } Added: trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -0,0 +1,30 @@ +/* + * + * Copyright (C) 2007-2009 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.gallery.server; + +import com.google.inject.Binder; +import com.google.inject.Module; + +public class GalleryServerModule implements Module { + @Override + public void configure(final Binder binder) { + binder.bind(GalleryServerTool.class).asEagerSingleton(); + } +} Added: trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -0,0 +1,61 @@ +/* + * + * Copyright (C) 2007-2009 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.gallery.server; + +import static cc.kune.gallery.shared.GalleryConstants.NAME; +import static cc.kune.gallery.shared.GalleryConstants.ROOT_NAME; +import static cc.kune.gallery.shared.GalleryConstants.TYPE_ALBUM; +import static cc.kune.gallery.shared.GalleryConstants.TYPE_ROOT; +import static cc.kune.gallery.shared.GalleryConstants.TYPE_UPLOADEDFILE; + +import java.util.Arrays; + +import cc.kune.core.server.AbstractServerTool; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.Container; +import cc.kune.domain.Group; +import cc.kune.domain.User; + +import com.google.inject.Inject; + +public class GalleryServerTool extends AbstractServerTool { + + @Inject + public GalleryServerTool(final ContentManager contentManager, final ContainerManager containerManager, + final ToolConfigurationManager configurationManager, final I18nTranslationService i18n) { + super(NAME, ROOT_NAME, TYPE_ROOT, Arrays.asList(TYPE_UPLOADEDFILE), Arrays.asList(TYPE_ROOT, + TYPE_ALBUM), Arrays.asList(TYPE_ALBUM), Arrays.asList(TYPE_ROOT, TYPE_ALBUM), contentManager, + containerManager, configurationManager, i18n, ServerToolTarget.forBoth); + } + + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { + final Container rootFolder = createRoot(group); + + containerManager.createFolder(group, rootFolder, i18n.t("Album sample"), user.getLanguage(), + TYPE_ALBUM); + return group; + } + +} Added: trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -0,0 +1,33 @@ +/* + * + * 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.gallery.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class GalleryConstants { + public static final String NAME = "gallery"; + public static final String ROOT_NAME = "gallery"; + public static final String TYPE_ALBUM = NAME + "." + "album"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private GalleryConstants() { + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-04 11:48:28 UTC (rev 1580) @@ -42,9 +42,9 @@ <g:center size="1.0"> <g:DockLayoutPanel unit="PX" ui:field="splitCenter" styleName="{res.style.entityCentralContainer}"> - <g:north size="168"> + <g:north size="153"> <g:VerticalPanel width="100%" - height="168px"> + height="153px"> <g:FlowPanel height="70px" width="100%" styleName="{res.style.entityHeader}" ui:field="entityHeader"> <!--<g:RichTextArea width="100%" height="70px" /> --> @@ -54,7 +54,7 @@ </g:FlowPanel> <g:HTMLPanel ui:field="arrow" styleName="{res.style.docSubheaderArrow}"/> - <g:FlowPanel width="100%" height="60px" + <g:FlowPanel width="100%" height="45px" styleName="{res.style.docSubheader}" ui:field="docSubheader"> </g:FlowPanel> </g:VerticalPanel> Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-11-04 11:48:28 UTC (rev 1580) @@ -104,7 +104,7 @@ overflow: hidden; border-collapse: separate; margin: -14px 0 0; - padding: 15px 0 0; + padding: 10px 0 0; } .docSubheader button.k-fr { @@ -219,7 +219,7 @@ } .entityToolsCenter span { - font-size: 22px; + font-size: 16px; font-weight: bold; } Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-11-04 11:48:28 UTC (rev 1580) @@ -67,10 +67,10 @@ .k-tool-item-focus span { color: c4; + font-size: 16px; } .k-tool-item-nofocus { - } .k-tool-item-nofocus span { @@ -83,6 +83,7 @@ .k-tool-item-selected span { color: c3; + font-size: 22px; } /* Derived from: from http://jonrohan.me/guide/css/creating-triangles-in-css/ */ Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-11-04 11:48:28 UTC (rev 1580) @@ -4,7 +4,7 @@ <ui:style> .label { text-decoration: none; - font-size: 22px; + font-size: 16px; color: white; /* text-shadow: 1px 1px 6px grey; */ @@ -19,7 +19,7 @@ } .flow { - min-height: 30px; + /* min-height: 30px; */ padding: 1px 10px; -moz-user-select: none; -khtml-user-select: none;