r1802 - in trunk/src/main/java/cc/kune: barters/client/actions blogs/client/actions chat/client/actions core/client/actions/xml docs/client/actions events/client/actions gspace/client/actions gspace/client/armor/resources gspace/client/viewers lists/client/actions tasks/client/actions trash/client/actions wiki/client/actions
Author: vjrj_ Date: 2012-03-28 03:02:06 +0200 (Wed, 28 Mar 2012) New Revision: 1802 Modified: trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java Log: Minor changes (folder go up in bottombar, less rounded borders) Modified: trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -69,21 +69,21 @@ final Provider<RefreshContentMenuItem> refresh, final Provider<CopyContentMenuItem> copyContent, final Provider<WriteToParticipantsMenuItem> writeToParticipants) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newBartersBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addPublicMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, newBartersBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, newFolderBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, copyContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, writeToParticipants, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents); Modified: trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -79,25 +79,25 @@ final Provider<WriteToParticipantsMenuItem> writeToParticipants, final Provider<SetAsHomePageMenuItem> setAsHomePage) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostIconBtn, noRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, blogNewMenu, containersNoRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, postNewMenu, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostItem, containersNoRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newBlogBtn, TYPE_ROOT); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newPostIconBtn, noRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, blogNewMenu, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, postNewMenu, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newPostItem, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, newBlogBtn, TYPE_ROOT); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addPublicMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, chatAbout, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, copyContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, writeToParticipants, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents); Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -51,12 +51,12 @@ final Provider<OpenRoomBtn> openRoomBtn, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ContentViewerOptionsMenu> optionsMenuContent) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newRoomBtn, TYPE_ROOT); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, openRoomBtn, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newRoomBtn, TYPE_ROOT); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, openRoomBtn, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openRoomMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openRoomArchiveMenuItem, containersNoRoot); } Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -132,7 +132,7 @@ subMenuDescriptor = new SubMenuDescriptor(parent, false, i18n.t(name)); // subMenuDescriptor.setVisible(false); submenus.put(subpathId, subMenuDescriptor); - actionRegistry.addAction(ActionGroups.TOOLBAR, subMenuDescriptor, typeId); + actionRegistry.addAction(ActionGroups.TOPBAR, subMenuDescriptor, typeId); } current = subMenuDescriptor; } @@ -176,7 +176,7 @@ descrip.getNewContentTitle(), TextUtils.empty(contentIntro) ? "" : contentIntro); } final Provider<GuiActionDescrip> menuItemProvider = createMenuItem(descrip, origTypeId, action); - actionRegistry.addAction(ActionGroups.TOOLBAR, menuItemProvider, origTypeId); + actionRegistry.addAction(ActionGroups.TOPBAR, menuItemProvider, origTypeId); } } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -81,26 +81,26 @@ final NewMenusForTypeIdsRegistry newMenusRegistry, final DocsFolderNewMenu foldersNewMenu, final DocsNewMenu docsNewMenu) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newDocIconBtn, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, foldersNewMenu, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, docsNewMenu, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newDocMenuItem, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderMenuItem, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newDocIconBtn, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newFolderBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, foldersNewMenu, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, docsNewMenu, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, newDocMenuItem, containers); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addPublicMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, newFolderMenuItem, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, chatAbout, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, copyContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, writeToParticipants, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents); Modified: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -75,34 +75,34 @@ final CalendarOnOverMenu onOverMenu, final Provider<CalendarGoTodayBtn> goToday, final Provider<RefreshContentMenuItem> refresh) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, goToday, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, calPrevBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, cal1DayBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, cal3DaysBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, cal7DaysBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, calMonthBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, calNextBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, export, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, goToday, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, calPrevBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, cal1DayBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, cal3DaysBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, cal7DaysBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, calMonthBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, calNextBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, export, all); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addPublicMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, copyContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, writeToParticipants, contents); // On over calendar menu - actionsRegistry.addAction(ActionGroups.TOOLBAR, onOverMenu, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, onOverMenu, containers); eventOpenMenuItem.get(); eventAddMenuItem.get(); eventRemoveMenuItem.get(); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newMeetingsBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, newMeetingsBtn, containers); // For now, commented: // actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ActionGroups.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -24,10 +24,11 @@ * edit, etc) */ public final class ActionGroups { - public final static String EDIT = "edit"; - public final static String ITEM_MENU = "menu-item"; - public final static String TOOLBAR = "view"; + public final static String BOTTOMBAR = "bottombar"; + public final static String EDIT = "edit"; + public final static String ITEM_MENU = "menu-item"; + public final static String TOPBAR = "topbar"; - private ActionGroups() { - } + private ActionGroups() { + } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -71,7 +71,7 @@ final CoreResources res, final Session session, final String typeRoot) { super(action); this.withToolTip(i18n.t("Go up: Open the container folder")).withIcon(res.folderGoUp()).withStyles( - "k-btn-min, k-fr"); + "k-btn-min, k-fl"); this.withId(GO_PARENT_ID); final StateAbstractDTO state = session.getCurrentState(); if (!session.isCurrentStateAContent()) { 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-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css 2012-03-28 01:02:06 UTC (rev 1802) @@ -130,12 +130,12 @@ border-left: 1px solid #959595; border-right: 1px solid #959595; border-top: 1px solid #959595; - -webkit-border-top-left-radius: 3px; - -moz-border-radius-topleft: 3px; - border-top-left-radius: 3px; - -webkit-border-top-right-radius: 3px; - -moz-border-radius-topright: 3px; - border-top-right-radius: 3px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; position: absolute; top: 0; bottom: 0; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPresenter.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -198,11 +198,16 @@ throw new UIException("Unexpected status in Viewer"); } } - final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContent.getGroup(), - stateContent.getTypeId(), session.isLogged(), rights, ActionGroups.TOOLBAR); + final GuiActionDescCollection topActions = actionsRegistry.getCurrentActions( + stateContent.getGroup(), stateContent.getTypeId(), session.isLogged(), rights, + ActionGroups.TOPBAR); + final GuiActionDescCollection bottomActions = actionsRegistry.getCurrentActions( + stateContent.getGroup(), stateContent.getTypeId(), session.isLogged(), rights, + ActionGroups.BOTTOMBAR); final GuiActionDescCollection pathActions = pathToolbarUtils.createPath(stateContent.getContainer(), true); - getView().setFooterActions(pathActions); - getView().setSubheaderActions(actions); + bottomActions.addAll(pathActions); + getView().setSubheaderActions(topActions); + getView().setFooterActions(bottomActions); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -201,12 +201,17 @@ getView().setContainer(stateContainer); final AccessRights rights = stateContainer.getContainerRights(); // NotifyUser.info("Rights: " + rights, true); - final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContainer.getGroup(), - stateContainer.getTypeId(), session.isLogged(), rights, ActionGroups.TOOLBAR); + final GuiActionDescCollection topActions = actionsRegistry.getCurrentActions( + stateContainer.getGroup(), stateContainer.getTypeId(), session.isLogged(), rights, + ActionGroups.TOPBAR); + final GuiActionDescCollection bottomActions = actionsRegistry.getCurrentActions( + stateContainer.getGroup(), stateContainer.getTypeId(), session.isLogged(), rights, + ActionGroups.BOTTOMBAR); final ContainerDTO container = stateContainer.getContainer(); final GuiActionDescCollection pathActions = pathToolbarUtils.createPath(container, true); - getView().setSubheaderActions(actions); - getView().setFooterActions(pathActions); + bottomActions.addAll(pathActions); + getView().setSubheaderActions(topActions); + getView().setFooterActions(bottomActions); createChildItems(container, stateContainer.getContainerRights()); } } Modified: trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -82,32 +82,32 @@ final Provider<ChatAboutContentBtn> chatAbout, final Provider<DelListMenuItem> delFolderMenuItem, final Provider<SetAsHomePageMenuItem> setAsHomePage) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContainer, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostIconBtn, noRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newListBtn, TYPE_ROOT); - actionsRegistry.addAction(ActionGroups.TOOLBAR, listNewMenu, containersNoRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, postNewMenu, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribeBtn, containersNoRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refreshList, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refreshPost, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, listOpenessMenuItem, containersNoRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostItem, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContainer, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, newPostIconBtn, noRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, newListBtn, TYPE_ROOT); + actionsRegistry.addAction(ActionGroups.TOPBAR, listNewMenu, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, postNewMenu, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, subscribeBtn, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, refreshList, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, refreshPost, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, listOpenessMenuItem, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, newPostItem, containersNoRoot); // actionsRegistry.addAction(ActionGroups.TOOLBAR, newListMenuItem, // TYPE_ROOT); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribersCount, containersNoRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addPublicMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, subscribersCount, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOPBAR, copyContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, chatAbout, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, writeToParticipants, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, delFolderMenuItem, containersNoRoot); Modified: trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -82,26 +82,26 @@ final Provider<DelFolderMenuItem> delFolderMenuItem, final Provider<SetAsHomePageMenuItem> setAsHomePage) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newTaskIconBtn, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newTaskIconBtn, all); // actionsRegistry.addAction(ActionGroups.TOOLBAR, taskFolderNewMenu, // containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, taskNewMenu, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, taskNewMenu, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, newFolderBtn, containers); // actionsRegistry.addAction(ActionGroups.TOOLBAR, newTaskItem, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addPublicMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, chatAbout, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, copyContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, writeToParticipants, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, marksAsDoneMenuItem, Modified: trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -47,8 +47,8 @@ final Provider<RefreshContentMenuItem> refresh, final Provider<GoParentChatBtn> folderGoUp, final Provider<ContentViewerOptionsMenu> optionsMenuContent) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); // actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, // DocsToolConstants.TYPE_DOCUMENT); // actionsRegistry.addAction(ActionGroups.ITEM_MENU, action, Modified: trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-28 00:46:55 UTC (rev 1801) +++ trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-28 01:02:06 UTC (rev 1802) @@ -80,29 +80,29 @@ final Provider<WriteToParticipantsMenuItem> writeToParticipants, final WikiPageNewMenu wikipageNewMenu) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newWikiIconBtn, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newWikiIconBtn, all); + actionsRegistry.addAction(ActionGroups.TOPBAR, newFolderBtn, containers); // actionsRegistry.addAction(ActionGroups.TOOLBAR, folderNewMenu, // containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, wikipageNewMenu, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, wikipageNewMenu, contents); // actionsRegistry.addAction(ActionGroups.TOOLBAR, newWikiMenuItem, // containers); // actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderMenuItem, // containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); - actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.BOTTOMBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, addPublicMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOPBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, chatAbout, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, copyContent, contents); + actionsRegistry.addAction(ActionGroups.TOPBAR, writeToParticipants, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents);
participants (1)
-
Vicente J. Ruiz Jurado