kune-commits

Download

[email protected]

October 2008

1 participants
40 discussions

r907 - trunk
by vjrj 14 Oct '08

14 Oct '08

Author: vjrj Date: 2008-10-14 02:23:09 +0200 (Tue, 14 Oct 2008) New Revision: 907 Modified: trunk/pom.xml Log: jmagick dep Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-10-13 21:53:04 UTC (rev 906) +++ trunk/pom.xml 2008-10-14 00:23:09 UTC (rev 907) @@ -84,6 +84,11 @@ <artifactId>suco</artifactId> <version>0.5.06</version> </dependency> +<dependency> + <groupId>jmagick</groupId> + <artifactId>jmagick</artifactId> + <version>6.2.4</version> +</dependency>  <dependency>

1 0

r906 - in trunk/src/main/java/org/ourproject/kune/workspace/client: skel socialnet
by vjrj 13 Oct '08

13 Oct '08

Author: vjrj Date: 2008-10-13 23:53:04 +0200 (Mon, 13 Oct 2008) New Revision: 906 Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java Log: Incomplete - taskHosted mode default border layout problems Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-13 21:53:04 UTC (rev 906) @@ -78,9 +78,12 @@ public void onHide(Component component) { super.onHide(component); if (accordionLayout.getActiveItem() != null && accordionLayout.getActiveItem().isHidden()) { - Component firstComponent = entitySummary.getComponent(0); - if (firstComponent != null) { - ((Panel) firstComponent).expand(true); + Panel firstComponent = null; + for (Component compo : entitySummary.getComponents()) { + if (compo.isVisible() && firstComponent == null) { + firstComponent = (Panel) compo; + firstComponent.expand(true); + } } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-13 21:53:04 UTC (rev 906) @@ -43,11 +43,13 @@ gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " + "please request to join to work on it"), dragConf, true, true, false, true, false); gridMenuPanel.setBorder(true); - gridMenuPanel.onDoubleClick(new Listener<String>() { + Listener<String> go = new Listener<String>() { public void onEvent(final String groupShortName) { presenter.onDoubleClick(groupShortName); } - }); + }; + gridMenuPanel.onClick(go); + gridMenuPanel.onDoubleClick(go); gridMenuPanel.getBottomBar().setCls("k-blank-toolbar"); super.add(gridMenuPanel); ws.addInSummary(this); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-10-13 21:53:04 UTC (rev 906) @@ -103,10 +103,6 @@ this.view = view; } - public void onDoubleClick(final String groupShortName) { - stateManager.gotoToken(groupShortName); - } - private boolean isMember(final boolean userIsAdmin, final boolean userIsCollab) { return userIsAdmin || userIsCollab; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-13 21:53:04 UTC (rev 906) @@ -27,6 +27,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; +import com.calclab.suco.client.listener.Listener; import com.gwtext.client.widgets.BoxComponent; import com.gwtext.client.widgets.event.ContainerListenerAdapter; @@ -42,6 +43,13 @@ gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false, false, false, false); gridMenuPanel.setBorder(true); + Listener<String> go = new Listener<String>() { + public void onEvent(final String groupShortName) { + presenter.onDoubleClick(groupShortName); + } + }; + gridMenuPanel.onClick(go); + gridMenuPanel.onDoubleClick(go); super.add(gridMenuPanel); ws.addInSummary(this); ws.addListenerInEntitySummary(new ContainerListenerAdapter() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2008-10-13 17:01:21 UTC (rev 905) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2008-10-13 21:53:04 UTC (rev 906) @@ -47,235 +47,239 @@ private final MenuItemCollection<GroupDTO> otherLoggedOperationsUsers; public SocialNetworkPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.i18n = i18n; - this.stateManager = stateManager; - this.imageUtils = imageUtils; - this.session = session; - this.snServiceProvider = snServiceProvider; - createButtons(); - createMenuActions(); - otherOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherLoggedOperationsUsers = new MenuItemCollection<GroupDTO>(); - otherOperations = new MenuItemCollection<GroupDTO>(); - otherLoggedOperations = new MenuItemCollection<GroupDTO>(); + final ImageUtils imageUtils, final Session session, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.i18n = i18n; + this.stateManager = stateManager; + this.imageUtils = imageUtils; + this.session = session; + this.snServiceProvider = snServiceProvider; + createButtons(); + createMenuActions(); + otherOperationsUsers = new MenuItemCollection<GroupDTO>(); + otherLoggedOperationsUsers = new MenuItemCollection<GroupDTO>(); + otherOperations = new MenuItemCollection<GroupDTO>(); + otherLoggedOperations = new MenuItemCollection<GroupDTO>(); } public void addGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.add(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperations : otherOperations; + collection.add(operation); } public void addUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.add(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; + collection.add(operation); } + public void onDoubleClick(final String groupShortName) { + stateManager.gotoToken(groupShortName); + } + public void removeGroupOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperations : otherOperations; - collection.remove(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperations : otherOperations; + collection.remove(operation); } public void removeUserOperation(final MenuItem<GroupDTO> operation, final boolean mustBeLogged) { - MenuItemCollection<GroupDTO> collection; - collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; - collection.remove(operation); + MenuItemCollection<GroupDTO> collection; + collection = mustBeLogged ? otherLoggedOperationsUsers : otherOperationsUsers; + collection.remove(operation); } protected GridItem<GroupDTO> createGridItem(final GridGroup groupCategory, final GroupDTO group, - final AccessRightsDTO rights, final MenuItem<GroupDTO>... gridMenuItems) { - final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); - final CustomMenu<GroupDTO> menu = gridItem.getMenu(); - if (rights.isAdministrable()) { - for (final MenuItem<GroupDTO> item : gridMenuItems) { - menu.addMenuItem(item); - } - } - return gridItem; + final AccessRightsDTO rights, final MenuItem<GroupDTO>... gridMenuItems) { + final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); + final CustomMenu<GroupDTO> menu = gridItem.getMenu(); + if (rights.isAdministrable()) { + for (final MenuItem<GroupDTO> item : gridMenuItems) { + menu.addMenuItem(item); + } + } + return gridItem; } private void createButtons() { - requestJoin = new GridButton("images/add-green.gif", i18n.t("Participate"), i18n - .t("Request to participate in this group"), new Listener<String>() { - public void onEvent(final String parameter) { - Site.showProgressProcessing(); - snServiceProvider.get().requestJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - final SocialNetworkRequestResult resultType = (SocialNetworkRequestResult) result; - switch (resultType) { - case accepted: - Site.info(i18n.t("You are now member of this group")); - stateManager.reload(); - break; - case denied: - Site.important(i18n.t("Sorry this is a closed group")); - break; - case moderated: - Site.info(i18n.t("Requested. Waiting for admins decision")); - break; - } - } - }); - } - }); + requestJoin = new GridButton("images/add-green.gif", i18n.t("Participate"), i18n + .t("Request to participate in this group"), new Listener<String>() { + public void onEvent(final String parameter) { + Site.showProgressProcessing(); + snServiceProvider.get().requestJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + Site.hideProgress(); + final SocialNetworkRequestResult resultType = (SocialNetworkRequestResult) result; + switch (resultType) { + case accepted: + Site.info(i18n.t("You are now member of this group")); + stateManager.reload(); + break; + case denied: + Site.important(i18n.t("Sorry this is a closed group")); + break; + case moderated: + Site.info(i18n.t("Requested. Waiting for admins decision")); + break; + } + } + }); + } + }); - unJoinButton = new GridButton("images/del.gif", i18n.t("Unjoin"), i18n - .t("Don't participate more in this group"), new Listener<String>() { - public void onEvent(final String parameter) { - removeMemberAction(); - } - }); + unJoinButton = new GridButton("images/del.gif", i18n.t("Unjoin"), i18n + .t("Don't participate more in this group"), new Listener<String>() { + public void onEvent(final String parameter) { + removeMemberAction(); + } + }); } private GridItem<GroupDTO> createDefMemberMenu(final GroupDTO group, final GridGroup gridGroup) { - final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); - final String longName = group.getLongName(); - boolean isPersonal = group.getType().equals(GroupType.PERSONAL); - final String toolTip = i18n.t(isPersonal ? "User nickname: [%s]" : "Group short name: [%s]", group - .getShortName()); - final String imageHtml = isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) : imageUtils - .getImageHtml(ImageDescriptor.groupDefIcon); - final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, - longName, longName, " ", longName, toolTip, menu); - if (!isPersonal) { - menu.addMenuItemList(otherOperations); - } - if (session.isLogged() && !isPersonal) { - menu.addMenuItemList(otherLoggedOperations); - } - if (isPersonal) { - menu.addMenuItemList(otherOperationsUsers); - } - if (session.isLogged() && isPersonal) { - menu.addMenuItemList(otherLoggedOperationsUsers); - } + final CustomMenu<GroupDTO> menu = new CustomMenu<GroupDTO>(group); + final String longName = group.getLongName(); + boolean isPersonal = group.getType().equals(GroupType.PERSONAL); + final String toolTip = i18n.t(isPersonal ? "User nickname: [%s]" : "Group short name: [%s]", group + .getShortName()); + final String imageHtml = isPersonal ? imageUtils.getImageHtml(ImageDescriptor.personDef) : imageUtils + .getImageHtml(ImageDescriptor.groupDefIcon); + final GridItem<GroupDTO> gridItem = new GridItem<GroupDTO>(group, gridGroup, group.getShortName(), imageHtml, + longName, longName, " ", longName, toolTip, menu); + if (!isPersonal) { + menu.addMenuItemList(otherOperations); + } + if (session.isLogged() && !isPersonal) { + menu.addMenuItemList(otherLoggedOperations); + } + if (isPersonal) { + menu.addMenuItemList(otherOperationsUsers); + } + if (session.isLogged() && isPersonal) { + menu.addMenuItemList(otherLoggedOperationsUsers); + } - return gridItem; + return gridItem; } private void createMenuActions() { - gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoToken(groupDTO.getShortName()); - } - }); - gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO groupDTO) { - stateManager.gotoToken(groupDTO.getShortName()); - } - }); - unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n - .t("Don't participate more as a member in this group"), new Listener<GroupDTO>() { - public void onEvent(final GroupDTO groupDTO) { - removeMemberAction(groupDTO); - } - }); - changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", - i18n.t("Change to collaborator"), new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().setAdminAsCollab(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().deleteMember(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member removed")); - stateManager.reload(); - // in the future, only if I cannot - // be affected: - // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); - } - }); - changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().AcceptJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member accepted")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Don't accept this member"), - new Listener<GroupDTO>() { - public void onEvent(final GroupDTO group) { - Site.showProgressProcessing(); - snServiceProvider.get().denyJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), group.getShortName(), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member rejected")); - stateManager.setSocialNetwork(result); - } - }); - } - }); + gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO groupDTO) { + stateManager.gotoToken(groupDTO.getShortName()); + } + }); + gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO groupDTO) { + stateManager.gotoToken(groupDTO.getShortName()); + } + }); + unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Don't participate more in this group"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO groupDTO) { + removeMemberAction(groupDTO); + } + }); + changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", + i18n.t("Change to collaborator"), new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().setAdminAsCollab(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Type of member changed")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().deleteMember(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member removed")); + stateManager.reload(); + // in the future, only if I cannot + // be affected: + // snService.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); + } + }); + changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Type of member changed")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().AcceptJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member accepted")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Don't accept this member"), + new Listener<GroupDTO>() { + public void onEvent(final GroupDTO group) { + Site.showProgressProcessing(); + snServiceProvider.get().denyJoinGroup(session.getUserHash(), + session.getCurrentState().getStateToken(), group.getShortName(), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member rejected")); + stateManager.setSocialNetwork(result); + } + }); + } + }); } private void removeMemberAction() { - removeMemberAction(session.getCurrentState().getGroup()); + removeMemberAction(session.getCurrentState().getGroup()); } private void removeMemberAction(final GroupDTO groupDTO) { - Site.showProgressProcessing(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), - new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Removed as member")); - stateManager.reload(); - // in the future with user info: - // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) - // result); - } - }); + Site.showProgressProcessing(); + snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), + new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Removed as member")); + stateManager.reload(); + // in the future with user info: + // services.stateManager.reloadSocialNetwork((SocialNetworkResultDTO) + // result); + } + }); } }

1 0

r905 - trunk/src/main/java/org/ourproject/kune/workspace/client/skel
by vjrj 13 Oct '08

13 Oct '08

Author: vjrj Date: 2008-10-13 19:01:21 +0200 (Mon, 13 Oct 2008) New Revision: 905 Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java Log: Incomplete - taskHosted mode default border layout problems Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-13 16:43:36 UTC (rev 904) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-13 17:01:21 UTC (rev 905) @@ -1,8 +1,5 @@ package org.ourproject.kune.workspace.client.skel; -import org.ourproject.kune.workspace.client.site.Site; - -import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; @@ -80,9 +77,7 @@ @Override public void onHide(Component component) { super.onHide(component); - Site.info("Hide summary component"); if (accordionLayout.getActiveItem() != null && accordionLayout.getActiveItem().isHidden()) { - Log.info("No active component"); Component firstComponent = entitySummary.getComponent(0); if (firstComponent != null) { ((Panel) firstComponent).expand(true);

1 0

r904 - in trunk/src/main/java/org/ourproject/kune: app/public/css platf/client/ui/gridmenu workspace/client/skel workspace/client/socialnet workspace/client/tags
by vjrj 13 Oct '08

13 Oct '08

Author: vjrj Date: 2008-10-13 18:43:36 +0200 (Mon, 13 Oct 2008) New Revision: 904 Added: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SummaryPanel.java Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java Log: Incomplete - task Hosted mode default border layout problems Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-13 16:43:36 UTC (rev 904) @@ -35,4 +35,4 @@ } */.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-TagsPanel-tag{float:left;margin-right:5px;cursor:pointer;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; background-color: #FFF; */border:1px solid #4D4D4D;background-color:#FFF;margin:5px 0 5px 10px;}.gwt-RichTextToolbar{/* background-color: #F2F2F2; - padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;background:#FFF;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;} \ No newline at end of file + padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-blank-toolbar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;background:#FFF;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;border-down-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-13 16:43:36 UTC (rev 904) @@ -2,6 +2,10 @@ background: #FFF none repeat scroll 0% 50%; } +.k-blank-toolbar { + background: #FFF none repeat scroll 0% 50%; +} + .k-sitebar .kune-IconHyperlink { white-space: nowrap; } @@ -61,6 +65,7 @@ .k-entity-summary { border-left-color: #FFF; border-left-width: 5px; + border-down-width: 5px; } .k-entitytextlogo { @@ -668,4 +673,8 @@ .k-textunderline { text-decoration: underline; color: gray; -} \ No newline at end of file +} + +.x-tool-kmenu{background-position:0 -75px;} + +.x-tool-kmenu-over{background-position:-15px -75px;} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2008-10-13 16:43:36 UTC (rev 904) @@ -68,399 +68,401 @@ private final boolean withEndIcon; public GridMenuPanel(final String emptyText) { - this(emptyText, null, null, false, false, false, false, false); + this(emptyText, null, null, false, false, false, false, false); } public GridMenuPanel(final String emptyText, final boolean grouped, final boolean withCounters) { - this(emptyText, null, null, grouped, withCounters, false, false, false); + this(emptyText, null, null, grouped, withCounters, false, false, false); } public GridMenuPanel(final String emptyText, final boolean grouped, final boolean withCounters, - final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { - this(emptyText, null, null, grouped, withCounters, withTopBar, withBottomBar, withEndIcon); + final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { + this(emptyText, null, null, grouped, withCounters, withTopBar, withBottomBar, withEndIcon); } public GridMenuPanel(final String emptyText, final GridDragConfiguration gridDragConfiguration) { - this(emptyText, gridDragConfiguration, null, false, false, false, false, false); + this(emptyText, gridDragConfiguration, null, false, false, false, false, false); } public GridMenuPanel(final String emptyText, final GridDragConfiguration dragConf, final boolean grouped, - final boolean withCounters, final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { - this(emptyText, dragConf, null, grouped, withCounters, withTopBar, withBottomBar, withEndIcon); + final boolean withCounters, final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { + this(emptyText, dragConf, null, grouped, withCounters, withTopBar, withBottomBar, withEndIcon); } public GridMenuPanel(final String emptyText, final GridDragConfiguration gridDragConfiguration, - final GridDropConfiguration gridDropConfiguration, final boolean grouped, final boolean withCounters, - final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { - this.onClick = new Event<String>("onClick"); - this.onDoubleClick = new Event<String>("onDoubleClick"); - this.grouped = grouped; - this.withCounters = withCounters; - this.withEndIcon = withEndIcon; - super.setBorder(false); - super.setLayout(new FitLayout()); - // super.setAutoScroll(true); - if (withTopBar) { - topBar = new Toolbar(); - super.setTopToolbar(topBar); - } - if (withBottomBar) { - bottomBar = new Toolbar(); - super.setBottomToolbar(bottomBar); - } - menuMap = new HashMap<String, CustomMenu<T>>(); - recordMap = new HashMap<T, Record>(); - super.addListener(new BoxComponentListenerAdapter() { - @Override - public void onRender(final Component component) { - // Log.warn("Render grid -------------------"); - } - }); - createGrid(emptyText, gridDragConfiguration, gridDropConfiguration); + final GridDropConfiguration gridDropConfiguration, final boolean grouped, final boolean withCounters, + final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { + this.onClick = new Event<String>("onClick"); + this.onDoubleClick = new Event<String>("onDoubleClick"); + this.grouped = grouped; + this.withCounters = withCounters; + this.withEndIcon = withEndIcon; + super.setBorder(false); + super.setLayout(new FitLayout()); + // super.setAutoScroll(true); + if (withTopBar) { + topBar = new Toolbar(); + super.setTopToolbar(topBar); + } + if (withBottomBar) { + bottomBar = new Toolbar(); + super.setBottomToolbar(bottomBar); + } + menuMap = new HashMap<String, CustomMenu<T>>(); + recordMap = new HashMap<T, Record>(); + super.addListener(new BoxComponentListenerAdapter() { + @Override + public void onRender(final Component component) { + // Log.warn("Render grid -------------------"); + } + }); + createGrid(emptyText, gridDragConfiguration, gridDropConfiguration); } public GridMenuPanel(final String emptyText, final GridDropConfiguration gridDropConfiguration) { - this(emptyText, null, gridDropConfiguration, false, false, false, false, false); + this(emptyText, null, gridDropConfiguration, false, false, false, false, false); } public GridMenuPanel(final String emptyText, final GridDropConfiguration dropConf, final boolean grouped, - final boolean withCounters, final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { - this(emptyText, null, dropConf, grouped, withCounters, withTopBar, withBottomBar, withEndIcon); + final boolean withCounters, final boolean withTopBar, final boolean withBottomBar, final boolean withEndIcon) { + this(emptyText, null, dropConf, grouped, withCounters, withTopBar, withBottomBar, withEndIcon); } public void addItem(final GridItem<T> gridItem) { - final String id = gridItem.getId(); - final Record newRecord = recordDef - .createRecord(id, new Object[] { gridItem.getGroup().getName(), gridItem.getGroup().getTooltipTitle(), - gridItem.getGroup().getTooltip(), gridItem.getGroup().getEndIconHtml(), id, - gridItem.getIconHtml(), gridItem.getTitle(), gridItem.getTitleHtml(), - gridItem.getEndIconHtml(), gridItem.getTooltipTitle(), gridItem.getTooltip() }); - recordMap.put(gridItem.getItem(), newRecord); - store.addSorted(newRecord); - menuMap.put(id, gridItem.getMenu()); - sort(); - doLayoutIfNeeded(); + final String id = gridItem.getId(); + final Record newRecord = recordDef + .createRecord(id, new Object[] { gridItem.getGroup().getName(), gridItem.getGroup().getTooltipTitle(), + gridItem.getGroup().getTooltip(), gridItem.getGroup().getEndIconHtml(), id, + gridItem.getIconHtml(), gridItem.getTitle(), gridItem.getTitleHtml(), + gridItem.getEndIconHtml(), gridItem.getTooltipTitle(), gridItem.getTooltip() }); + recordMap.put(gridItem.getItem(), newRecord); + store.addSorted(newRecord); + menuMap.put(id, gridItem.getMenu()); + sort(); + doLayoutIfNeeded(); } public void confDropInPanel(final Panel panel, final GridDropConfiguration gridDropConfiguration) { - // FIXME: This doesn't works :-/ - // http://extjs.com/forum/showthread.php?t=18105 - final DropTargetConfig dCfg = new DropTargetConfig(); - dCfg.setTarget(true); - dCfg.setdDdGroup(gridDropConfiguration.getDdGroupId()); - new DropTarget(panel, dCfg) { - @Override - public boolean notifyDrop(final DragSource src, final EventObject e, final DragData dragData) { - if (dragData instanceof GridDragData) { - final GridDragData gridDragData = (GridDragData) dragData; - final Record[] records = gridDragData.getSelections(); - for (int i = 0; i < records.length; i++) { - gridDropConfiguration.fire(records[i].getAsString(ID)); - } - } - return true; - } + // FIXME: This doesn't works :-/ + // http://extjs.com/forum/showthread.php?t=18105 + final DropTargetConfig dCfg = new DropTargetConfig(); + dCfg.setTarget(true); + dCfg.setdDdGroup(gridDropConfiguration.getDdGroupId()); + new DropTarget(panel, dCfg) { + @Override + public boolean notifyDrop(final DragSource src, final EventObject e, final DragData dragData) { + if (dragData instanceof GridDragData) { + final GridDragData gridDragData = (GridDragData) dragData; + final Record[] records = gridDragData.getSelections(); + for (Record record : records) { + gridDropConfiguration.fire(record.getAsString(ID)); + } + } + return true; + } - @Override - public String notifyEnter(final DragSource src, final EventObject e, final DragData data) { - return "x-tree-drop-ok-append"; - } + @Override + public String notifyEnter(final DragSource src, final EventObject e, final DragData data) { + return "x-tree-drop-ok-append"; + } - @Override - public String notifyOver(final DragSource src, final EventObject e, final DragData data) { - return "x-tree-drop-ok-append"; - } - }; + @Override + public String notifyOver(final DragSource src, final EventObject e, final DragData data) { + return "x-tree-drop-ok-append"; + } + }; } @Override public void doLayout(final boolean shallow) { - // Grid rendered problems with shallow false - super.doLayout(); - grid.doLayout(); + // Grid rendered problems with shallow false + grid.doLayout(false); + super.doLayout(false); } public void doLayoutIfNeeded() { - if (super.isRendered()) { - super.doLayout(); - } + if (super.isRendered()) { + grid.doLayout(false); + super.doLayout(false); + } } public Toolbar getBottomBar() { - assert bottomBar != null; - return bottomBar; + assert bottomBar != null; + return bottomBar; } public Toolbar getTopBar() { - assert topBar != null; - return topBar; + assert topBar != null; + return topBar; } public void onClick(final Listener<String> listener) { - onClick.add(listener); + onClick.add(listener); } public void onDoubleClick(final Listener<String> listener) { - onDoubleClick.add(listener); + onDoubleClick.add(listener); } + @Override public void removeAll() { - store.removeAll(); - recordMap.clear(); - menuMap.clear(); + store.removeAll(); + recordMap.clear(); + menuMap.clear(); } public void removeItem(final GridItem<T> gridItem) { - final Record record = recordMap.get(gridItem.getItem()); - if (record != null) { - menuMap.remove(record); - store.remove(record); - recordMap.remove(gridItem.getItem()); - doLayoutIfNeeded(); - } else { - Log.error("Trying to remove a non existing item: " + gridItem.getId()); - } + final Record record = recordMap.get(gridItem.getItem()); + if (record != null) { + menuMap.remove(record); + store.remove(record); + recordMap.remove(gridItem.getItem()); + doLayoutIfNeeded(); + } else { + Log.error("Trying to remove a non existing item: " + gridItem.getId()); + } } @Override public void setHeight(final int height) { - super.setHeight(height); - // grid.setHeight(height); - doLayoutIfNeeded(); + super.setHeight(height); + // grid.setHeight(height); + doLayoutIfNeeded(); } @Override public void setWidth(final int width) { - // grid.setWidth(width - 27); - grid.setWidth(width - 27); - // super.setWidth(width - 11); - doLayoutIfNeeded(); + // grid.setWidth(width - 27); + grid.setWidth(width - 27); + // super.setWidth(width - 11); + doLayoutIfNeeded(); } public void sort() { - store.sort(GROUP, SortDir.ASC); + store.sort(GROUP, SortDir.ASC); } public void updateItem(final GridItem<T> gridItem) { - final String id = gridItem.getId(); - final Record record = recordMap.get(gridItem.getItem()); - if (record != null) { - record.set(GROUP, gridItem.getGroup().getName()); - record.set(GROUP_TOOLTIP_TITLE, gridItem.getGroup().getTooltipTitle()); - record.set(GROUP_TOOLTIP, gridItem.getGroup().getTooltip()); - record.set(GROUP_ENDICON_HTML, gridItem.getGroup().getEndIconHtml()); - record.set(ICON_HTML, gridItem.getIconHtml()); - record.set(TITLE, gridItem.getTitle()); - record.set(TITLE_HTML, gridItem.getTitleHtml()); - record.set(END_ICON_HTML, gridItem.getEndIconHtml()); - record.set(TOOLTIPTITLE, gridItem.getTooltipTitle()); - record.set(TOOLTIP, gridItem.getTooltip()); - store.commitChanges(); - menuMap.put(id, gridItem.getMenu()); - sort(); - doLayoutIfNeeded(); - } else { - Log.error("Trying to update a non existing item: " + id); - } + final String id = gridItem.getId(); + final Record record = recordMap.get(gridItem.getItem()); + if (record != null) { + record.set(GROUP, gridItem.getGroup().getName()); + record.set(GROUP_TOOLTIP_TITLE, gridItem.getGroup().getTooltipTitle()); + record.set(GROUP_TOOLTIP, gridItem.getGroup().getTooltip()); + record.set(GROUP_ENDICON_HTML, gridItem.getGroup().getEndIconHtml()); + record.set(ICON_HTML, gridItem.getIconHtml()); + record.set(TITLE, gridItem.getTitle()); + record.set(TITLE_HTML, gridItem.getTitleHtml()); + record.set(END_ICON_HTML, gridItem.getEndIconHtml()); + record.set(TOOLTIPTITLE, gridItem.getTooltipTitle()); + record.set(TOOLTIP, gridItem.getTooltip()); + store.commitChanges(); + menuMap.put(id, gridItem.getMenu()); + sort(); + doLayoutIfNeeded(); + } else { + Log.error("Trying to update a non existing item: " + id); + } } private void configureDrag(final GridDragConfiguration gridDragConfiguration) { - // TODO: put this in GDConf - grid.setEnableDragDrop(true); - grid.setDdGroup(gridDragConfiguration.getDdGroupId()); - grid.setDragDropText(gridDragConfiguration.getDragMessage()); + // TODO: put this in GDConf + grid.setEnableDragDrop(true); + grid.setDdGroup(gridDragConfiguration.getDdGroupId()); + grid.setDragDropText(gridDragConfiguration.getDragMessage()); } private void configureDrop(final GridDropConfiguration gridDropConfiguration) { - // TODO: put this in GDConf - grid.setEnableDragDrop(true); - grid.setDdGroup(gridDropConfiguration.getDdGroupId()); - final DropTargetConfig dCfg = new DropTargetConfig(); - dCfg.setTarget(true); - dCfg.setdDdGroup(gridDropConfiguration.getDdGroupId()); - new DropTarget(grid, dCfg) { - @Override - public boolean notifyDrop(final DragSource src, final EventObject e, final DragData dragData) { - if (dragData instanceof GridDragData) { - final GridDragData gridDragData = (GridDragData) dragData; - final Record[] records = gridDragData.getSelections(); - for (int i = 0; i < records.length; i++) { - gridDropConfiguration.fire(records[i].getAsString(ID)); - } - } - return true; - } + // TODO: put this in GDConf + grid.setEnableDragDrop(true); + grid.setDdGroup(gridDropConfiguration.getDdGroupId()); + final DropTargetConfig dCfg = new DropTargetConfig(); + dCfg.setTarget(true); + dCfg.setdDdGroup(gridDropConfiguration.getDdGroupId()); + new DropTarget(grid, dCfg) { + @Override + public boolean notifyDrop(final DragSource src, final EventObject e, final DragData dragData) { + if (dragData instanceof GridDragData) { + final GridDragData gridDragData = (GridDragData) dragData; + final Record[] records = gridDragData.getSelections(); + for (Record record : records) { + gridDropConfiguration.fire(record.getAsString(ID)); + } + } + return true; + } - @Override - public String notifyEnter(final DragSource src, final EventObject e, final DragData data) { - return "x-tree-drop-ok-append"; - } + @Override + public String notifyEnter(final DragSource src, final EventObject e, final DragData data) { + return "x-tree-drop-ok-append"; + } - @Override - public String notifyOver(final DragSource src, final EventObject e, final DragData data) { - return "x-tree-drop-ok-append"; - } - }; + @Override + public String notifyOver(final DragSource src, final EventObject e, final DragData data) { + return "x-tree-drop-ok-append"; + } + }; } private void createGrid(final String emptyText, final GridDragConfiguration gridDragConfiguration, - final GridDropConfiguration gridDropConfiguration) { - grid = new GridPanel(); - grid.setId(Ext.generateId()); - final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(GROUP), - new StringFieldDef(GROUP_TOOLTIP_TITLE), new StringFieldDef(GROUP_TOOLTIP), - new StringFieldDef(GROUP_ENDICON_HTML), new StringFieldDef(ID), new StringFieldDef(ICON_HTML), - new StringFieldDef(TITLE), new StringFieldDef(TITLE_HTML), new StringFieldDef(END_ICON_HTML), - new StringFieldDef(TOOLTIPTITLE), new StringFieldDef(TOOLTIP) }; - recordDef = new RecordDef(fieldDefs); + final GridDropConfiguration gridDropConfiguration) { + grid = new GridPanel(); + grid.setId(Ext.generateId()); + final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(GROUP), + new StringFieldDef(GROUP_TOOLTIP_TITLE), new StringFieldDef(GROUP_TOOLTIP), + new StringFieldDef(GROUP_ENDICON_HTML), new StringFieldDef(ID), new StringFieldDef(ICON_HTML), + new StringFieldDef(TITLE), new StringFieldDef(TITLE_HTML), new StringFieldDef(END_ICON_HTML), + new StringFieldDef(TOOLTIPTITLE), new StringFieldDef(TOOLTIP) }; + recordDef = new RecordDef(fieldDefs); - final MemoryProxy proxy = new MemoryProxy(new Object[][] {}); + final MemoryProxy proxy = new MemoryProxy(new Object[][] {}); - final ArrayReader reader = new ArrayReader(1, recordDef); - store = new GroupingStore(proxy, reader); - store.setSortInfo(new SortState(GROUP, SortDir.ASC)); - store.setGroupField(GROUP); - store.setGroupOnSort(true); - store.load(); - grid.setStore(store); + final ArrayReader reader = new ArrayReader(1, recordDef); + store = new GroupingStore(proxy, reader); + store.setSortInfo(new SortState(GROUP, SortDir.ASC)); + store.setGroupField(GROUP); + store.setGroupOnSort(true); + store.load(); + grid.setStore(store); - // TODO: Change this with a method that modify the html - final String commonTootipHtmlRender = "<span ext:qtitle=\"{1}\" ext:qtip=\"{2}\">{0}</span>"; + // TODO: Change this with a method that modify the html + final String commonTootipHtmlRender = "<span ext:qtitle=\"{1}\" ext:qtip=\"{2}\">{0}</span>"; - final Renderer iconHtmlRenderer = new Renderer() { - public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, - Store store) { - return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(ICON_HTML), - record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); - } - }; + final Renderer iconHtmlRenderer = new Renderer() { + public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, + Store store) { + return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(ICON_HTML), + record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); + } + }; - final Renderer titleHtmlRenderer = new Renderer() { - public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, - Store store) { - return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(TITLE_HTML), - record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); - } - }; + final Renderer titleHtmlRenderer = new Renderer() { + public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, + Store store) { + return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(TITLE_HTML), + record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); + } + }; - final Renderer endIconHtmlRenderer = new Renderer() { - public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, - Store store) { - return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(END_ICON_HTML), - record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); - } - }; + final Renderer endIconHtmlRenderer = new Renderer() { + public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, + Store store) { + return Format.format(commonTootipHtmlRender, new String[] { record.getAsString(END_ICON_HTML), + record.getAsString(TOOLTIPTITLE), record.getAsString(TOOLTIP) }); + } + }; - final ColumnConfig iconColumn = new ColumnConfig("Icon", ICON_HTML, 24, false, iconHtmlRenderer, ICON_HTML); - final ColumnConfig titleColumn = new ColumnConfig("Title", TITLE_HTML, 100, true, titleHtmlRenderer, TITLE_HTML); - final ColumnConfig endIconColumn = new ColumnConfig("EndIcon", END_ICON_HTML, 24, false, endIconHtmlRenderer, - END_ICON_HTML); - final ColumnConfig groupColumn = new ColumnConfig(GROUP, GROUP, 0); - // Fixed widths? - iconColumn.setFixed(true); - titleColumn.setFixed(false); - endIconColumn.setFixed(true); - final ArrayList<ColumnConfig> columnList = new ArrayList<ColumnConfig>(); - columnList.add(iconColumn); - columnList.add(titleColumn); - if (grouped) { - columnList.add(groupColumn); - } - if (withEndIcon) { - columnList.add(endIconColumn); - } - ColumnConfig[] columnsConfigs = {}; - columnsConfigs = columnList.toArray(columnsConfigs); - columnModel = new ColumnModel(columnsConfigs); - grid.setColumnModel(columnModel); + final ColumnConfig iconColumn = new ColumnConfig("Icon", ICON_HTML, 24, false, iconHtmlRenderer, ICON_HTML); + final ColumnConfig titleColumn = new ColumnConfig("Title", TITLE_HTML, 100, true, titleHtmlRenderer, TITLE_HTML); + final ColumnConfig endIconColumn = new ColumnConfig("EndIcon", END_ICON_HTML, 24, false, endIconHtmlRenderer, + END_ICON_HTML); + final ColumnConfig groupColumn = new ColumnConfig(GROUP, GROUP, 0); + // Fixed widths? + iconColumn.setFixed(true); + titleColumn.setFixed(false); + endIconColumn.setFixed(true); + final ArrayList<ColumnConfig> columnList = new ArrayList<ColumnConfig>(); + columnList.add(iconColumn); + columnList.add(titleColumn); + if (grouped) { + columnList.add(groupColumn); + } + if (withEndIcon) { + columnList.add(endIconColumn); + } + ColumnConfig[] columnsConfigs = {}; + columnsConfigs = columnList.toArray(columnsConfigs); + columnModel = new ColumnModel(columnsConfigs); + grid.setColumnModel(columnModel); - grid.setAutoExpandColumn(TITLE_HTML); - grid.setSelectionModel(new RowSelectionModel()); + grid.setAutoExpandColumn(TITLE_HTML); + grid.setSelectionModel(new RowSelectionModel()); - grid.addGridRowListener(new GridRowListener() { - public void onRowClick(final GridPanel grid, final int rowIndex, final EventObject e) { - showMenu(rowIndex, e); - onClick(rowIndex); - } + grid.addGridRowListener(new GridRowListener() { + public void onRowClick(final GridPanel grid, final int rowIndex, final EventObject e) { + // showMenu(rowIndex, e); + onClick(rowIndex); + } - public void onRowContextMenu(final GridPanel grid, final int rowIndex, final EventObject e) { - showMenu(rowIndex, e); - } + public void onRowContextMenu(final GridPanel grid, final int rowIndex, final EventObject e) { + showMenu(rowIndex, e); + } - public void onRowDblClick(final GridPanel grid, final int rowIndex, final EventObject e) { - onDoubleClick(rowIndex); - } + public void onRowDblClick(final GridPanel grid, final int rowIndex, final EventObject e) { + onDoubleClick(rowIndex); + } - private void showMenu(final int rowIndex, final EventObject e) { - final Record record = store.getRecordAt(rowIndex); - final CustomMenu<T> menu = menuMap.get(record.getAsString(ID)); - if (menu != null) { - menu.showMenu(e); - } - } - }); - grid.stripeRows(true); - grid.setHideColumnHeader(true); - // Not sure if when doLayoutIfNeeded there are problems with size and - // column header - grid.setBorder(false); - grid.setAutoScroll(true); + private void showMenu(final int rowIndex, final EventObject e) { + final Record record = store.getRecordAt(rowIndex); + final CustomMenu<T> menu = menuMap.get(record.getAsString(ID)); + if (menu != null) { + menu.showMenu(e); + } + } + }); + grid.stripeRows(true); + grid.setHideColumnHeader(true); + // Not sure if when doLayoutIfNeeded there are problems with size and + // column header + grid.setBorder(false); + grid.setAutoScroll(true); - if (grouped) { - final GroupingView groupView = new GroupingView(); - groupView.setForceFit(true); - final String groupEndIconHtmlTpl = "{[values.rs[0].data[\"" + GROUP_ENDICON_HTML + "\"]]}"; - // http://www.gwt-ext.com/forum/viewtopic.php?f=7&t=1388&p=6789&hilit=setGroup… - if (withCounters) { - groupView.setGroupTextTpl("<span style=\"overflow: hidden;\" ext:qtip=\"{[values.rs[0].data[\"" - + GROUP_TOOLTIP + "\"]]}\">{[values.rs[0].data[\"" + GROUP - + "\"]]} ({[values.rs.length]})</span>" + groupEndIconHtmlTpl); - } else { - groupView.setGroupTextTpl("<span style=\"overflow: hidden;\" ext:qtip=\"{[values.rs[0].data[\"" - + GROUP_TOOLTIP + "\"]]}\">{[values.rs[0].data[\"" + GROUP + "\"]]}</span>" - + groupEndIconHtmlTpl); - } - // Other sample with condition: - // view.setGroupTextTpl("{text} ({[values.rs.length]} - // {[values.rs.length - // > 1 ? \"Items\" : \"Item\"]})"); - groupView.setHideGroupedColumn(true); - groupView.setEmptyGroupText(emptyText); - groupView.setShowGroupsText(true); - groupView.setEnableNoGroups(true); - groupView.setEmptyText(emptyText); - groupView.setGroupByText(GROUP); - groupView.setIgnoreAdd(true); - groupView.setEnableGrouping(true); - grid.setView(groupView); - } else { - final GridView view = new GridView(); - view.setForceFit(true); - grid.setView(view); - } + if (grouped) { + final GroupingView groupView = new GroupingView(); + groupView.setForceFit(true); + final String groupEndIconHtmlTpl = "{[values.rs[0].data[\"" + GROUP_ENDICON_HTML + "\"]]}"; + // http://www.gwt-ext.com/forum/viewtopic.php?f=7&t=1388&p=6789&hilit=setGroup… + if (withCounters) { + groupView.setGroupTextTpl("<span style=\"overflow: hidden;\" ext:qtip=\"{[values.rs[0].data[\"" + + GROUP_TOOLTIP + "\"]]}\">{[values.rs[0].data[\"" + GROUP + + "\"]]} ({[values.rs.length]})</span>" + groupEndIconHtmlTpl); + } else { + groupView.setGroupTextTpl("<span style=\"overflow: hidden;\" ext:qtip=\"{[values.rs[0].data[\"" + + GROUP_TOOLTIP + "\"]]}\">{[values.rs[0].data[\"" + GROUP + "\"]]}</span>" + + groupEndIconHtmlTpl); + } + // Other sample with condition: + // view.setGroupTextTpl("{text} ({[values.rs.length]} + // {[values.rs.length + // > 1 ? \"Items\" : \"Item\"]})"); + groupView.setHideGroupedColumn(true); + groupView.setEmptyGroupText(emptyText); + groupView.setShowGroupsText(true); + groupView.setEnableNoGroups(true); + groupView.setEmptyText(emptyText); + groupView.setGroupByText(GROUP); + groupView.setIgnoreAdd(true); + groupView.setEnableGrouping(true); + grid.setView(groupView); + } else { + final GridView view = new GridView(); + view.setForceFit(true); + grid.setView(view); + } - grid.setAutoWidth(true); - grid.setAutoHeight(true); + grid.setAutoWidth(true); + grid.setAutoHeight(true); - if (gridDropConfiguration != null) { - configureDrop(gridDropConfiguration); - } - if (gridDragConfiguration != null) { - configureDrag(gridDragConfiguration); - } else { - grid.setDraggable(false); - } - super.add(grid); + if (gridDropConfiguration != null) { + configureDrop(gridDropConfiguration); + } + if (gridDragConfiguration != null) { + configureDrag(gridDragConfiguration); + } else { + grid.setDraggable(false); + } + super.add(grid); } private void onClick(final int rowIndex) { - final Record record = store.getRecordAt(rowIndex); - onClick.fire(record.getAsString(ID)); + final Record record = store.getRecordAt(rowIndex); + onClick.fire(record.getAsString(ID)); } private void onDoubleClick(final int rowIndex) { - final Record record = store.getRecordAt(rowIndex); - onDoubleClick.fire(record.getAsString(ID)); + final Record record = store.getRecordAt(rowIndex); + onDoubleClick.fire(record.getAsString(ID)); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java 2008-10-13 16:43:36 UTC (rev 904) @@ -54,9 +54,8 @@ entityFitPanel.add(entityAnchorLayout); } - public void addInSummary(Widget widget) { - entitySummary.addInSummary(widget); - doLayoutIfNeeded(); + public void addInSummary(Panel panel) { + entitySummary.addInSummary(panel); } public void addInTools(final Widget widget) { @@ -71,6 +70,9 @@ public void addToEntityMainHeader(final Widget widget) { entityMainHeader.clear(); entityMainHeader.add(widget); + if (entityMainHeader.isRendered()) { + entityMainHeader.doLayout(false); + } doLayoutIfNeeded(); } @@ -86,6 +88,10 @@ return entitySummary.getSiteTraybar(); } + public void refreshSummary() { + entitySummary.doLayoutIfNeeded(); + } + public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { if (oldTheme != null) { entityFitPanel.removeClass("k-entity-" + oldTheme); @@ -96,7 +102,8 @@ private void doLayoutIfNeeded() { if (entityFitPanel.isRendered()) { - entityFitPanel.doLayout(); + entityFitPanel.doLayout(false); } } + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-13 16:43:36 UTC (rev 904) @@ -1,9 +1,14 @@ package org.ourproject.kune.workspace.client.skel; +import org.ourproject.kune.workspace.client.site.Site; + +import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.Toolbar; import com.gwtext.client.widgets.event.ContainerListener; +import com.gwtext.client.widgets.event.ContainerListenerAdapter; import com.gwtext.client.widgets.layout.AccordionLayout; import com.gwtext.client.widgets.layout.AnchorLayout; import com.gwtext.client.widgets.layout.AnchorLayoutData; @@ -17,9 +22,10 @@ private final Panel entitySummary; private final Toolbar trayBar; private final Panel mainFitPanel; + private final AccordionLayout accordionLayout; public EntitySummary() { - mainFitPanel = new Panel(""); + mainFitPanel = new Panel(); mainFitPanel.setLayout(new FitLayout()); mainFitPanel.setBorder(false); mainFitPanel.setWidth(150); @@ -27,16 +33,23 @@ Panel anchorLayoutPanel = new Panel(); anchorLayoutPanel.setLayout(new AnchorLayout()); anchorLayoutPanel.setBorder(false); - anchorLayoutPanel.setWidth(150); + entityTools = new Panel(); entityTools.setLayout(new AnchorLayout()); + entityTools.setBorder(false); + entityTools.setAutoScroll(false); entityTools.setId(ENTITY_TOOLS); - entityTools.setAutoHeight(true); + entitySummary = new Panel(); - entityTools.setBorder(false); entitySummary.setBorder(false); - entityTools.setAutoScroll(false); - entitySummary.setAutoScroll(true); + accordionLayout = new AccordionLayout(true); + accordionLayout.setTitleCollapse(true); + // accordionLayout.setHideCollapseTool(true); + // accordionLayout.setAnimate(true); + // accordionLayout.setActiveOnTop(false); + accordionLayout.setFill(true); + // entitySummary.setAutoScroll(true); + entitySummary.setLayout(accordionLayout); entitySummary.setCls(ENTITY_SUMMARY); entitySummary.setId(ENTITY_SUMMARY); @@ -45,19 +58,47 @@ trayBar.setId(SITE_TRAYBAR); trayBar.setCls(SITE_TRAYBAR); trayBar.addFill(); - entitySummary.setBottomToolbar(trayBar); + mainFitPanel.setBottomToolbar(trayBar); + anchorLayoutPanel.add(entityTools, new AnchorLayoutData("100%")); anchorLayoutPanel.add(entitySummary, new AnchorLayoutData("100% -50")); mainFitPanel.add(anchorLayoutPanel); } - public void addInSummary(final Widget widget) { - entitySummary.add(widget); + public void addInSummary(final Panel panel) { + // panel.addTool(new Tool(new Tool.ToolType("kmenu"), new Function() { + // public void execute() { + // Site.info("lalalal"); + // } + // }, "Bla, bla, bla")); + entitySummary.add(panel); + if (entitySummary.isRendered()) { + panel.doLayout(false); + entitySummary.doLayout(false); + } + panel.addListener(new ContainerListenerAdapter() { + @Override + public void onHide(Component component) { + super.onHide(component); + Site.info("Hide summary component"); + if (accordionLayout.getActiveItem() != null && accordionLayout.getActiveItem().isHidden()) { + Log.info("No active component"); + Component firstComponent = entitySummary.getComponent(0); + if (firstComponent != null) { + ((Panel) firstComponent).expand(true); + } + } + + } + }); doLayoutIfNeeded(); } public void addInTools(final Widget widget) { entityTools.add(widget); + if (entityTools.isRendered()) { + entityTools.doLayout(false); + } doLayoutIfNeeded(); } @@ -65,6 +106,13 @@ entitySummary.addListener(listener); } + public void doLayoutIfNeeded() { + if (mainFitPanel.isRendered()) { + mainFitPanel.doLayout(false); + entitySummary.doLayout(false); + } + } + public Panel getPanel() { return mainFitPanel; } @@ -73,32 +121,4 @@ return trayBar; } - private Panel createAccordionPanel() { - Panel accordionPanel = new Panel(); - accordionPanel.setBorder(false); - accordionPanel.setLayout(new AccordionLayout(true)); - - Panel panelOne = new Panel("Panel 1", "<p>Panel1 content!</p>"); - panelOne.setIconCls("settings-icon"); - accordionPanel.add(panelOne); - - Panel panelTwo = new Panel("Panel 2", "<p>Panel2 content!</p>"); - panelTwo.setIconCls("folder-icon"); - accordionPanel.add(panelTwo); - - Panel panelThree = new Panel("Panel 3", "<p>Panel3 content!</p>"); - panelThree.setIconCls("user-add-icon"); - accordionPanel.add(panelThree); - - // accordionPanel.setCls(ENTITY_SUMMARY); - - return accordionPanel; - } - - private void doLayoutIfNeeded() { - if (mainFitPanel.isRendered()) { - mainFitPanel.doLayout(); - } - } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-13 16:43:36 UTC (rev 904) @@ -3,7 +3,6 @@ import org.ourproject.kune.platf.client.ui.RoundedPanel; import org.ourproject.kune.workspace.client.themes.WsTheme; -import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.RegionPosition; import com.gwtext.client.widgets.Panel; @@ -71,11 +70,13 @@ titles.add(roundedTitle, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); titles.add(subTitle, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); + titles.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2); + bottomPanel.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT + 2); final Panel contentWrap = new Panel(); final Panel contextWrap = new Panel(); - contentWrap.setLayout(new AnchorLayout()); - contextWrap.setLayout(new AnchorLayout()); + contentWrap.setLayout(new BorderLayout()); + contextWrap.setLayout(new BorderLayout()); contentWrap.setBorder(true); contextWrap.setBorder(true); content = new Panel(); @@ -86,9 +87,7 @@ content.setBorder(false); context.setBorder(false); context.setCollapsible(true); - // content.setPaddings(7); content.setAutoScroll(true); - // context.setAutoScroll(true); contentTopBar = new Toolbar(); contentBottomBar = new Toolbar(); @@ -102,15 +101,14 @@ contentBottomBar.addStyleName("k-toolbar-top-line"); contextTopBar.addStyleName("k-toolbar-bottom-line"); contextBottomBar.addStyleName("k-toolbar-top-line"); - contentWrap.add(contentTopBar.getPanel()); - contextWrap.add(contextTopBar.getPanel()); - contentWrap.add(content, new AnchorLayoutData("100% -" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2))); - contextWrap.add(context, new AnchorLayoutData("100% -" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2))); - contentWrap.add(contentBottomBar.getPanel()); - contextWrap.add(contextBottomBar.getPanel()); - titles.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2); - bottomPanel.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT + 2); + contentWrap.add(contentTopBar.getPanel(), new BorderLayoutData(RegionPosition.NORTH)); + contextWrap.add(contextTopBar.getPanel(), new BorderLayoutData(RegionPosition.NORTH)); + contentWrap.add(content, new BorderLayoutData(RegionPosition.CENTER)); + contextWrap.add(context, new BorderLayoutData(RegionPosition.CENTER)); + contentWrap.add(contentBottomBar.getPanel(), new BorderLayoutData(RegionPosition.SOUTH)); + contextWrap.add(contextBottomBar.getPanel(), new BorderLayoutData(RegionPosition.SOUTH)); + BorderLayoutData eastData = new BorderLayoutData(RegionPosition.EAST); contextWrap.setWidth(175); eastData.setUseSplitTips(true); @@ -192,16 +190,11 @@ context.addStyleName("k-entity-context-" + newTheme); } - private void doLayoutIfNeeded() { - Log.debug("Doing EW layout"); - if (mainFitPanel.isRendered()) { - mainFitPanel.doLayout(); - } - } - private void setPanel(Panel panel, Widget widget) { panel.clear(); panel.add(widget); - doLayoutIfNeeded(); + if (panel.isRendered()) { + panel.doLayout(false); + } } } Added: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SummaryPanel.java 2008-10-13 16:43:36 UTC (rev 904) @@ -0,0 +1,28 @@ +package org.ourproject.kune.workspace.client.skel; + +import com.gwtext.client.widgets.Panel; + +public class SummaryPanel extends Panel { + + private final WorkspaceSkeleton ws; + + public SummaryPanel(String title, String titleTooltip, WorkspaceSkeleton ws) { + this.ws = ws; + super.setBorder(false); + super.setTitle("<span ext:qtip=\"" + titleTooltip + "\">" + title + "</span>"); + super.setAutoScroll(true); + } + + public void doLayoutIfNeeded() { + if (super.isRendered()) { + super.doLayout(false); + } + } + + @Override + public void setVisible(final boolean visible) { + super.setVisible(visible); + doLayoutIfNeeded(); + ws.refreshSummary(); + } +} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2008-10-13 16:43:36 UTC (rev 904) @@ -49,8 +49,8 @@ new Viewport(container); } - public void addInSummary(Widget widget) { - entity.addInSummary(widget); + public void addInSummary(Panel panel) { + entity.addInSummary(panel); } public void addInTools(final Widget widget) { @@ -111,6 +111,10 @@ }); } + public void refreshSummary() { + entity.refreshSummary(); + } + public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { entity.setTheme(oldTheme, newTheme); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-13 16:43:36 UTC (rev 904) @@ -3,12 +3,12 @@ import java.util.HashMap; import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.ui.DropDownPanel; import org.ourproject.kune.platf.client.ui.gridmenu.GridButton; import org.ourproject.kune.platf.client.ui.gridmenu.GridDragConfiguration; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; @@ -24,7 +24,7 @@ import com.gwtext.client.widgets.event.ButtonListenerAdapter; import com.gwtext.client.widgets.event.ContainerListenerAdapter; -public class GroupMembersSummaryPanel extends DropDownPanel implements GroupMembersSummaryView { +public class GroupMembersSummaryPanel extends SummaryPanel implements GroupMembersSummaryView { // private static final int MAX_HEIGHT = 110; private final GridMenuPanel<GroupDTO> gridMenuPanel; private final I18nUITranslationService i18n; @@ -33,25 +33,23 @@ public GroupMembersSummaryPanel(final GroupMembersSummaryPresenter presenter, final I18nUITranslationService i18n, final WorkspaceSkeleton ws) { - super(true); + super(i18n.t("Group members"), i18n.t("People and groups collaborating in this group"), ws); this.presenter = presenter; this.i18n = i18n; - super.setHeaderText(i18n.t("Group members")); - super.setHeaderTitle(i18n.t("People and groups collaborating in this group")); - super.setBorderStylePrimaryName("k-dropdownouter-members"); - super.addStyleName("kune-Margin-Medium-t"); final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, i18n .t("Drop in the chat area to start a chat.") + "<br/>" + i18n.t("Drop into a room to invite the user to join the chat room")); gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " + "please request to join to work on it"), dragConf, true, true, false, true, false); + gridMenuPanel.setBorder(true); gridMenuPanel.onDoubleClick(new Listener<String>() { public void onEvent(final String groupShortName) { presenter.onDoubleClick(groupShortName); } }); - this.setContent(gridMenuPanel); + gridMenuPanel.getBottomBar().setCls("k-blank-toolbar"); + super.add(gridMenuPanel); ws.addInSummary(this); ws.addListenerInEntitySummary(new ContainerListenerAdapter() { @Override @@ -89,12 +87,14 @@ public void addItem(final GridItem<GroupDTO> gridItem) { gridMenuPanel.addItem(gridItem); + doLayoutIfNeeded(); } public void addToolbarFill() { gridMenuPanel.getBottomBar().addFill(); } + @Override public void clear() { gridMenuPanel.removeAll(); for (final ToolbarButton button : buttonsCache.values()) { @@ -103,6 +103,8 @@ button.setVisible(false); button.removeFromParent(); } + buttonsCache.clear(); + doLayoutIfNeeded(); } public void confirmAddCollab(final String groupShortName, final String groupLongName) { @@ -121,28 +123,12 @@ }); } - public void setDefaultHeigth() { - // super.setContentHeight(""); - // gridMenuPanel.setHeight("auto"); - // gridMenuPanel.doLayoutIfNeeded(); - } - + @Override public void setDraggable(final boolean draggable) { // gridMenuPanel.setDraggable(draggable); } - public void setMaxHeigth() { - // super.setContentHeight("" + MAX_HEIGHT); - // gridMenuPanel.setHeight(MAX_HEIGHT - 26); - } - - @Override public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - super.setTheme(oldTheme, newTheme); + // super.setTheme(oldTheme, newTheme); } - - @Override - public void setVisible(final boolean visible) { - super.setVisible(visible); - } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-10-13 16:43:36 UTC (rev 904) @@ -41,143 +41,133 @@ private final StateManager stateManager; public GroupMembersSummaryPresenter(final I18nUITranslationService i18n, final StateManager stateManager, - final ImageUtils imageUtils, final Session session, - final Provider<SocialNetworkServiceAsync> snServiceProvider, - final Provider<GroupLiveSearcher> liveSearcherProvider, final WsThemePresenter wsThemePresenter) { - super(i18n, stateManager, imageUtils, session, snServiceProvider); - this.i18n = i18n; - this.stateManager = stateManager; - this.session = session; - this.snServiceProvider = snServiceProvider; - final Listener<StateDTO> setStateListener = new Listener<StateDTO>() { - public void onEvent(StateDTO state) { - setState(state); - } - }; - stateManager.onStateChanged(setStateListener); - stateManager.onSocialNetworkChanged(setStateListener); - wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - view.setTheme(oldTheme, newTheme); - } - }); - final String adminsTitle = i18n.t("Admins"); - final String collabsTitle = i18n.t("Collaborators"); - final String pendingTitle = i18n.t("Pending"); - adminCategory = new GridGroup(adminsTitle, adminsTitle, i18n.t("People that can admin this group"), true); - collabCategory = new GridGroup(collabsTitle, collabsTitle, i18n - .t("Other people that collaborate with this group"), true); - pendigCategory = new GridGroup(pendingTitle, pendingTitle, i18n - .t("People pending to be accepted in this group by the admins"), imageUtils - .getImageHtml(ImageDescriptor.alert), true); - // i18n.t("Add member") - addMember = new GridButton("images/add-green.gif", "", i18n - .t("Add a group or a person as member of this group"), new Listener<String>() { - public void onEvent(final String parameter) { - liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { - public void onEvent(final LinkDTO link) { - view.confirmAddCollab(link.getShortName(), link.getLongName()); - } - }); - liveSearcherProvider.get().show(); - } - }); - super.addGroupOperation(gotoGroupMenuItem, false); - super.addUserOperation(gotoMemberMenuItem, false); + final ImageUtils imageUtils, final Session session, + final Provider<SocialNetworkServiceAsync> snServiceProvider, + final Provider<GroupLiveSearcher> liveSearcherProvider, final WsThemePresenter wsThemePresenter) { + super(i18n, stateManager, imageUtils, session, snServiceProvider); + this.i18n = i18n; + this.stateManager = stateManager; + this.session = session; + this.snServiceProvider = snServiceProvider; + final Listener<StateDTO> setStateListener = new Listener<StateDTO>() { + public void onEvent(StateDTO state) { + setState(state); + } + }; + stateManager.onStateChanged(setStateListener); + stateManager.onSocialNetworkChanged(setStateListener); + wsThemePresenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() { + public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { + view.setTheme(oldTheme, newTheme); + } + }); + final String adminsTitle = i18n.t("Admins"); + final String collabsTitle = i18n.t("Collaborators"); + final String pendingTitle = i18n.t("Pending"); + adminCategory = new GridGroup(adminsTitle, adminsTitle, i18n.t("People that can admin this group"), true); + collabCategory = new GridGroup(collabsTitle, collabsTitle, i18n + .t("Other people that collaborate with this group"), true); + pendigCategory = new GridGroup(pendingTitle, pendingTitle, i18n + .t("People pending to be accepted in this group by the admins"), imageUtils + .getImageHtml(ImageDescriptor.alert), true); + // i18n.t("Add member") + addMember = new GridButton("images/add-green.gif", "", i18n + .t("Add a group or a person as member of this group"), new Listener<String>() { + public void onEvent(final String parameter) { + liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { + public void onEvent(final LinkDTO link) { + view.confirmAddCollab(link.getShortName(), link.getLongName()); + } + }); + liveSearcherProvider.get().show(); + } + }); + super.addGroupOperation(gotoGroupMenuItem, false); + super.addUserOperation(gotoMemberMenuItem, false); } public void addCollab(final String groupShortName) { - Site.showProgressProcessing(); - snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(), - groupShortName, new AsyncCallbackSimple<SocialNetworkResultDTO>() { - public void onSuccess(final SocialNetworkResultDTO result) { - Site.hideProgress(); - Site.info(i18n.t("Member added as collaborator")); - stateManager.setSocialNetwork(result); - } + Site.showProgressProcessing(); + snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(), + groupShortName, new AsyncCallbackSimple<SocialNetworkResultDTO>() { + public void onSuccess(final SocialNetworkResultDTO result) { + Site.hideProgress(); + Site.info(i18n.t("Member added as collaborator")); + stateManager.setSocialNetwork(result); + } - }); + }); } public void init(final GroupMembersSummaryView view) { - this.view = view; + this.view = view; } public void onDoubleClick(final String groupShortName) { - stateManager.gotoToken(groupShortName); + stateManager.gotoToken(groupShortName); } private boolean isMember(final boolean userIsAdmin, final boolean userIsCollab) { - return userIsAdmin || userIsCollab; + return userIsAdmin || userIsCollab; } @SuppressWarnings("unchecked") private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRightsDTO rights) { - final AccessListsDTO accessLists = socialNetwork.getAccessLists(); + final AccessListsDTO accessLists = socialNetwork.getAccessLists(); - final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); - final List<GroupDTO> collabList = accessLists.getEditors().getList(); - final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); + final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); + final List<GroupDTO> collabList = accessLists.getEditors().getList(); + final List<GroupDTO> pendingCollabsList = socialNetwork.getPendingCollaborators().getList(); - final int numAdmins = adminsList.size(); + final int numAdmins = adminsList.size(); - boolean userIsAdmin = rights.isAdministrable(); - final boolean userIsCollab = !userIsAdmin && rights.isEditable(); - final boolean userCanView = rights.isVisible(); - boolean userIsMember = isMember(userIsAdmin, userIsCollab); + boolean userIsAdmin = rights.isAdministrable(); + final boolean userIsCollab = !userIsAdmin && rights.isEditable(); + final boolean userCanView = rights.isVisible(); + boolean userIsMember = isMember(userIsAdmin, userIsCollab); - view.clear(); + view.clear(); - if (userIsAdmin) { - view.addButton(addMember); - view.addToolbarFill(); - } + if (userIsAdmin) { + view.addButton(addMember); + view.addToolbarFill(); + } - view.setDraggable(session.isLogged()); + view.setDraggable(session.isLogged()); - if (!userIsMember) { - view.addButton(requestJoin); - } else if (userIsAdmin && numAdmins > 1 || userIsCollab) { - view.addButton(unJoinButton); - } + if (!userIsMember) { + view.addButton(requestJoin); + } else if (userIsAdmin && numAdmins > 1 || userIsCollab) { + view.addButton(unJoinButton); + } - if (userCanView) { - for (final GroupDTO admin : adminsList) { - view - .addItem(createGridItem(adminCategory, admin, rights, changeToCollabMenuItem, - removeMemberMenuItem)); - } - for (final GroupDTO collab : collabList) { - view - .addItem(createGridItem(collabCategory, collab, rights, changeToAdminMenuItem, - removeMemberMenuItem)); - } - if (userIsAdmin) { - for (final GroupDTO pendingCollab : pendingCollabsList) { - view.addItem(createGridItem(pendigCategory, pendingCollab, rights, acceptJoinGroupMenuItem, - denyJoinGroupMenuItem)); - } - } - } - setMaxSize(adminsList.size(), collabList.size(), pendingCollabsList.size(), userIsAdmin); - view.setVisible(true); + if (userCanView) { + for (final GroupDTO admin : adminsList) { + view + .addItem(createGridItem(adminCategory, admin, rights, changeToCollabMenuItem, + removeMemberMenuItem)); + } + for (final GroupDTO collab : collabList) { + view + .addItem(createGridItem(collabCategory, collab, rights, changeToAdminMenuItem, + removeMemberMenuItem)); + } + if (userIsAdmin) { + for (final GroupDTO pendingCollab : pendingCollabsList) { + view.addItem(createGridItem(pendigCategory, pendingCollab, rights, acceptJoinGroupMenuItem, + denyJoinGroupMenuItem)); + } + } + } + view.setVisible(true); } - private void setMaxSize(final int admins, final int collabs, final int pendingCollabs, final boolean isAdmin) { - final int members = admins + collabs + (isAdmin ? pendingCollabs : 0); - if (members > 2) { - view.setMaxHeigth(); - } else { - view.setDefaultHeigth(); - } - } - private void setState(final StateDTO state) { - if (state.getGroup().getType().equals(GroupType.PERSONAL)) { - view.setVisible(false); - } else { - setGroupMembers(state.getGroupMembers(), state.getGroupRights()); - } + if (state.getGroup().getType().equals(GroupType.PERSONAL)) { + view.setVisible(false); + } else { + setGroupMembers(state.getGroupMembers(), state.getGroupRights()); + } } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2008-10-13 16:43:36 UTC (rev 904) @@ -17,14 +17,8 @@ void confirmAddCollab(String groupShortName, String groupLongName); - void setContentVisible(boolean visible); - - void setDefaultHeigth(); - void setDraggable(boolean draggable); - void setMaxHeigth(); - void setTheme(WsTheme oldTheme, WsTheme newTheme); void setVisible(boolean visible); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-13 16:43:36 UTC (rev 904) @@ -21,29 +21,28 @@ import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.services.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.DropDownPanel; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; +import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.themes.WsTheme; import com.gwtext.client.widgets.BoxComponent; import com.gwtext.client.widgets.event.ContainerListenerAdapter; -public class ParticipationSummaryPanel extends DropDownPanel implements ParticipationSummaryView { +public class ParticipationSummaryPanel extends SummaryPanel implements ParticipationSummaryView { private final GridMenuPanel<GroupDTO> gridMenuPanel; public ParticipationSummaryPanel(final ParticipationSummaryPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws) { - super(true); - // super.setHeaderText(i18n.t("Participates as...")); - super.setHeaderText(i18n.t("Participates in")); - super.setHeaderTitle(i18n.t("Groups in which participates")); - super.setBorderStylePrimaryName("k-dropdownouter-part"); - super.addStyleName("kune-Margin-Medium-t"); + super(i18n.t("Participates in"), i18n.t("Groups in which participates"), ws); + // super.setBorderStylePrimaryName("k-dropdownouter-part"); // + // super.addStyleName("kune-Margin-Medium-t"); gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false, false, false, false); - this.setContent(gridMenuPanel); + gridMenuPanel.setBorder(true); + super.add(gridMenuPanel); ws.addInSummary(this); ws.addListenerInEntitySummary(new ContainerListenerAdapter() { @Override @@ -58,16 +57,13 @@ gridMenuPanel.addItem(gridItem); } + @Override public void clear() { gridMenuPanel.removeAll(); } - public void hide() { - this.setVisible(false); + public void setTheme(WsTheme oldTheme, WsTheme newTheme) { + // TODO Auto-generated method stub } - public void show() { - this.setVisible(true); - } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2008-10-13 16:43:36 UTC (rev 904) @@ -32,8 +32,6 @@ void hide(); - void setContentVisible(boolean visible); - void setTheme(WsTheme oldTheme, WsTheme newTheme); void show(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-10-13 16:43:36 UTC (rev 904) @@ -24,9 +24,10 @@ import org.ourproject.kune.platf.client.dto.TagResultDTO; import org.ourproject.kune.platf.client.services.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.DropDownPanel; import org.ourproject.kune.platf.client.ui.KuneUiUtils; +import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import org.ourproject.kune.workspace.client.themes.WsTheme; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; @@ -36,7 +37,7 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -public class TagsSummaryPanel extends DropDownPanel implements TagsSummaryView { +public class TagsSummaryPanel extends SummaryPanel implements TagsSummaryView { private final FlowPanel flowPanel; private final TagsSummaryPresenter presenter; @@ -45,9 +46,8 @@ public TagsSummaryPanel(final TagsSummaryPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws) { - super(i18n.t("Tags"), true); + super(i18n.t("Tags"), i18n.t("Keywords or terms associated with this group"), ws); this.i18n = i18n; - setHeaderTitle(i18n.t("Keywords or terms associated with this group")); this.presenter = presenter; flowPanel = new FlowPanel(); final VerticalPanel vp = new VerticalPanel(); @@ -55,9 +55,8 @@ vp.add(flowPanel); vp.setWidth("100%"); vp.setCellWidth(flowPanel, "100%"); - super.setContent(vp); - super.setBorderStylePrimaryName("k-dropdownouter-tags"); - addStyleName("kune-Margin-Medium-t"); + super.add(vp); + // super.setBorderStylePrimaryName("k-dropdownouter-tags"); flowPanel.addStyleName("kune-Margin-Small-trbl"); ws.addInSummary(this); } @@ -89,4 +88,8 @@ } }); } + + public void setTheme(WsTheme oldTheme, WsTheme newTheme) { + // TODO Auto-generated method stub + } }

1 0

11 Oct '08

Author: vjrj Date: 2008-10-11 19:04:26 +0200 (Sat, 11 Oct 2008) New Revision: 903 Modified: trunk/dev-utils/kune.cleanup.eclipse.preferences.xml trunk/dev-utils/kune.formatter.eclipse.preferences.xml trunk/pom.xml trunk/script/css-compact-and-tidy.css trunk/src/main/java/org/ourproject/kune/app/public/Kune.html trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java trunk/src/main/resources/kune.properties Log: Incomplete - task Hosted mode default border layout problems with mozilla 1.7.13 search bug tags fixed folder navigation selection bug fixed language shows in subtitle optionally other fixes Modified: trunk/dev-utils/kune.cleanup.eclipse.preferences.xml =================================================================== --- trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2008-10-11 17:04:26 UTC (rev 903) @@ -1,51 +1,55 @@ -<?xml version="1.0" encoding="UTF-8"?> -<profiles version="2"> -<profile kind="CleanUpProfile" name="kune-clean-up" version="2"> -<setting id="cleanup.always_use_blocks" value="true"/> -<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/> -<setting id="cleanup.use_this_for_non_static_field_access" value="false"/> -<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/> -<setting id="cleanup.remove_unused_private_fields" value="true"/> -<setting id="cleanup.remove_unnecessary_casts" value="true"/> -<setting id="cleanup.sort_members_all" value="true"/> -<setting id="cleanup.make_local_variable_final" value="true"/> -<setting id="cleanup.never_use_parentheses_in_expressions" value="false"/> -<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/> -<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/> -<setting id="cleanup.remove_trailing_whitespaces" value="true"/> -<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/> -<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/> -<setting id="cleanup.always_use_parentheses_in_expressions" value="true"/> -<setting id="cleanup.remove_unused_private_types" value="true"/> -<setting id="cleanup.format_source_code" value="true"/> -<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/> -<setting id="cleanup.remove_unused_local_variables" value="false"/> -<setting id="cleanup.add_missing_nls_tags" value="false"/> -<setting id="cleanup.add_missing_override_annotations" value="false"/> -<setting id="cleanup.add_missing_annotations" value="false"/> -<setting id="cleanup.use_this_for_non_static_method_access" value="false"/> -<setting id="cleanup.make_variable_declarations_final" value="true"/> -<setting id="cleanup.make_parameters_final" value="true"/> -<setting id="cleanup.remove_private_constructors" value="true"/> -<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/> -<setting id="cleanup.add_missing_deprecated_annotations" value="false"/> -<setting id="cleanup.add_generated_serial_version_id" value="false"/> -<setting id="cleanup.organize_imports" value="true"/> -<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/> -<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/> -<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/> -<setting id="cleanup.use_parentheses_in_expressions" value="false"/> -<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/> -<setting id="cleanup.never_use_blocks" value="false"/> -<setting id="cleanup.sort_members" value="false"/> -<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/> -<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/> -<setting id="cleanup.add_serial_version_id" value="true"/> -<setting id="cleanup.add_default_serial_version_id" value="true"/> -<setting id="cleanup.use_blocks" value="true"/> -<setting id="cleanup.make_private_fields_final" value="true"/> -<setting id="cleanup.remove_unused_imports" value="true"/> -<setting id="cleanup.remove_unused_private_methods" value="true"/> -<setting id="cleanup.remove_unused_private_members" value="false"/> -</profile> -</profiles> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<profiles version="2"> +<profile kind="CleanUpProfile" name="kune-clean-up" version="2"> +<setting id="cleanup.remove_unused_private_fields" value="true"/> +<setting id="cleanup.always_use_parentheses_in_expressions" value="true"/> +<setting id="cleanup.never_use_blocks" value="false"/> +<setting id="cleanup.remove_unused_private_methods" value="true"/> +<setting id="cleanup.add_missing_deprecated_annotations" value="false"/> +<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/> +<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/> +<setting id="cleanup.sort_members" value="true"/> +<setting id="cleanup.remove_unused_local_variables" value="false"/> +<setting id="cleanup.never_use_parentheses_in_expressions" value="false"/> +<setting id="cleanup.remove_unused_private_members" value="false"/> +<setting id="cleanup.remove_unnecessary_casts" value="true"/> +<setting id="cleanup.make_parameters_final" value="true"/> +<setting id="cleanup.use_this_for_non_static_field_access" value="false"/> +<setting id="cleanup.remove_private_constructors" value="true"/> +<setting id="cleanup.use_blocks" value="true"/> +<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/> +<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/> +<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/> +<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/> +<setting id="cleanup.add_default_serial_version_id" value="true"/> +<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/> +<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/> +<setting id="cleanup.make_variable_declarations_final" value="true"/> +<setting id="cleanup.add_missing_nls_tags" value="false"/> +<setting id="cleanup.format_source_code" value="true"/> +<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/> +<setting id="cleanup.add_missing_override_annotations" value="false"/> +<setting id="cleanup.remove_unused_private_types" value="true"/> +<setting id="cleanup.add_missing_methods" value="false"/> +<setting id="cleanup.make_local_variable_final" value="true"/> +<setting id="cleanup.correct_indentation" value="false"/> +<setting id="cleanup.remove_unused_imports" value="true"/> +<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/> +<setting id="cleanup.make_private_fields_final" value="true"/> +<setting id="cleanup.add_generated_serial_version_id" value="false"/> +<setting id="cleanup.organize_imports" value="true"/> +<setting id="cleanup.remove_trailing_whitespaces" value="true"/> +<setting id="cleanup.sort_members_all" value="true"/> +<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/> +<setting id="cleanup.add_missing_annotations" value="false"/> +<setting id="cleanup.use_parentheses_in_expressions" value="false"/> +<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/> +<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/> +<setting id="cleanup.use_this_for_non_static_method_access" value="false"/> +<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/> +<setting id="cleanup.add_serial_version_id" value="true"/> +<setting id="cleanup.format_source_code_changes_only" value="false"/> +<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/> +<setting id="cleanup.always_use_blocks" value="true"/> +</profile> +</profiles> Modified: trunk/dev-utils/kune.formatter.eclipse.preferences.xml =================================================================== --- trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2008-10-11 17:04:26 UTC (rev 903) @@ -1,264 +1,267 @@ -<?xml version="1.0" encoding="UTF-8"?> -<profiles version="11"> -<profile kind="CodeFormatterProfile" name="kune-formatter" version="11"> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="8"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> -<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="mixed"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> -</profile> -</profiles> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<profiles version="11"> +<profile kind="CodeFormatterProfile" name="kune-formatter" version="11"> +<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> +<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> +<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/> +<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/> +<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> +<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/> +<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> +<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/> +<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/> +<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> +</profile> +</profiles> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/pom.xml 2008-10-11 17:04:26 UTC (rev 903) @@ -1,613 +1,624 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ourproject</groupId> - <artifactId>kune</artifactId> - <packaging>jar</packaging> - <version>0.0.4</version> - <description> - kune free/open/libre collaboration platform - </description> - <name>kune</name> - <url>http://kune.ourproject.org</url> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ourproject</groupId> + <artifactId>kune</artifactId> + <packaging>jar</packaging> + <version>0.0.4</version> + <description> + kune free/open/libre collaboration platform + </description> + <name>kune</name> + <url>http://kune.ourproject.org</url> - <dependencies> -  - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-servlet</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> + <dependencies> +  + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-servlet</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + </dependency> -  - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>1.5.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>1.5.2</version> - </dependency> -  - <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>2.0.5</version> - </dependency> - <dependency> - <groupId>com.gwtextux</groupId> - <artifactId>gwtextux</artifactId> - <version>0.3.0b</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <version>2.5.2</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> - <artifactId>gwt-voices</artifactId> - <version>1.5.5</version> - </dependency> +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>1.5.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>1.5.2</version> + </dependency> +  + <dependency> + <groupId>com.gwtext</groupId> + <artifactId>gwtext</artifactId> + <version>2.0.5</version> + </dependency> + <dependency> + <groupId>com.gwtextux</groupId> + <artifactId>gwtextux</artifactId> + <version>0.3.0b</version> + </dependency> + <dependency> + <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> + <artifactId>gwt-log</artifactId> + <version>2.5.2</version> + </dependency> + <dependency> + <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> + <artifactId>gwt-voices</artifactId> + <version>1.5.5</version> + </dependency> -  - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>com.calclab</groupId> - <artifactId>suco</artifactId> - <version>0.5.06</version> - </dependency> +  + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>net.sf.dozer</groupId> + <artifactId>dozer</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>com.calclab</groupId> + <artifactId>suco</artifactId> + <version>0.5.06</version> + </dependency> -  - <dependency> - <groupId>com.calclab.emite</groupId> - <artifactId>emite</artifactId> - <version>0.4.1</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smack</groupId> - <artifactId>smack</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx</groupId> - <artifactId>smackx</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx.debugger</groupId> - <artifactId>smackx-debugger</artifactId> - <version>3.0.4</version> - </dependency> +  + <dependency> + <groupId>com.calclab.emite</groupId> + <artifactId>emite</artifactId> + <version>0.4.1</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smack</groupId> + <artifactId>smack</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smackx</groupId> + <artifactId>smackx</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smackx.debugger</groupId> + <artifactId>smackx-debugger</artifactId> + <version>3.0.4</version> + </dependency> -  - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> - </dependency> +  + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + </dependency> -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>3.0.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.5.ga</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.3.1.ga</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-tools</artifactId> - <version>3.2.0.beta9a</version> - </dependency> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.wideplay</groupId> - <artifactId>warp-persist</artifactId> - <version>0.6</version> - </dependency> +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <version>3.0.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.5.ga</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.0.ga</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.3.1.ga</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-tools</artifactId> + <version>3.2.0.beta9a</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1.2</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.wideplay</groupId> + <artifactId>warp-persist</artifactId> + <version>0.6</version> + </dependency> -  - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.0-RC2</version> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>2.1</version> - <classifier>jdk15</classifier> - </dependency> +  + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.0-RC2</version> + </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>2.1</version> + <classifier>jdk15</classifier> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> -  - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> - </dependency> +  + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.1.1</version> + </dependency> - <dependency> - <groupId>org.cafesip.gwtcomp</groupId> - <artifactId>gwtcomp</artifactId> - <version>0.0.3b</version> - </dependency> - <dependency> - <groupId>org.cafesip.gwtcomp</groupId> - <artifactId>gwtcomp-servlet</artifactId> - <version>0.0.3b</version> - </dependency> + <dependency> + <groupId>org.cafesip.gwtcomp</groupId> + <artifactId>gwtcomp</artifactId> + <version>0.0.3b</version> + </dependency> + <dependency> + <groupId>org.cafesip.gwtcomp</groupId> + <artifactId>gwtcomp-servlet</artifactId> + <version>0.0.3b</version> + </dependency> -  +  - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-core</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - </dependency> + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-core</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-plugin</artifactId> + <version>1.7.0.0</version> + </dependency> -  - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>6.1.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.5</version> - <scope>provided</scope> - </dependency> +  + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>6.1.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.5</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.20070617</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> -  - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.openqa.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0-beta-1</version> - <scope>test</scope> - </dependency> - </dependencies> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.20070617</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> +  + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.openqa.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>1.0-beta-1</version> + <scope>test</scope> + </dependency> + </dependencies> -  - <repositories> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Maven Repository</name> - <url>http://repository.jboss.org/maven2</url> - <layout>default</layout> - </repository> - <repository> - <id>dyndns-repo</id> - <url>http://maven.dyndns.org/2</url> - </repository> - <repository> - <id>gwt-maven</id> - <url> - http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ - </url> - </repository> - <repository> - <id>kune-maven</id> - <url>http://kune.ourproject.org/mavenrepo/</url> - </repository> - <repository> - <id>gwtext</id> - <url>http://www.gwt-ext.com/maven2/</url> - </repository> - <repository> - <id>openqa.org</id> - <name>Openqa Release Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa.org</id> - <name>Openqa Snapshot Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>com.totsp.gwt</groupId> - <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>2.0-beta23</version> - <configuration> - <logLevel>INFO</logLevel> - <style>PRETTY</style> - <runTarget> - org.ourproject.kune.app.Kune/Kune.html - </runTarget> - <compileTargets> - <compileTarget> - org.ourproject.kune.app.Kune - </compileTarget> - </compileTargets> - <generatorRootClasses> - <value>org.ourproject.kune.MyBean</value> - </generatorRootClasses> - <generatorDestinationPackage> - org.ourproject.kune.app.Kune - </generatorDestinationPackage> - <generateGettersAndSetters> - true - </generateGettersAndSetters> - <generatePropertyChangeSupport> - true - </generatePropertyChangeSupport> - </configuration> - <executions> - <execution> - <goals> -  -  - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> - <configuration> - <webXml>target/web.xml</webXml> - </configuration> - </plugin> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.3</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>true</downloadJavadocs> - <wtpversion>1.5</wtpversion> - </configuration> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.5</version> - <configuration> - <contextPath>/</contextPath> - <scanIntervalSeconds>0</scanIntervalSeconds> - </configuration> - </plugin> +  + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Maven Repository</name> + <url>http://repository.jboss.org/maven2</url> + <layout>default</layout> + </repository> + <repository> + <id>dyndns-repo</id> + <url>http://maven.dyndns.org/2</url> + </repository> + <repository> + <id>gwt-maven</id> + <url> + http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ + </url> + </repository> + <repository> + <id>kune-maven</id> + <url>http://kune.ourproject.org/mavenrepo/</url> + </repository> + <repository> + <id>gwtext</id> + <url>http://www.gwt-ext.com/maven2/</url> + </repository> + <repository> + <id>openqa.org</id> + <name>Openqa Release Repository</name> + <url>http://archiva.openqa.org/repository/releases</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>openqa.org</id> + <name>Openqa Snapshot Repository</name> + <url>http://archiva.openqa.org/repository/snapshots</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + <issueManagement> + <system>google code issues list</system> + <url>http://code.google.com/p/kune/issues/list</url> + </issueManagement> + <scm> + <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> + </scm> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3</version> + <configuration> + <forkMode>pertest</forkMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>com.totsp.gwt</groupId> + <artifactId>maven-googlewebtoolkit2-plugin</artifactId> + <version>2.0-beta23</version> + <configuration> + <logLevel>INFO</logLevel> + <style>PRETTY</style> + <runTarget> + org.ourproject.kune.app.Kune/Kune.html + </runTarget> + <compileTargets> + <compileTarget> + org.ourproject.kune.app.Kune + </compileTarget> + </compileTargets> + <generatorRootClasses> + <value>org.ourproject.kune.MyBean</value> + </generatorRootClasses> + <generatorDestinationPackage> + org.ourproject.kune.app.Kune + </generatorDestinationPackage> + <generateGettersAndSetters> + true + </generateGettersAndSetters> + <generatePropertyChangeSupport> + true + </generatePropertyChangeSupport> + </configuration> + <executions> + <execution> + <goals> +  +  + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0</version> + <configuration> + <webXml>target/web.xml</webXml> + </configuration> + </plugin> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.3</version> + <configuration> + <downloadSources>true</downloadSources> + <downloadJavadocs>true</downloadJavadocs> + <wtpversion>1.5</wtpversion> + </configuration> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.5</version> + <configuration> + <contextPath>/</contextPath> + <scanIntervalSeconds>0</scanIntervalSeconds> + </configuration> + </plugin> - <plugin> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <changeLogFile> - src/main/resources/db/liquibase_changelog.xml - </changeLogFile> - <driver>com.mysql.jdbc.Driver</driver> - <url>jdbc:mysql://localhost/kune_dev</url> - <username>kune</username> - <password>db4kune</password> - <verbose>true</verbose> - </configuration> -  - <goals> - <goal>update</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <executions> - <execution> - <id>core</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>core</classifier> - <includes> - <include> - **/Kune-Platform.gwt.xml** - </include> - <include> - **/I18nTranslationService** - </include> - <include>**/BasicDialog.**</include> - <include>**/HorizontalLine.**</include> - <include>**/AbstractLabel.**</include> - <include>**/IconLabel.**</include> - <include> - **/EditableIconLabel.** - </include> - <include> - **/EditableClickListener.** - </include> - <include>**/KuneStringUtils.**</include> - <include>**/IconHyperlink*.**</include> - <include>**/LabelWrapper*.**</include> - <include>**/KuneUiUtils.**</include> - <include>**/View.**</include> -  - </includes> - </configuration> - </execution> - <execution> - <id>helloworldplugin</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>helloworldplugin</classifier> - <includes> - <include>**/HelloWorld*</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - <executions> - <execution> - <phase>pre-integration-test</phase> - <goals> - <goal>start-server</goal> - </goals> - <configuration> - <background>true</background> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> -  - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - </resource> - </resources> - </build> + <plugin> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-plugin</artifactId> + <version>1.7.0.0</version> + <executions> + <execution> + <phase>process-resources</phase> + <configuration> + <changeLogFile> + src/main/resources/db/liquibase_changelog.xml + </changeLogFile> + <driver>com.mysql.jdbc.Driver</driver> + <url>jdbc:mysql://localhost/kune_dev</url> + <username>kune</username> + <password>db4kune</password> + <verbose>true</verbose> + </configuration> +  + <goals> + <goal>update</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <id>core</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>core</classifier> + <includes> + <include> + **/Kune-Platform.gwt.xml** + </include> + <include> + **/I18nTranslationService** + </include> + <include>**/BasicDialog.**</include> + <include>**/HorizontalLine.**</include> + <include>**/AbstractLabel.**</include> + <include>**/IconLabel.**</include> + <include> + **/EditableIconLabel.** + </include> + <include> + **/EditableClickListener.** + </include> + <include>**/KuneStringUtils.**</include> + <include>**/IconHyperlink*.**</include> + <include>**/LabelWrapper*.**</include> + <include>**/KuneUiUtils.**</include> + <include>**/View.**</include> +  + </includes> + </configuration> + </execution> + <execution> + <id>helloworldplugin</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>helloworldplugin</classifier> + <includes> + <include>**/HelloWorld*</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.2</version> - <configuration> - <linkXref>true</linkXref> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name> - net.sourceforge.cobertura.datafile - </name> - <value> - ${project.build.directory}/cobertura/cobertura.ser - </value> - </property> - </systemProperties> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + <configuration> + <port>4441</port> + </configuration> + <executions> + <execution> + <phase>pre-integration-test</phase> + <goals> + <goal>start-server</goal> + </goals> + <configuration> + <background>true</background> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> +  + <skip>true</skip> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>src/main/java</directory> + </resource> + </resources> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.2</version> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name> + net.sourceforge.cobertura.datafile + </name> + <value> + ${project.build.directory}/cobertura/cobertura.ser + </value> + </property> + </systemProperties> + <forkMode>pertest</forkMode> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + </plugin> + </plugins> + </reporting> </project> Modified: trunk/script/css-compact-and-tidy.css =================================================================== --- trunk/script/css-compact-and-tidy.css 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/script/css-compact-and-tidy.css 2008-10-11 17:04:26 UTC (rev 903) @@ -37,7 +37,7 @@ } function tidy { -ls `which csstidy | cut -d " " -f 1` 2> /dev/null +ls `which csstidy | cut -d " " -f 1` 2> /dev/null > /dev/null if [[ $? -eq 0 ]] then csstidy $CATTMPFILE \ Modified: trunk/src/main/java/org/ourproject/kune/app/public/Kune.html =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2008-10-11 17:04:26 UTC (rev 903) @@ -48,7 +48,7 @@ src="org.ourproject.kune.app.Kune.nocache.js"></script> <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width:0;height:0;border:0"></iframe> -<div id="kuneprogresspanel" class="k-sitebar"> +<div id="kuneprogresspanel" class=""> <table cellspacing="0" summary="Starting" cellpadding="0" border="0" style="height: 16px; margin-top: 5px; margin-left: 5px;"> <tbody> @@ -58,7 +58,7 @@ src="images/spin-kune-thund-green.gif" style="height: 16px; width: 16px;" /></td> <td align="left" style="vertical-align: top;" class="kune-Progress"> - <div class="k-sitebar gwt-Label" id="kuneprogresstext">Starting</div> + <div class="gwt-Label" id="kuneprogresstext">Starting</div> </td> <td width="100%" height="16" align="left" style="vertical-align: top;"></td> Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-11 17:04:26 UTC (rev 903) @@ -35,4 +35,4 @@ } */.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-TagsPanel-tag{float:left;margin-right:5px;cursor:pointer;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; background-color: #FFF; */border:1px solid #4D4D4D;background-color:#FFF;margin:5px 0 5px 10px;}.gwt-RichTextToolbar{/* background-color: #F2F2F2; - padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial,sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;} \ No newline at end of file + padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;background:#FFF;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-11 17:04:26 UTC (rev 903) @@ -1,23 +1,23 @@ .k-site-traybar { - background: #FFF none repeat scroll 0% 50%; + background: #FFF none repeat scroll 0% 50%; } .k-sitebar .kune-IconHyperlink { - white-space: nowrap; + white-space: nowrap; } .k-sitebar .kune-IconHyperlink a:link { - cursor: pointer; - text-decoration: underline; - color: #B3B3B3; + cursor: pointer; + text-decoration: underline; + color: #B3B3B3; } .k-sitebar .kune-IconHyperlink a:hover { - text-decoration: underline; + text-decoration: underline; } .k-sitebar .kune-IconHyperlink a:visited { - color: #B3B3B3; + color: #B3B3B3; } .k-sitebar-labellink { @@ -28,586 +28,606 @@ } .k-sitebar { - margin-right: 10px; - height: 16px; + margin-right: 10px; + height: 16px; + background: #FFF; } .k-sitebar .gwt-TextBox { - border: 1px solid #E4A374; - margin: 0 15px 0 3px; - padding-left: 3px; - color: #B3B3B3; + border: 1px solid #E4A374; + margin: 0 15px 0 3px; + padding-left: 3px; + color: #B3B3B3; } .k-sitebar .gwt-Hyperlink a { - white-space: nowrap; - color: #B3B3B3; - text-decoration: underline; - cursor: pointer; + white-space: nowrap; + color: #B3B3B3; + text-decoration: underline; + cursor: pointer; } .k-sitebar .gwt-PushButton { - cursor: pointer; + cursor: pointer; } .k-sitebar-LabelLink { - white-space: nowrap; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; + white-space: nowrap; + color: #B3B3B3; + cursor: pointer; + text-decoration: underline; } .k-entity-summary { - border-left-color: #FFF; - border-left-width: 5px; + border-left-color: #FFF; + border-left-width: 5px; } .k-entitytextlogo { - border: 2px solid #F2F2F2; - height: 60px; - margin: 0 0 4px -1px; - overflow: hidden; - width: 468px; + border: 2px solid #F2F2F2; + height: 60px; + margin: 0 0 4px -1px; + overflow: hidden; + width: 468px; } .k-entitytextlogo .gwt-Label { - font-size: 167%; - font-weight: 700; - margin: 5px; - height: 27px; + font-size: 167%; + font-weight: 700; + margin: 5px; + height: 27px; } .k-entitytextlogo-default .gwt-Label { - color: #69312F; + color: #69312F; } .k-entitytextlogo-green .gwt-Label { - color: #250; + color: #250; } .k-entitytextlogo-blue .gwt-Label { - color: #000080; + color: #000080; } .k-entitytextlogo-grey .gwt-Label { - color: #1A1A1A; + color: #1A1A1A; } .k-entitytextlogo-purple .gwt-Label { - color: #440055; + color: #440055; } .k-entitytextlogo-red .gwt-Label { - color: #800000; + color: #800000; } .k-entitytextlogo .gwt-Hyperlink a { - color: #CCC; - font-size: 85%; - margin: 5px; - text-decoration: underline; - white-space: nowrap; - background-color: #FFF; + color: #CCC; + font-size: 85%; + margin: 5px; + text-decoration: underline; + white-space: nowrap; + background-color: #FFF; } .k-entity-default .x-layout-split { - background: #DD8A3D none repeat scroll 0% 50%; + background: #DD8A3D none repeat scroll 0% 50%; } .k-entity-green .x-layout-split { - background: #5FD35F none repeat scroll 0% 50%; + background: #5FD35F none repeat scroll 0% 50%; } .k-entity-blue .x-layout-split { - background: #0066FF none repeat scroll 0% 50%; + background: #0066FF none repeat scroll 0% 50%; } .k-entity-grey .x-layout-split { - background: #4D4D4D none repeat scroll 0% 50%; + background: #4D4D4D none repeat scroll 0% 50%; } .k-entity-purple .x-layout-split { - background: #660080 none repeat scroll 0% 50%; + background: #660080 none repeat scroll 0% 50%; } .k-entity-red .x-layout-split { - background: #D40000 none repeat scroll 0% 50%; + background: #D40000 none repeat scroll 0% 50%; } .k-entityworkspace .x-layout-split { - background: transparent none repeat scroll 0% 50%; + background: transparent none repeat scroll 0% 50%; } .k-entityworkspace-default .x-layout-split { - background: #DEAA87 none repeat scroll 0% 50%; + background: #DEAA87 none repeat scroll 0% 50%; } .k-entityworkspace-green .x-layout-split { - background: #DCE8AB none repeat scroll 0% 50%; + background: #DCE8AB none repeat scroll 0% 50%; } .k-entityworkspace-blue .x-layout-split { - background: #D5D5FF none repeat scroll 0% 50%; + background: #D5D5FF none repeat scroll 0% 50%; } .k-entityworkspace-grey .x-layout-split { - background: #999999 none repeat scroll 0% 50%; + background: #999999 none repeat scroll 0% 50%; } .k-entityworkspace-purple .x-layout-split { - background: #A793AC none repeat scroll 0% 50%; + background: #A793AC none repeat scroll 0% 50%; } .k-entityworkspace-red .x-layout-split { - background: #FF5555 none repeat scroll 0% 50%; + background: #FF5555 none repeat scroll 0% 50%; } .k-entity-title { - border-left-style: solid; - border-left-width: 2px; + border-left-style: solid; + border-left-width: 2px; } .k-entity-title div { - line-height: 22px; - white-space: nowrap; + line-height: 22px; + white-space: nowrap; } .k-entity-subtitle { + } .k-entity-subtitle div { - line-height: 22px; - white-space: nowrap; + line-height: 22px; + white-space: nowrap; } .k-entity-title-rd-default { - background: #DD8A3D; + background: #DD8A3D; } .k-entity-title-rd-green { - background: #5FD35F; + background: #5FD35F; } .k-entity-title-rd-blue { - background: #0066FF; + background: #0066FF; } .k-entity-title-rd-grey { - background: #4D4D4D; + background: #4D4D4D; } .k-entity-title-rd-purple { - background: #660080; + background: #660080; } .k-entity-title-rd-red { - background: #D40000; + background: #D40000; } .k-entity-title-default { - background: #F1BB59 none repeat scroll 0% 50%; - border-left-color: #DD8A3D; + background: #F1BB59 none repeat scroll 0% 50%; + border-left-color: #DD8A3D; } .k-entity-title-green { - background: #AFA none repeat scroll 0% 50%; - border-left-color: #5FD35F; + background: #AFA none repeat scroll 0% 50%; + border-left-color: #5FD35F; } .k-entity-title-blue { - background: #AFDDE9 none repeat scroll 0% 50%; - border-left-color: #0066FF; + background: #AFDDE9 none repeat scroll 0% 50%; + border-left-color: #0066FF; } .k-entity-title-grey { - background: #CCCCCC none repeat scroll 0% 50%; - border-left-color: #4D4D4D; + background: #CCCCCC none repeat scroll 0% 50%; + border-left-color: #4D4D4D; } .k-entity-title-purple { - background: #DDAFE9 none repeat scroll 0% 50%; - border-left-color: #660080; + background: #DDAFE9 none repeat scroll 0% 50%; + border-left-color: #660080; } .k-entity-title-red { - background: #FF8080 none repeat scroll 0% 50%; - border-left-color: #D40000; + background: #FF8080 none repeat scroll 0% 50%; + border-left-color: #D40000; } .k-entity-title-default div { - color: #69312F; + color: #69312F; } .k-entity-title-green div { - color: #250; + color: #250; } .k-entity-title-blue div { - color: #000080; + color: #000080; } .k-entity-title-grey div { - color: #1A1A1A; + color: #1A1A1A; } .k-entity-title-purple div { - color: #440055; + color: #440055; } .k-entity-title-red div { - color: #800000; + color: #800000; } .k-entity-subtitle-default { - background: #DD8A3D none repeat scroll 0% 50%; + background: #DD8A3D none repeat scroll 0% 50%; } .k-entity-subtitle-green { - background: #5FD35F none repeat scroll 0% 50%; + background: #5FD35F none repeat scroll 0% 50%; } .k-entity-subtitle-blue { - background: #0066FF none repeat scroll 0% 50%; + background: #0066FF none repeat scroll 0% 50%; } .k-entity-subtitle-grey { - background: #4D4D4D none repeat scroll 0% 50%; + background: #4D4D4D none repeat scroll 0% 50%; } .k-entity-subtitle-purple { - background: #660080 none repeat scroll 0% 50%; + background: #660080 none repeat scroll 0% 50%; } .k-entity-subtitle-red { - background: #D40000 none repeat scroll 0% 50%; + background: #D40000 none repeat scroll 0% 50%; } .k-entity-subtitle-default div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-green div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-blue div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-grey div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-purple div { - color: #FFF; + color: #FFF; } .k-entity-subtitle-red div { - color: #FFF; + color: #FFF; } -.k-entity-bottom-rd-default, .k-entity-bottom-default, .k-toolselectoritem-sel-default { - background: #DD8A3D; +.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default + { + background: #DD8A3D; } -.k-entity-bottom-rd-green, .k-entity-bottom-green, .k-toolselectoritem-sel-green { - background: #5FD35F; +.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green + { + background: #5FD35F; } -.k-entity-bottom-rd-blue, .k-entity-bottom-blue, .k-toolselectoritem-sel-blue { - background: #0066FF; +.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue + { + background: #0066FF; } -.k-entity-bottom-rd-grey, .k-entity-bottom-grey, .k-toolselectoritem-sel-grey { - background: #4D4D4D; +.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey + { + background: #4D4D4D; } -.k-entity-bottom-rd-purple, .k-entity-bottom-purple, .k-toolselectoritem-sel-purple { - background: #660080; +.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple + { + background: #660080; } -.k-entity-bottom-rd-red, .k-entity-bottom-red, .k-toolselectoritem-sel-red { - background: #D40000; +.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red + { + background: #D40000; } .k-entitylicensepanel-licensetext { - cursor: pointer; - margin-left: 5px; - text-decoration: underline; + cursor: pointer; + margin-left: 5px; + text-decoration: underline; } -.k-entity-context-default div, .k-entity-context-default .x-tree .x-panel-body { - background: #FFD09D none repeat scroll 0% 50%; +.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body + { + background: #FFD09D none repeat scroll 0% 50%; } -.k-entity-context-green div, .k-entity-context-green .x-tree .x-panel-body { - background: #CFA none repeat scroll 0% 50%; +.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body + { + background: #CFA none repeat scroll 0% 50%; } -.k-entity-context-blue div, .k-entity-context-blue .x-tree .x-panel-body { - background: #AACCFF none repeat scroll 0% 50%; +.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body + { + background: #AACCFF none repeat scroll 0% 50%; } -.k-entity-context-grey div, .k-entity-context-grey .x-tree .x-panel-body { - background: #B3B3B3 none repeat scroll 0% 50%; +.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body + { + background: #B3B3B3 none repeat scroll 0% 50%; } -.k-entity-context-purple div, .k-entity-context-purple .x-tree .x-panel-body { - background: #DDAFE9 none repeat scroll 0% 50%; +.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body + { + background: #DDAFE9 none repeat scroll 0% 50%; } -.k-entity-context-red div, .k-entity-context-red .x-tree .x-panel-body { - background: #FFAAAA none repeat scroll 0% 50%; +.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body { + background: #FFAAAA none repeat scroll 0% 50%; } - .k-entity-context-purple .x-tree .x-panel-body { - background: #DDAFE9 none repeat scroll 0% 50%; + background: #DDAFE9 none repeat scroll 0% 50%; } - .k-entity-bottom div { - line-height: 2em; - color: #FFF; + line-height: 2em; + color: #FFF; } .k-toolbar-top-line { - border-top-color: rgb( 208, 208, 208 ); - border-top-style: solid; - border-top-width: 1px; + border-top-color: rgb(208, 208, 208); + border-top-style: solid; + border-top-width: 1px; } .k-toolbar-bottom-line { - border-bottom-color: rgb( 208, 208, 208 ); - border-bottom-style: solid; - border-bottom-width: 1px; + border-bottom-color: rgb(208, 208, 208); + border-bottom-style: solid; + border-bottom-width: 1px; } -.x-toolbar td, .x-toolbar span, .x-toolbar input, .x-toolbar div, .x-toolbar select, .x-toolbar label { - white-space: nowrap; - font: normal 100% arial,sans; - line-height: 19px; +.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label + { + white-space: nowrap; + font: normal 100% arial, sans; + line-height: 19px; } .k-toolbar-sep { - padding-top: 4px; - padding-left: 5px; + padding-top: 4px; + padding-left: 5px; } + /* Custom gwt-ext styles */ .ytb-sep { - background-image: url(../js/ext/resources/images/default/grid/grid-split.gif); - background-position: center; - background-repeat: no-repeat; - display: block; - font-size: 1px; - height: 16px; - width: 4px; - overflow: hidden; - cursor: default; - margin: 0 2px 0; - border: 0; + background-image: + url(../js/ext/resources/images/default/grid/grid-split.gif); + background-position: center; + background-repeat: no-repeat; + display: block; + font-size: 1px; + height: 16px; + width: 4px; + overflow: hidden; + cursor: default; + margin: 0 2px 0; + border: 0; } .ytb-spacer { - width: 2px; + width: 2px; } .x-grid-group-hd { - border-bottom: 2px solid grey; - cursor: pointer; - padding-top: 3px; + border-bottom: 2px solid grey; + cursor: pointer; + padding-top: 3px; } + /* Drop down */ .k-dropdownouter { - background-color: grey; + background-color: grey; } .k-dropdownouter-members { + } .k-dropdownouter-members-default { - background-color: #DF5244; + background-color: #DF5244; } .k-dropdownouter-members-green { - background-color: #008000; + background-color: #008000; } .k-dropdownouter-members-blue { - background-color: #5500D4; + background-color: #5500D4; } .k-dropdownouter-members-grey { - background-color: #4D4D4D; + background-color: #4D4D4D; } .k-dropdownouter-members-purple { - background-color: #672178; + background-color: #672178; } .k-dropdownouter-members-red { - background-color: #A02C2C; + background-color: #A02C2C; } .k-dropdownouter-part { + } .k-dropdownouter-part-default { - background-color: #CA5842; + background-color: #CA5842; } .k-dropdownouter-part-green { - background-color: #00AA00; + background-color: #00AA00; } .k-dropdownouter-part-blue { - background-color: #6600FF; + background-color: #6600FF; } .k-dropdownouter-part-grey { - background-color: #666666; + background-color: #666666; } .k-dropdownouter-part-purple { - background-color: #892CA0; + background-color: #892CA0; } .k-dropdownouter-part-red { - background-color: #C83737; + background-color: #C83737; } .k-dropdownouter-tags { + } .k-dropdownouter-tags-default { - background-color: #87501E; + background-color: #87501E; } .k-dropdownouter-tags-green { - background-color: #00D400; + background-color: #00D400; } .k-dropdownouter-tags-blue { - background-color: #9955FF; + background-color: #9955FF; } .k-dropdownouter-tags-grey { - background-color: #808080; + background-color: #808080; } .k-dropdownouter-tags-purple { - background-color: #AB37C8; + background-color: #AB37C8; } .k-dropdownouter-tags-red { - background-color: #D35F5F; + background-color: #D35F5F; } .k-dropdownouter-summary { + } .k-dropdownouter-summary-default { - background-color: #9F734B; + background-color: #9F734B; } .k-dropdownouter-summary-green { - background-color: #4CE14C; + background-color: #4CE14C; } .k-dropdownouter-summary-blue { - background-color: #69A5FF; + background-color: #69A5FF; } .k-dropdownouter-summary-grey { - background-color: #A6A6A6; + background-color: #A6A6A6; } .k-dropdownouter-summary-purple { - background-color: #C473D8; + background-color: #C473D8; } .k-dropdownouter-summary-red { - background-color: #E08F8F; + background-color: #E08F8F; } .k-dropdowninner { - margin: 0 3px 1px 3px; - background: green; - background-color: #FFF; - /* padding: 3px; */ + margin: 0 3px 1px 3px; + background: green; + background-color: #FFF; + /* padding: 3px; */ } .k-dropdownlabel { - color: #FFF; - cursor: pointer; + color: #FFF; + cursor: pointer; } .k-dropdownlabel .gwt-Label { - margin: 0 5px 0 0; - width: 100%; + margin: 0 5px 0 0; + width: 100%; } .k-dropdownlabel img { - margin: 0 3px 0 1px; + margin: 0 3px 0 1px; } + /* WsTheme */ .k-wstheme-icon-default { - background: #FF8C00; + background: #FF8C00; } .k-wstheme-icon-green { - background: green; + background: green; } .k-wstheme-icon-blue { - background: blue; + background: blue; } .k-wstheme-icon-grey { - background: grey; + background: grey; } .k-wstheme-icon-purple { - background: purple; + background: purple; } .k-wstheme-icon-red { - background: red; + background: red; } /* Tool selector items */ - .k-toolselectoritem { width: auto; - margin-bottom: 5px; + margin-bottom: 5px; cursor: pointer; } .k-toolselectoritem-sel { + } .k-toolselectoritem-notsel-default { - background: #FFE9A5; + background: #FFE9A5; } .k-toolselectoritem-notsel-green { - background: #D6F4D6; + background: #D6F4D6; } .k-toolselectoritem-notsel-blue { - background: #D7D7F4; + background: #D7D7F4; } .k-toolselectoritem-notsel-grey { - background: #E6E6E6; + background: #E6E6E6; } .k-toolselectoritem-notsel-purple { - background: #EED7F4; + background: #EED7F4; } .k-toolselectoritem-notsel-red { - background: #FFD5D5; + background: #FFD5D5; } .k-toolselectoritem-sel a { @@ -621,6 +641,7 @@ } .k-toolselectoritem-notsel { + } .k-toolselectoritem-notsel a { @@ -635,16 +656,16 @@ /* others */ .k-textlinethrough { - text-decoration: line-through; - color: red; + text-decoration: line-through; + color: red; } .k-textnormal { - text-decoration: inherit; - color: green; + text-decoration: inherit; + color: green; } .k-textunderline { - text-decoration: underline; - color: gray; -} + text-decoration: underline; + color: gray; +} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-11 17:04:26 UTC (rev 903) @@ -45,108 +45,112 @@ private ToolbarButton traybarButton; public ChatEngineXmpp(final EmiteUIDialog emiteUIDialog, final ChatOptions chatOptions, - final I18nTranslationService i18n, final WorkspaceSkeleton ws) { - this.emiteDialog = emiteUIDialog; - this.chatOptions = chatOptions; - this.i18n = i18n; - this.ws = ws; + final I18nTranslationService i18n, final WorkspaceSkeleton ws) { + this.emiteDialog = emiteUIDialog; + this.chatOptions = chatOptions; + this.i18n = i18n; + this.ws = ws; } public ChatOptions getChatOptions() { - return chatOptions; + return chatOptions; } public void joinRoom(final String roomName, final String userAlias) { - if (emiteDialog.isLoggedIn()) { - final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/" - + chatOptions.userOptions.getUserJid().getNode()); - emiteDialog.joinRoom(roomURI); - } else { - ws.showAlertMessage(i18n.t("Error"), i18n.t("To join a chatroom you need to be 'online'.")); - } + if (emiteDialog.isLoggedIn()) { + final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/" + + chatOptions.userOptions.getUserJid().getNode()); + emiteDialog.joinRoom(roomURI); + } else { + ws.showAlertMessage(i18n.t("Error"), i18n.t("To join a chatroom you need to be 'online'.")); + } } public void login(final String jid, final String passwd) { - final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd); - // FIXME: Avatar provider - final AvatarProvider avatarProvider = new AvatarProvider() { - public String getAvatarURL(XmppURI userURI) { - return "images/person-def.gif"; - } - }; - final String initialWindowTitle = Window.getTitle(); - chatOptions.userOptions = userChatOptions; - if (emiteDialog.isDialogNotStarted()) { - emiteDialog.start(userChatOptions, chatOptions.httpBase, chatOptions.roomHost, initialWindowTitle, - avatarProvider, i18n.t("Chat")); - } else { - emiteDialog.setEnableStatusUI(true); - emiteDialog.refreshUserInfo(chatOptions.userOptions); - } - emiteDialog.show(OwnStatus.online); - if (traybarButton == null) { - traybarButton = new ToolbarButton(); - traybarButton.setTooltip(i18n.t("Show/hide the chat window")); - // traybarButton.setIcon("images/emite-chat.gif"); - traybarButton.setIcon("images/e-icon.gif"); - traybarButton.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - if (emiteDialog.isVisible()) { - emiteDialog.hide(); - } else { - emiteDialog.show(); - } - } - }); - ws.getSiteTraybar().addButton(traybarButton); - emiteDialog.onChatAttended(new Listener<String>() { - public void onEvent(final String parameter) { - traybarButton.setIcon("images/e-icon.gif"); - } - }); - emiteDialog.onChatUnattendedWithActivity(new Listener<String>() { - public void onEvent(final String parameter) { - traybarButton.setIcon("images/e-icon-a.gif"); - } - }); - } - emiteDialog.hide(); - emiteDialog.onChatAttended(new Listener<String>() { - public void onEvent(final String parameter) { - Window.setTitle(initialWindowTitle); - } - }); - emiteDialog.onChatUnattendedWithActivity(new Listener<String>() { - public void onEvent(final String chatTitle) { - Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle); - } - }); + final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd); + // FIXME: Avatar provider + final AvatarProvider avatarProvider = new AvatarProvider() { + public String getAvatarURL(XmppURI userURI) { + return "images/person-def.gif"; + } + }; + final String initialWindowTitle = Window.getTitle(); + chatOptions.userOptions = userChatOptions; + if (emiteDialog.isDialogNotStarted()) { + emiteDialog.start(userChatOptions, chatOptions.httpBase, chatOptions.roomHost, initialWindowTitle, + avatarProvider, i18n.t("Chat")); + } else { + emiteDialog.setEnableStatusUI(true); + emiteDialog.refreshUserInfo(chatOptions.userOptions); + } + emiteDialog.show(OwnStatus.online); + if (traybarButton == null) { + traybarButton = new ToolbarButton(); + traybarButton.setTooltip(i18n.t("Show/hide the chat window")); + // traybarButton.setIcon("images/emite-chat.gif"); + traybarButton.setIcon("images/e-icon.gif"); + traybarButton.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + if (emiteDialog.isVisible()) { + emiteDialog.hide(); + } else { + emiteDialog.show(); + } + } + }); + ws.getSiteTraybar().addButton(traybarButton); + emiteDialog.onChatAttended(new Listener<String>() { + public void onEvent(final String parameter) { + traybarButton.setIcon("images/e-icon.gif"); + } + }); + emiteDialog.onChatUnattendedWithActivity(new Listener<String>() { + public void onEvent(final String parameter) { + traybarButton.setIcon("images/e-icon-a.gif"); + } + }); + } + emiteDialog.hide(); + emiteDialog.onChatAttended(new Listener<String>() { + public void onEvent(final String parameter) { + Window.setTitle(initialWindowTitle); + } + }); + emiteDialog.onChatUnattendedWithActivity(new Listener<String>() { + public void onEvent(final String chatTitle) { + Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle); + } + }); } public void logout() { - if (!emiteDialog.isDialogNotStarted()) { - emiteDialog.setOwnPresence(OwnStatus.offline); - chatOptions.userOptions = getUserChatOptions("reset(a)example.com", ""); - emiteDialog.refreshUserInfo(chatOptions.userOptions); - emiteDialog.setEnableStatusUI(false); - } + if (!emiteDialog.isDialogNotStarted()) { + emiteDialog.setOwnPresence(OwnStatus.offline); + chatOptions.userOptions = getUserChatOptions("reset(a)example.com", ""); + emiteDialog.refreshUserInfo(chatOptions.userOptions); + emiteDialog.setEnableStatusUI(false); + } } public void show() { - emiteDialog.show(); + emiteDialog.show(); } public void stop() { - emiteDialog.destroy(); - emiteDialog.getSession().logout(); + if (!emiteDialog.isDialogNotStarted()) { + emiteDialog.destroy(); + } + if (emiteDialog.getSession().isLoggedIn()) { + emiteDialog.getSession().logout(); + } } private UserChatOptions getUserChatOptions(final String jid, final String passwd) { - final String resource = "emiteui-" + new Date().getTime() + "-kune"; // + - // getGwtMetaProperty(GWT_PROPERTY_RELEASE); - // FIXME, get this from user profile - return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, resource, "blue", - SubscriptionMode.autoAcceptAll, true); + final String resource = "emiteui-" + new Date().getTime() + "-kune"; // + + // getGwtMetaProperty(GWT_PROPERTY_RELEASE); + // FIXME, get this from user profile + return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, resource, "blue", + SubscriptionMode.autoAcceptAll, true); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-11 17:04:26 UTC (rev 903) @@ -118,8 +118,7 @@ register(Singleton.class, new Factory<DocumentReader>(DocumentReader.class) { public DocumentReader create() { final DocumentReaderView view = new DocumentReaderPanel($(WorkspaceSkeleton.class)); - final DocumentReaderPresenter presenter = new DocumentReaderPresenter($(Session.class), view, - $(I18nUITranslationService.class)); + final DocumentReaderPresenter presenter = new DocumentReaderPresenter($(Session.class), view); return presenter; } }); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -28,6 +28,8 @@ public class FolderViewerPanel extends Label implements FolderViewerView { public FolderViewerPanel() { - super("Folder properties, translations ..." + Site.IN_DEVELOPMENT); + super("Folder properties, translations ..." + Site.IN_DEVELOPMENT); + super.setStyleName("kune-Content-Main"); + super.addStyleName("kune-Margin-7-trbl"); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-11 17:04:26 UTC (rev 903) @@ -25,42 +25,36 @@ import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; public class DocumentReaderPresenter implements DocumentReader { private final DocumentReaderView view; - private final I18nUITranslationService i18n; private final Session session; - public DocumentReaderPresenter(final Session session, final DocumentReaderView view, - final I18nUITranslationService i18n) { - this.session = session; - this.view = view; - this.i18n = i18n; + public DocumentReaderPresenter(final Session session, final DocumentReaderView view) { + this.session = session; + this.view = view; } public View getView() { - return view; + return view; } public void showDocument(final StateToken token, final String text, final String typeId, - final BasicMimeTypeDTO mimeType) { - if (typeId.equals(DocumentClientTool.TYPE_UPLOADEDFILE)) { - if (mimeType != null) { - final String url = "/kune/servlets/FileDownloadManager?token=" + token + "&hash=" - + session.getUserHash(); - if (mimeType.getType().equals("image")) { - view.setContent("<img src=\"" + url + "\">"); - } else if (mimeType.toString().equals("text/plain")) { - view.setContent(text); - } else { - view.setContent("<a href=\"" + url + "\">" + i18n.t("Download") + "</a>"); - } - } else { - view.setContent("<a href=\"" + "dd" + "\">" + i18n.t("Download") + "</a>"); - } - } else { - view.setContent(text); - } + final BasicMimeTypeDTO mimeType) { + if (typeId.equals(DocumentClientTool.TYPE_UPLOADEDFILE)) { + if (mimeType != null) { + final String url = "/kune/servlets/FileDownloadManager?token=" + token + "&hash=" + + session.getUserHash(); + if (mimeType.getType().equals("image")) { + view.setContent("<img src=\"" + url + "\">"); + } else if (mimeType.toString().equals("text/plain") || mimeType.toString().equals("application/pdf")) { + view.setContent(text); + } else { + view.setContent(""); + } + } + } else { + view.setContent(text); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-11 17:04:26 UTC (rev 903) @@ -57,254 +57,255 @@ private StateToken stateToken; public StateDTO() { - this(null, null, null); + this(null, null, null); } public StateDTO(final String docRef, final String title, final String content) { - this.documentId = docRef; - this.title = title; - this.content = content; + this.documentId = docRef; + this.title = title; + this.content = content; } public AccessListsDTO getAccessLists() { - return accessLists; + return accessLists; } public List<UserSimpleDTO> getAuthors() { - return authors; + return authors; } public ContainerDTO getContainer() { - return container; + return container; } public AccessRightsDTO getContainerRights() { - return containerRights; + return containerRights; } public String getContent() { - return content; + return content; } public AccessRightsDTO getContentRights() { - return this.contentRights; + return this.contentRights; } public Double getCurrentUserRate() { - return currentUserRate; + return currentUserRate; } public String getDocumentId() { - return documentId; + return documentId; } public GroupDTO getGroup() { - return this.group; + return this.group; } public SocialNetworkDTO getGroupMembers() { - return groupMembers; + return groupMembers; } public AccessRightsDTO getGroupRights() { - return groupRights; + return groupRights; } public List<TagResultDTO> getGroupTags() { - return groupTags; + return groupTags; } public I18nLanguageDTO getLanguage() { - return language; + return language; } public LicenseDTO getLicense() { - return license; + return license; } public BasicMimeTypeDTO getMimeType() { - return mimeType; + return mimeType; } public ParticipationDataDTO getParticipation() { - return participation; + return participation; } public Date getPublishedOn() { - return publishedOn; + return publishedOn; } public Double getRate() { - return rate; + return rate; } public Integer getRateByUsers() { - return rateByUsers; + return rateByUsers; } public ContainerDTO getRootContainer() { - return rootContainer; + return rootContainer; } public SocialNetworkDTO getSocialNetwork() { - return socialNetwork; + return socialNetwork; } public StateToken getStateToken() { - return stateToken; + return stateToken; } public ContentStatusDTO getStatus() { - return status; + return status; } public String getTags() { - return tags; + return tags; } public String getTitle() { - return title; + return title; } public String getToolName() { - return toolName; + return toolName; } public String getTypeId() { - return typeId; + return typeId; } public int getVersion() { - return version; + return version; } // FIXME: maybe a tag in the content showing the type, think about this public boolean hasDocument() { - return documentId != null; + return documentId != null; } public boolean isRateable() { - return isRateable; + return isRateable; } public void setAccessLists(final AccessListsDTO accessLists) { - this.accessLists = accessLists; + this.accessLists = accessLists; } public void setAuthors(final List<UserSimpleDTO> authors) { - this.authors = authors; + this.authors = authors; } public void setContainer(final ContainerDTO container) { - this.container = container; + this.container = container; } public void setContainerRights(final AccessRightsDTO containerRights) { - this.containerRights = containerRights; + this.containerRights = containerRights; } public void setContent(final String content) { - this.content = content; + this.content = content; } public void setContentRights(final AccessRightsDTO accessRights) { - this.contentRights = accessRights; + this.contentRights = accessRights; } public void setCurrentUserRate(final Double currentUserRate) { - this.currentUserRate = currentUserRate; + this.currentUserRate = currentUserRate; } public void setDocumentId(final String docRef) { - this.documentId = docRef; + this.documentId = docRef; } public void setGroup(final GroupDTO group) { - this.group = group; + this.group = group; } public void setGroupMembers(final SocialNetworkDTO groupMembers) { - this.groupMembers = groupMembers; + this.groupMembers = groupMembers; } public void setGroupRights(final AccessRightsDTO groupRights) { - this.groupRights = groupRights; + this.groupRights = groupRights; } public void setGroupTags(final List<TagResultDTO> groupTags) { - this.groupTags = groupTags; + this.groupTags = groupTags; } public void setLanguage(final I18nLanguageDTO language) { - this.language = language; + this.language = language; } public void setLicense(final LicenseDTO license) { - this.license = license; + this.license = license; } public void setMimeType(final BasicMimeTypeDTO mimeType) { - this.mimeType = mimeType; + this.mimeType = mimeType; } public void setParticipation(final ParticipationDataDTO participation) { - this.participation = participation; + this.participation = participation; } public void setPublishedOn(final Date publishedOn) { - this.publishedOn = publishedOn; + this.publishedOn = publishedOn; } public void setRate(final Double rate) { - this.rate = rate; + this.rate = rate; } public void setRateable(final boolean isRateable) { - this.isRateable = isRateable; + this.isRateable = isRateable; } public void setRateByUsers(final Integer rateByUsers) { - this.rateByUsers = rateByUsers; + this.rateByUsers = rateByUsers; } public void setRootContainer(final ContainerDTO rootContainer) { - this.rootContainer = rootContainer; + this.rootContainer = rootContainer; } public void setSocialNetwork(final SocialNetworkDTO socialNetwork) { - this.socialNetwork = socialNetwork; + this.socialNetwork = socialNetwork; } public void setStateToken(final StateToken stateToken) { - this.stateToken = stateToken; + this.stateToken = stateToken; } public void setStatus(final ContentStatusDTO status) { - this.status = status; + this.status = status; } public void setTags(final String tags) { - this.tags = tags; + this.tags = tags; } public void setTitle(final String title) { - this.title = title; + this.title = title; } public void setToolName(final String toolName) { - this.toolName = toolName; + this.toolName = toolName; } public void setTypeId(final String typeId) { - this.typeId = typeId; + this.typeId = typeId; } public void setVersion(final int version) { - this.version = version; + this.version = version; } + @Override public String toString() { - return "StateDTO[" + stateToken + "/" + typeId + "]"; + return "StateDTO[" + stateToken + "/" + typeId + (mimeType != null ? "-" + mimeType : "") + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-11 17:04:26 UTC (rev 903) @@ -89,245 +89,268 @@ @Override protected void onLoad() { - register(ApplicationComponentGroup.class, new Factory<WorkspaceSkeleton>(WorkspaceSkeleton.class) { - public WorkspaceSkeleton create() { - return new WorkspaceSkeleton(); - } - }); + register(ApplicationComponentGroup.class, new Factory<WorkspaceSkeleton>(WorkspaceSkeleton.class) { + @Override + public WorkspaceSkeleton create() { + return new WorkspaceSkeleton(); + } + }); - register(ApplicationComponentGroup.class, new Factory<QuickTipsHelper>(QuickTipsHelper.class) { - public QuickTipsHelper create() { - return new QuickTipsHelper(); - } - }); + register(ApplicationComponentGroup.class, new Factory<QuickTipsHelper>(QuickTipsHelper.class) { + @Override + public QuickTipsHelper create() { + return new QuickTipsHelper(); + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteProgress>(SiteProgress.class) { - public SiteProgress create() { - final SiteProgressPresenter presenter = new SiteProgressPresenter(); - final SiteProgressPanel panel = new SiteProgressPanel(presenter, $$(SitePublicSpaceLink.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteProgress>(SiteProgress.class) { + @Override + public SiteProgress create() { + final SiteProgressPresenter presenter = new SiteProgressPresenter(); + final SiteProgressPanel panel = new SiteProgressPanel(presenter, $$(SitePublicSpaceLink.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<Site>(Site.class) { - public Site create() { - return new Site($(I18nUITranslationService.class), $(SiteProgress.class), $$(SiteMessage.class)); - } - }); + register(ApplicationComponentGroup.class, new Factory<Site>(Site.class) { + @Override + public Site create() { + return new Site($(I18nUITranslationService.class), $(SiteProgress.class), $$(SiteMessage.class)); + } + }); - register(ApplicationComponentGroup.class, new Factory<SitePublicSpaceLink>(SitePublicSpaceLink.class) { - public SitePublicSpaceLink create() { - final SitePublicSpaceLinkPresenter presenter = new SitePublicSpaceLinkPresenter($(StateManager.class)); - final SitePublicSpaceLinkPanel panel = new SitePublicSpaceLinkPanel(presenter, - $(WorkspaceSkeleton.class), $(I18nUITranslationService.class), $(Images.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SitePublicSpaceLink>(SitePublicSpaceLink.class) { + @Override + public SitePublicSpaceLink create() { + final SitePublicSpaceLinkPresenter presenter = new SitePublicSpaceLinkPresenter($(StateManager.class)); + final SitePublicSpaceLinkPanel panel = new SitePublicSpaceLinkPanel(presenter, + $(WorkspaceSkeleton.class), $(I18nUITranslationService.class), $(Images.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteMessage>(SiteMessage.class) { - public SiteMessage create() { - final SiteMessagePresenter siteMessagePresenter = new SiteMessagePresenter(); - final SiteMessageView siteMessageView = new SiteMessagePanel(siteMessagePresenter, true, - $(I18nUITranslationService.class)); - siteMessagePresenter.init(siteMessageView); - return siteMessagePresenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteMessage>(SiteMessage.class) { + @Override + public SiteMessage create() { + final SiteMessagePresenter siteMessagePresenter = new SiteMessagePresenter(); + final SiteMessageView siteMessageView = new SiteMessagePanel(siteMessagePresenter, true, + $(I18nUITranslationService.class)); + siteMessagePresenter.init(siteMessageView); + return siteMessagePresenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteUserMenu>(SiteUserMenu.class) { - public SiteUserMenu create() { - final SiteUserMenuPresenter presenter = new SiteUserMenuPresenter($(Session.class), - $(StateManager.class)); - final SiteUserMenuPanel panel = new SiteUserMenuPanel(presenter, $(WorkspaceSkeleton.class), - $(I18nUITranslationService.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteUserMenu>(SiteUserMenu.class) { + @Override + public SiteUserMenu create() { + final SiteUserMenuPresenter presenter = new SiteUserMenuPresenter($(Session.class), + $(StateManager.class)); + final SiteUserMenuPanel panel = new SiteUserMenuPanel(presenter, $(WorkspaceSkeleton.class), + $(I18nUITranslationService.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) { - public SiteSignInLink create() { - final SiteSignInLinkPresenter presenter = new SiteSignInLinkPresenter($(Session.class)); - final SiteSignInLinkPanel panel = new SiteSignInLinkPanel(presenter, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) { + @Override + public SiteSignInLink create() { + final SiteSignInLinkPresenter presenter = new SiteSignInLinkPresenter($(Session.class)); + final SiteSignInLinkPanel panel = new SiteSignInLinkPanel(presenter, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteSignOutLink>(SiteSignOutLink.class) { - public SiteSignOutLink create() { - final SiteSignOutLinkPresenter presenter = new SiteSignOutLinkPresenter($(Session.class), - $$(UserServiceAsync.class), $$(KuneErrorHandler.class)); - final SiteSignOutLinkPanel panel = new SiteSignOutLinkPanel(presenter, - $(I18nUITranslationService.class), $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteSignOutLink>(SiteSignOutLink.class) { + @Override + public SiteSignOutLink create() { + final SiteSignOutLinkPresenter presenter = new SiteSignOutLinkPresenter($(Session.class), + $$(UserServiceAsync.class), $$(KuneErrorHandler.class)); + final SiteSignOutLinkPanel panel = new SiteSignOutLinkPanel(presenter, + $(I18nUITranslationService.class), $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteNewGroupLink>(SiteNewGroupLink.class) { - public SiteNewGroupLink create() { - final SiteNewGroupLinkPresenter presenter = new SiteNewGroupLinkPresenter(); - final SiteNewGroupLinkPanel panel = new SiteNewGroupLinkPanel(presenter, $(WorkspaceSkeleton.class), - $(I18nUITranslationService.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteNewGroupLink>(SiteNewGroupLink.class) { + @Override + public SiteNewGroupLink create() { + final SiteNewGroupLinkPresenter presenter = new SiteNewGroupLinkPresenter(); + final SiteNewGroupLinkPanel panel = new SiteNewGroupLinkPanel(presenter, $(WorkspaceSkeleton.class), + $(I18nUITranslationService.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteOptions>(SiteOptions.class) { - public SiteOptions create() { - final SiteOptionsPresenter presenter = new SiteOptionsPresenter(); - final SiteOptionsPanel panel = new SiteOptionsPanel(presenter, $(WorkspaceSkeleton.class), - $(I18nUITranslationService.class), $$(I18nTranslator.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteOptions>(SiteOptions.class) { + @Override + public SiteOptions create() { + final SiteOptionsPresenter presenter = new SiteOptionsPresenter(); + final SiteOptionsPanel panel = new SiteOptionsPanel(presenter, $(WorkspaceSkeleton.class), + $(I18nUITranslationService.class), $$(I18nTranslator.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) { - public SiteSearch create() { - final SiteSearchPresenter presenter = new SiteSearchPresenter($$(SiteSearcher.class)); - final SiteSearchPanel panel = new SiteSearchPanel(presenter, $(WorkspaceSkeleton.class), - $(I18nUITranslationService.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) { + @Override + public SiteSearch create() { + final SiteSearchPresenter presenter = new SiteSearchPresenter($$(SiteSearcher.class)); + final SiteSearchPanel panel = new SiteSearchPanel(presenter, $(WorkspaceSkeleton.class), + $(I18nUITranslationService.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<SiteLogo>(SiteLogo.class) { - public SiteLogo create() { - final SiteLogoPresenter presenter = new SiteLogoPresenter($(Session.class)); - final SiteLogoPanel panel = new SiteLogoPanel(presenter, $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<SiteLogo>(SiteLogo.class) { + @Override + public SiteLogo create() { + final SiteLogoPresenter presenter = new SiteLogoPresenter($(Session.class)); + final SiteLogoPanel panel = new SiteLogoPanel(presenter, $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<EntityLogo>(EntityLogo.class) { - public EntityLogo create() { - final EntityLogoPresenter presenter = new EntityLogoPresenter($(StateManager.class), - $(WsThemePresenter.class), $(Session.class)); - final EntityLogoPanel panel = new EntityLogoPanel($(I18nUITranslationService.class), - $(WorkspaceSkeleton.class), $$(FileDownloadUtils.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<EntityLogo>(EntityLogo.class) { + @Override + public EntityLogo create() { + final EntityLogoPresenter presenter = new EntityLogoPresenter($(StateManager.class), + $(WsThemePresenter.class), $(Session.class)); + final EntityLogoPanel panel = new EntityLogoPanel($(I18nUITranslationService.class), + $(WorkspaceSkeleton.class), $$(FileDownloadUtils.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<WsThemePresenter>(WsThemePresenter.class) { - public WsThemePresenter create() { - final WsThemePresenter presenter = new WsThemePresenter($(Session.class), $$(GroupServiceAsync.class), - $(StateManager.class)); - final WsThemePanel panel = new WsThemePanel($(WorkspaceSkeleton.class), presenter, - $(I18nUITranslationService.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<WsThemePresenter>(WsThemePresenter.class) { + @Override + public WsThemePresenter create() { + final WsThemePresenter presenter = new WsThemePresenter($(Session.class), $$(GroupServiceAsync.class), + $(StateManager.class)); + final WsThemePanel panel = new WsThemePanel($(WorkspaceSkeleton.class), presenter, + $(I18nUITranslationService.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<EntityTitle>(EntityTitle.class) { - public EntityTitle create() { - final EntityTitlePresenter presenter = new EntityTitlePresenter($(I18nUITranslationService.class), - $(KuneErrorHandler.class), $(StateManager.class), $(Session.class), - $$(ContentServiceAsync.class), $$(ContextNavigator.class), $(ContentIconsRegistry.class)); - final EntityTitlePanel panel = new EntityTitlePanel($(WorkspaceSkeleton.class), presenter); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<EntityTitle>(EntityTitle.class) { + @Override + public EntityTitle create() { + final EntityTitlePresenter presenter = new EntityTitlePresenter($(I18nUITranslationService.class), + $(KuneErrorHandler.class), $(StateManager.class), $(Session.class), + $$(ContentServiceAsync.class), $$(ContextNavigator.class), $(ContentIconsRegistry.class)); + final EntityTitlePanel panel = new EntityTitlePanel($(WorkspaceSkeleton.class), presenter); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<EntitySubTitle>(EntitySubTitle.class) { - public EntitySubTitle create() { - final EntitySubTitlePresenter presenter = new EntitySubTitlePresenter( - $(I18nUITranslationService.class), $(StateManager.class)); - final EntitySubTitlePanel panel = new EntitySubTitlePanel(presenter, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<EntitySubTitle>(EntitySubTitle.class) { + @Override + public EntitySubTitle create() { + final EntitySubTitlePresenter presenter = new EntitySubTitlePresenter( + $(I18nUITranslationService.class), $(StateManager.class), false); + final EntitySubTitlePanel panel = new EntitySubTitlePanel(presenter, $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<EntityLicensePresenter>(EntityLicensePresenter.class) { - public EntityLicensePresenter create() { - final EntityLicensePresenter presenter = new EntityLicensePresenter($(StateManager.class)); - final EntityLicensePanel panel = new EntityLicensePanel(presenter, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<EntityLicensePresenter>(EntityLicensePresenter.class) { + @Override + public EntityLicensePresenter create() { + final EntityLicensePresenter presenter = new EntityLicensePresenter($(StateManager.class)); + final EntityLicensePanel panel = new EntityLicensePanel(presenter, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<RateIt>(RateIt.class) { - public RateIt create() { - final RateItPresenter presenter = new RateItPresenter($(I18nUITranslationService.class), - $(Session.class), $$(ContentServiceAsync.class), $(StateManager.class)); - final RateItPanel panel = new RateItPanel(presenter, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<RateIt>(RateIt.class) { + @Override + public RateIt create() { + final RateItPresenter presenter = new RateItPresenter($(I18nUITranslationService.class), + $(Session.class), $$(ContentServiceAsync.class), $(StateManager.class)); + final RateItPanel panel = new RateItPanel(presenter, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<RatePresenter>(RatePresenter.class) { - public RatePresenter create() { - final RatePresenter presenter = new RatePresenter($(StateManager.class)); - final RatePanel panel = new RatePanel(null, null, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<RatePresenter>(RatePresenter.class) { + @Override + public RatePresenter create() { + final RatePresenter presenter = new RatePresenter($(StateManager.class)); + final RatePanel panel = new RatePanel(null, null, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<GroupMembersSummary>(GroupMembersSummary.class) { - public GroupMembersSummary create() { - final GroupMembersSummaryPresenter presenter = new GroupMembersSummaryPresenter( - $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class), - $(Session.class), $$(SocialNetworkServiceAsync.class), $$(GroupLiveSearcher.class), - $(WsThemePresenter.class)); - final GroupMembersSummaryView view = new GroupMembersSummaryPanel(presenter, - $(I18nUITranslationService.class), $(WorkspaceSkeleton.class)); - presenter.init(view); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<GroupMembersSummary>(GroupMembersSummary.class) { + @Override + public GroupMembersSummary create() { + final GroupMembersSummaryPresenter presenter = new GroupMembersSummaryPresenter( + $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class), + $(Session.class), $$(SocialNetworkServiceAsync.class), $$(GroupLiveSearcher.class), + $(WsThemePresenter.class)); + final GroupMembersSummaryView view = new GroupMembersSummaryPanel(presenter, + $(I18nUITranslationService.class), $(WorkspaceSkeleton.class)); + presenter.init(view); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<GroupSummary>(GroupSummary.class) { - public GroupSummary create() { - final GroupSummaryPresenter presenter = new GroupSummaryPresenter($(StateManager.class), - $(WsThemePresenter.class)); - final GroupSummaryView view = new GroupSummaryPanel(presenter, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(view); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<GroupSummary>(GroupSummary.class) { + @Override + public GroupSummary create() { + final GroupSummaryPresenter presenter = new GroupSummaryPresenter($(StateManager.class), + $(WsThemePresenter.class)); + final GroupSummaryView view = new GroupSummaryPanel(presenter, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(view); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<ParticipationSummary>(ParticipationSummary.class) { - public ParticipationSummary create() { - final ParticipationSummaryPresenter presenter = new ParticipationSummaryPresenter( - $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class), - $(Session.class), $$(SocialNetworkServiceAsync.class), $(WsThemePresenter.class)); - final ParticipationSummaryView view = new ParticipationSummaryPanel(presenter, - $(I18nUITranslationService.class), $(WorkspaceSkeleton.class)); - presenter.init(view); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<ParticipationSummary>(ParticipationSummary.class) { + @Override + public ParticipationSummary create() { + final ParticipationSummaryPresenter presenter = new ParticipationSummaryPresenter( + $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class), + $(Session.class), $$(SocialNetworkServiceAsync.class), $(WsThemePresenter.class)); + final ParticipationSummaryView view = new ParticipationSummaryPanel(presenter, + $(I18nUITranslationService.class), $(WorkspaceSkeleton.class)); + presenter.init(view); + return presenter; + } + }); - register(ApplicationComponentGroup.class, new Factory<TagsSummary>(TagsSummary.class) { - public TagsSummary create() { - final TagsSummaryPresenter presenter = new TagsSummaryPresenter($(Session.class), - $$(SiteSearcher.class), $(StateManager.class), $(WsThemePresenter.class)); - final TagsSummaryPanel panel = new TagsSummaryPanel(presenter, $(I18nUITranslationService.class), - $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); + register(ApplicationComponentGroup.class, new Factory<TagsSummary>(TagsSummary.class) { + @Override + public TagsSummary create() { + final TagsSummaryPresenter presenter = new TagsSummaryPresenter($(Session.class), + $$(SiteSearcher.class), $(StateManager.class), $(WsThemePresenter.class)); + final TagsSummaryPanel panel = new TagsSummaryPanel(presenter, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -11,40 +11,40 @@ private final Hyperlink hl; public ToolSelectorItemPanel(final ToolSelectorItemPresenter presenter, final WorkspaceSkeleton ws) { - super(RoundedPanel.RIGHT, 2); - hl = new Hyperlink(); - super.setWidget(hl); - ws.getEntitySummary().addInTools(this); - super.sinkEvents(Event.ONCLICK); - super.addStyleName("k-toolselectoritem"); + super(RoundedPanel.RIGHT, 2); + hl = new Hyperlink(); + super.setWidget(hl); + ws.addInTools(this); + super.sinkEvents(Event.ONCLICK); + super.addStyleName("k-toolselectoritem"); } @Override public void onBrowserEvent(final Event event) { - super.onBrowserEvent(event); + super.onBrowserEvent(event); } public void setLink(final String text, final String targetHistoryToken) { - hl.setText(text); - hl.setTargetHistoryToken(targetHistoryToken); + hl.setText(text); + hl.setTargetHistoryToken(targetHistoryToken); } public void setSelected(final boolean selected) { - if (selected) { - hl.setStylePrimaryName("k-toolselectoritem-sel"); - } else { - hl.setStylePrimaryName("k-toolselectoritem-notsel"); - } - super.setCornerStyleName(hl.getStyleName()); + if (selected) { + hl.setStylePrimaryName("k-toolselectoritem-sel"); + } else { + hl.setStylePrimaryName("k-toolselectoritem-notsel"); + } + super.setCornerStyleName(hl.getStyleName()); } public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - if (oldTheme != null) { - final String oldName = oldTheme.getName(); - hl.removeStyleDependentName(oldName); - } - final String newName = newTheme.getName(); - hl.addStyleDependentName(newName); - super.setCornerStyleName(hl.getStyleName()); + if (oldTheme != null) { + final String oldName = oldTheme.getName(); + hl.removeStyleDependentName(oldName); + } + final String newName = newTheme.getName(); + hl.addStyleDependentName(newName); + super.setCornerStyleName(hl.getStyleName()); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java 2008-10-11 17:04:26 UTC (rev 903) @@ -7,10 +7,11 @@ import com.gwtext.client.widgets.layout.BorderLayout; import com.gwtext.client.widgets.layout.BorderLayoutData; +@Deprecated public class DefaultBorderLayout { public enum Position { - NORTH, CENTER, SOUTH, EAST, WEST + NORTH, CENTER, SOUTH, EAST, WEST } public static final int DEF_TOOLBAR_HEIGHT = 26; @@ -18,131 +19,140 @@ private static final int NO_SIZE = -666; private static RegionPosition[] regionPositions = new RegionPosition[] { RegionPosition.NORTH, - RegionPosition.CENTER, RegionPosition.SOUTH, RegionPosition.EAST, RegionPosition.WEST }; + RegionPosition.CENTER, RegionPosition.SOUTH, RegionPosition.EAST, RegionPosition.WEST }; private final Panel mainPanel; public DefaultBorderLayout() { - mainPanel = new Panel(); - mainPanel.setLayout(new BorderLayout()); - mainPanel.setBorder(false); + mainPanel = new Panel(); + mainPanel.setLayout(new BorderLayout()); + mainPanel.setBorder(false); } + public DefaultBorderLayout(String title) { + this(); + mainPanel.setTitle(title); + } + public void add(final Panel panel, final Position position) { - add(panel, position, false); + add(panel, position, false); } public void add(final Panel panel, final Position position, final boolean split) { - add(panel, position, split, NO_SIZE); + add(panel, position, split, NO_SIZE); } public void add(final Panel panel, final Position position, final boolean split, final int size) { - final RegionPosition regionPosition = regionPositions[position.ordinal()]; - final BorderLayoutData borderLayoutData = new BorderLayoutData(regionPosition); - borderLayoutData.setSplit(split); - if (split) { - borderLayoutData.setUseSplitTips(true); - borderLayoutData.setCollapseModeMini(true); - } - if (size != NO_SIZE) { - switch (position) { - case NORTH: - case SOUTH: - panel.setHeight(size); - break; - case EAST: - case WEST: - panel.setWidth(size); - } - } - mainPanel.add(panel, borderLayoutData); - doLayoutIfNeeded(); + final RegionPosition regionPosition = regionPositions[position.ordinal()]; + final BorderLayoutData borderLayoutData = new BorderLayoutData(regionPosition); + borderLayoutData.setSplit(split); + if (split) { + borderLayoutData.setUseSplitTips(true); + borderLayoutData.setCollapseModeMini(true); + } + if (size != NO_SIZE) { + switch (position) { + case NORTH: + case SOUTH: + panel.setHeight(size); + break; + case EAST: + case WEST: + panel.setWidth(size); + } + } + mainPanel.add(panel, borderLayoutData); + doLayoutIfNeeded(); } public void add(final Panel panel, final Position position, final int size) { - add(panel, position, false, size); + add(panel, position, false, size); } public void add(final Panel panel, final Widget widget) { - panel.add(widget); - if (panel.isRendered()) { - panel.syncSize(); - panel.doLayout(false); - } - doLayoutIfNeeded(); + panel.add(widget); + if (panel.isRendered()) { + panel.syncSize(); + panel.doLayout(false); + } + doLayoutIfNeeded(); } public void addStyle(final String style) { - mainPanel.addClass(style); + mainPanel.addClass(style); } public Toolbar createBottomBar(final Panel panel) { - return createBottomBar(panel, null); + return createBottomBar(panel, null); } public Toolbar createBottomBar(final Panel panel, final String cssStyle) { - return createBottomBar(panel, cssStyle, null); + return createBottomBar(panel, cssStyle, null); } public Toolbar createBottomBar(final Panel panel, final String cssStyle, final String id) { - final Toolbar bottomToolbar = new Toolbar(); - if (id != null) { - bottomToolbar.setId(id); - } - bottomToolbar.setHeight(DEF_TOOLBAR_HEIGHT); - if (cssStyle != null) { - bottomToolbar.setCls(cssStyle); - } - panel.setBottomToolbar(bottomToolbar); - return bottomToolbar; + final Toolbar bottomToolbar = new Toolbar(); + if (id != null) { + bottomToolbar.setId(id); + } + bottomToolbar.setHeight(DEF_TOOLBAR_HEIGHT); + if (cssStyle != null) { + bottomToolbar.setCls(cssStyle); + } + panel.setBottomToolbar(bottomToolbar); + return bottomToolbar; } public Toolbar createTopBar(final Panel panel) { - return createTopBar(panel, null); + return createTopBar(panel, null); } public Toolbar createTopBar(final Panel panel, final String cssStyle) { - return createTopBar(panel, cssStyle); + return createTopBar(panel, cssStyle); } public Toolbar createTopBar(final Panel panel, final String cssStyle, final String id) { - final Toolbar topToolbar = new Toolbar(); - topToolbar.setHeight(DEF_TOOLBAR_HEIGHT); - if (id != null) { - topToolbar.setId(id); - } - if (cssStyle != null) { - topToolbar.setCls(cssStyle); - } - panel.setTopToolbar(topToolbar); - return topToolbar; + final Toolbar topToolbar = new Toolbar(); + topToolbar.setHeight(DEF_TOOLBAR_HEIGHT); + if (id != null) { + topToolbar.setId(id); + } + if (cssStyle != null) { + topToolbar.setCls(cssStyle); + } + panel.setTopToolbar(topToolbar); + return topToolbar; } public void doLayoutIfNeeded() { - if (mainPanel.isRendered()) { - mainPanel.doLayout(false); - } + if (mainPanel.isRendered()) { + mainPanel.doLayout(false); + } } public Panel getPanel() { - return mainPanel; + return mainPanel; } public void removeStyle(final String style) { - mainPanel.removeClass(style); + mainPanel.removeClass(style); } public void setBorder(final boolean border) { - mainPanel.setBorder(border); + mainPanel.setBorder(border); } public void setPanel(final Panel panel, final Widget widget) { - panel.clear(); - add(panel, widget); - doLayoutIfNeeded(); + panel.clear(); + add(panel, widget); + doLayoutIfNeeded(); } + public void setWidth(int width) { + mainPanel.setWidth(width); + } + public void syncSize() { - mainPanel.syncSize(); + mainPanel.syncSize(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -68,254 +68,256 @@ private final ContextNavigatorPresenter presenter; public ContextNavigatorPanel(final ContextNavigatorPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws, final ActionManager actionManager) { - this.presenter = presenter; - this.ws = ws; - this.actionManager = actionManager; + final WorkspaceSkeleton ws, final ActionManager actionManager) { + this.presenter = presenter; + this.ws = ws; + this.actionManager = actionManager; - contextMenus = new HashMap<String, Menu>(); - fireOnTextChange = true; - isEditable = false; - + contextMenus = new HashMap<String, Menu>(); + fireOnTextChange = true; + isEditable = false; } public void addItem(final ContextNavigatorItem item) { - final String nodeId = item.getId(); - if (treePanel.getNodeById(nodeId) == null) { - final TreeNode child = new TreeNode(item.getText()); - child.setId(nodeId); - final String icon = item.getIconUrl(); - if (icon != null) { - child.setIcon(icon); - } - child.setHref("#" + item.getStateToken().toString()); - child.setAllowDrag(item.isDraggable()); - child.setAllowDrop(item.isDroppable()); - createItemMenu(nodeId, item.getActionCollection()); - final TreeNode parent = treePanel.getNodeById(item.getParentId()); - if (parent != null) { - // Log.info("Adding child node: " + nodeId + " to folder: " + - // item.getParentId()); - child.addListener(new TreeNodeListenerAdapter() { - // @Override - // public void onClick(final Node node, final EventObject e) - // { - // Log.info("Tree node clicked: " + getToken(node)); - // // treePanel.getNodeById(node.getId()).select(); - // presenter.gotoToken(getToken(node)); - // } + final String nodeId = item.getId(); + if (treePanel.getNodeById(nodeId) == null) { + final TreeNode child = new TreeNode(item.getText()); + child.setId(nodeId); + final String icon = item.getIconUrl(); + if (icon != null) { + child.setIcon(icon); + } + child.setHref("#" + item.getStateToken().toString()); + child.setAllowDrag(item.isDraggable()); + child.setAllowDrop(item.isDroppable()); + createItemMenu(nodeId, item.getActionCollection()); + final TreeNode parent = treePanel.getNodeById(item.getParentId()); + if (parent != null) { + child.addListener(new TreeNodeListenerAdapter() { + @Override + public void onTextChange(final Node node, final String text, final String oldText) { + if (fireOnTextChange) { + presenter.onItemRename(getToken(node), text, oldText); + } + } + }); + if (!item.getStateToken().hasAll()) { + // is a container + child.setExpandable(true); + child.setSingleClickExpand(true); + child.addListener(new TreeNodeListenerAdapter() { + @Override + public void onExpand(final Node node) { + treePanel.getNodeById(node.getId()).select(); + presenter.gotoToken(getToken(node)); + } + }); + } else { + // is a document + child.setLeaf(true); + } + child.addListener(new TreeNodeListenerAdapter() { + @Override + public void onClick(Node node, EventObject e) { + presenter.gotoToken(getToken(node)); + } + }); + parent.appendChild(child); + switch (item.getContentStatus()) { + case publishedOnline: + child.setCls("k-textnormal"); + break; + case inTheDustbin: + case rejected: + child.setCls("k-textlinethrough"); + break; + case editingInProgress: + case submittedForEvaluation: + child.setCls("k-textunderline"); + break; + } + } else { + Log.error("Error building file tree, parent folder not found"); + } + } else { + // the node already created + } - @Override - public void onTextChange(final Node node, final String text, final String oldText) { - if (fireOnTextChange) { - presenter.onItemRename(getToken(node), text, oldText); - } - } - }); - if (!item.getStateToken().hasAll()) { - // is a container - child.setExpandable(true); - child.setSingleClickExpand(true); - child.addListener(new TreeNodeListenerAdapter() { - public void onExpand(final Node node) { - treePanel.getNodeById(node.getId()).select(); - presenter.gotoToken(getToken(node)); - child.setIcon("public/nav/folder.png"); - } - }); - } else { - // is a document - child.setLeaf(true); - } - parent.appendChild(child); - switch (item.getContentStatus()) { - case publishedOnline: - child.setCls("k-textnormal"); - break; - case inTheDustbin: - case rejected: - child.setCls("k-textlinethrough"); - break; - case editingInProgress: - case submittedForEvaluation: - child.setCls("k-textunderline"); - break; - } - } else { - Log.error("Error building file tree, parent folder not found"); - } - } else { - // the node already created - } - } public void clear() { - if (treePanel != null) { - treePanel.clear(); - treePanel = null; - } - contextMenus.clear(); + if (treePanel != null) { + treePanel.clear(); + treePanel = null; + } + contextMenus.clear(); } public void editItem(final String id) { - treeEditor.startEdit(getNode(id)); + treeEditor.startEdit(getNode(id)); } public boolean isSelected(final String id) { - final TreeNode item = getNode(id); - if (item != null) { - return item.isSelected(); - } - return false; + final TreeNode item = getNode(id); + if (item != null) { + return item.isSelected(); + } + return false; } public void selectItem(final String id) { - final TreeNode item = getNode(id); - if (item != null) { - item.select(); - if (item.getParentNode() != null) { - item.ensureVisible(); - } - if (item.getChildNodes().length > 0) { - item.expand(); - } - } else { - Log.error("Error building file tree, current token not found"); - } + final TreeNode item = getNode(id); + if (item != null) { + item.select(); + if (item.getParentNode() != null) { + if (treePanel.isRendered()) { + item.ensureVisible(); + } + } + if (item.getChildNodes().length > 0) { + item.expand(); + } + } else { + Log.error("Error building file tree, current token not found"); + } } public void setEditable(final boolean editable) { - this.isEditable = editable; + this.isEditable = editable; } public void setFireOnTextChange(final boolean fireOnTextChange) { - this.fireOnTextChange = fireOnTextChange; + this.fireOnTextChange = fireOnTextChange; } public void setItemText(final String genId, final String text) { - final TreeNode node = getNode(genId); - node.setText(text); + final TreeNode node = getNode(genId); + node.setText(text); } public void setRootItem(final String id, final String text, final StateToken stateToken) { - if (treePanel == null || treePanel.getNodeById(id) == null) { - createTreePanel(id, text, stateToken); - } + if (treePanel == null || treePanel.getNodeById(id) == null) { + createTreePanel(id, text, stateToken); + } } private void createItemMenu(final String nodeId, final ActionItemCollection<StateToken> actionCollection) { - DeferredCommand.addCommand(new Command() { - public void execute() { - Menu menu = null; - if (actionCollection != null) { - menu = new Menu(); - // Remove if when retrieved rights of siblings - for (final ActionItem<StateToken> actionItem : actionCollection) { - final ActionDescriptor<StateToken> action = actionItem.getAction(); - final Item item = new Item(action.getText()); - item.setIcon(action.getIconUrl()); - menu.addItem(item); - item.addListener(new BaseItemListenerAdapter() { - public void onClick(final BaseItem item, final EventObject e) { - doAction(actionItem); - } - }); - } - } - contextMenus.put(nodeId, menu); - } - }); + DeferredCommand.addCommand(new Command() { + public void execute() { + Menu menu = null; + if (actionCollection != null) { + menu = new Menu(); + // Remove if when retrieved rights of siblings + for (final ActionItem<StateToken> actionItem : actionCollection) { + final ActionDescriptor<StateToken> action = actionItem.getAction(); + final Item item = new Item(action.getText()); + item.setIcon(action.getIconUrl()); + menu.addItem(item); + item.addListener(new BaseItemListenerAdapter() { + @Override + public void onClick(final BaseItem item, final EventObject e) { + doAction(actionItem); + } + }); + } + } + contextMenus.put(nodeId, menu); + } + }); } private void createTreePanel(final String rootId, final String text, final StateToken stateToken) { - if (treePanel != null) { - clear(); - } - treePanel = new TreePanel(); - treePanel.setHeight("100%"); - treePanel.setAutoScroll(true); - treePanel.setRootVisible(false); - treePanel.setContainerScroll(true); - treePanel.setAnimate(true); - treePanel.setBorder(false); - treePanel.setUseArrows(true); - treePanel.setSelectionModel(new MultiSelectionModel()); - // treePanel.setBufferResize(true;) - // treePanel.setId(CTX_NAVIGATOR_TREEPANEL); - final TreeNode root = new TreeNode(); - root.setAllowDrag(false); - root.setExpanded(true); - root.setId(rootId); - root.setText(text); - root.setHref("#" + stateToken); - root.expand(); - treePanel.addListener(new TreePanelListenerAdapter() { - public boolean doBeforeNodeDrop(final TreePanel treePanel, final TreeNode target, final DragData dragData, - final String point, final DragDrop source, final TreeNode dropNode, - final DropNodeCallback dropNodeCallback) { - Site.info("Drag & drop of contents in development"); - return false; - } + if (treePanel != null) { + clear(); + } + treePanel = new TreePanel(); + treePanel.setHeight("100%"); + treePanel.setAutoScroll(true); + treePanel.setRootVisible(false); + treePanel.setContainerScroll(true); + treePanel.setAnimate(true); + treePanel.setBorder(false); + treePanel.setUseArrows(true); + treePanel.setSelectionModel(new MultiSelectionModel()); + // treePanel.setBufferResize(true;) + // treePanel.setId(CTX_NAVIGATOR_TREEPANEL); + final TreeNode root = new TreeNode(); + root.setAllowDrag(false); + root.setExpanded(true); + root.setId(rootId); + root.setText(text); + root.setHref("#" + stateToken); + root.expand(); + treePanel.addListener(new TreePanelListenerAdapter() { + @Override + public boolean doBeforeNodeDrop(final TreePanel treePanel, final TreeNode target, final DragData dragData, + final String point, final DragDrop source, final TreeNode dropNode, + final DropNodeCallback dropNodeCallback) { + Site.info("Drag & drop of contents in development"); + return false; + } - public void onContextMenu(final TreeNode node, final EventObject e) { - final Menu menu = contextMenus.get(node.getId()); - if (menu != null && menu.getItems().length > 0) { - menu.showAt(e.getXY()); - } else { - Log.info("Empty item menu"); - } - } - }); - treePanel.setLines(false); - treePanel.setEnableDD(isEditable); - treePanel.setRootNode(root); - // treePanel.expand(); + @Override + public void onContextMenu(final TreeNode node, final EventObject e) { + final Menu menu = contextMenus.get(node.getId()); + if (menu != null && menu.getItems().length > 0) { + menu.showAt(e.getXY()); + } else { + Log.info("Empty item menu"); + } + } + }); + treePanel.setLines(false); + treePanel.setEnableDD(isEditable); + treePanel.setRootNode(root); + // treePanel.expand(); - final TextField field = new TextField(); - treeEditor = new TreeEditor(treePanel, field); - treeEditor.addListener(new EditorListenerAdapter() { - public boolean doBeforeStartEdit(final Editor source, final ExtElement boundEl, final Object value) { - return isEditable; - } - }); - // test !? - treeEditor.setAutosize(false); + final TextField field = new TextField(); + treeEditor = new TreeEditor(treePanel, field); + treeEditor.addListener(new EditorListenerAdapter() { + @Override + public boolean doBeforeStartEdit(final Editor source, final ExtElement boundEl, final Object value) { + return isEditable; + } + }); + // test !? + treeEditor.setAutosize(false); - treePanel.addListener(new ContainerListenerAdapter() { - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - // Log.debug("tree-------w: " + adjWidth + " h: " + adjHeight); - treePanel.doLayout(false); - } - }); + treePanel.addListener(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + // Log.debug("tree-------w: " + adjWidth + " h: " + adjHeight); + treePanel.doLayout(false); + } + }); - ws.getEntityWorkspace().addContextListener(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - // Log.debug("-------w: " + adjWidth + " h: " + adjHeight); - // Log.debug("---r---w: " + rawWidth + " h: " + rawHeight); - } - }); + ws.getEntityWorkspace().addContextListener(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + // Log.debug("-------w: " + adjWidth + " h: " + adjHeight); + // Log.debug("---r---w: " + rawWidth + " h: " + rawHeight); + } + }); - ws.getEntityWorkspace().setContext(treePanel); + ws.getEntityWorkspace().setContext(treePanel); } private void doAction(final ActionItem<StateToken> actionItem) { - actionManager.doAction(actionItem); + actionManager.doAction(actionItem); } private TreeNode getNode(final String id) { - final TreeNode node = treePanel.getNodeById(id); - if (node == null) { - Log.error("Id: " + id + " not found in context navigator"); - } - return node; + final TreeNode node = treePanel.getNodeById(id); + if (node == null) { + Log.error("Id: " + id + " not found in context navigator"); + } + return node; } private String getToken(final Node node) { - return node.getAttribute("href").substring(1); + return node.getAttribute("href").substring(1); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-11 17:04:26 UTC (rev 903) @@ -248,7 +248,7 @@ final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, true); - final String contentTypeIcon = contentTypeId.equals(TYPE_FOLDER) ? "" : contentIconsRegistry + final String contentTypeIcon = contentTypeId.equals(TYPE_FOLDER) ? null : contentIconsRegistry .getContentTypeIcon(contentTypeId, mimeType); final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), genId(parentStateToken), contentTypeIcon, title, status, stateToken, dragDropContentRegistry.isDraggable(contentTypeId, rights Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -21,7 +21,6 @@ package org.ourproject.kune.workspace.client.editor; import org.ourproject.kune.platf.client.services.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.workspace.client.skel.Toolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; @@ -46,102 +45,103 @@ private final WorkspaceSkeleton ws; public TextEditorPanel(final TextEditorPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws, final ColorWebSafePalette colorPalette) { - this.presenter = presenter; - this.i18n = i18n; - this.ws = ws; - mainPanel = new VerticalPanel(); - mainPanel.setWidth("100%"); + final WorkspaceSkeleton ws, final ColorWebSafePalette colorPalette) { + this.presenter = presenter; + this.i18n = i18n; + this.ws = ws; + mainPanel = new VerticalPanel(); + mainPanel.setWidth("100%"); - gwtRTarea = new RichTextArea(); - gwtRTarea.setWidth("97%"); - gwtRTarea.addStyleName("kune-TexEditorPanel-TextArea"); + gwtRTarea = new RichTextArea(); + gwtRTarea.setWidth("97%"); + gwtRTarea.addStyleName("kune-TexEditorPanel-TextArea"); - final Toolbar editorTopBar = new Toolbar(); - editorTopBar.getPanel().setWidth("auto"); - textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, colorPalette, i18n); - editorTopBar.add(textEditorToolbar); - editorTopBar.addStyleName("k-toolbar-bottom-line"); + final Toolbar editorTopBar = new Toolbar(); + editorTopBar.getPanel().setWidth("auto"); + textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, colorPalette, i18n); + editorTopBar.add(textEditorToolbar); + editorTopBar.addStyleName("k-toolbar-bottom-line"); - mainPanel.add(editorTopBar.getPanel()); - mainPanel.add(gwtRTarea); + mainPanel.add(editorTopBar.getPanel()); + mainPanel.add(gwtRTarea); - ws.getEntityWorkspace().addContentListener(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - adjustSize(adjHeight); - } - }); + ws.getEntityWorkspace().addContentListener(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + adjustSize(adjHeight); + } + }); - saveTimer = new Timer() { - public void run() { - presenter.onSave(); - } - }; + saveTimer = new Timer() { + @Override + public void run() { + presenter.onSave(); + } + }; } public void attach() { - ws.getEntityWorkspace().setContent(mainPanel); + ws.getEntityWorkspace().setContent(mainPanel); } public void detach() { - mainPanel.removeFromParent(); + mainPanel.removeFromParent(); } public void editHTML(final boolean edit) { - textEditorToolbar.editHTML(edit); + textEditorToolbar.editHTML(edit); } public String getHTML() { - return gwtRTarea.getHTML(); + return gwtRTarea.getHTML(); } public String getText() { - return gwtRTarea.getText(); + return gwtRTarea.getText(); } public void saveTimerCancel() { - saveTimer.cancel(); + saveTimer.cancel(); } public void scheduleSave(final int delayMillis) { - saveTimer.schedule(delayMillis); + saveTimer.schedule(delayMillis); } public void setEnabled(final boolean enabled) { - final String bgColor = enabled ? BACKCOLOR_ENABLED : BACKCOLOR_DISABLED; - DOM.setStyleAttribute(gwtRTarea.getElement(), "backgroundColor", bgColor); - gwtRTarea.setEnabled(enabled); + final String bgColor = enabled ? BACKCOLOR_ENABLED : BACKCOLOR_DISABLED; + DOM.setStyleAttribute(gwtRTarea.getElement(), "backgroundColor", bgColor); + gwtRTarea.setEnabled(enabled); } public void setHeight(final String height) { - gwtRTarea.setHeight(height); + gwtRTarea.setHeight(height); } public void setHTML(final String html) { - gwtRTarea.setHTML(html); + gwtRTarea.setHTML(html); } public void setText(final String text) { - gwtRTarea.setText(text); + gwtRTarea.setText(text); } public void showSaveBeforeDialog() { - MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Save before close?"), new MessageBox.ConfirmCallback() { - public void execute(final String btnID) { - if (btnID.equals("yes")) { - presenter.onSaveAndClose(); - } else { - presenter.onCancelConfirmed(); - } - } - }); + MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Save before close?"), new MessageBox.ConfirmCallback() { + public void execute(final String btnID) { + if (btnID.equals("yes")) { + presenter.onSaveAndClose(); + } else { + presenter.onCancelConfirmed(); + } + } + }); } private void adjustSize(final int height) { - gwtRTarea.setHeight("" - + (height - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT)); + gwtRTarea + .setHeight("" + (height - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -66,203 +66,214 @@ private SiteBottomTrayButton traybarButton; public SiteSearcherPanel(final SiteSearcherPresenter initPresenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - super(i18n); - this.presenter = initPresenter; - this.ws = ws; - dialog = createDialog(); + final WorkspaceSkeleton ws) { + super(i18n); + this.presenter = initPresenter; + this.ws = ws; + dialog = createDialog(); } public String getTextToSearch() { - return searchField.getValueAsString(); + return searchField.getValueAsString(); } public void hide() { - dialog.hide(); + dialog.hide(); } public void search(final String text, final SiteSearcherType type) { - searchField.setValue(text); - switch (type) { - case group_user: - query(groupStore, groupsGrid, text); - break; - case content: - query(contentStore, contentGrid, text); - break; - default: - break; - } + searchField.setValue(text); + switch (type) { + case group_user: + query(groupStore, groupsGrid, text); + break; + case content: + query(contentStore, contentGrid, text); + break; + default: + break; + } } + public void setTextToSearch(String text) { + searchField.setValue(text); + } + public void show() { - dialog.show(); - dialog.expand(); - dialog.center(); - if (traybarButton == null) { - traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", i18n.t("Show/hide searcher"), - dialog, ws); - } + dialog.show(); + dialog.expand(); + dialog.center(); + if (traybarButton == null) { + traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", i18n.t("Show/hide searcher"), + dialog, ws); + } } private Window createDialog() { - final Panel north = new Panel(); - north.setHeight(50); - north.setBorder(false); + final Panel north = new Panel(); + north.setHeight(50); + north.setBorder(false); - final TabPanel centerPanel = new TabPanel(); - centerPanel.setActiveTab(0); - centerPanel.setAutoScroll(true); - centerPanel.setClosable(false); - centerPanel.setBorder(false); + final TabPanel centerPanel = new TabPanel(); + centerPanel.setActiveTab(0); + centerPanel.setAutoScroll(true); + centerPanel.setClosable(false); + centerPanel.setBorder(false); - final BasicDialog dialog = new BasicDialog(i18n.t("Search"), false, false, 500, 400); - // dialog.setResizable(false); - dialog.setIconCls("search-icon"); - final Button closeButton = new Button(i18n.tWithNT("Close", "used in button")); - closeButton.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - presenter.doClose(); - } - }); - dialog.addButton(closeButton); + final BasicDialog dialog = new BasicDialog(i18n.t("Search"), false, false, 500, 400); + // dialog.setResizable(false); + dialog.setIconCls("search-icon"); + final Button closeButton = new Button(i18n.tWithNT("Close", "used in button")); + closeButton.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + presenter.doClose(); + } + }); + dialog.addButton(closeButton); - final Panel searchPanel = createSearchForm(presenter); - final Panel groupsPanel = new Panel("Groups & Users"); - final Panel contentPanel = new Panel("Content"); - groupsPanel.setLayout(new FitLayout()); - contentPanel.setLayout(new FitLayout()); + final Panel searchPanel = createSearchForm(presenter); + final Panel groupsPanel = new Panel("Groups & Users"); + final Panel contentPanel = new Panel("Content"); + groupsPanel.setLayout(new FitLayout()); + contentPanel.setLayout(new FitLayout()); - groupsGrid = createSearchPanel(SiteSearcherType.group_user); - contentGrid = createSearchPanel(SiteSearcherType.content); - groupsPanel.add(groupsGrid); - contentPanel.add(contentGrid); - centerPanel.add(groupsPanel); - centerPanel.add(contentPanel); - dialog.add(searchPanel, new BorderLayoutData(RegionPosition.NORTH)); - dialog.add(centerPanel, new BorderLayoutData(RegionPosition.CENTER)); + groupsGrid = createSearchPanel(SiteSearcherType.group_user); + contentGrid = createSearchPanel(SiteSearcherType.content); + groupsPanel.add(groupsGrid); + contentPanel.add(contentGrid); + centerPanel.add(groupsPanel); + centerPanel.add(contentPanel); + dialog.add(searchPanel, new BorderLayoutData(RegionPosition.NORTH)); + dialog.add(centerPanel, new BorderLayoutData(RegionPosition.CENTER)); - groupsPanel.addListener(new PanelListenerAdapter() { - public void onActivate(final Panel panel) { - dialog.setTitle(i18n.t("Search users and groups")); - presenter.doSearch(SiteSearcherType.group_user); - } - }); + groupsPanel.addListener(new PanelListenerAdapter() { + @Override + public void onActivate(final Panel panel) { + dialog.setTitle(i18n.t("Search users and groups")); + presenter.doSearch(SiteSearcherType.group_user); + } + }); - contentPanel.addListener(new PanelListenerAdapter() { - public void onActivate(final Panel panel) { - dialog.setTitle(i18n.t("Search contents")); - presenter.doSearch(SiteSearcherType.content); - } - }); + contentPanel.addListener(new PanelListenerAdapter() { + @Override + public void onActivate(final Panel panel) { + dialog.setTitle(i18n.t("Search contents")); + presenter.doSearch(SiteSearcherType.content); + } + }); - final String panelId = groupsPanel.getId(); - centerPanel.setActiveItemID(panelId); + final String panelId = groupsPanel.getId(); + centerPanel.setActiveItemID(panelId); - dialog.setCloseAction(Window.HIDE); - dialog.ensureDebugId(SITE_SEARCHER_DIALOG); + dialog.setCloseAction(Window.HIDE); + dialog.ensureDebugId(SITE_SEARCHER_DIALOG); - return dialog; + return dialog; } private Panel createSearchForm(final SiteSearcherPresenter presenter) { - final Panel searchPanel = new Panel(); - searchPanel.setBorder(false); + final Panel searchPanel = new Panel(); + searchPanel.setBorder(false); - final HorizontalPanel hp = new HorizontalPanel(); + final HorizontalPanel hp = new HorizontalPanel(); - final FormPanel form = new FormPanel(); - form.setBorder(false); - form.setWidth(330); - form.setHideLabels(true); + final FormPanel form = new FormPanel(); + form.setBorder(false); + form.setWidth(330); + form.setHideLabels(true); - searchField = new TextField(); - searchField.setWidth(300); - searchField.addListener(new FieldListenerAdapter() { + searchField = new TextField(); + searchField.setWidth(300); + searchField.addListener(new FieldListenerAdapter() { - public void onSpecialKey(final Field field, final EventObject e) { - switch (e.getKey()) { - case KeyboardListener.KEY_ENTER: - presenter.doSearch(field.getValueAsString()); - break; - } - e.stopEvent(); - } + @Override + public void onSpecialKey(final Field field, final EventObject e) { + switch (e.getKey()) { + case KeyboardListener.KEY_ENTER: + presenter.doSearch(field.getValueAsString()); + break; + } + e.stopEvent(); + } - }); - form.add(searchField); + }); + form.add(searchField); - final Button searchBtn = new Button(i18n.tWithNT("Search", "used in button")); - searchBtn.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - presenter.doSearch(getTextToSearch()); - } - }); - hp.add(form); - hp.add(searchBtn); - hp.setSpacing(7); - hp.addStyleName("kune-Margin-Large-trbl"); - searchPanel.add(hp); - return searchPanel; + final Button searchBtn = new Button(i18n.tWithNT("Search", "used in button")); + searchBtn.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + presenter.doSearch(getTextToSearch()); + } + }); + hp.add(form); + hp.add(searchBtn); + hp.setSpacing(7); + hp.addStyleName("kune-Margin-Large-trbl"); + searchPanel.add(hp); + return searchPanel; } private GridPanel createSearchPanel(final SiteSearcherType type) { - final String id = "shortName"; - final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(id), new StringFieldDef("longName"), - new StringFieldDef("link"), new StringFieldDef("iconUrl") }; - final Store store; + final String id = "shortName"; + final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(id), new StringFieldDef("longName"), + new StringFieldDef("link"), new StringFieldDef("iconUrl") }; + final Store store; - switch (type) { - case group_user: - store = groupStore = createStore(fieldDefs, "/kune/json/GroupJSONService/search", id); - break; - case content: - store = contentStore = createStore(fieldDefs, "/kune/json/ContentJSONService/search", id); - break; - default: - throw new RuntimeException("Unknown type of search"); - } + switch (type) { + case group_user: + store = groupStore = createStore(fieldDefs, "/kune/json/GroupJSONService/search", id); + break; + case content: + store = contentStore = createStore(fieldDefs, "/kune/json/ContentJSONService/search", id); + break; + default: + throw new RuntimeException("Unknown type of search"); + } - final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { new ColumnConfig() { - { - setDataIndex(id); - setWidth(100); - } - }, new ColumnConfig() { - { - setDataIndex("longName"); - setWidth(350); - } - } }); + final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { new ColumnConfig() { + { + setDataIndex(id); + setWidth(100); + } + }, new ColumnConfig() { + { + setDataIndex("longName"); + setWidth(350); + } + } }); - // columnModel.setDefaultSortable(true); + // columnModel.setDefaultSortable(true); - final String gridName = type == SiteSearcherType.group_user ? "group-search" : "content-search"; + final String gridName = type == SiteSearcherType.group_user ? "group-search" : "content-search"; - final GridPanel grid = new GridPanel(gridName, 474, 250, store, columnModel); + final GridPanel grid = new GridPanel(gridName, 474, 250, store, columnModel); - createPagingToolbar(store, grid); - grid.setHideColumnHeader(true); - final GridView view = new GridView(); - view.setForceFit(true); - view.setEmptyText(i18n.t("No results")); - grid.setView(view); + createPagingToolbar(store, grid); + grid.setHideColumnHeader(true); + final GridView view = new GridView(); + view.setForceFit(true); + view.setEmptyText(i18n.t("No results")); + grid.setView(view); - grid.addListener(new PanelListenerAdapter() { - public void onRender(final Component component) { - Log.debug("Loading store"); - store.load(0, PAGINATION_SIZE); - } - }); + grid.addListener(new PanelListenerAdapter() { + @Override + public void onRender(final Component component) { + Log.debug("Loading store"); + store.load(0, PAGINATION_SIZE); + } + }); - grid.addGridCellListener(new GridCellListenerAdapter() { - public void onCellClick(final GridPanel grid, final int rowIndex, final int colindex, final EventObject e) { - final Record record = store.getRecordAt(rowIndex); - final String groupShortName = record.getAsString(id); - presenter.doGoto(groupShortName); - } - }); + grid.addGridCellListener(new GridCellListenerAdapter() { + @Override + public void onCellClick(final GridPanel grid, final int rowIndex, final int colindex, final EventObject e) { + final Record record = store.getRecordAt(rowIndex); + final String groupShortName = record.getAsString(id); + presenter.doGoto(groupShortName); + } + }); - return grid; + return grid; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2008-10-11 17:04:26 UTC (rev 903) @@ -20,7 +20,6 @@ package org.ourproject.kune.workspace.client.search; import java.util.HashMap; -import java.util.Iterator; import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.state.StateManager; @@ -36,53 +35,58 @@ private final Provider<StateManager> stateManagerProvider; public SiteSearcherPresenter(final Provider<StateManager> stateManagerProvider) { - this.stateManagerProvider = stateManagerProvider; - searchHistory = new HashMap<String, Integer>(); - currentSearch = SiteSearcherType.group_user; + this.stateManagerProvider = stateManagerProvider; + searchHistory = new HashMap<String, Integer>(); + currentSearch = SiteSearcherType.group_user; } public void doClose() { - view.hide(); + view.hide(); } public void doGoto(final String groupShortName) { - stateManagerProvider.get().gotoToken(groupShortName); + stateManagerProvider.get().gotoToken(groupShortName); } public void doSearch(final SiteSearcherType typeOfSearch) { - doSearchOfType(view.getTextToSearch(), typeOfSearch); + if (view != null) { + String textToSearch = view.getTextToSearch(); + if (textToSearch != null) { + doSearchOfType(textToSearch, typeOfSearch); + } + } } public void doSearch(final String text) { - Site.showProgressLoading(); - searchHistory.put(text, null); - view.search(text, currentSearch); - view.show(); - Site.hideProgress(); + Site.showProgressLoading(); + searchHistory.put(text, null); + view.search(text, currentSearch); + view.show(); + Site.hideProgress(); } public void doSearchOfType(final String text, final SiteSearcherType typeOfSearch) { - this.currentSearch = typeOfSearch; - doSearch(text); + view.setTextToSearch(text); + this.currentSearch = typeOfSearch; + doSearch(text); } public Object[][] getSearchHistory() { - final Object[][] objs = new Object[searchHistory.size()][1]; - int i = 0; - for (final Iterator<String> iterator = searchHistory.keySet().iterator(); iterator.hasNext();) { - final String search = iterator.next(); - final Object[] obj = new Object[] { search }; - objs[i++] = obj; - } - return objs; + final Object[][] objs = new Object[searchHistory.size()][1]; + int i = 0; + for (String search : searchHistory.keySet()) { + final Object[] obj = new Object[] { search }; + objs[i++] = obj; + } + return objs; } public View getView() { - return view; + return view; } public void init(final SiteSearcherView view) { - this.view = view; + this.view = view; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java 2008-10-11 17:04:26 UTC (rev 903) @@ -29,6 +29,8 @@ void search(String text, SiteSearcherType currentSearch); + void setTextToSearch(String text); + void show(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2008-10-11 17:04:26 UTC (rev 903) @@ -15,14 +15,14 @@ private static final String MUST_BE_BETWEEN_3_AND_15 = "Must be between 3 and 15 lowercase characters. Can only contain characters, numbers, and dashes"; - private static final String NICK_FIELD = "nick"; - private static final String EMAIL_FIELD = "email"; - private static final String LONGNAME_FIELD = "long_name"; - private static final String PASSWORD_FIELD = "password"; - private static final String PASSWORD_FIELD_DUP = "passwordDup"; - private static final String LANG_FIELD = "lang"; - private static final String COUNTRY_FIELD = "country"; - private static final String TIMEZONE_FIELD = "timezone"; + private static final String NICK_FIELD = "kune-urf-nick-f"; + private static final String EMAIL_FIELD = "kune-urf-email-f"; + private static final String LONGNAME_FIELD = "kune-urf-long_name-f"; + private static final String PASSWORD_FIELD = "kune-urf-password-f"; + private static final String PASSWORD_FIELD_DUP = "kune-urf-passwordDup-f"; + private static final String LANG_FIELD = "kune-urf-lang-f"; + private static final String COUNTRY_FIELD = "kune-urf-country-f"; + private static final String TIMEZONE_FIELD = "kune-urf-timezone-f"; private final TextField shortNameRegField; private final TextField longNameRegField; @@ -34,173 +34,179 @@ private final ComboBox timezoneCombo; public RegisterForm(final SignInPresenter presenter, final I18nUITranslationService i18n) { - super.addStyleName("kune-Margin-Large-l"); + super.addStyleName("kune-Margin-Large-l"); - shortNameRegField = new TextField(); - shortNameRegField.setFieldLabel(i18n.t("Nickname")); - shortNameRegField.setName(NICK_FIELD); - shortNameRegField.setWidth(DEF_FIELD_WIDTH); - shortNameRegField.setAllowBlank(false); - shortNameRegField.setMinLength(3); - shortNameRegField.setMaxLength(15); - shortNameRegField.setRegex("^[a-z0-9_\\-]+$"); - shortNameRegField.setMinLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); - shortNameRegField.setMaxLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); - shortNameRegField.setRegexText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); - shortNameRegField.setValidationEvent(false); - add(shortNameRegField); + shortNameRegField = new TextField(); + shortNameRegField.setFieldLabel(i18n.t("Nickname")); + shortNameRegField.setName(NICK_FIELD); + shortNameRegField.setWidth(DEF_FIELD_WIDTH); + shortNameRegField.setAllowBlank(false); + shortNameRegField.setMinLength(3); + shortNameRegField.setMaxLength(15); + shortNameRegField.setRegex("^[a-z0-9_\\-]+$"); + shortNameRegField.setMinLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); + shortNameRegField.setMaxLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); + shortNameRegField.setRegexText(i18n.t(MUST_BE_BETWEEN_3_AND_15)); + shortNameRegField.setValidationEvent(false); + add(shortNameRegField); - longNameRegField = new TextField(); - longNameRegField.setFieldLabel(i18n.t("Full Name")); - longNameRegField.setName(LONGNAME_FIELD); - longNameRegField.setWidth(DEF_FIELD_WIDTH); - longNameRegField.setAllowBlank(false); - longNameRegField.setMinLength(3); - longNameRegField.setMaxLength(50); - longNameRegField.setValidationEvent(false); - add(longNameRegField); + longNameRegField = new TextField(); + longNameRegField.setFieldLabel(i18n.t("Full Name")); + longNameRegField.setName(LONGNAME_FIELD); + longNameRegField.setWidth(DEF_FIELD_WIDTH); + longNameRegField.setAllowBlank(false); + longNameRegField.setMinLength(3); + longNameRegField.setMaxLength(50); + longNameRegField.setValidationEvent(false); + longNameRegField.setId(LONGNAME_FIELD); + add(longNameRegField); - passwdRegField = new TextField(); - passwdRegField.setFieldLabel(i18n.t("Password")); - passwdRegField.setName(PASSWORD_FIELD); - passwdRegField.setPassword(true); - passwdRegField.setAllowBlank(false); - passwdRegField.setMaxLength(40); - passwdRegField.setWidth(DEF_FIELD_WIDTH); - passwdRegField.setValidationEvent(false); - add(passwdRegField); + passwdRegField = new TextField(); + passwdRegField.setFieldLabel(i18n.t("Password")); + passwdRegField.setName(PASSWORD_FIELD); + passwdRegField.setPassword(true); + passwdRegField.setAllowBlank(false); + passwdRegField.setMaxLength(40); + passwdRegField.setWidth(DEF_FIELD_WIDTH); + passwdRegField.setValidationEvent(false); + passwdRegField.setId(PASSWORD_FIELD); + add(passwdRegField); - passwdRegFieldDup = new TextField(); - passwdRegFieldDup.setFieldLabel(i18n.t("Retype password")); - passwdRegFieldDup.setName(PASSWORD_FIELD_DUP); - passwdRegFieldDup.setPassword(true); - passwdRegFieldDup.setAllowBlank(false); - passwdRegFieldDup.setMinLength(6); - passwdRegFieldDup.setMaxLength(40); - passwdRegFieldDup.setWidth(DEF_FIELD_WIDTH); - passwdRegFieldDup.setInvalidText(i18n.t("Passwords do not match")); - passwdRegFieldDup.setValidator(new Validator() { - public boolean validate(final String value) throws ValidationException { - return passwdRegField.getValueAsString().equals(passwdRegFieldDup.getValueAsString()); - } - }); - passwdRegFieldDup.setValidationEvent(false); - add(passwdRegFieldDup); + passwdRegFieldDup = new TextField(); + passwdRegFieldDup.setFieldLabel(i18n.t("Retype password")); + passwdRegField.setName(PASSWORD_FIELD_DUP); + passwdRegFieldDup.setPassword(true); + passwdRegFieldDup.setAllowBlank(false); + passwdRegFieldDup.setMinLength(6); + passwdRegFieldDup.setMaxLength(40); + passwdRegFieldDup.setWidth(DEF_FIELD_WIDTH); + passwdRegFieldDup.setInvalidText(i18n.t("Passwords do not match")); + passwdRegFieldDup.setValidator(new Validator() { + public boolean validate(final String value) throws ValidationException { + return passwdRegField.getValueAsString().equals(passwdRegFieldDup.getValueAsString()); + } + }); + passwdRegFieldDup.setValidationEvent(false); + passwdRegField.setId(PASSWORD_FIELD_DUP); + add(passwdRegFieldDup); - emailRegField = new TextField(); - emailRegField.setFieldLabel(i18n.t("Email")); - emailRegField.setName(EMAIL_FIELD); - emailRegField.setVtype(VType.EMAIL); - emailRegField.setWidth(DEF_FIELD_WIDTH); - emailRegField.setAllowBlank(false); - emailRegField.setValidationEvent(false); + emailRegField = new TextField(); + emailRegField.setFieldLabel(i18n.t("Email")); + emailRegField.setName(EMAIL_FIELD); + emailRegField.setVtype(VType.EMAIL); + emailRegField.setWidth(DEF_FIELD_WIDTH); + emailRegField.setAllowBlank(false); + emailRegField.setValidationEvent(false); + emailRegField.setId(EMAIL_FIELD); + add(emailRegField); - add(emailRegField); + final Store langStore = new SimpleStore(new String[] { "abbr", "language" }, presenter.getLanguages()); + langStore.load(); - final Store langStore = new SimpleStore(new String[] { "abbr", "language" }, presenter.getLanguages()); - langStore.load(); + languageCombo = new ComboBox(); + languageCombo.setName(LANG_FIELD); + languageCombo.setMinChars(1); + languageCombo.setFieldLabel(i18n.t("Language")); + languageCombo.setStore(langStore); + languageCombo.setDisplayField("language"); + languageCombo.setMode(ComboBox.LOCAL); + languageCombo.setTriggerAction(ComboBox.ALL); + languageCombo.setEmptyText(i18n.t("Enter language")); + languageCombo.setLoadingText(i18n.t("Searching...")); + languageCombo.setTypeAhead(true); + languageCombo.setTypeAheadDelay(1000); + languageCombo.setSelectOnFocus(false); + languageCombo.setWidth(186); + languageCombo.setAllowBlank(false); + languageCombo.setValueField("abbr"); + languageCombo.setValue(presenter.getCurrentLanguage().getCode()); + languageCombo.setPageSize(7); + languageCombo.setForceSelection(true); + languageCombo.setValidationEvent(false); + languageCombo.setId(LANG_FIELD); + add(languageCombo); - languageCombo = new ComboBox(); - languageCombo.setName(LANG_FIELD); - languageCombo.setMinChars(1); - languageCombo.setFieldLabel(i18n.t("Language")); - languageCombo.setStore(langStore); - languageCombo.setDisplayField("language"); - languageCombo.setMode(ComboBox.LOCAL); - languageCombo.setTriggerAction(ComboBox.ALL); - languageCombo.setEmptyText(i18n.t("Enter language")); - languageCombo.setLoadingText(i18n.t("Searching...")); - languageCombo.setTypeAhead(true); - languageCombo.setTypeAheadDelay(1000); - languageCombo.setSelectOnFocus(false); - languageCombo.setWidth(186); - languageCombo.setAllowBlank(false); - languageCombo.setValueField("abbr"); - languageCombo.setValue(presenter.getCurrentLanguage().getCode()); - languageCombo.setPageSize(7); - languageCombo.setForceSelection(true); - languageCombo.setValidationEvent(false); - add(languageCombo); + final Store countryStore = new SimpleStore(new String[] { "abbr", "country" }, presenter.getCountries()); + countryStore.load(); - final Store countryStore = new SimpleStore(new String[] { "abbr", "country" }, presenter.getCountries()); - countryStore.load(); + countryCombo = new ComboBox(); + countryCombo.setName(COUNTRY_FIELD); + countryCombo.setMinChars(1); + countryCombo.setFieldLabel(i18n.t("Country")); + countryCombo.setStore(countryStore); + countryCombo.setDisplayField("country"); + countryCombo.setMode(ComboBox.LOCAL); + countryCombo.setTriggerAction(ComboBox.ALL); + countryCombo.setEmptyText(i18n.t("Enter your country")); + countryCombo.setLoadingText(i18n.t("Searching...")); + countryCombo.setTypeAhead(true); + countryCombo.setTypeAheadDelay(1000); + countryCombo.setSelectOnFocus(false); + countryCombo.setWidth(186); + countryCombo.setAllowBlank(false); + countryCombo.setValueField("abbr"); + countryCombo.setPageSize(7); + countryCombo.setForceSelection(true); + countryCombo.setValidationEvent(false); + countryCombo.setId(COUNTRY_FIELD); + add(countryCombo); - countryCombo = new ComboBox(); - countryCombo.setName(COUNTRY_FIELD); - countryCombo.setMinChars(1); - countryCombo.setFieldLabel(i18n.t("Country")); - countryCombo.setStore(countryStore); - countryCombo.setDisplayField("country"); - countryCombo.setMode(ComboBox.LOCAL); - countryCombo.setTriggerAction(ComboBox.ALL); - countryCombo.setEmptyText(i18n.t("Enter your country")); - countryCombo.setLoadingText(i18n.t("Searching...")); - countryCombo.setTypeAhead(true); - countryCombo.setTypeAheadDelay(1000); - countryCombo.setSelectOnFocus(false); - countryCombo.setWidth(186); - countryCombo.setAllowBlank(false); - countryCombo.setValueField("abbr"); - countryCombo.setPageSize(7); - countryCombo.setForceSelection(true); - countryCombo.setValidationEvent(false); - add(countryCombo); + final Store timezoneStore = new SimpleStore(new String[] { "id" }, presenter.getTimezones()); + timezoneStore.load(); - final Store timezoneStore = new SimpleStore(new String[] { "id" }, presenter.getTimezones()); - timezoneStore.load(); - - timezoneCombo = new ComboBox(); - timezoneCombo.setName(TIMEZONE_FIELD); - timezoneCombo.setMinChars(1); - timezoneCombo.setFieldLabel(i18n.t("Timezone")); - timezoneCombo.setStore(timezoneStore); - timezoneCombo.setDisplayField("id"); - timezoneCombo.setMode(ComboBox.LOCAL); - timezoneCombo.setTriggerAction(ComboBox.ALL); - timezoneCombo.setEmptyText(i18n.t("Enter your timezone")); - timezoneCombo.setLoadingText(i18n.t("Searching...")); - timezoneCombo.setTypeAhead(true); - timezoneCombo.setTypeAheadDelay(1000); - timezoneCombo.setSelectOnFocus(false); - timezoneCombo.setWidth(186); - timezoneCombo.setAllowBlank(false); - timezoneCombo.setValueField("id"); - timezoneCombo.setPageSize(7); - timezoneCombo.setForceSelection(true); - timezoneCombo.setValidationEvent(false); - add(timezoneCombo); + timezoneCombo = new ComboBox(); + timezoneCombo.setName(TIMEZONE_FIELD); + timezoneCombo.setMinChars(1); + timezoneCombo.setFieldLabel(i18n.t("Timezone")); + timezoneCombo.setStore(timezoneStore); + timezoneCombo.setDisplayField("id"); + timezoneCombo.setMode(ComboBox.LOCAL); + timezoneCombo.setTriggerAction(ComboBox.ALL); + timezoneCombo.setEmptyText(i18n.t("Enter your timezone")); + timezoneCombo.setLoadingText(i18n.t("Searching...")); + timezoneCombo.setTypeAhead(true); + timezoneCombo.setTypeAheadDelay(1000); + timezoneCombo.setSelectOnFocus(false); + timezoneCombo.setWidth(186); + timezoneCombo.setAllowBlank(false); + timezoneCombo.setValueField("id"); + timezoneCombo.setPageSize(7); + timezoneCombo.setForceSelection(true); + timezoneCombo.setValidationEvent(false); + timezoneCombo.setId(TIMEZONE_FIELD); + add(timezoneCombo); } public String getCountry() { - return countryCombo.getValueAsString(); + return countryCombo.getValueAsString(); } public String getEmail() { - return emailRegField.getValueAsString(); + return emailRegField.getValueAsString(); } public String getLanguage() { - return languageCombo.getValueAsString(); + return languageCombo.getValueAsString(); } public String getLongName() { - return longNameRegField.getValueAsString(); + return longNameRegField.getValueAsString(); } public String getRegisterPassword() { - return passwdRegField.getValueAsString(); + return passwdRegField.getValueAsString(); } public String getRegisterPasswordDup() { - return passwdRegFieldDup.getValueAsString(); + return passwdRegFieldDup.getValueAsString(); } public String getShortName() { - return shortNameRegField.getValueAsString(); + return shortNameRegField.getValueAsString(); } public String getTimezone() { - return timezoneCombo.getValueAsString(); + return timezoneCombo.getValueAsString(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2008-10-11 17:04:26 UTC (rev 903) @@ -6,8 +6,8 @@ import com.gwtext.client.widgets.form.TextField; public class SignInForm extends DefaultForm { - private static final String NICKOREMAIL_FIELD = "nickOrEmail"; - private static final String PASSWORD_FIELD = "password"; + private static final String NICKOREMAIL_FIELD = "kune-sif-nkf"; + private static final String PASSWORD_FIELD = "kune-sif-psf"; private final TextField loginNickOrEmailField; private final TextField loginPassField; @@ -21,6 +21,7 @@ loginNickOrEmailField.setWidth(DEF_FIELD_WIDTH); loginNickOrEmailField.setAllowBlank(false); loginNickOrEmailField.setValidationEvent(false); + loginNickOrEmailField.setId(NICKOREMAIL_FIELD); super.add(loginNickOrEmailField); loginPassField = new TextField(); @@ -30,6 +31,7 @@ loginPassField.setPassword(true); loginPassField.setAllowBlank(false); loginPassField.setValidationEvent(false); + loginPassField.setId(PASSWORD_FIELD); super.add(loginPassField); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -53,7 +53,7 @@ public class SignInPanel implements SignInView { private class MessagePanel extends Panel { - private static final String SIGNIN_MESSAGE_PANEL = "k-signin-message-panel"; + private static final String SIGNIN_MESSAGE_PANEL = "kune-sip-mp"; private final SimpleMessagePanel messagesPanel; public MessagePanel() { @@ -81,8 +81,11 @@ } } - private static final String USER_SIGN_IN_PANEL = "k-user-sign-in-panel"; - private static final String USER_REGISTER_PANEL = "k-user-register-panel"; + private static final String USER_SIGN_IN_PANEL = "kune-sip-usp"; + private static final String USER_REGISTER_PANEL = "kune-sip-rp"; + private static final String CANCEL_BUTTON_ID = "kune-sip-cb"; + private static final String REGISTER_BUTTON_ID = "kune-sip-rb"; + private static final String SIGN_IN_BUTTON_ID = "kune-sip-sib"; private BasicDialog dialog; private final SignInPresenter presenter; @@ -298,6 +301,7 @@ } } }); + signInBtn.setId(SIGN_IN_BUTTON_ID); dialog.addButton(signInBtn); final Button registerBtn = new Button(i18n.t("Register")); @@ -310,9 +314,11 @@ } }); dialog.addButton(registerBtn); + registerBtn.setId(REGISTER_BUTTON_ID); registerBtn.hide(); final Button cancel = new Button(); + cancel.setId(CANCEL_BUTTON_ID); dialog.addButton(cancel); cancel.setText(i18n.tWithNT("Cancel", "used in button")); cancel.addListener(new ButtonListenerAdapter() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -1,6 +1,5 @@ package org.ourproject.kune.workspace.client.sitebar.sitelogo; -import org.ourproject.kune.workspace.client.skel.SiteBar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.user.client.ui.Image; @@ -10,12 +9,11 @@ private final Image siteLogoImg; public SiteLogoPanel(final SiteLogoPresenter presenter, final WorkspaceSkeleton ws) { - siteLogoImg = new Image(); - final SiteBar siteBar = ws.getSiteBar(); - siteBar.add(siteLogoImg); + siteLogoImg = new Image(); + ws.getSiteBar().add(siteLogoImg); } public void setSiteLogoUrl(final String siteLogoUrl) { - siteLogoImg.setUrl(siteLogoUrl); + siteLogoImg.setUrl(siteLogoUrl); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -4,7 +4,7 @@ import org.ourproject.kune.platf.client.ui.IconLabel; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.site.Site; -import org.ourproject.kune.workspace.client.skel.SiteBar; +import org.ourproject.kune.workspace.client.skel.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.user.client.Window; @@ -14,8 +14,8 @@ public class SitePublicSpaceLinkPanel implements SitePublicSpaceLinkView { - private static final String SITE_GOTO_PUBLIC = "k-site-goto-public"; - private static final String SITE_CONTENT_NO_PUBLIC = "k-site-content-no-public"; + private static final String SITE_GOTO_PUBLIC = "kune-spslp-gplb"; + private static final String SITE_CONTENT_NO_PUBLIC = "knue-spslp-cnp"; private final HorizontalPanel publicHP; private final IconLabel contentNoPublic; @@ -23,45 +23,45 @@ private String publicUrl; public SitePublicSpaceLinkPanel(final SitePublicSpaceLinkPresenter presenter, final WorkspaceSkeleton ws, - final I18nUITranslationService i18n, final Images img) { - publicHP = new HorizontalPanel(); - gotoPublic = new IconLabel(img.anybody(), i18n.t("Go to Public Space"), false); - gotoPublic.ensureDebugId(SITE_GOTO_PUBLIC); - contentNoPublic = new IconLabel(img.anybody(), i18n.t("This content is not public")); - contentNoPublic.ensureDebugId(SITE_CONTENT_NO_PUBLIC); - publicHP.add(gotoPublic); - publicHP.add(contentNoPublic); - final SiteBar siteBar = ws.getSiteBar(); - siteBar.add(publicHP); - siteBar.addFill(); + final I18nUITranslationService i18n, final Images img) { + publicHP = new HorizontalPanel(); + gotoPublic = new IconLabel(img.anybody(), i18n.t("Go to Public Space"), false); + gotoPublic.ensureDebugId(SITE_GOTO_PUBLIC); + contentNoPublic = new IconLabel(img.anybody(), i18n.t("This content is not public")); + contentNoPublic.ensureDebugId(SITE_CONTENT_NO_PUBLIC); + publicHP.add(gotoPublic); + publicHP.add(contentNoPublic); + final SimpleToolbar siteBar = ws.getSiteBar(); + siteBar.add(publicHP); + siteBar.addFill(); - gotoPublic.addStyleName("kune-Margin-Medium-r"); - setContentPublic(true); - gotoPublic.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { - gotoPublic(); - } - }); - gotoPublic.setTitle(i18n.t("Leave the workspace and go to the public space of this group") - + Site.IN_DEVELOPMENT); - gotoPublic.addStyleName("k-sitebar-labellink"); - contentNoPublic.addStyleName("k-sitebar-labellink"); + gotoPublic.addStyleName("kune-Margin-Medium-r"); + setContentPublic(true); + gotoPublic.addClickListener(new ClickListener() { + public void onClick(final Widget sender) { + gotoPublic(); + } + }); + gotoPublic.setTitle(i18n.t("Leave the workspace and go to the public space of this group") + + Site.IN_DEVELOPMENT); + gotoPublic.addStyleName("k-sitebar-labellink"); + contentNoPublic.addStyleName("k-sitebar-labellink"); } public void setContentGotoPublicUrl(final String publicUrl) { - this.publicUrl = publicUrl; + this.publicUrl = publicUrl; } public void setContentPublic(boolean visible) { - gotoPublic.setVisible(visible); - contentNoPublic.setVisible(!visible); + gotoPublic.setVisible(visible); + contentNoPublic.setVisible(!visible); } public void setVisible(final boolean visible) { - publicHP.setVisible(visible); + publicHP.setVisible(visible); } private void gotoPublic() { - Window.open(publicUrl, "_blank", ""); + Window.open(publicUrl, "_blank", ""); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -3,7 +3,7 @@ import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.site.Site; -import org.ourproject.kune.workspace.client.skel.SiteBar; +import org.ourproject.kune.workspace.client.skel.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.user.client.ui.ClickListener; @@ -16,84 +16,84 @@ public class SiteSearchPanel implements SiteSearchView { private static final String SEARCH_TEXT_WIDTH_SMALL = "120"; private static final String SEARCH_TEXT_WIDTH_BIG = "180"; - private static final String SITE_SEARCH_BUTTON = "k-site-search-button"; - private static final String SITE_SEARCH_TEXTBOX = "k-site-search-textbox"; + private static final String SITE_SEARCH_BUTTON = "kune-ssp-bt"; + private static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tb"; private final PushButton searchButton; private final TextBox searchTextBox; private final I18nUITranslationService i18n; public SiteSearchPanel(final SiteSearchPresenter presenter, final WorkspaceSkeleton ws, - final I18nUITranslationService i18n) { - this.i18n = i18n; - final Images img = Images.App.getInstance(); - final SiteBar siteBar = ws.getSiteBar(); - siteBar.addSpacer(); - siteBar.addSpacer(); - searchButton = new PushButton(img.kuneSearchIco().createImage(), img.kuneSearchIcoPush().createImage()); - searchButton.ensureDebugId(SITE_SEARCH_BUTTON); - searchTextBox = new TextBox(); - searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); + final I18nUITranslationService i18n) { + this.i18n = i18n; + final Images img = Images.App.getInstance(); + final SimpleToolbar siteBar = ws.getSiteBar(); + siteBar.addSpacer(); + siteBar.addSpacer(); + searchButton = new PushButton(img.kuneSearchIco().createImage(), img.kuneSearchIcoPush().createImage()); + searchButton.ensureDebugId(SITE_SEARCH_BUTTON); + searchTextBox = new TextBox(); + searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); - siteBar.add(searchButton); - siteBar.addSpacer(); - siteBar.add(searchTextBox); - siteBar.addSpacer(); + siteBar.add(searchButton); + siteBar.addSpacer(); + siteBar.add(searchTextBox); + siteBar.addSpacer(); - setTextSearchSmall(); - setDefaultTextSearch(); - searchTextBox.addFocusListener(new FocusListener() { - public void onFocus(final Widget arg0) { - presenter.onSearchFocus(); - } + setTextSearchSmall(); + setDefaultTextSearch(); + searchTextBox.addFocusListener(new FocusListener() { + public void onFocus(final Widget arg0) { + presenter.onSearchFocus(); + } - public void onLostFocus(final Widget arg0) { - presenter.onSearchLostFocus(searchTextBox.getText()); - } - }); + public void onLostFocus(final Widget arg0) { + presenter.onSearchLostFocus(searchTextBox.getText()); + } + }); - searchButton.addClickListener(new ClickListener() { - public void onClick(final Widget arg0) { - Site.showProgressProcessing(); - presenter.doSearch(searchTextBox.getText()); - } - }); + searchButton.addClickListener(new ClickListener() { + public void onClick(final Widget arg0) { + Site.showProgressProcessing(); + presenter.doSearch(searchTextBox.getText()); + } + }); - searchTextBox.addKeyboardListener(new KeyboardListener() { - public void onKeyDown(final Widget arg0, final char arg1, final int arg2) { - } + searchTextBox.addKeyboardListener(new KeyboardListener() { + public void onKeyDown(final Widget arg0, final char arg1, final int arg2) { + } - public void onKeyPress(final Widget arg0, final char arg1, final int arg2) { - } + public void onKeyPress(final Widget arg0, final char arg1, final int arg2) { + } - public void onKeyUp(final Widget widget, final char key, final int mod) { - if (key == KEY_ENTER) { - if (searchTextBox.getText().length() > 0) { - Site.showProgressProcessing(); - presenter.doSearch(searchTextBox.getText()); - } - } - } - }); + public void onKeyUp(final Widget widget, final char key, final int mod) { + if (key == KEY_ENTER) { + if (searchTextBox.getText().length() > 0) { + Site.showProgressProcessing(); + presenter.doSearch(searchTextBox.getText()); + } + } + } + }); } public void clearSearchText() { - searchTextBox.setText(""); + searchTextBox.setText(""); } public void setDefaultTextSearch() { - searchTextBox.setText(i18n.t("Search")); + searchTextBox.setText(i18n.t("Search")); } public void setSearchText(final String text) { - searchTextBox.setText(text); + searchTextBox.setText(text); } public void setTextSearchBig() { - searchTextBox.setWidth(SEARCH_TEXT_WIDTH_BIG); + searchTextBox.setWidth(SEARCH_TEXT_WIDTH_BIG); } public void setTextSearchSmall() { - searchTextBox.setWidth(SEARCH_TEXT_WIDTH_SMALL); + searchTextBox.setWidth(SEARCH_TEXT_WIDTH_SMALL); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -8,7 +8,7 @@ public class SiteSignInLinkPanel implements SiteSignInLinkView { - private static final String SITE_SIGN_IN = "k-site-sign-in"; + private static final String SITE_SIGN_IN = "kune-ssilp-hy"; private final Hyperlink signInHyperlink; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -10,7 +10,7 @@ public class SiteSignOutLinkPanel implements SiteSignOutLinkView { - private static final String SITE_SIGN_OUT = "k-site-sign-out"; + private static final String SITE_SIGN_OUT = "k-ssolp-lb"; private final Label signOutLabel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -17,10 +17,10 @@ public class SiteUserMenuPanel implements SiteUserMenuView { - private static final String LOGGED_USER_MENU = "k-logged-user-menu"; - private static final String USER_PREFERENCES_MENU_ITEM = "k-user-pref-menu-item"; - private static final String USER_HOME_PAGE_MENU_ITEM = "k-user-home-page-menu-item"; - private static final String USER_PARTICIPATION_MENU_ITEM = "k-user-participation-menu-item"; + private static final String LOGGED_USER_MENU = "kune-sump-lum"; + private static final String USER_PREFERENCES_MENU_ITEM = "kune-sump-uprmi"; + private static final String USER_HOME_PAGE_MENU_ITEM = "kune-sump-hpmi"; + private static final String USER_PARTICIPATION_MENU_ITEM = "kune-sump-upami"; private final PushButton loggedUserMenu; private final Widget separator; private final Menu userMenu; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java 2008-10-11 17:04:26 UTC (rev 903) @@ -1,47 +1,102 @@ package org.ourproject.kune.workspace.client.skel; -import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; import org.ourproject.kune.workspace.client.themes.WsTheme; import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.core.RegionPosition; import com.gwtext.client.widgets.Panel; +import com.gwtext.client.widgets.Toolbar; +import com.gwtext.client.widgets.event.ContainerListenerAdapter; +import com.gwtext.client.widgets.layout.AnchorLayout; +import com.gwtext.client.widgets.layout.AnchorLayoutData; +import com.gwtext.client.widgets.layout.BorderLayout; +import com.gwtext.client.widgets.layout.BorderLayoutData; import com.gwtext.client.widgets.layout.FitLayout; -public class Entity extends DefaultBorderLayout { +public class Entity { + private final Panel entityFitPanel; private final EntityWorkspace entityWorkspace; private final EntitySummary entitySummary; private final Panel entityMainHeader; public Entity() { - entityMainHeader = new Panel(); - entityMainHeader.setBorder(false); - entityMainHeader.setLayout(new FitLayout()); - entitySummary = new EntitySummary(); - entityWorkspace = new EntityWorkspace(); - add(entityMainHeader, DefaultBorderLayout.Position.NORTH, 65); - add(entityWorkspace.getPanel(), DefaultBorderLayout.Position.CENTER); - add(entitySummary.getPanel(), DefaultBorderLayout.Position.EAST, true, 150); + entityFitPanel = new Panel(); + entityFitPanel.setLayout(new FitLayout()); + entityFitPanel.setBorder(false); + + Panel entityAnchorLayout = new Panel(); + entityAnchorLayout.setBorder(false); + entityAnchorLayout.setLayout(new AnchorLayout()); + + Panel entityBorderLayout = new Panel(); + entityBorderLayout.setLayout(new BorderLayout()); + entityBorderLayout.setBorder(false); + + entityMainHeader = new Panel(); + entityMainHeader.setBorder(false); + entityMainHeader.setHeight(65); + + entityWorkspace = new EntityWorkspace(); + + BorderLayoutData eastData = new BorderLayoutData(RegionPosition.EAST); + eastData.setMinSize(50); + eastData.setSplit(true); + eastData.setCollapseModeMini(true); + eastData.setUseSplitTips(true); + + entitySummary = new EntitySummary(); + entityBorderLayout.add(entityWorkspace.getPanel(), new BorderLayoutData(RegionPosition.CENTER)); + entityBorderLayout.add(entitySummary.getPanel(), eastData); + + entityAnchorLayout.add(entityMainHeader, new AnchorLayoutData("100%")); + entityAnchorLayout.add(entityBorderLayout, new AnchorLayoutData("100% -65")); + entityFitPanel.add(entityAnchorLayout); } - public void addToEntityMainHeader(final Widget widget) { - entityMainHeader.add(widget); - doLayoutIfNeeded(); + public void addInSummary(Widget widget) { + entitySummary.addInSummary(widget); + doLayoutIfNeeded(); } - public EntitySummary getEntitySummary() { - return entitySummary; + public void addInTools(final Widget widget) { + entitySummary.addInTools(widget); + doLayoutIfNeeded(); } + public void addListenerInEntitySummary(ContainerListenerAdapter listener) { + entitySummary.addListener(listener); + } + + public void addToEntityMainHeader(final Widget widget) { + entityMainHeader.clear(); + entityMainHeader.add(widget); + doLayoutIfNeeded(); + } + public EntityWorkspace getEntityWorkspace() { - return entityWorkspace; + return entityWorkspace; } + public Panel getPanel() { + return entityFitPanel; + } + + public Toolbar getSiteTraybar() { + return entitySummary.getSiteTraybar(); + } + public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - if (oldTheme != null) { - super.removeStyle("k-entity-" + oldTheme); - } - super.addStyle("k-entity-" + newTheme); - entityWorkspace.setTheme(oldTheme, newTheme); + if (oldTheme != null) { + entityFitPanel.removeClass("k-entity-" + oldTheme); + } + entityFitPanel.addClass("k-entity-" + newTheme); + entityWorkspace.setTheme(oldTheme, newTheme); } + + private void doLayoutIfNeeded() { + if (entityFitPanel.isRendered()) { + entityFitPanel.doLayout(); + } + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-11 17:04:26 UTC (rev 903) @@ -1,12 +1,12 @@ package org.ourproject.kune.workspace.client.skel; -import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; - -import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.Toolbar; import com.gwtext.client.widgets.event.ContainerListener; +import com.gwtext.client.widgets.layout.AccordionLayout; +import com.gwtext.client.widgets.layout.AnchorLayout; +import com.gwtext.client.widgets.layout.AnchorLayoutData; import com.gwtext.client.widgets.layout.FitLayout; public class EntitySummary { @@ -15,57 +15,90 @@ private static final String ENTITY_TOOLS = "k-entity-tools"; private final Panel entityTools; private final Panel entitySummary; - private final DefaultBorderLayout mainPanel; private final Toolbar trayBar; - private final VerticalPanel vpTools; + private final Panel mainFitPanel; public EntitySummary() { - mainPanel = new DefaultBorderLayout(); - entityTools = new Panel(); - entityTools.setLayout(new FitLayout()); - entityTools.setId(ENTITY_TOOLS); - entityTools.setAutoHeight(true); - vpTools = new VerticalPanel(); - entityTools.add(vpTools); - entitySummary = new Panel(); - entityTools.setBorder(false); - entitySummary.setBorder(false); - entityTools.setAutoScroll(false); - entitySummary.setAutoScroll(true); - entitySummary.setCls(ENTITY_SUMMARY); - entitySummary.setId(ENTITY_SUMMARY); - trayBar = mainPanel.createBottomBar(entitySummary, SITE_TRAYBAR, SITE_TRAYBAR); - mainPanel.add(entityTools, DefaultBorderLayout.Position.NORTH); - mainPanel.add(entitySummary, DefaultBorderLayout.Position.CENTER); - trayBar.addFill(); + mainFitPanel = new Panel(""); + mainFitPanel.setLayout(new FitLayout()); + mainFitPanel.setBorder(false); + mainFitPanel.setWidth(150); + + Panel anchorLayoutPanel = new Panel(); + anchorLayoutPanel.setLayout(new AnchorLayout()); + anchorLayoutPanel.setBorder(false); + anchorLayoutPanel.setWidth(150); + entityTools = new Panel(); + entityTools.setLayout(new AnchorLayout()); + entityTools.setId(ENTITY_TOOLS); + entityTools.setAutoHeight(true); + entitySummary = new Panel(); + entityTools.setBorder(false); + entitySummary.setBorder(false); + entityTools.setAutoScroll(false); + entitySummary.setAutoScroll(true); + entitySummary.setCls(ENTITY_SUMMARY); + entitySummary.setId(ENTITY_SUMMARY); + + trayBar = new Toolbar(); + trayBar.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT); + trayBar.setId(SITE_TRAYBAR); + trayBar.setCls(SITE_TRAYBAR); + trayBar.addFill(); + entitySummary.setBottomToolbar(trayBar); + anchorLayoutPanel.add(entityTools, new AnchorLayoutData("100%")); + anchorLayoutPanel.add(entitySummary, new AnchorLayoutData("100% -50")); + mainFitPanel.add(anchorLayoutPanel); } public void addInSummary(final Widget widget) { - entitySummary.add(widget); - entitySummary.syncSize(); - mainPanel.doLayoutIfNeeded(); + entitySummary.add(widget); + doLayoutIfNeeded(); } public void addInTools(final Widget widget) { - vpTools.add(widget); - // entityTools.render(widget.getElement()); - if (entityTools.isRendered()) { - entityTools.syncSize(); - entityTools.doLayout(false); - mainPanel.doLayoutIfNeeded(); - } + entityTools.add(widget); + doLayoutIfNeeded(); } public void addListener(final ContainerListener listener) { - entitySummary.addListener(listener); + entitySummary.addListener(listener); } public Panel getPanel() { - return mainPanel.getPanel(); + return mainFitPanel; } public Toolbar getSiteTraybar() { - return trayBar; + return trayBar; } + private Panel createAccordionPanel() { + Panel accordionPanel = new Panel(); + accordionPanel.setBorder(false); + accordionPanel.setLayout(new AccordionLayout(true)); + + Panel panelOne = new Panel("Panel 1", "<p>Panel1 content!</p>"); + panelOne.setIconCls("settings-icon"); + accordionPanel.add(panelOne); + + Panel panelTwo = new Panel("Panel 2", "<p>Panel2 content!</p>"); + panelTwo.setIconCls("folder-icon"); + accordionPanel.add(panelTwo); + + Panel panelThree = new Panel("Panel 3", "<p>Panel3 content!</p>"); + panelThree.setIconCls("user-add-icon"); + accordionPanel.add(panelThree); + + // accordionPanel.setCls(ENTITY_SUMMARY); + + return accordionPanel; + } + + private void doLayoutIfNeeded() { + if (mainFitPanel.isRendered()) { + mainFitPanel.doLayout(); + } + } + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-11 17:04:26 UTC (rev 903) @@ -1,17 +1,20 @@ package org.ourproject.kune.workspace.client.skel; -import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; import org.ourproject.kune.platf.client.ui.RoundedPanel; import org.ourproject.kune.workspace.client.themes.WsTheme; +import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.core.RegionPosition; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.event.ContainerListener; import com.gwtext.client.widgets.layout.AnchorLayout; import com.gwtext.client.widgets.layout.AnchorLayoutData; +import com.gwtext.client.widgets.layout.BorderLayout; +import com.gwtext.client.widgets.layout.BorderLayoutData; import com.gwtext.client.widgets.layout.FitLayout; -public class EntityWorkspace extends DefaultBorderLayout { +public class EntityWorkspace { private static final String ENTITY_TITLE = "k-entity-title"; private static final String ENTITY_SUBTITLE = "k-entity-subtitle"; private static final String ENTITY_BOTTOM = "k-entity-bottom"; @@ -28,131 +31,177 @@ private final Toolbar contextBottomBar; private final RoundedPanel roundedTitle; private final RoundedPanel roundedBottom; + private final Panel cntCtxBorderLayout; + private final Panel mainFitPanel; public EntityWorkspace() { - final Panel titles = new Panel(); - titles.setBorder(false); - titles.setLayout(new AnchorLayout()); - final Panel bottomPanel = new Panel(); - bottomPanel.setBorder(false); - bottomPanel.setLayout(new AnchorLayout()); + mainFitPanel = new Panel(); + mainFitPanel.setLayout(new FitLayout()); + mainFitPanel.setBorder(false); - title = new SimpleToolbar(); - title.setHeight("" + (DEF_TOOLBAR_HEIGHT - 2)); - title.setStylePrimaryName(ENTITY_TITLE); - title.ensureDebugId(ENTITY_TITLE); - subTitle = new SimpleToolbar(); - subTitle.setStylePrimaryName(ENTITY_SUBTITLE); - subTitle.ensureDebugId(ENTITY_SUBTITLE); - bottom = new SimpleToolbar(); - bottom.setHeight("" + (DEF_TOOLBAR_HEIGHT - 2)); - bottom.setStylePrimaryName(ENTITY_BOTTOM); - bottom.ensureDebugId(ENTITY_BOTTOM); + Panel mainAnchorLayout = new Panel(); + mainAnchorLayout.setLayout(new AnchorLayout()); + mainAnchorLayout.setBorder(false); - roundedTitle = new RoundedPanel(title, RoundedPanel.TOPLEFT, 2); - roundedBottom = new RoundedPanel(bottom, RoundedPanel.BOTTOMLEFT, 2); + cntCtxBorderLayout = new Panel(); + cntCtxBorderLayout.setLayout(new BorderLayout()); + cntCtxBorderLayout.setBorder(false); + final Panel titles = new Panel(); + titles.setBorder(false); + titles.setLayout(new AnchorLayout()); + final Panel bottomPanel = new Panel(); + bottomPanel.setBorder(false); + bottomPanel.setLayout(new AnchorLayout()); - titles.add(roundedTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); - titles.add(subTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); - bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); + title = new SimpleToolbar(); + title.setHeight("" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - 2)); + title.setStylePrimaryName(ENTITY_TITLE); + // title.ensureDebugId(ENTITY_TITLE); + subTitle = new SimpleToolbar(); + subTitle.setStylePrimaryName(ENTITY_SUBTITLE); + // subTitle.ensureDebugId(ENTITY_SUBTITLE); + bottom = new SimpleToolbar(); + bottom.setHeight("" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - 2)); + bottom.setStylePrimaryName(ENTITY_BOTTOM); + bottom.ensureDebugId(ENTITY_BOTTOM); - final DefaultBorderLayout contentWrap = new DefaultBorderLayout(); - final DefaultBorderLayout contextWrap = new DefaultBorderLayout(); - contentWrap.setBorder(true); - contextWrap.setBorder(true); - content = new Panel(); - context = new Panel(); - content.setCls(ENTITY_CONTENT); - context.setCls(ENTITY_CONTEXT); - context.setLayout(new FitLayout()); - content.setBorder(false); - context.setBorder(false); - context.setCollapsible(true); - // content.setPaddings(7); - content.setAutoScroll(true); - // context.setAutoScroll(true); + roundedTitle = new RoundedPanel(title, RoundedPanel.TOPLEFT, 2); + roundedBottom = new RoundedPanel(bottom, RoundedPanel.BOTTOMLEFT, 2); - contentTopBar = new Toolbar(); - contentBottomBar = new Toolbar(); - contextTopBar = new Toolbar(); - contextBottomBar = new Toolbar(); - contentTopBar.addStyleName("k-toolbar-bottom-line"); - contentBottomBar.addStyleName("k-toolbar-top-line"); - contextTopBar.addStyleName("k-toolbar-bottom-line"); - contextBottomBar.addStyleName("k-toolbar-top-line"); - contentWrap.add(contentTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT); - contextWrap.add(contextTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT); - contentWrap.add(content, Position.CENTER, -1); - contextWrap.add(context, Position.CENTER, -1); - contentWrap.add(contentBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT); - contextWrap.add(contextBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT); + titles.add(roundedTitle, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); + titles.add(subTitle, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); + bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT)); - add(titles, DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT * 2); - add(contentWrap.getPanel(), DefaultBorderLayout.Position.CENTER); - add(contextWrap.getPanel(), DefaultBorderLayout.Position.EAST, true, 175); - add(bottomPanel, DefaultBorderLayout.Position.SOUTH, DEF_TOOLBAR_HEIGHT + 2); + final Panel contentWrap = new Panel(); + final Panel contextWrap = new Panel(); + contentWrap.setLayout(new AnchorLayout()); + contextWrap.setLayout(new AnchorLayout()); + contentWrap.setBorder(true); + contextWrap.setBorder(true); + content = new Panel(); + context = new Panel(); + content.setCls(ENTITY_CONTENT); + context.setCls(ENTITY_CONTEXT); + context.setLayout(new FitLayout()); + content.setBorder(false); + context.setBorder(false); + context.setCollapsible(true); + // content.setPaddings(7); + content.setAutoScroll(true); + // context.setAutoScroll(true); + + contentTopBar = new Toolbar(); + contentBottomBar = new Toolbar(); + contextTopBar = new Toolbar(); + contextBottomBar = new Toolbar(); + contentTopBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT); + contextTopBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT); + contentBottomBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT); + contentBottomBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT); + contentTopBar.addStyleName("k-toolbar-bottom-line"); + contentBottomBar.addStyleName("k-toolbar-top-line"); + contextTopBar.addStyleName("k-toolbar-bottom-line"); + contextBottomBar.addStyleName("k-toolbar-top-line"); + contentWrap.add(contentTopBar.getPanel()); + contextWrap.add(contextTopBar.getPanel()); + contentWrap.add(content, new AnchorLayoutData("100% -" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2))); + contextWrap.add(context, new AnchorLayoutData("100% -" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2))); + contentWrap.add(contentBottomBar.getPanel()); + contextWrap.add(contextBottomBar.getPanel()); + titles.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2); + bottomPanel.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT + 2); + + BorderLayoutData eastData = new BorderLayoutData(RegionPosition.EAST); + contextWrap.setWidth(175); + eastData.setUseSplitTips(true); + eastData.setCollapseModeMini(true); + cntCtxBorderLayout.add(contentWrap, new BorderLayoutData(RegionPosition.CENTER)); + cntCtxBorderLayout.add(contextWrap, eastData); + + mainAnchorLayout.add(titles, new AnchorLayoutData("100%")); + mainAnchorLayout.add(cntCtxBorderLayout, new AnchorLayoutData("100% -" + + ((WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 3) + 2))); + mainAnchorLayout.add(bottomPanel, new AnchorLayoutData("100%")); + mainFitPanel.add(mainAnchorLayout); } public void addContentListener(final ContainerListener listener) { - content.addListener(listener); + content.addListener(listener); } public void addContextListener(final ContainerListener listener) { - context.addListener(listener); + context.addListener(listener); } public SimpleToolbar getBottomTitle() { - return bottom; + return bottom; } public Toolbar getContentBottomBar() { - return contentBottomBar; + return contentBottomBar; } public Toolbar getContentTopBar() { - return contentTopBar; + return contentTopBar; } public Toolbar getContextBottomBar() { - return contextBottomBar; + return contextBottomBar; } public Toolbar getContextTopBar() { - return contextTopBar; + return contextTopBar; } + public Panel getPanel() { + return mainFitPanel; + } + public SimpleToolbar getSubTitle() { - return subTitle; + return subTitle; } - public SimpleToolbar getTitle() { - return title; + public SimpleToolbar getTitleComponent() { + return title; } public void setContent(final Widget widget) { - setPanel(content, widget); + setPanel(content, widget); } public void setContext(final Widget widget) { - setPanel(context, widget); + setPanel(context, widget); } public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - final String themeS = newTheme.toString(); - if (oldTheme != null) { - final String previousThemeS = oldTheme.toString(); - title.removeStyleDependentName(previousThemeS); - subTitle.removeStyleDependentName(previousThemeS); - bottom.removeStyleDependentName(previousThemeS); - super.removeStyle("k-entityworkspace-" + previousThemeS); - context.removeStyleName("k-entity-context-" + previousThemeS); - } - super.addStyle("k-entityworkspace-" + newTheme); - roundedTitle.setCornerStyleName("k-entity-title-rd-" + newTheme); - roundedBottom.setCornerStyleName("k-entity-bottom-rd-" + newTheme); - title.addStyleDependentName(themeS); - subTitle.addStyleDependentName(themeS); - bottom.addStyleDependentName(themeS); - context.addStyleName("k-entity-context-" + newTheme); + final String themeS = newTheme.toString(); + if (oldTheme != null) { + final String previousThemeS = oldTheme.toString(); + title.removeStyleDependentName(previousThemeS); + subTitle.removeStyleDependentName(previousThemeS); + bottom.removeStyleDependentName(previousThemeS); + cntCtxBorderLayout.removeClass("k-entityworkspace-" + previousThemeS); + context.removeStyleName("k-entity-context-" + previousThemeS); + } + cntCtxBorderLayout.addClass("k-entityworkspace-" + newTheme); + roundedTitle.setCornerStyleName("k-entity-title-rd-" + newTheme); + roundedBottom.setCornerStyleName("k-entity-bottom-rd-" + newTheme); + title.addStyleDependentName(themeS); + subTitle.addStyleDependentName(themeS); + bottom.addStyleDependentName(themeS); + context.addStyleName("k-entity-context-" + newTheme); } + + private void doLayoutIfNeeded() { + Log.debug("Doing EW layout"); + if (mainFitPanel.isRendered()) { + mainFitPanel.doLayout(); + } + } + + private void setPanel(Panel panel, Widget widget) { + panel.clear(); + panel.add(widget); + doLayoutIfNeeded(); + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java 2008-10-11 17:04:26 UTC (rev 903) @@ -7,27 +7,31 @@ private final SimpleToolbar simpleToolbar; + @Deprecated public SiteBar() { - super.setBorder(false); - simpleToolbar = new SimpleToolbar(); - simpleToolbar.setStyleName("k-sitebar"); - super.add(simpleToolbar); + // super.setLayout(new FitLayout()); + super.setBorder(false); + simpleToolbar = new SimpleToolbar(); + simpleToolbar.setStyleName("k-sitebar"); + simpleToolbar.addSpacer(); + super.add(simpleToolbar); } + @Override public void add(final Widget widget) { - simpleToolbar.add(widget); + simpleToolbar.add(widget); } public Widget addFill() { - return simpleToolbar.addFill(); + return simpleToolbar.addFill(); } public Widget addSeparator() { - return simpleToolbar.addSeparator(); + return simpleToolbar.addSeparator(); } public Widget addSpacer() { - return simpleToolbar.addSpacer(); + return simpleToolbar.addSpacer(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java 2008-10-11 17:04:26 UTC (rev 903) @@ -1,7 +1,5 @@ package org.ourproject.kune.workspace.client.skel; -import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; - import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; @@ -12,67 +10,67 @@ private final HorizontalPanel childPanel; public Toolbar() { - container = new Panel(); - container.setBorder(false); - container.setBodyBorder(false); - container.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); - container.setWidth("100%"); - container.setHeader(false); - container.setBaseCls("x-toolbar"); - container.addClass("x-panel"); - childPanel = new HorizontalPanel(); - container.add(childPanel); + container = new Panel(); + container.setBorder(false); + container.setBodyBorder(false); + container.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT); + container.setWidth("100%"); + container.setHeader(false); + container.setBaseCls("x-toolbar"); + container.addClass("x-panel"); + childPanel = new HorizontalPanel(); + container.add(childPanel); } public void add(final Widget widget) { - childPanel.add(widget); - doLayoutIfNeeded(); + childPanel.add(widget); + doLayoutIfNeeded(); } public Widget addFill() { - final Label emptyLabel = new Label(""); - this.add(emptyLabel); - childPanel.setCellWidth(emptyLabel, "100%"); - return emptyLabel; + final Label emptyLabel = new Label(""); + this.add(emptyLabel); + childPanel.setCellWidth(emptyLabel, "100%"); + return emptyLabel; } public Widget addSeparator() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("ytb-sep"); - emptyLabel.addStyleName("k-toolbar-sep"); - this.add(emptyLabel); - return emptyLabel; + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-sep"); + emptyLabel.addStyleName("k-toolbar-sep"); + this.add(emptyLabel); + return emptyLabel; } public Widget addSpacer() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("ytb-spacer"); - this.add(emptyLabel); - return emptyLabel; + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-spacer"); + this.add(emptyLabel); + return emptyLabel; } public void addStyleName(final String cls) { - container.addClass(cls); + container.addClass(cls); } public void doLayoutIfNeeded() { - if (container.isRendered()) { - container.doLayout(false); - } + if (container.isRendered()) { + container.doLayout(false); + } } public Panel getPanel() { - return container; + return container; } public void remove(final Widget widget) { - childPanel.remove(widget); - doLayoutIfNeeded(); + childPanel.remove(widget); + doLayoutIfNeeded(); } public void removeAll() { - childPanel.clear(); - doLayoutIfNeeded(); + childPanel.clear(); + doLayoutIfNeeded(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2008-10-11 17:04:26 UTC (rev 903) @@ -1,6 +1,5 @@ package org.ourproject.kune.workspace.client.skel; -import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; import org.ourproject.kune.workspace.client.themes.WsTheme; import com.calclab.suco.client.listener.Listener0; @@ -13,97 +12,117 @@ import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.Toolbar; import com.gwtext.client.widgets.Viewport; +import com.gwtext.client.widgets.event.ContainerListenerAdapter; +import com.gwtext.client.widgets.layout.AnchorLayout; +import com.gwtext.client.widgets.layout.AnchorLayoutData; import com.gwtext.client.widgets.layout.FitLayout; public class WorkspaceSkeleton { + public static final int DEF_TOOLBAR_HEIGHT = 26; private final Entity entity; - private final SiteBar sitebar; - private final DefaultBorderLayout mainPanel; + private final SimpleToolbar sitebar; + private final Panel mainPanel; private final Panel container; private final ExtElement extRootBody; public WorkspaceSkeleton() { - extRootBody = new ExtElement(RootPanel.getBodyElement()); - container = new Panel(); - container.setLayout(new FitLayout()); - container.setBorder(false); - container.setPaddings(5); - mainPanel = new DefaultBorderLayout(); - sitebar = new SiteBar(); - entity = new Entity(); - mainPanel.add(sitebar, DefaultBorderLayout.Position.NORTH, DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); - mainPanel.add(entity.getPanel(), DefaultBorderLayout.Position.CENTER); - container.add(mainPanel.getPanel()); - new Viewport(container); + extRootBody = new ExtElement(RootPanel.getBodyElement()); + + container = new Panel(); + container.setLayout(new FitLayout()); + container.setBorder(false); + container.setPaddings(5); + + mainPanel = new Panel(); + mainPanel.setLayout(new AnchorLayout()); + mainPanel.setBorder(false); + + sitebar = new SimpleToolbar(); + sitebar.setStyleName("k-sitebar"); + sitebar.setHeight("" + DEF_TOOLBAR_HEIGHT); + + entity = new Entity(); + + mainPanel.add(sitebar, new AnchorLayoutData("100%")); + mainPanel.add(entity.getPanel(), new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); + container.add(mainPanel); + new Viewport(container); } + public void addInSummary(Widget widget) { + entity.addInSummary(widget); + } + + public void addInTools(final Widget widget) { + entity.addInTools(widget); + } + + public void addListenerInEntitySummary(ContainerListenerAdapter listener) { + entity.addListenerInEntitySummary(listener); + } + public void addToEntityMainHeader(final Widget widget) { - entity.addToEntityMainHeader(widget); + entity.addToEntityMainHeader(widget); } public void askConfirmation(final String title, final String message, final Listener0 onConfirmed, - final Listener0 onCancel) { - MessageBox.confirm(title, message, new MessageBox.ConfirmCallback() { - public void execute(final String btnID) { - if (btnID.equals("yes")) { - DeferredCommand.addCommand(new Command() { - public void execute() { - onConfirmed.onEvent(); - } - }); - } else { - onCancel.onEvent(); - } - } - }); + final Listener0 onCancel) { + MessageBox.confirm(title, message, new MessageBox.ConfirmCallback() { + public void execute(final String btnID) { + if (btnID.equals("yes")) { + DeferredCommand.addCommand(new Command() { + public void execute() { + onConfirmed.onEvent(); + } + }); + } else { + onCancel.onEvent(); + } + } + }); } - public EntitySummary getEntitySummary() { - return entity.getEntitySummary(); - } - public EntityWorkspace getEntityWorkspace() { - return entity.getEntityWorkspace(); + return entity.getEntityWorkspace(); } - public SiteBar getSiteBar() { - return sitebar; + public SimpleToolbar getSiteBar() { + return sitebar; } public Toolbar getSiteTraybar() { - return entity.getEntitySummary().getSiteTraybar(); + return entity.getSiteTraybar(); } public void mask() { - extRootBody.mask(); + extRootBody.mask(); } public void mask(final String message) { - extRootBody.mask(message, "x-mask-loading"); + extRootBody.mask(message, "x-mask-loading"); } public void promptMessage(final String title, final String message, final Listener0 onEnter) { - MessageBox.prompt(title, message, new MessageBox.PromptCallback() { - public void execute(final String btnID, final String text) { - // FIXME: use btnID - onEnter.onEvent(); - } - }); + MessageBox.prompt(title, message, new MessageBox.PromptCallback() { + public void execute(final String btnID, final String text) { + // FIXME: use btnID + onEnter.onEvent(); + } + }); } public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - entity.setTheme(oldTheme, newTheme); + entity.setTheme(oldTheme, newTheme); } public void showAlertMessage(final String title, final String message) { - MessageBox.alert(title, message, new MessageBox.AlertCallback() { - public void execute() { - } - }); + MessageBox.alert(title, message, new MessageBox.AlertCallback() { + public void execute() { + } + }); } public void unMask() { - extRootBody.unmask(); + extRootBody.unmask(); } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -9,7 +9,6 @@ import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; -import org.ourproject.kune.workspace.client.skel.EntitySummary; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; @@ -33,115 +32,117 @@ private final HashMap<GridButton, ToolbarButton> buttonsCache; public GroupMembersSummaryPanel(final GroupMembersSummaryPresenter presenter, final I18nUITranslationService i18n, - final WorkspaceSkeleton ws) { - super(true); - this.presenter = presenter; - this.i18n = i18n; - super.setHeaderText(i18n.t("Group members")); - super.setHeaderTitle(i18n.t("People and groups collaborating in this group")); - super.setBorderStylePrimaryName("k-dropdownouter-members"); - super.addStyleName("kune-Margin-Medium-t"); + final WorkspaceSkeleton ws) { + super(true); + this.presenter = presenter; + this.i18n = i18n; + super.setHeaderText(i18n.t("Group members")); + super.setHeaderTitle(i18n.t("People and groups collaborating in this group")); + super.setBorderStylePrimaryName("k-dropdownouter-members"); + super.addStyleName("kune-Margin-Medium-t"); - final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, i18n - .t("Drop in the chat area to start a chat.") - + "<br/>" + i18n.t("Drop into a room to invite the user to join the chat room")); - gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " - + "please request to join to work on it"), dragConf, true, true, false, true, false); - gridMenuPanel.onDoubleClick(new Listener<String>() { - public void onEvent(final String groupShortName) { - presenter.onDoubleClick(groupShortName); - } - }); - final EntitySummary entitySummary = ws.getEntitySummary(); - this.setContent(gridMenuPanel); - entitySummary.addInSummary(this); - entitySummary.addListener(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - gridMenuPanel.setWidth(adjWidth); - } - }); - buttonsCache = new HashMap<GridButton, ToolbarButton>(); + final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, i18n + .t("Drop in the chat area to start a chat.") + + "<br/>" + i18n.t("Drop into a room to invite the user to join the chat room")); + gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested " + + "please request to join to work on it"), dragConf, true, true, false, true, false); + gridMenuPanel.onDoubleClick(new Listener<String>() { + public void onEvent(final String groupShortName) { + presenter.onDoubleClick(groupShortName); + } + }); + this.setContent(gridMenuPanel); + ws.addInSummary(this); + ws.addListenerInEntitySummary(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + gridMenuPanel.setWidth(adjWidth); + } + }); + buttonsCache = new HashMap<GridButton, ToolbarButton>(); } public void addButton(final GridButton gridButton) { - // Workaround: gwt-ext don't have toolbar.removeItem method ... - ToolbarButton button = buttonsCache.get(gridButton); - if (button == null) { - button = new ToolbarButton(gridButton.getTitle()); - button.setIcon(gridButton.getIcon()); - button.setTooltip(gridButton.getTooltip()); - button.addListener(new ButtonListenerAdapter() { - public void onClick(final Button button, final EventObject e) { - DeferredCommand.addCommand(new Command() { - public void execute() { - gridButton.getListener().onEvent(""); - } - }); - } - }); - buttonsCache.put(gridButton, button); - } else { - button.setVisible(true); - } - gridMenuPanel.getBottomBar().addButton(button); + // Workaround: gwt-ext don't have toolbar.removeItem method ... + ToolbarButton button = buttonsCache.get(gridButton); + if (button == null) { + button = new ToolbarButton(gridButton.getTitle()); + button.setIcon(gridButton.getIcon()); + button.setTooltip(gridButton.getTooltip()); + button.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(final Button button, final EventObject e) { + DeferredCommand.addCommand(new Command() { + public void execute() { + gridButton.getListener().onEvent(""); + } + }); + } + }); + buttonsCache.put(gridButton, button); + } else { + button.setVisible(true); + } + gridMenuPanel.getBottomBar().addButton(button); } public void addItem(final GridItem<GroupDTO> gridItem) { - gridMenuPanel.addItem(gridItem); + gridMenuPanel.addItem(gridItem); } public void addToolbarFill() { - gridMenuPanel.getBottomBar().addFill(); + gridMenuPanel.getBottomBar().addFill(); } public void clear() { - gridMenuPanel.removeAll(); - for (final ToolbarButton button : buttonsCache.values()) { - // Workaround: gwt-ext don't have toolbar.removeItem method ... - // gridMenuPanel.getBottomBar().getEl().removeChild(button.getElement()); - button.setVisible(false); - button.removeFromParent(); - } + gridMenuPanel.removeAll(); + for (final ToolbarButton button : buttonsCache.values()) { + // Workaround: gwt-ext don't have toolbar.removeItem method ... + // gridMenuPanel.getBottomBar().getEl().removeChild(button.getElement()); + button.setVisible(false); + button.removeFromParent(); + } } public void confirmAddCollab(final String groupShortName, final String groupLongName) { - final String groupName = groupLongName + " (" + groupShortName + ")"; - MessageBox.confirm(i18n.t("Confirm addition of member"), i18n.t("Add [%s] as member?", groupName), - new MessageBox.ConfirmCallback() { - public void execute(final String btnID) { - if (btnID.equals("yes")) { - DeferredCommand.addCommand(new Command() { - public void execute() { - presenter.addCollab(groupShortName); - } - }); - } - } - }); + final String groupName = groupLongName + " (" + groupShortName + ")"; + MessageBox.confirm(i18n.t("Confirm addition of member"), i18n.t("Add [%s] as member?", groupName), + new MessageBox.ConfirmCallback() { + public void execute(final String btnID) { + if (btnID.equals("yes")) { + DeferredCommand.addCommand(new Command() { + public void execute() { + presenter.addCollab(groupShortName); + } + }); + } + } + }); } public void setDefaultHeigth() { - // super.setContentHeight(""); - // gridMenuPanel.setHeight("auto"); - // gridMenuPanel.doLayoutIfNeeded(); + // super.setContentHeight(""); + // gridMenuPanel.setHeight("auto"); + // gridMenuPanel.doLayoutIfNeeded(); } public void setDraggable(final boolean draggable) { - // gridMenuPanel.setDraggable(draggable); + // gridMenuPanel.setDraggable(draggable); } public void setMaxHeigth() { - // super.setContentHeight("" + MAX_HEIGHT); - // gridMenuPanel.setHeight(MAX_HEIGHT - 26); + // super.setContentHeight("" + MAX_HEIGHT); + // gridMenuPanel.setHeight(MAX_HEIGHT - 26); } + @Override public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - super.setTheme(oldTheme, newTheme); + super.setTheme(oldTheme, newTheme); } + @Override public void setVisible(final boolean visible) { - super.setVisible(visible); + super.setVisible(visible); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -24,7 +24,6 @@ import org.ourproject.kune.platf.client.ui.DropDownPanel; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; -import org.ourproject.kune.workspace.client.skel.EntitySummary; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.gwtext.client.widgets.BoxComponent; @@ -35,41 +34,40 @@ private final GridMenuPanel<GroupDTO> gridMenuPanel; public ParticipationSummaryPanel(final ParticipationSummaryPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - super(true); - // super.setHeaderText(i18n.t("Participates as...")); - super.setHeaderText(i18n.t("Participates in")); - super.setHeaderTitle(i18n.t("Groups in which participates")); - super.setBorderStylePrimaryName("k-dropdownouter-part"); - super.addStyleName("kune-Margin-Medium-t"); - gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false, - false, false, false); - final EntitySummary entitySummary = ws.getEntitySummary(); - this.setContent(gridMenuPanel); - entitySummary.addInSummary(this); - entitySummary.addListener(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - gridMenuPanel.setWidth(adjWidth); - } - }); + final WorkspaceSkeleton ws) { + super(true); + // super.setHeaderText(i18n.t("Participates as...")); + super.setHeaderText(i18n.t("Participates in")); + super.setHeaderTitle(i18n.t("Groups in which participates")); + super.setBorderStylePrimaryName("k-dropdownouter-part"); + super.addStyleName("kune-Margin-Medium-t"); + gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false, + false, false, false); + this.setContent(gridMenuPanel); + ws.addInSummary(this); + ws.addListenerInEntitySummary(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + gridMenuPanel.setWidth(adjWidth); + } + }); } public void addItem(final GridItem<GroupDTO> gridItem) { - gridMenuPanel.addItem(gridItem); + gridMenuPanel.addItem(gridItem); } public void clear() { - gridMenuPanel.removeAll(); + gridMenuPanel.removeAll(); } public void hide() { - this.setVisible(false); + this.setVisible(false); } public void show() { - this.setVisible(true); + this.setVisible(true); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -20,7 +20,6 @@ package org.ourproject.kune.workspace.client.tags; -import java.util.Iterator; import java.util.List; import org.ourproject.kune.platf.client.dto.TagResultDTO; @@ -45,50 +44,49 @@ private final I18nTranslationService i18n; public TagsSummaryPanel(final TagsSummaryPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - super(i18n.t("Tags"), true); - this.i18n = i18n; - setHeaderTitle(i18n.t("Keywords or terms associated with this group")); - this.presenter = presenter; - flowPanel = new FlowPanel(); - final VerticalPanel vp = new VerticalPanel(); - noTagsLabel = new Label(i18n.t("The contents of this group don't have any tag")); - vp.add(flowPanel); - vp.setWidth("100%"); - vp.setCellWidth(flowPanel, "100%"); - super.setContent(vp); - super.setBorderStylePrimaryName("k-dropdownouter-tags"); - addStyleName("kune-Margin-Medium-t"); - flowPanel.addStyleName("kune-Margin-Small-trbl"); - ws.getEntitySummary().addInSummary(this); + final WorkspaceSkeleton ws) { + super(i18n.t("Tags"), true); + this.i18n = i18n; + setHeaderTitle(i18n.t("Keywords or terms associated with this group")); + this.presenter = presenter; + flowPanel = new FlowPanel(); + final VerticalPanel vp = new VerticalPanel(); + noTagsLabel = new Label(i18n.t("The contents of this group don't have any tag")); + vp.add(flowPanel); + vp.setWidth("100%"); + vp.setCellWidth(flowPanel, "100%"); + super.setContent(vp); + super.setBorderStylePrimaryName("k-dropdownouter-tags"); + addStyleName("kune-Margin-Medium-t"); + flowPanel.addStyleName("kune-Margin-Small-trbl"); + ws.addInSummary(this); } public void setTags(final List<TagResultDTO> groupTags) { - DeferredCommand.addCommand(new Command() { - public void execute() { - flowPanel.clear(); - if (groupTags.size() == 0) { - flowPanel.add(noTagsLabel); - } else { - for (final Iterator<TagResultDTO> iterator = groupTags.iterator(); iterator.hasNext();) { - final TagResultDTO tagResult = iterator.next(); - final Label label = new Label(tagResult.getName()); - // i18n pluralization - if (tagResult.getCount().intValue() > 1) { - KuneUiUtils.setQuickTip(label, i18n.t("[%d] items with this tag", tagResult.getCount())); - } else { - KuneUiUtils.setQuickTip(label, i18n.t("[%d] item with this tag", tagResult.getCount())); - } - label.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { - presenter.doSearchTag(tagResult.getName()); - } - }); - label.addStyleName("kune-TagsPanel-tag"); - flowPanel.add(label); - } - } - } - }); + DeferredCommand.addCommand(new Command() { + public void execute() { + flowPanel.clear(); + if (groupTags.size() == 0) { + flowPanel.add(noTagsLabel); + } else { + for (final TagResultDTO tagResult : groupTags) { + final Label label = new Label(tagResult.getName()); + // i18n pluralization + if (tagResult.getCount().intValue() > 1) { + KuneUiUtils.setQuickTip(label, i18n.t("[%d] items with this tag", tagResult.getCount())); + } else { + KuneUiUtils.setQuickTip(label, i18n.t("[%d] item with this tag", tagResult.getCount())); + } + label.addClickListener(new ClickListener() { + public void onClick(final Widget sender) { + presenter.doSearchTag(tagResult.getName()); + } + }); + label.addStyleName("kune-TagsPanel-tag"); + flowPanel.add(label); + } + } + } + }); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -20,7 +20,6 @@ package org.ourproject.kune.workspace.client.title; -import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.workspace.client.skel.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; @@ -30,39 +29,38 @@ private final Label subTitleLeftLabel; private final Label subTitleRightLabel; - public EntitySubTitlePanel(final EntitySubTitlePresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { - subTitleLeftLabel = new Label(); - subTitleRightLabel = new Label(); + public EntitySubTitlePanel(final EntitySubTitlePresenter presenter, final WorkspaceSkeleton ws) { + subTitleLeftLabel = new Label(); + subTitleRightLabel = new Label(); - final SimpleToolbar wsSubTitle = ws.getEntityWorkspace().getSubTitle(); - wsSubTitle.add(subTitleLeftLabel); - wsSubTitle.addFill(); - wsSubTitle.add(subTitleRightLabel); + final SimpleToolbar wsSubTitle = ws.getEntityWorkspace().getSubTitle(); + wsSubTitle.add(subTitleLeftLabel); + wsSubTitle.addFill(); + wsSubTitle.add(subTitleRightLabel); - subTitleRightLabel.setText(i18n.t("Language:")); + subTitleRightLabel.setText(""); - subTitleLeftLabel.addStyleName("kune-Margin-Large-l"); - subTitleLeftLabel.addStyleName("kune-ft15px"); - subTitleRightLabel.addStyleName("kune-Margin-Large-r"); - subTitleRightLabel.addStyleName("kune-ft12px"); + subTitleLeftLabel.addStyleName("kune-Margin-Large-l"); + subTitleLeftLabel.addStyleName("kune-ft15px"); + subTitleRightLabel.addStyleName("kune-Margin-Large-r"); + subTitleRightLabel.addStyleName("kune-ft12px"); } public void setContentSubTitleLeft(final String subTitle) { - subTitleLeftLabel.setText(subTitle); + subTitleLeftLabel.setText(subTitle); } public void setContentSubTitleLeftVisible(final boolean visible) { - subTitleLeftLabel.setVisible(visible); + subTitleLeftLabel.setVisible(visible); } public void setContentSubTitleRight(final String subTitle) { - subTitleRightLabel.setText(subTitle); + subTitleRightLabel.setText(subTitle); } public void setContentSubTitleRightVisible(final boolean visible) { - subTitleRightLabel.setVisible(visible); + subTitleRightLabel.setVisible(visible); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2008-10-11 17:04:26 UTC (rev 903) @@ -31,43 +31,48 @@ private EntitySubTitleView view; private final I18nTranslationService i18n; + private final boolean showLanguage; - public EntitySubTitlePresenter(final I18nTranslationService i18n, final StateManager stateManager) { - this.i18n = i18n; - stateManager.onStateChanged(new Listener<StateDTO>() { - public void onEvent(final StateDTO state) { - setState(state); - } - }); + public EntitySubTitlePresenter(final I18nTranslationService i18n, final StateManager stateManager, + boolean showLanguage) { + this.i18n = i18n; + this.showLanguage = showLanguage; + stateManager.onStateChanged(new Listener<StateDTO>() { + public void onEvent(final StateDTO state) { + setState(state); + } + }); } public View getView() { - return view; + return view; } public void init(final EntitySubTitleView view) { - this.view = view; + this.view = view; } public void setContentLanguage(final String langName) { - view.setContentSubTitleRight(i18n.t("Language: [%s]", langName)); + if (showLanguage) { + view.setContentSubTitleRight(i18n.t("Language: [%s]", langName)); + } } private void setState(final StateDTO state) { - if (state.hasDocument()) { - view.setContentSubTitleLeft(i18n.tWithNT("by: [%s]", "used in a list of authors", state.getAuthors().get(0) - .getName())); - view.setContentSubTitleLeftVisible(true); - } else { - view.setContentSubTitleLeftVisible(false); - } - if (state.getLanguage() != null) { - final String langName = state.getLanguage().getEnglishName(); - setContentLanguage(langName); - view.setContentSubTitleRightVisible(true); - } else { - view.setContentSubTitleRightVisible(false); - } + if (state.hasDocument()) { + view.setContentSubTitleLeft(i18n.tWithNT("by: [%s]", "used in a list of authors", state.getAuthors().get(0) + .getName())); + view.setContentSubTitleLeftVisible(true); + } else { + view.setContentSubTitleLeftVisible(false); + } + if (state.getLanguage() != null && showLanguage) { + final String langName = state.getLanguage().getEnglishName(); + setContentLanguage(langName); + view.setContentSubTitleRightVisible(true); + } else { + view.setContentSubTitleRightVisible(false); + } } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2008-10-11 17:04:26 UTC (rev 903) @@ -42,7 +42,7 @@ }); dateLabel = new Label(); - final SimpleToolbar wsTitle = ws.getEntityWorkspace().getTitle(); + final SimpleToolbar wsTitle = ws.getEntityWorkspace().getTitleComponent(); wsTitle.add(icon); wsTitle.add(titleLabel); wsTitle.addFill(); Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2008-10-06 17:05:30 UTC (rev 902) +++ trunk/src/main/resources/kune.properties 2008-10-11 17:04:26 UTC (rev 903) @@ -25,5 +25,5 @@ kune.sitelogourl = images/kune-logo-16px.png kune.upload.location = /var/lib/kune/uploads/ -kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff +kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav kune.upload.maxfilesizeinmegas = 10

1 0

06 Oct '08

Author: vjrj Date: 2008-10-06 19:05:30 +0200 (Mon, 06 Oct 2008) New Revision: 902 Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java Removed: trunk/config/ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java Modified: trunk/INSTALL trunk/pom.xml trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java trunk/src/main/resources/META-INF/persistence.xml trunk/src/main/webapp/WEB-INF/web.xml trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java Log: Incomplete - task 21: OutOfMemory running junit test http://code.google.com/p/kune/issues/detail?id=21 Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/INSTALL 2008-10-06 17:05:30 UTC (rev 902) @@ -48,8 +48,8 @@ # yourUser is the user you are using to develop/run the application sudo mkdir -p /var/lib/kune/lucene/kune_dev/indexes sudo mkdir -p /var/lib/kune/lucene/kune_test/indexes - sudo chown yourUser:yourUser /var/lib/lucene/kune_dev/indexes - sudo chown yourUser:yourUser /var/lib/lucene/kune_test/indexes + sudo chown yourUser:yourUser /var/lib/kune/lucene/kune_dev/indexes + sudo chown yourUser:yourUser /var/lib/kune/lucene/kune_test/indexes In case you are using windows as dev platform you only have to create a couple of folders anywhere you like and then specify them in persistence.xml, as follows: <property name="hibernate.search.default.indexBase" value="C:\kune\kune-index"/> @@ -58,7 +58,7 @@ - Install and run a openfire jabber server (see Appendix B for proper configuration of openfire) or ejabberd. - Run jetty: - mvn jetty:run -Ddatabase.migrator.should.run=false # without liquibase db migraton (liquibase.should.run=false in new version) + mvn jetty:run -Dliquibase.should.run=false once started (and initialized the db), you can stop a run jetty with de db migrator to insert initial data and migrate: mvn jetty:run Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/pom.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.ourproject</groupId> <artifactId>kune</artifactId> @@ -42,10 +43,8 @@ <version>1.5.2</version> </dependency>  <dependency> @@ -226,11 +225,11 @@ <artifactId>liquibase-core</artifactId> <version>1.7.0</version> </dependency> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - </dependency> + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-plugin</artifactId> + <version>1.7.0.0</version> + </dependency>  <dependency> @@ -288,7 +287,9 @@ </dependency> </dependencies> -  +  <repositories> <repository> <id>repository.jboss.org</id> @@ -347,6 +348,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.3</version> + <configuration> + <forkMode>pertest</forkMode> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -439,11 +443,8 @@ <verbose>true</verbose> </configuration>  <goals> @@ -487,7 +488,8 @@ <include>**/LabelWrapper*.**</include> <include>**/KuneUiUtils.**</include> <include>**/View.**</include> -  + <forkMode>pertest</forkMode> +  <skip>true</skip> </configuration> - <executions> <execution> <phase>integration-test</phase> @@ -592,6 +597,7 @@ </value> </property> </systemProperties> + <forkMode>pertest</forkMode> </configuration> </plugin> <plugin> Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -1,12 +1,13 @@ +<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> <module> <inherits name='com.google.gwt.i18n.I18N' /> <inherits name='com.google.gwt.user.User' /> - +  <inherits name="com.google.gwt.user.Debug"/> - +  - <set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" /> + <set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" /> <inherits name="com.calclab.suco.Suco" /> @@ -18,7 +19,7 @@ <inherits name='com.gwtext.GwtExt' /> <script src="js/ext/adapter/ext/ext-base.js" /> <script src="js/ext/ext-all.js" /> - + <inherits name="com.gwtextux.GwtExtUx" /> <inherits name="com.gwtextux.UploadDialog"/> <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> @@ -45,5 +46,5 @@   - + </module> Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-06 17:05:30 UTC (rev 902) @@ -3,2159 +3,25 @@ Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt version: 2.3.1 -*/ -body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input, textarea, select{font-family:inherit;font-size:inherit;font-weight:inherit;} - -/* +*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}/* Copyright (c) 2007, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt version: 2.3.1 -*/ -body {font:13px/1.22 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}table {font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:99%;} - - -/* - * Ext JS Library 2.0.2 - * Copyright(c) 2006-2008, Ext JS, LLC. - * licensing(a)extjs.com - * - * http://extjs.com/license - */ - -html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;} -img,body,html{border:0;} -address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;} -ol,ul{list-style:none;} -caption,th{text-align:left;} -h1,h2,h3,h4,h5,h6{font-size:100%;} -q:before,q:after{content:'';} - -.ext-el-mask{z-index:20000;position:absolute;top:0;left:0;-moz-opacity:0.5;opacity:.50;filter:alpha(opacity=50);background-color:#CCC;width:100%;height:100%;zoom:1;} -.ext-el-mask-msg{z-index:20001;position:absolute;top:0;left:0;border:1px solid #6593cf;background:#c3daf9 url(../js/ext/resources/images/default/box/tb-blue.gif) repeat-x 0 -16px;padding:2px;} -.ext-el-mask-msg div{padding:5px 10px 5px 10px;background:#eee;border:1px solid #a3bad9;color:#222;font:normal 100% arial,sans;cursor:wait;} -.ext-shim{position:absolute;visibility:hidden;left:0;top:0;overflow:hidden;} -.ext-ie .ext-shim{filter:alpha(opacity=0);} -.ext-ie6 .ext-shim{margin-left:5px;margin-top:3px;} -.x-mask-loading div{padding:5px 10px 5px 25px;background:#fbfbfb url( '../js/ext/resources/images/default/grid/loading.gif' ) no-repeat 5px 5px;line-height:16px;} -.x-hidden,.x-hide-offsets{position:absolute;left:-10000px;top:-10000px;visibility:hidden;} -.x-hide-display{display:none!important;} -.x-hide-visibility{visibility:hidden!important;} -.x-masked{overflow:hidden!important;} -.x-masked select,.x-masked object,.x-masked embed{visibility:hidden;} -.x-layer{visibility:hidden;} -.x-unselectable,.x-unselectable *{-moz-user-select:none;-khtml-user-select:none;} -.x-repaint{zoom:1;background-color:transparent;-moz-outline:none;} -.x-item-disabled{color:gray;cursor:default;opacity:.6;-moz-opacity:.6;filter:alpha(opacity=60);} -.x-item-disabled *{color:gray!important;cursor:default!important;} -.x-splitbar-proxy{position:absolute;visibility:hidden;z-index:20001;background:#aaa;zoom:1;line-height:1px;font-size:1px;overflow:hidden;} -.x-splitbar-h,.x-splitbar-proxy-h{cursor:e-resize;cursor:col-resize;} -.x-splitbar-v,.x-splitbar-proxy-v{cursor:s-resize;cursor:row-resize;} -.x-color-palette{width:150px;height:92px;cursor:pointer;} -.x-color-palette a{border:1px solid #fff;float:left;padding:2px;text-decoration:none;-moz-outline:0 none;outline:0 none;cursor:pointer;} -.x-color-palette a:hover,.x-color-palette a.x-color-palette-sel{border:1px solid #8BB8F3;background:#deecfd;} -.x-color-palette em{display:block;border:1px solid #ACA899;} -.x-color-palette em span{cursor:pointer;display:block;height:10px;line-height:10px;width:10px;} -.x-ie-shadow{display:none;position:absolute;overflow:hidden;left:0;top:0;background:#777;zoom:1;} -.x-shadow{display:none;position:absolute;overflow:hidden;left:0;top:0;} -.x-shadow *{overflow:hidden;} -.x-shadow *{padding:0;border:0;margin:0;clear:none;zoom:1;} -.x-shadow .xstc,.x-shadow .xsbc{height:6px;float:left;} -.x-shadow .xstl,.x-shadow .xstr,.x-shadow .xsbl,.x-shadow .xsbr{width:6px;height:6px;float:left;} -.x-shadow .xsc{width:100%;} -.x-shadow .xsml,.x-shadow .xsmr{width:6px;float:left;height:100%;} -.x-shadow .xsmc{float:left;height:100%;background:transparent url( ../js/ext/resources/images/default/shadow-c.png );} -.x-shadow .xst,.x-shadow .xsb{height:6px;overflow:hidden;width:100%;} -.x-shadow .xsml{background:transparent url( ../js/ext/resources/images/default/shadow-lr.png ) repeat-y 0 0;} -.x-shadow .xsmr{background:transparent url( ../js/ext/resources/images/default/shadow-lr.png ) repeat-y -6px 0;} -.x-shadow .xstl{background:transparent url( ../js/ext/resources/images/default/shadow.png ) no-repeat 0 0;} -.x-shadow .xstc{background:transparent url( ../js/ext/resources/images/default/shadow.png ) repeat-x 0 -30px;} -.x-shadow .xstr{background:transparent url( ../js/ext/resources/images/default/shadow.png ) repeat-x 0 -18px;} -.x-shadow .xsbl{background:transparent url( ../js/ext/resources/images/default/shadow.png ) no-repeat 0 -12px;} -.x-shadow .xsbc{background:transparent url( ../js/ext/resources/images/default/shadow.png ) repeat-x 0 -36px;} -.x-shadow .xsbr{background:transparent url( ../js/ext/resources/images/default/shadow.png ) repeat-x 0 -6px;} -.loading-indicator{font-size:100%;background-image:url(../js/ext/resources/images/default/grid/loading.gif);background-repeat:no-repeat;background-position:left;padding-left:20px;line-height:16px;margin:3px;} -.x-text-resize{position:absolute;left:-1000px;top:-1000px;visibility:hidden;zoom:1;} -.x-drag-overlay{width:100%;height:100%;display:none;position:absolute;left:0;top:0;background-image:url(../js/ext/resources/images/default/s.gif);z-index:20000;} -.x-clear{clear:both;height:0;overflow:hidden;line-height:0;font-size:0;} -.x-spotlight{z-index:8999;position:absolute;top:0;left:0;-moz-opacity:0.5;opacity:.50;filter:alpha(opacity=50);background-color:#CCC;width:0;height:0;zoom:1;} - -.x-tab-panel{overflow:hidden;} -.x-tab-panel-header,.x-tab-panel-footer{background:#deecfd;border:1px solid #8db2e3;overflow:hidden;zoom:1;} -.x-tab-panel-header{border:1px solid #8db2e3;padding-bottom:2px;} -.x-tab-panel-footer{border:1px solid #8db2e3;padding-top:2px;} -.x-tab-strip-wrap{width:100%;overflow:hidden;position:relative;zoom:1;} -ul.x-tab-strip{display:block;width:5000px;zoom:1;} -ul.x-tab-strip-top{padding-top:1px;background:url(../js/ext/resources/images/default/tabs/tab-strip-bg.gif) #cedff5 repeat-x bottom;border-bottom:1px solid #8db2e3;} -ul.x-tab-strip-bottom{padding-bottom:1px;background:url(../js/ext/resources/images/default/tabs/tab-strip-btm-bg.gif) #cedff5 repeat-x top;border-top:1px solid #8db2e3;border-bottom:0 none;} -.x-tab-panel-header-plain .x-tab-strip-top{background:transparent!important;padding-top:0!important;} -.x-tab-panel-header-plain{background:transparent!important;border-width:0!important;padding-bottom:0!important;} -.x-tab-panel-header-plain .x-tab-strip-spacer{border:1px solid #8db2e3;border-top:0 none;height:2px;background:#deecfd;font-size:1px;line-height:1px;} -.ext-border-box .x-tab-panel-header-plain .x-tab-strip-spacer{height:3px;} -ul.x-tab-strip li{float:left;margin-left:2px;} -ul.x-tab-strip li.x-tab-edge{float:left;margin:0!important;padding:0!important;border:0 none!important;font-size:1px!important;line-height:1px!important;overflow:hidden;zoom:1;background:transparent!important;width:1px;} -.x-tab-strip a,.x-tab-strip span,.x-tab-strip em{display:block;} -.x-tab-strip a{text-decoration:none!important;-moz-outline:none;outline:none;cursor:pointer;} -.x-tab-strip-inner{overflow:hidden;text-overflow:ellipsis;} -.x-tab-strip span.x-tab-strip-text{font:normal 100% arial,sans;color:#416aa3;white-space:nowrap;cursor:pointer;padding:4px 0;} -.x-tab-strip .x-tab-with-icon .x-tab-right{padding-left:6px;} -.x-tab-strip .x-tab-with-icon span.x-tab-strip-text{padding-left:20px;background-position:0 3px;background-repeat:no-repeat;} -.x-tab-strip-over span.x-tab-strip-text{color:#15428b;} -.x-tab-strip-active{cursor:default;} -.x-tab-strip-active span.x-tab-strip-text{cursor:default;color:#15428b;font-weight:bold;} -.x-tab-strip-disabled .x-tabs-text{cursor:default;color:#aaa;} -.x-tab-panel-body{overflow:hidden;} -.x-tab-panel-bwrap{overflow:hidden;} -.ext-ie .x-tab-strip .x-tab-right{position:relative;} -.x-tab-strip-top .x-tab-strip-active .x-tab-right{margin-bottom:-1px;} -.x-tab-strip-top .x-tab-strip-active .x-tab-right span.x-tab-strip-text{padding-bottom:5px;} -.x-tab-strip-bottom .x-tab-strip-active .x-tab-right{margin-top:-1px;} -.x-tab-strip-bottom .x-tab-strip-active .x-tab-right span.x-tab-strip-text{padding-top:5px;} -.x-tab-strip-top .x-tab-right{background:transparent url(../js/ext/resources/images/default/tabs/tabs-sprite.gif) no-repeat 0 -51px;padding-left:10px;} -.x-tab-strip-top .x-tab-left{background:transparent url(../js/ext/resources/images/default/tabs/tabs-sprite.gif) no-repeat right -351px;padding-right:10px;} -.x-tab-strip-top .x-tab-strip-inner{background:transparent url(../js/ext/resources/images/default/tabs/tabs-sprite.gif) repeat-x 0 -201px;} -.x-tab-strip-top .x-tab-strip-over .x-tab-right{background-position:0 -101px;} -.x-tab-strip-top .x-tab-strip-over .x-tab-left{background-position:right -401px;} -.x-tab-strip-top .x-tab-strip-over .x-tab-strip-inner{background-position:0 -251px;} -.x-tab-strip-top .x-tab-strip-active .x-tab-right{background-position:0 0;} -.x-tab-strip-top .x-tab-strip-active .x-tab-left{background-position:right -301px;} -.x-tab-strip-top .x-tab-strip-active .x-tab-strip-inner{background-position:0 -151px;} -.x-tab-strip-bottom .x-tab-right{background:url(../js/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif) no-repeat bottom right;} -.x-tab-strip-bottom .x-tab-left{background:url(../js/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif) no-repeat bottom left;} -.x-tab-strip-bottom .x-tab-strip-active .x-tab-right{background:url(../js/ext/resources/images/default/tabs/tab-btm-right-bg.gif) no-repeat bottom left;} -.x-tab-strip-bottom .x-tab-strip-active .x-tab-left{background:url(../js/ext/resources/images/default/tabs/tab-btm-left-bg.gif) no-repeat bottom right;} -.x-tab-strip-bottom .x-tab-left{padding:0 10px;} -.x-tab-strip-bottom .x-tab-right{padding:0;} -.x-tab-strip .x-tab-strip-close{display:none;} -.x-tab-strip-closable{position:relative;} -.x-tab-strip-closable .x-tab-left{padding-right:19px;} -.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close{background-image:url(../js/ext/resources/images/default/tabs/tab-close.gif);opacity:.6;-moz-opacity:.6;background-repeat:no-repeat;display:block;width:11px;height:11px;position:absolute;top:3px;right:3px;cursor:pointer;z-index:2;} -.x-tab-strip .x-tab-strip-active a.x-tab-strip-close{opacity:.8;-moz-opacity:.8;} -.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover{background-image:url(../js/ext/resources/images/default/tabs/tab-close.gif);opacity:1;-moz-opacity:1;} -.x-tab-panel-body{border:1px solid #8db2e3;background:#fff;} -.x-tab-panel-body-top{border-top:0 none;} -.x-tab-panel-body-bottom{border-bottom:0 none;} -.x-tab-scroller-left{background:transparent url(../js/ext/resources/images/default/tabs/scroll-left.gif) no-repeat -18px 0;border-bottom:1px solid #8db2e3;width:18px;position:absolute;left:0;top:0;z-index:10;cursor:pointer;} -.x-tab-scroller-left-over{background-position:0 0;} -.x-tab-scroller-left-disabled{background-position:-18px 0;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);cursor:default;} -.x-tab-scroller-right{background:transparent url(../js/ext/resources/images/default/tabs/scroll-right.gif) no-repeat 0 0;border-bottom:1px solid #8db2e3;width:18px;position:absolute;right:0;top:0;z-index:10;cursor:pointer;} -.x-tab-scroller-right-over{background-position:-18px 0;} -.x-tab-scroller-right-disabled{background-position:0 0;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);cursor:default;} -.x-tab-scrolling .x-tab-strip-wrap{margin-left:18px;margin-right:18px;} -.x-tab-scrolling{position:relative;} -.x-tab-panel-bbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;} -.x-tab-panel-tbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;} -.x-border-layout-ct .x-tab-panel{background:white;} - - .x-form-field{margin:0;font:normal 100% arial,sans;} -.x-form-text,textarea.x-form-field{padding:1px 3px;background:#fff url(../js/ext/resources/images/default/form/text-bg.gif) repeat-x 0 0;border:1px solid #B5B8C8;} -textarea.x-form-field{padding:2px 3px;} -.x-form-text{height:22px;line-height:18px;vertical-align:middle;} -.ext-ie .x-form-text{margin:-1px 0;height:22px;line-height:18px;} -.ext-ie textarea.x-form-field{margin:-1px 0;} -.ext-strict .x-form-text{height:18px;} -.ext-safari .x-form-text{height:20px;padding:0 3px;} -.ext-safari.ext-mac textarea.x-form-field{margin-bottom:-2px;} -.ext-gecko .x-form-text{padding-top:2px;padding-bottom:0;} -textarea{resize:none;} -.x-form-select-one{height:20px;line-height:18px;vertical-align:middle;background-color:#fff;border:1px solid #B5B8C8;} -.x-form-field-wrap{position:relative;zoom:1;white-space:nowrap;} -.x-editor .x-form-check-wrap{background:#fff;} -.x-form-field-wrap .x-form-trigger{width:17px;height:21px;border:0;background:transparent url(../js/ext/resources/images/default/form/trigger.gif) no-repeat 0 0;cursor:pointer;border-bottom:1px solid #B5B8C8;position:absolute;top:0;} -.ext-safari .x-form-field-wrap .x-form-trigger{height:21px;} -.x-form-field-wrap .x-form-date-trigger{background-image:url(../js/ext/resources/images/default/form/date-trigger.gif);cursor:pointer;} -.x-form-field-wrap .x-form-clear-trigger{background-image:url(../js/ext/resources/images/default/form/clear-trigger.gif);cursor:pointer;} -.x-form-field-wrap .x-form-search-trigger{background-image:url(../js/ext/resources/images/default/form/search-trigger.gif);cursor:pointer;} -.ext-safari .x-form-field-wrap .x-form-trigger{right:0;} -.x-form-field-wrap .x-form-twin-triggers .x-form-trigger{position:static;top:auto;vertical-align:top;} -.x-form-field-wrap .x-form-trigger-over{background-position:-17px 0;} -.x-form-field-wrap .x-form-trigger-click{background-position:-34px 0;} -.x-trigger-wrap-focus .x-form-trigger{background-position:-51px 0;} -.x-trigger-wrap-focus .x-form-trigger-over{background-position:-68px 0;} -.x-trigger-wrap-focus .x-form-trigger-click{background-position:-85px 0;} -.x-trigger-wrap-focus .x-form-trigger{border-bottom:1px solid #7eadd9;} -.x-item-disabled .x-form-trigger-over{background-position:0 0!important;border-bottom:1px solid #B5B8C8;} -.x-item-disabled .x-form-trigger-click{background-position:0 0!important;border-bottom:1px solid #B5B8C8;} -.x-form-focus,textarea.x-form-focus{border:1px solid #7eadd9;} -.x-form-invalid,textarea.x-form-invalid{background:#fff url(../js/ext/resources/images/default/grid/invalid_line.gif) repeat-x bottom;border:1px solid #dd7870;} -.ext-safari .x-form-invalid{background-color:#fee;border:1px solid #ff7870;} -.x-editor{visibility:hidden;padding:0;margin:0;} -.x-form-check-wrap{line-height:18px;} -.ext-ie .x-form-check-wrap input{width:15px;height:15px;} -.x-editor .x-form-check-wrap{padding:3px;} -.x-editor .x-form-checkbox{height:13px;} -.x-form-grow-sizer{font:normal 100% arial,sans;left:-10000px;padding:8px 3px;position:absolute;visibility:hidden;top:-10000px;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;zoom:1;} -.x-form-grow-sizer p{margin:0!important;border:0 none!important;padding:0!important;} -.x-form-item{font:normal 100% arial,sans;display:block;margin-bottom:4px;} -.x-form-item label{display:block;float:left;width:100px;padding:3px;padding-left:0;clear:left;z-index:2;position:relative;} -.x-form-element{padding-left:105px;position:relative;} -.x-form-invalid-msg{color:#e00;padding:2px;padding-left:18px;font:normal 100% arial,sans;background:transparent url(../js/ext/resources/images/default/shared/warning.gif) no-repeat 0 2px;line-height:16px;width:200px;} -.x-form-label-right label{text-align:right;} -.x-form-label-top .x-form-item label{width:auto;float:none;clear:none;display:inline;margin-bottom:4px;position:static;} -.x-form-label-top .x-form-element{padding-left:0;padding-top:4px;} -.x-form-label-top .x-form-item{padding-bottom:4px;} -.x-form-empty-field{color:gray;} -.x-small-editor .x-form-field{font:normal 100% arial,sans;} -.x-small-editor .x-form-text{height:20px;line-height:16px;vertical-align:middle;} -.ext-ie .x-small-editor .x-form-text{margin-top:-1px!important;margin-bottom:-1px!important;height:20px!important;line-height:16px!important;} -.ext-strict .x-small-editor .x-form-text{height:16px!important;} -.ext-safari .x-small-editor .x-form-field{font:normal 100% arial,sans;} -.ext-ie .x-small-editor .x-form-text{height:20px;line-height:16px;} -.ext-border-box .x-small-editor .x-form-text{height:20px;} -.x-small-editor .x-form-select-one{height:20px;line-height:16px;vertical-align:middle;} -.x-small-editor .x-form-num-field{text-align:right;} -.x-small-editor .x-form-field-wrap .x-form-trigger{height:19px;} -.x-form-clear{clear:both;height:0;overflow:hidden;line-height:0;font-size:0;} -.x-form-clear-left{clear:left;height:0;overflow:hidden;line-height:0;font-size:0;} -.x-form-cb-label{width:'auto'!important;float:none!important;clear:none!important;display:inline!important;margin-left:4px;} -.x-form-column{float:left;padding:0;margin:0;width:48%;overflow:hidden;zoom:1;} -.x-form .x-form-btns-ct .x-btn{float:right;clear:none;} -.x-form .x-form-btns-ct .x-form-btns td{border:0;padding:0;} -.x-form .x-form-btns-ct .x-form-btns-right table{float:right;clear:none;} -.x-form .x-form-btns-ct .x-form-btns-left table{float:left;clear:none;} -.x-form .x-form-btns-ct .x-form-btns-center{text-align:center;} -.x-form .x-form-btns-ct .x-form-btns-center table{margin:0 auto;} -.x-form .x-form-btns-ct table td.x-form-btn-td{padding:3px;} -.x-form .x-form-btns-ct .x-btn-focus .x-btn-left{background-position:0 -147px;} -.x-form .x-form-btns-ct .x-btn-focus .x-btn-right{background-position:0 -168px;} -.x-form .x-form-btns-ct .x-btn-focus .x-btn-center{background-position:0 -189px;} -.x-form .x-form-btns-ct .x-btn-click .x-btn-center{background-position:0 -126px;} -.x-form .x-form-btns-ct .x-btn-click .x-btn-right{background-position:0 -84px;} -.x-form .x-form-btns-ct .x-btn-click .x-btn-left{background-position:0 -63px;} -.x-form-invalid-icon{width:16px;height:18px;visibility:hidden;position:absolute;left:0;top:0;display:block;background:transparent url(../js/ext/resources/images/default/form/exclamation.gif) no-repeat 0 2px;} -.x-fieldset{border:1px solid #B5B8C8;padding:10px;margin-bottom:10px;} -.x-fieldset legend{font:bold 100% arial,sans;color:#15428b;} -.ext-ie .x-fieldset legend{margin-bottom:10px;} -.ext-ie .x-fieldset{padding-top:0;padding-bottom:10px;} -.x-fieldset legend .x-tool-toggle{margin-right:3px;margin-left:0;float:left!important;} -.x-fieldset legend input{margin-right:3px;float:left!important;height:13px;width:13px;} -fieldset.x-panel-collapsed{padding-bottom:0!important;border-width:1px 0 0 0!important;} -fieldset.x-panel-collapsed .x-fieldset-bwrap{visibility:hidden;position:absolute;left:-1000px;top:-1000px;} -.ext-ie .x-fieldset-bwrap{zoom:1;} -.ext-ie td .x-form-text{position:relative;top:-1px;} -.x-fieldset-noborder{border:0 none transparent;} -.x-fieldset-noborder legend{margin-left:-3px;} -.ext-ie .x-fieldset-noborder legend{position:relative;margin-bottom:23px;} -.ext-ie .x-fieldset-noborder legend span{position:absolute;left:-5px;} -.ext-gecko .x-window-body .x-form-item{-moz-outline:none;overflow:auto;} -.ext-gecko .x-form-item{-moz-outline:none;} -.x-hide-label label.x-form-item-label{display:none;} -.x-hide-label .x-form-element{padding-left:0!important;} -.x-fieldset{overflow:hidden;} -.x-fieldset-bwrap{overflow:hidden;zoom:1;} -.x-fieldset-body{overflow:hidden;} - -.x-btn{font:normal 100% arial,sans;cursor:pointer;white-space:nowrap;} -.x-btn button{border:0 none;background:transparent;padding-left:3px;padding-right:3px;cursor:pointer;margin:0;overflow:visible;width:auto;-moz-outline:0 none;outline:0 none;} -* html .ext-ie .x-btn button{width:1px;} -.ext-gecko .x-btn button{padding-left:0;padding-right:0;} -.ext-ie .x-btn button{padding-top:2px;} -.x-btn-icon .x-btn-center .x-btn-text{background-position:center;background-repeat:no-repeat;height:16px;width:16px;cursor:pointer;white-space:nowrap;padding:0;} -.x-btn-icon .x-btn-center{padding:1px;} -.x-btn em{font-style:normal;font-weight:normal;} -.x-btn-text-icon .x-btn-center .x-btn-text{background-position:0 2px;background-repeat:no-repeat;padding-left:18px;padding-top:3px;padding-bottom:2px;padding-right:0;} -.x-btn-left,.x-btn-right{font-size:1px;line-height:1px;} -.x-btn-left{width:3px;height:21px;background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 0;} -.x-btn-right{width:3px;height:21px;background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 -21px;} -.x-btn-left i,.x-btn-right i{display:block;width:3px;overflow:hidden;font-size:1px;line-height:1px;} -.x-btn-center{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) repeat-x 0 -42px;vertical-align:middle;text-align:center;padding:0 5px;cursor:pointer;white-space:nowrap;} -.x-btn-over .x-btn-left{background-position:0 -63px;} -.x-btn-over .x-btn-right{background-position:0 -84px;} -.x-btn-over .x-btn-center{background-position:0 -105px;} -.x-btn-click .x-btn-center,.x-btn-menu-active .x-btn-center{background-position:0 -126px;} -.x-btn-disabled *{color:gray!important;cursor:default!important;} -.x-btn-menu-text-wrap .x-btn-center{padding:0 3px;} -.ext-gecko .x-btn-menu-text-wrap .x-btn-center{padding:0 1px;} -.x-btn-menu-arrow-wrap .x-btn-center{padding:0;} -.x-btn-menu-arrow-wrap .x-btn-center button{width:12px!important;height:21px;padding:0!important;display:block;background:transparent url(../js/ext/resources/images/default/button/btn-arrow.gif) no-repeat left 3px;} -.x-btn-with-menu .x-btn-center{padding-right:2px!important;} -.x-btn-with-menu .x-btn-center em{display:block;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat right 0;padding-right:10px;} -.x-btn-text-icon .x-btn-with-menu .x-btn-center em{display:block;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat right 3px;padding-right:10px;} -.x-btn-pressed .x-btn-left{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 -63px;} -.x-btn-pressed .x-btn-right{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 -84px;} -.x-btn-pressed .x-btn-center{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) repeat-x 0 -126px;} - -.x-toolbar{border-color:#a9bfd3;border-style:solid;border-width:0 0 1px 0;display:block;padding:2px;background:#d0def0 url(../js/ext/resources/images/default/toolbar/bg.gif) repeat-x top left;position:relative;zoom:1;} -.x-toolbar .x-item-disabled .x-btn-icon{opacity:.35;-moz-opacity:.35;filter:alpha(opacity=35);} -.x-toolbar td{vertical-align:middle;} -.mso .x-toolbar,.x-grid-mso .x-toolbar{border:0 none;background:url(../js/ext/resources/images/default/grid/mso-hd.gif);} -.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial,sans;} -.x-toolbar .x-item-disabled{color:gray;cursor:default;opacity:.6;-moz-opacity:.6;filter:alpha(opacity=60);} -.x-toolbar .x-item-disabled *{color:gray;cursor:default;} -.x-toolbar .x-btn-left{background:none;} -.x-toolbar .x-btn-right{background:none;} -.x-toolbar .x-btn-center{background:none;padding:0;} -.x-toolbar .x-btn-menu-text-wrap .x-btn-center button{padding-right:2px;} -.ext-gecko .x-toolbar .x-btn-menu-text-wrap .x-btn-center button{padding-right:0;} -.x-toolbar .x-btn-menu-arrow-wrap .x-btn-center button{padding:0 2px;} -.x-toolbar .x-btn-menu-arrow-wrap .x-btn-center button{width:12px;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat 0 3px;} -.x-toolbar .x-btn-text-icon .x-btn-menu-arrow-wrap .x-btn-center button{width:12px;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat 0 3px;} -.x-toolbar .x-btn-over .x-btn-menu-arrow-wrap .x-btn-center button{background-position:0 -47px;} -.x-toolbar .x-btn-over .x-btn-left{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 0;} -.x-toolbar .x-btn-over .x-btn-right{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -21px;} -.x-toolbar .x-btn-over .x-btn-center{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -42px;} -.x-toolbar .x-btn-click .x-btn-left,.x-toolbar .x-btn-pressed .x-btn-left,.x-toolbar .x-btn-menu-active .x-btn-left{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -63px;} -.x-toolbar .x-btn-click .x-btn-right,.x-toolbar .x-btn-pressed .x-btn-right,.x-toolbar .x-btn-menu-active .x-btn-right{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -84px;} -.x-toolbar .x-btn-click .x-btn-center,.x-toolbar .x-btn-pressed .x-btn-center,.x-toolbar .x-btn-menu-active .x-btn-center{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -105px;} -.x-toolbar .x-btn-with-menu .x-btn-center em{padding-right:8px;} -.x-toolbar .ytb-text{padding:2px;} -.x-toolbar .ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-blue-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px 0;border:0;} -.x-toolbar .ytb-spacer{width:2px;} -.x-tbar-page-number{width:24px;height:14px;} -.x-tbar-page-first{background-image:url(../js/ext/resources/images/default/grid/page-first.gif)!important;} -.x-tbar-loading{background-image:url(../js/ext/resources/images/default/grid/done.gif)!important;} -.x-tbar-page-last{background-image:url(../js/ext/resources/images/default/grid/page-last.gif)!important;} -.x-tbar-page-next{background-image:url(../js/ext/resources/images/default/grid/page-next.gif)!important;} -.x-tbar-page-prev{background-image:url(../js/ext/resources/images/default/grid/page-prev.gif)!important;} -.x-item-disabled .x-tbar-loading{background-image:url(../js/ext/resources/images/default/grid/loading.gif)!important;} -.x-item-disabled .x-tbar-page-first{background-image:url(../js/ext/resources/images/default/grid/page-first-disabled.gif)!important;} -.x-item-disabled .x-tbar-page-last{background-image:url(../js/ext/resources/images/default/grid/page-last-disabled.gif)!important;} -.x-item-disabled .x-tbar-page-next{background-image:url(../js/ext/resources/images/default/grid/page-next-disabled.gif)!important;} -.x-item-disabled .x-tbar-page-prev{background-image:url(../js/ext/resources/images/default/grid/page-prev-disabled.gif)!important;} -.x-paging-info{position:absolute;top:5px;right:8px;color:#444;} - -.x-resizable-handle{position:absolute;z-index:100;font-size:1px;line-height:6px;overflow:hidden;background:white;filter:alpha(opacity=0);opacity:0;zoom:1;} -.x-resizable-handle-east{width:6px;cursor:e-resize;right:0;top:0;height:100%;} -.ext-ie .x-resizable-handle-east{margin-right:-1px;} -.x-resizable-handle-south{width:100%;cursor:s-resize;left:0;bottom:0;height:6px;} -.ext-ie .x-resizable-handle-south{margin-bottom:-1px;} -.x-resizable-handle-west{width:6px;cursor:w-resize;left:0;top:0;height:100%;} -.x-resizable-handle-north{width:100%;cursor:n-resize;left:0;top:0;height:6px;} -.x-resizable-handle-southeast{width:6px;cursor:se-resize;right:0;bottom:0;height:6px;z-index:101;} -.x-resizable-handle-northwest{width:6px;cursor:nw-resize;left:0;top:0;height:6px;z-index:101;} -.x-resizable-handle-northeast{width:6px;cursor:ne-resize;right:0;top:0;height:6px;z-index:101;} -.x-resizable-handle-southwest{width:6px;cursor:sw-resize;left:0;bottom:0;height:6px;z-index:101;} -.x-resizable-over .x-resizable-handle,.x-resizable-pinned .x-resizable-handle{filter:alpha(opacity=100);opacity:1;} -.x-resizable-over .x-resizable-handle-east,.x-resizable-pinned .x-resizable-handle-east{background:url(../js/ext/resources/images/default/sizer/e-handle.gif);background-position:left;} -.x-resizable-over .x-resizable-handle-west,.x-resizable-pinned .x-resizable-handle-west{background:url(../js/ext/resources/images/default/sizer/e-handle.gif);background-position:left;} -.x-resizable-over .x-resizable-handle-south,.x-resizable-pinned .x-resizable-handle-south{background:url(../js/ext/resources/images/default/sizer/s-handle.gif);background-position:top;} -.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north{background:url(../js/ext/resources/images/default/sizer/s-handle.gif);background-position:top;} -.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast{background:url(../js/ext/resources/images/default/sizer/se-handle.gif);background-position:top left;} -.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest{background:url(../js/ext/resources/images/default/sizer/nw-handle.gif);background-position:bottom right;} -.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast{background:url(../js/ext/resources/images/default/sizer/ne-handle.gif);background-position:bottom left;} -.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest{background:url(../js/ext/resources/images/default/sizer/sw-handle.gif);background-position:top right;} -.x-resizable-proxy{border:1px dashed #3b5a82;position:absolute;overflow:hidden;display:none;left:0;top:0;z-index:50000;} -.x-resizable-overlay{width:100%;height:100%;display:none;position:absolute;left:0;top:0;background:white;z-index:200000;-moz-opacity:0;opacity:0;filter:alpha(opacity=0);} - - .x-grid3{position:relative;overflow:hidden;background-color:#fff;} -.x-grid-panel .x-panel-body{overflow:hidden!important;} -.x-grid-panel .x-panel-mc .x-panel-body{border:1px solid #99bbe8;} -.ext-ie .x-grid3 table,.ext-safari .x-grid3 table{table-layout:fixed;} -.x-grid3-viewport{overflow:hidden;} -.x-grid3-hd-row td,.x-grid3-row td,.x-grid3-summary-row td{font:normal 100% arial,sans;-moz-outline:none;-moz-user-focus:normal;} -.x-grid3-row td,.x-grid3-summary-row td{line-height:13px;vertical-align:top;padding-left:1px;padding-right:1px;-moz-user-select:none;} -.x-grid3-hd-row td{line-height:15px;vertical-align:middle;border-left:1px solid #eee;border-right:1px solid #d0d0d0;} -.x-grid3-hd-row .x-grid3-marker-hd{padding:3px;} -.x-grid3-row .x-grid3-marker{padding:3px;} -.x-grid3-cell-inner,.x-grid3-hd-inner{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;padding:3px 3px 3px 5px;white-space:nowrap;} -.x-grid3-hd-inner{position:relative;cursor:inherit;padding:4px 3px 4px 5px;} -.x-grid3-row-body{white-space:normal;} -.x-grid3-body-cell{-moz-outline:0 none;outline:0 none;} -.ext-ie .x-grid3-cell-inner,.ext-ie .x-grid3-hd-inner{width:100%;} -.ext-strict .x-grid3-cell-inner,.ext-strict .x-grid3-hd-inner{width:auto;} -.x-grid-row-loading{background:#fff url(../js/ext/resources/images/default/shared/loading-balls.gif) no-repeat center center;} -.x-grid-page{overflow:hidden;} -.x-grid3-row{cursor:default;border:1px solid #ededed;border-top-color:#fff;width:100%;} -.x-grid3-row-alt{background-color:#fafafa;} -.x-grid3-row-over{border:1px solid #ddd;background:#efefef url(../js/ext/resources/images/default/grid/row-over.gif) repeat-x left top;} -.x-grid3-resize-proxy{width:1px;left:0;background-color:#777;cursor:e-resize;cursor:col-resize;position:absolute;top:0;height:100px;overflow:hidden;visibility:hidden;border:0 none;z-index:7;} -.x-grid3-resize-marker{width:1px;left:0;background-color:#777;position:absolute;top:0;height:100px;overflow:hidden;visibility:hidden;border:0 none;z-index:7;} -.x-grid3-focus{position:absolute;top:0;-moz-outline:0 none;outline:0 none;-moz-user-select:normal;-khtml-user-select:normal;} -.x-grid3-header{background:#f9f9f9 url(../js/ext/resources/images/default/grid/grid3-hrow.gif) repeat-x 0 bottom;cursor:default;zoom:1;padding:1px 0 0 0;} -.x-grid3-header-pop{border-left:1px solid #d0d0d0;float:right;clear:none;} -.x-grid3-header-pop-inner{border-left:1px solid #eee;width:14px;height:19px;background:transparent url(../js/ext/resources/images/default/grid/hd-pop.gif) no-repeat center center;} -.ext-ie .x-grid3-header-pop-inner{width:15px;} -.ext-strict .x-grid3-header-pop-inner{width:14px;} -.x-grid3-header-inner{overflow:hidden;zoom:1;float:left;} -.x-grid3-header-offset{padding-left:1px;width:10000px;} -td.x-grid3-hd-over,td.sort-desc,td.sort-asc,td.x-grid3-hd-menu-open{border-left:1px solid #aaccf6;border-right:1px solid #aaccf6;} -td.x-grid3-hd-over .x-grid3-hd-inner,td.sort-desc .x-grid3-hd-inner,td.sort-asc .x-grid3-hd-inner,td.x-grid3-hd-menu-open .x-grid3-hd-inner{background:#ebf3fd url(../js/ext/resources/images/default/grid/grid3-hrow-over.gif) repeat-x left bottom;} -.x-grid3-sort-icon{background-repeat:no-repeat;display:none;height:4px;width:13px;margin-left:3px;vertical-align:middle;} -.sort-asc .x-grid3-sort-icon{background-image:url(../js/ext/resources/images/default/grid/sort_asc.gif);display:inline;} -.sort-desc .x-grid3-sort-icon{background-image:url(../js/ext/resources/images/default/grid/sort_desc.gif);display:inline;} -.ext-strict .ext-ie .x-grid3-header-inner{position:relative;} -.ext-strict .ext-ie6 .x-grid3-hd{position:relative;} -.ext-strict .ext-ie6 .x-grid3-hd-inner{position:static;} -.x-grid3-body{zoom:1;} -.x-grid3-scroller{overflow:auto;zoom:1;position:relative;} -.x-grid3-cell-text,.x-grid3-hd-text{display:block;padding:3px 5px 3px 5px;-moz-user-select:none;-khtml-user-select:none;color:black;} -.x-grid3-split{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;cursor:e-resize;cursor:col-resize;display:block;font-size:1px;height:16px;overflow:hidden;position:absolute;top:2px;width:6px;z-index:3;} -.x-grid3-hd-text{color:#15428b;} -.x-dd-drag-proxy .x-grid3-hd-inner{background:#ebf3fd url(../js/ext/resources/images/default/grid/grid3-hrow-over.gif) repeat-x left bottom;width:120px;padding:3px;border:1px solid #aaccf6;overflow:hidden;} -.col-move-top,.col-move-bottom{width:9px;height:9px;position:absolute;top:0;line-height:1px;font-size:1px;overflow:hidden;visibility:hidden;z-index:20000;} -.col-move-top{background:transparent url(../js/ext/resources/images/default/grid/col-move-top.gif) no-repeat left top;} -.col-move-bottom{background:transparent url(../js/ext/resources/images/default/grid/col-move-bottom.gif) no-repeat left top;} -.x-grid3-row-selected{background:#DFE8F6!important;border:1px dotted #a3bae9;} -.x-grid3-cell-selected{background-color:#B8CFEE!important;color:black;} -.x-grid3-cell-selected span{color:black!important;} -.x-grid3-cell-selected .x-grid3-cell-text{color:black;} -.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{background:#ebeadb url(../js/ext/resources/images/default/grid/grid-hrow.gif) repeat-x 0 bottom!important;vertical-align:middle!important;color:black;padding:0;border-top:1px solid white;border-bottom:none!important;border-right:1px solid #6fa0df!important;text-align:center;} -.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div{padding:0 4px;color:#15428b!important;text-align:center;} -.x-grid3-dirty-cell{background:transparent url(../js/ext/resources/images/default/grid/dirty.gif) no-repeat 0 0;} -.x-grid3-topbar,.x-grid3-bottombar{font:normal 100% arial,sans;overflow:hidden;display:none;zoom:1;position:relative;} -.x-grid3-topbar .x-toolbar{border-right:0 none;} -.x-grid3-bottombar .x-toolbar{border-right:0 none;border-bottom:0 none;border-top:1px solid #a9bfd3;} -.x-props-grid .x-grid3-cell{padding:1px;} -.x-props-grid .x-grid3-td-name .x-grid3-cell-inner{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y -16px!important;padding-left:12px;color:black!important;} -.x-props-grid .x-grid3-body .x-grid3-td-name{padding:1px;padding-right:0;background:white!important;border:0 none;border-right:1px solid #eee;} -.xg-hmenu-sort-asc .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-asc.gif);} -.xg-hmenu-sort-desc .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-desc.gif);} -.xg-hmenu-lock .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-lock.gif);} -.xg-hmenu-unlock .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-unlock.gif);} -.x-grid3-col-dd{border:0 none;padding:0;background:transparent;} -.x-dd-drag-ghost .x-grid3-dd-wrap{padding:1px 3px 3px 1px;} -.x-grid3-hd{-moz-user-select:none;} -.x-grid3-hd-btn{display:none;position:absolute;width:14px;background:#c3daf9 url(../js/ext/resources/images/default/grid/grid3-hd-btn.gif) no-repeat left center;right:0;top:0;z-index:2;cursor:pointer;} -.x-grid3-hd-over .x-grid3-hd-btn,.x-grid3-hd-menu-open .x-grid3-hd-btn{display:block;} -a.x-grid3-hd-btn:hover{background-position:-14px center;} -.x-grid3-body .x-grid3-td-expander{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y right;} -.x-grid3-body .x-grid3-td-expander .x-grid3-cell-inner{padding:0!important;height:100%;} -.x-grid3-row-expander{width:100%;height:18px;background-position:4px 2px;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/grid/row-expand-sprite.gif);} -.x-grid3-row-collapsed .x-grid3-row-expander{background-position:4px 2px;} -.x-grid3-row-expanded .x-grid3-row-expander{background-position:-21px 2px;} -.x-grid3-row-collapsed .x-grid3-row-body{display:none!important;} -.x-grid3-row-expanded .x-grid3-row-body{display:block!important;} -.x-grid3-body .x-grid3-td-checker{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y right;} -.x-grid3-body .x-grid3-td-checker .x-grid3-cell-inner,.x-grid3-header .x-grid3-td-checker .x-grid3-hd-inner{padding:0!important;height:100%;} -.x-grid3-row-checker,.x-grid3-hd-checker{width:100%;height:18px;background-position:2px 2px;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/grid/row-check-sprite.gif);} -.x-grid3-row .x-grid3-row-checker{background-position:2px 2px;} -.x-grid3-row-selected .x-grid3-row-checker,.x-grid3-hd-checker-on .x-grid3-hd-checker{background-position:-23px 2px;} -.x-grid3-hd-checker{background-position:2px 3px;} -.x-grid3-hd-checker-on .x-grid3-hd-checker{background-position:-23px 3px;} -.x-grid3-body .x-grid3-td-numberer{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y right;} -.x-grid3-body .x-grid3-td-numberer .x-grid3-cell-inner{padding:3px 5px 0 0!important;text-align:right;color:#444;} -.x-grid3-body .x-grid3-row-selected .x-grid3-td-numberer,.x-grid3-body .x-grid3-row-selected .x-grid3-td-checker,.x-grid3-body .x-grid3-row-selected .x-grid3-td-expander{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif) repeat-y right;} -.x-grid3-body .x-grid3-check-col-td .x-grid3-cell-inner{padding:1px 0 0 0!important;} -.x-grid3-check-col{width:100%;height:16px;background-position:center center;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/menu/unchecked.gif);} -.x-grid3-check-col-on{width:100%;height:16px;background-position:center center;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/menu/checked.gif);} -.x-grid-group,.x-grid-group-body,.x-grid-group-hd{zoom:1;} -.x-grid-group-hd{border-bottom:2px solid #99bbe8;cursor:pointer;padding-top:6px;} -.x-grid-group-hd div{background:transparent url(../js/ext/resources/images/default/grid/group-expand-sprite.gif) no-repeat 3px -47px;padding:4px 4px 4px 17px;color:#3764a0;font:bold 100% arial,sans;} -.x-grid-group-collapsed .x-grid-group-hd div{background-position:3px 3px;} -.x-grid-group-collapsed .x-grid-group-body{display:none;} -.x-group-by-icon{background-image:url(../js/ext/resources/images/default/grid/group-by.gif);} -.x-cols-icon{background-image:url(../js/ext/resources/images/default/grid/columns.gif);} -.x-show-groups-icon{background-image:url(../js/ext/resources/images/default/grid/group-by.gif);} -.ext-ie .x-grid3 .x-editor .x-form-text{position:relative;top:-1px;} -.ext-ie .x-props-grid .x-editor .x-form-text{position:static;top:0;} -.x-grid-empty{padding:10px;color:gray;font:normal 100% arial,sans;} -.ext-ie7 .x-grid-panel .x-panel-bbar{position:relative;} - -.x-dd-drag-proxy{position:absolute;left:0;top:0;visibility:hidden;z-index:15000;} -.x-dd-drag-ghost{color:black;font:normal 100% arial,helvetica,sans-serif;-moz-opacity:0.85;opacity:.85;filter:alpha(opacity=85);border-top:1px solid #ddd;border-left:1px solid #ddd;border-right:1px solid #bbb;border-bottom:1px solid #bbb;padding:3px;padding-left:20px;background-color:white;white-space:nowrap;} -.x-dd-drag-repair .x-dd-drag-ghost{-moz-opacity:0.4;opacity:.4;filter:alpha(opacity=40);border:0 none;padding:0;background-color:transparent;} -.x-dd-drag-repair .x-dd-drop-icon{visibility:hidden;} -.x-dd-drop-icon{position:absolute;top:3px;left:3px;display:block;width:16px;height:16px;background-color:transparent;background-position:center;background-repeat:no-repeat;z-index:1;} -.x-dd-drop-nodrop .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/dd/drop-no.gif);} -.x-dd-drop-ok .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/dd/drop-yes.gif);} -.x-dd-drop-ok-add .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/dd/drop-add.gif);} -.x-view-selector{position:absolute;left:0;top:0;width:0;background:#c3daf9;border:1px dotted #39b;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);zoom:1;} - -.x-tree .x-panel-body{background-color:#fff;} -.ext-strict .ext-ie .x-tree .x-panel-bwrap{position:relative;overflow:hidden;} -.x-tree-icon,.x-tree-ec-icon,.x-tree-elbow-line,.x-tree-elbow,.x-tree-elbow-end,.x-tree-elbow-plus,.x-tree-elbow-minus,.x-tree-elbow-end-plus,.x-tree-elbow-end-minus{border:0 none;height:18px;margin:0;padding:0;vertical-align:top;width:16px;background-repeat:no-repeat;} -.x-tree-node-collapsed .x-tree-node-icon,.x-tree-node-expanded .x-tree-node-icon,.x-tree-node-leaf .x-tree-node-icon{border:0 none;height:18px;margin:0;padding:0;vertical-align:top;width:16px;background-position:center;background-repeat:no-repeat;} -.ext-ie .x-tree-node-indent img,.ext-ie .x-tree-node-icon,.ext-ie .x-tree-ec-icon{vertical-align:middle!important;} -.x-tree-node-expanded .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/folder-open.gif);} -.x-tree-node-leaf .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/leaf.gif);} -.x-tree-node-collapsed .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/folder.gif);} -.ext-ie input.x-tree-node-cb{width:15px;height:15px;} -input.x-tree-node-cb{margin-left:1px;} -.ext-ie input.x-tree-node-cb{margin-left:0;} -.x-tree-noicon .x-tree-node-icon{width:0;height:0;} -.x-tree-node-loading .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/loading.gif)!important;} -.x-tree-node-loading a span{font-style:italic;color:#444;} -.ext-ie .x-tree-node-el input{width:15px;height:15px;} -.x-tree-lines .x-tree-elbow{background-image:url(../js/ext/resources/images/default/tree/elbow.gif);} -.x-tree-lines .x-tree-elbow-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-plus.gif);} -.x-tree-lines .x-tree-elbow-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-minus.gif);} -.x-tree-lines .x-tree-elbow-end{background-image:url(../js/ext/resources/images/default/tree/elbow-end.gif);} -.x-tree-lines .x-tree-elbow-end-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-plus.gif);} -.x-tree-lines .x-tree-elbow-end-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-minus.gif);} -.x-tree-lines .x-tree-elbow-line{background-image:url(../js/ext/resources/images/default/tree/elbow-line.gif);} -.x-tree-no-lines .x-tree-elbow{background:transparent;} -.x-tree-no-lines .x-tree-elbow-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-plus-nl.gif);} -.x-tree-no-lines .x-tree-elbow-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-minus-nl.gif);} -.x-tree-no-lines .x-tree-elbow-end{background:transparent;} -.x-tree-no-lines .x-tree-elbow-end-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-plus-nl.gif);} -.x-tree-no-lines .x-tree-elbow-end-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-minus-nl.gif);} -.x-tree-no-lines .x-tree-elbow-line{background:transparent;} -.x-tree-arrows .x-tree-elbow{background:transparent;} -.x-tree-arrows .x-tree-elbow-plus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat 0 0;} -.x-tree-arrows .x-tree-elbow-minus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat -16px 0;} -.x-tree-arrows .x-tree-elbow-end{background:transparent;} -.x-tree-arrows .x-tree-elbow-end-plus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat 0 0;} -.x-tree-arrows .x-tree-elbow-end-minus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat -16px 0;} -.x-tree-arrows .x-tree-elbow-line{background:transparent;} -.x-tree-arrows .x-tree-ec-over .x-tree-elbow-plus{background-position:-32px 0;} -.x-tree-arrows .x-tree-ec-over .x-tree-elbow-minus{background-position:-48px 0;} -.x-tree-arrows .x-tree-ec-over .x-tree-elbow-end-plus{background-position:-32px 0;} -.x-tree-arrows .x-tree-ec-over .x-tree-elbow-end-minus{background-position:-48px 0;} -.x-tree-elbow-plus,.x-tree-elbow-minus,.x-tree-elbow-end-plus,.x-tree-elbow-end-minus{cursor:pointer;} -.ext-ie ul.x-tree-node-ct{font-size:0;line-height:0;zoom:1;} -.x-tree-node{color:black;font:normal 100% arial,sans;white-space:nowrap;} -.x-tree-node-el{line-height:18px;cursor:pointer;} -.x-tree-node a,.x-dd-drag-ghost a{text-decoration:none;color:black;-khtml-user-select:none;-moz-user-select:none;-kthml-user-focus:normal;-moz-user-focus:normal;-moz-outline:0 none;outline:0 none;} -.x-tree-node a span,.x-dd-drag-ghost a span{text-decoration:none;color:black;padding:1px 3px 1px 2px;} -.x-tree-node .x-tree-node-disabled a span{color:gray!important;} -.x-tree-node .x-tree-node-disabled .x-tree-node-icon{-moz-opacity:0.5;opacity:.5;filter:alpha(opacity=50);} -.x-tree-node .x-tree-node-inline-icon{background:transparent;} -.x-tree-node a:hover,.x-dd-drag-ghost a:hover{text-decoration:none;} -.x-tree-node div.x-tree-drag-insert-below{border-bottom:1px dotted #36c;} -.x-tree-node div.x-tree-drag-insert-above{border-top:1px dotted #36c;} -.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below{border-bottom:0 none;} -.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above{border-top:0 none;} -.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below a{border-bottom:2px solid #36c;} -.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above a{border-top:2px solid #36c;} -.x-tree-node .x-tree-drag-append a span{background:#ddd;border:1px dotted gray;} -.x-tree-node .x-tree-node-over{background-color:#eee;} -.x-tree-node .x-tree-selected{background-color:#d9e8fb;} -.x-dd-drag-ghost .x-tree-node-indent,.x-dd-drag-ghost .x-tree-ec-icon{display:none!important;} -.x-tree-drop-ok-append .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-add.gif);} -.x-tree-drop-ok-above .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-over.gif);} -.x-tree-drop-ok-below .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-under.gif);} -.x-tree-drop-ok-between .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-between.gif);} - -.x-date-picker{border:1px solid #1b376c;border-top:0 none;background:#fff;position:relative;} -.x-date-picker a{-moz-outline:0 none;outline:0 none;} -.x-date-inner,.x-date-inner td,.x-date-inner th{border-collapse:separate;} -.x-date-middle,.x-date-left,.x-date-right{background:url(../js/ext/resources/images/default/shared/hd-sprite.gif) repeat-x 0 -83px;color:#FFF;font:bold 100% arial,sans;overflow:hidden;} -.x-date-middle .x-btn-left,.x-date-middle .x-btn-center,.x-date-middle .x-btn-right{background:transparent!important;vertical-align:middle;} -.x-date-middle .x-btn .x-btn-text{color:#fff;} -.x-date-middle .x-btn-with-menu .x-btn-center em{background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow-light.gif) no-repeat right 0;} -.x-date-right,.x-date-left{width:18px;} -.x-date-right{text-align:right;} -.x-date-middle{padding-top:2px;padding-bottom:2px;} -.x-date-right a,.x-date-left a{display:block;width:16px;height:16px;background-position:center;background-repeat:no-repeat;cursor:pointer;-moz-opacity:0.6;opacity:.6;filter:alpha(opacity=60);} -.x-date-right a:hover,.x-date-left a:hover{-moz-opacity:1;opacity:1;filter:alpha(opacity=100);} -.x-date-right a{background-image:url(../js/ext/resources/images/default/shared/right-btn.gif);margin-right:2px;text-decoration:none!important;} -.x-date-left a{background-image:url(../js/ext/resources/images/default/shared/left-btn.gif);margin-left:2px;text-decoration:none!important;} -table.x-date-inner{width:100%;table-layout:fixed;} -.x-date-inner th{width:25px;} -.x-date-inner th{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;text-align:right!important;border-bottom:1px solid #a3bad9;font:normal 100% arial,sans;color:#233d6d;cursor:default;padding:0;border-collapse:separate;} -.x-date-inner th span{display:block;padding:2px;padding-right:7px;} -.x-date-inner td{border:1px solid #fff;text-align:right;padding:0;} -.x-date-inner a{padding:2px 5px;display:block;font:normal 100% arial,sans;text-decoration:none;color:black;text-align:right;zoom:1;} -.x-date-inner .x-date-active{cursor:pointer;color:black;} -.x-date-inner .x-date-selected a{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;border:1px solid #8db2e3;padding:1px 4px;} -.x-date-inner .x-date-today a{border:1px solid darkred;padding:1px 4px;} -.x-date-inner .x-date-selected span{font-weight:bold;} -.x-date-inner .x-date-prevday a,.x-date-inner .x-date-nextday a{color:#aaa;text-decoration:none!important;} -.x-date-bottom{padding:4px;border-top:1px solid #a3bad9;background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;} -.x-date-inner a:hover,.x-date-inner .x-date-disabled a:hover{text-decoration:none!important;color:black;background:#ddecfe;} -.x-date-inner .x-date-disabled a{cursor:default;background:#eee;color:#bbb;} -.x-date-mmenu{background:#eee!important;} -.x-date-mmenu .x-menu-item{font-size:10px;padding:1px 24px 1px 4px;white-space:nowrap;color:#000;} -.x-date-mmenu .x-menu-item .x-menu-item-icon{width:10px;height:10px;margin-right:5px;background-position:center -4px!important;} -.x-date-mp{position:absolute;left:0;top:0;background:white;display:none;} -.x-date-mp td{padding:2px;font:normal 100% arial,sans;} -td.x-date-mp-month,td.x-date-mp-year,td.x-date-mp-ybtn{border:0 none;text-align:center;vertical-align:middle;width:25%;} -.x-date-mp-ok{margin-right:3px;} -.x-date-mp-btns button{text-decoration:none;text-align:center;text-decoration:none!important;background:#083772;color:white;border:1px solid;border-color:#36c #005 #005 #36c;padding:1px 3px 1px;font:normal 100% arial,sans;cursor:pointer;} -.x-date-mp-btns{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;} -.x-date-mp-btns td{border-top:1px solid #c5d2df;text-align:center;} -td.x-date-mp-month a,td.x-date-mp-year a{display:block;padding:2px 4px;text-decoration:none;text-align:center;color:#15428b;} -td.x-date-mp-month a:hover,td.x-date-mp-year a:hover{color:#15428b;text-decoration:none;cursor:pointer;background:#ddecfe;} -td.x-date-mp-sel a{padding:1px 3px;background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;border:1px solid #8db2e3;} -.x-date-mp-ybtn a{overflow:hidden;width:15px;height:15px;cursor:pointer;background:transparent url(../js/ext/resources/images/default/panel/tool-sprites.gif) no-repeat;display:block;margin:0 auto;} -.x-date-mp-ybtn a.x-date-mp-next{background-position:0 -120px;} -.x-date-mp-ybtn a.x-date-mp-next:hover{background-position:-15px -120px;} -.x-date-mp-ybtn a.x-date-mp-prev{background-position:0 -105px;} -.x-date-mp-ybtn a.x-date-mp-prev:hover{background-position:-15px -105px;} -.x-date-mp-ybtn{text-align:center;} -td.x-date-mp-sep{border-right:1px solid #c5d2df;} - -.x-tip{position:absolute;top:0;left:0;visibility:hidden;z-index:20000;border:0 none;} -.x-tip .x-tip-close{background-image:url(../js/ext/resources/images/default/qtip/close.gif);height:15px;float:right;width:15px;margin:0 0 2px 2px;cursor:pointer;display:none;} -.x-tip .x-tip-tc{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -62px;padding-top:3px;overflow:hidden;zoom:1;} -.x-tip .x-tip-tl{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 0;padding-left:6px;overflow:hidden;zoom:1;} -.x-tip .x-tip-tr{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat right 0;padding-right:6px;overflow:hidden;zoom:1;} -.x-tip .x-tip-bc{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -121px;height:3px;overflow:hidden;} -.x-tip .x-tip-bl{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -59px;padding-left:6px;zoom:1;} -.x-tip .x-tip-br{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat right -59px;padding-right:6px;zoom:1;} -.x-tip .x-tip-mc{border:0 none;font:normal 100% arial,sans;} -.x-tip .x-tip-ml{background:#fff url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -124px;padding-left:6px;zoom:1;} -.x-tip .x-tip-mr{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat right -124px;padding-right:6px;zoom:1;} -.ext-ie .x-tip .x-tip-header,.ext-ie .x-tip .x-tip-tc{font-size:0;line-height:0;} -.x-tip .x-tip-header-text{font:bold 100% arial,sans;padding:0;margin:0 0 2px 0;color:#444;} -.x-tip .x-tip-body{font:normal 100% arial,sans;margin:0!important;line-height:14px;color:#444;padding:0;} -.x-tip .x-tip-body .loading-indicator{margin:0;} -.x-tip-draggable .x-tip-header,.x-tip-draggable .x-tip-header-text{cursor:move;} -.x-form-invalid-tip .x-tip-tc{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) repeat-x 0 -12px;padding-top:6px;} -.x-form-invalid-tip .x-tip-tl{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);} -.x-form-invalid-tip .x-tip-tr{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);} -.x-form-invalid-tip .x-tip-bc{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) repeat-x 0 -18px;height:6px;} -.x-form-invalid-tip .x-tip-bl{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) no-repeat 0 -6px;} -.x-form-invalid-tip .x-tip-br{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) no-repeat right -6px;} -.x-form-invalid-tip .x-tip-ml{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);} -.x-form-invalid-tip .x-tip-mr{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);} -.x-form-invalid-tip .x-tip-body{padding:2px;} -.x-form-invalid-tip .x-tip-body{padding-left:24px;background:transparent url(../js/ext/resources/images/default/form/exclamation.gif) no-repeat 2px 2px;} - -.x-menu{border:1px solid #718bb7;z-index:15000;zoom:1;background:#f0f0f0 url(../js/ext/resources/images/default/menu/menu.gif) repeat-y;padding:2px;} -.x-menu a{text-decoration:none!important;} -.ext-ie .x-menu{zoom:1;overflow:hidden;} -.x-menu-list{background:transparent;border:0 none;} -.x-menu li{line-height:100%;} -.x-menu li.x-menu-sep-li{font-size:1px;line-height:1px;} -.x-menu-list-item{font:normal 100% arial,sans;white-space:nowrap;-moz-user-select:none;-khtml-user-select:none;display:block;padding:1px;} -.x-menu-item-arrow{background:transparent url(../js/ext/resources/images/default/menu/menu-parent.gif) no-repeat right;} -.x-menu-sep{display:block;font-size:1px;line-height:1px;margin:2px 3px;background-color:#e0e0e0;border-bottom:1px solid #fff;overflow:hidden;} -.x-menu-focus{position:absolute;left:0;top:-5px;width:0;height:0;line-height:1px;} -.x-menu a.x-menu-item{display:block;line-height:16px;padding:3px 21px 3px 3px;white-space:nowrap;text-decoration:none;color:#222;-moz-outline:0 none;outline:0 none;cursor:pointer;} -.x-menu-item-active{background:#ebf3fd url(../js/ext/resources/images/default/menu/item-over.gif) repeat-x left bottom;border:1px solid #aaccf6;padding:0;} -.x-menu-item-active a.x-menu-item{color:#233d6d;} -.x-menu-item-icon{border:0 none;height:16px;padding:0;vertical-align:top;width:16px;margin:0 8px 0 0;background-position:center;} -.x-menu-check-item .x-menu-item-icon{background:transparent url(../js/ext/resources/images/default/menu/unchecked.gif) no-repeat center;} -.x-menu-item-checked .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/menu/checked.gif);} -.x-menu-group-item .x-menu-item-icon{background:transparent;} -.x-menu-item-checked .x-menu-group-item .x-menu-item-icon{background:transparent url(../js/ext/resources/images/default/menu/group-checked.gif) no-repeat center;} -.x-menu-plain{background:#fff!important;} -.x-menu-date-item{padding:0;} -.x-menu .x-color-palette,.x-menu .x-date-picker{margin-left:26px;margin-right:4px;} -.x-menu .x-date-picker{border:1px solid #a3bad9;margin-top:2px;margin-bottom:2px;} -.x-menu-plain .x-color-palette,.x-menu-plain .x-date-picker{margin:0;border:0 none;} -.x-date-menu{padding:0!important;} -.x-cycle-menu .x-menu-item-checked{border:1px dotted #a3bae9!important;background:#DFE8F6;padding:0;} - - .x-box-tl{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat 0 0;zoom:1;} -.x-box-tc{height:8px;background:transparent url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 0;overflow:hidden;} -.x-box-tr{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat right -8px;} -.x-box-ml{background:transparent url(../js/ext/resources/images/default/box/l.gif) repeat-y 0;padding-left:4px;overflow:hidden;zoom:1;} -.x-box-mc{background:#eee url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 -16px;padding:4px 10px;font-family:"Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;color:#393939;font-size:100%;} -.x-box-mc h3{font-size:14px;font-weight:bold;margin:0 0 4px 0;zoom:1;} -.x-box-mr{background:transparent url(../js/ext/resources/images/default/box/r.gif) repeat-y right;padding-right:4px;overflow:hidden;} -.x-box-bl{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat 0 -16px;zoom:1;} -.x-box-bc{background:transparent url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 -8px;height:8px;overflow:hidden;} -.x-box-br{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat right -24px;} -.x-box-tl,.x-box-bl{padding-left:8px;overflow:hidden;} -.x-box-tr,.x-box-br{padding-right:8px;overflow:hidden;} -.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr{background-image:url(../js/ext/resources/images/default/box/corners-blue.gif);} -.x-box-blue .x-box-bc,.x-box-blue .x-box-mc,.x-box-blue .x-box-tc{background-image:url(../js/ext/resources/images/default/box/tb-blue.gif);} -.x-box-blue .x-box-mc{background-color:#c3daf9;} -.x-box-blue .x-box-mc h3{color:#17385b;} -.x-box-blue .x-box-ml{background-image:url(../js/ext/resources/images/default/box/l-blue.gif);} -.x-box-blue .x-box-mr{background-image:url(../js/ext/resources/images/default/box/r-blue.gif);} - -#x-debug-browser .x-tree .x-tree-node a span{color:#222297;font-size:100%;padding-top:2px;font-family:"monotype","courier new",sans-serif;line-height:18px;} -#x-debug-browser .x-tree a i{color:#FF4545;font-style:normal;} -#x-debug-browser .x-tree a em{color:#999;} -#x-debug-browser .x-tree .x-tree-node .x-tree-selected a span{background:#c3daf9;} -#x-debug-browser .x-tool-toggle{background-position:0 -75px;} -#x-debug-browser .x-tool-toggle-over{background-position:-15px -75px;} -#x-debug-browser.x-panel-collapsed .x-tool-toggle{background-position:0 -60px;} -#x-debug-browser.x-panel-collapsed .x-tool-toggle-over{background-position:-15px -60px;} - -.x-combo-list{border:1px solid #98c0f4;background:#ddecfe;zoom:1;overflow:hidden;} -.x-combo-list-inner{overflow:auto;background:white;position:relative;zoom:1;overflow-x:hidden;} -.x-combo-list-hd{font:bold 100% arial,sans;color:#15428b;background-image:url(../js/ext/resources/images/default/layout/panel-title-light-bg.gif);border-bottom:1px solid #98c0f4;padding:3px;} -.x-resizable-pinned .x-combo-list-inner{border-bottom:1px solid #98c0f4;} -.x-combo-list-item{font:normal 100% arial,sans;padding:2px;border:1px solid #fff;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} -.x-combo-list .x-combo-selected{border:1px dotted #a3bae9!important;background:#DFE8F6;cursor:pointer;} -.x-combo-noedit{cursor:pointer;} -.x-combo-list .x-toolbar{border-top:1px solid #98c0f4;border-bottom:0 none;} -.x-combo-list-small .x-combo-list-item{font:normal 100% arial,sans;} - -.x-panel{border-style:solid;border-color:#99bbe8;border-width:0;} -.x-panel-header{overflow:hidden;zoom:1;color:#15428b;font:bold 100% arial,sans;padding:5px 3px 4px 5px;border:1px solid #99bbe8;line-height:15px;background:transparent url(../js/ext/resources/images/default/panel/white-top-bottom.gif) repeat-x 0 -1px;} -.x-panel-body{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;background:white;position:relative;} -.x-panel-bbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;} -.x-panel-tbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;} -.x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar{border-top:1px solid #99bbe8;border-bottom:0 none;} -.x-panel-body-noheader,.x-panel-mc .x-panel-body{border-top:1px solid #99bbe8;} -.x-panel-header{overflow:hidden;zoom:1;} -.x-panel-tl .x-panel-header{color:#15428b;font:bold 100% arial,sans;padding:5px 0 4px 0;border:0 none;background:transparent;} -.x-panel-tl .x-panel-icon,.x-window-tl .x-panel-icon{padding-left:20px!important;background-repeat:no-repeat;background-position:0 4px;zoom:1;} -.x-panel-inline-icon{width:16px;height:16px;background-repeat:no-repeat;background-position:0 0;vertical-align:middle;margin-right:4px;margin-top:-1px;margin-bottom:-1px;} -.x-panel-tc{background:transparent url(../js/ext/resources/images/default/panel/top-bottom.gif) repeat-x 0 0;overflow:hidden;} -.ext-strict .ext-ie7 .x-panel-tc{overflow:visible;} -.x-panel-tl{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat 0 0;padding-left:6px;zoom:1;border-bottom:1px solid #99bbe8;} -.x-panel-tr{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat right 0;zoom:1;padding-right:6px;} -.x-panel-bc{background:transparent url(../js/ext/resources/images/default/panel/top-bottom.gif) repeat-x 0 bottom;zoom:1;} -.x-panel-bc .x-panel-footer{zoom:1;} -.x-panel-bl{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat 0 bottom;padding-left:6px;zoom:1;} -.x-panel-br{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat right bottom;padding-right:6px;zoom:1;} -.x-panel-mc{border:0 none;padding:0;margin:0;font:normal 100% arial,sans;padding-top:6px;background:#dfe8f6;} -.x-panel-mc .x-panel-body{background:transparent;border:0 none;} -.x-panel-ml{background:#fff url(../js/ext/resources/images/default/panel/left-right.gif) repeat-y 0 0;padding-left:6px;zoom:1;} -.x-panel-mr{background:transparent url(../js/ext/resources/images/default/panel/left-right.gif) repeat-y right 0;padding-right:6px;zoom:1;} -.x-panel-bc .x-panel-footer{padding-bottom:6px;} -.x-panel-nofooter .x-panel-bc{height:6px;font-size:0;line-height:0;} -.x-panel-bwrap{overflow:hidden;zoom:1;} -.x-panel-body{overflow:hidden;zoom:1;} -.x-panel-collapsed .x-resizable-handle{display:none;} -.ext-gecko .x-panel-animated div{overflow:hidden!important;} -.x-plain-body{overflow:hidden;} -.x-plain-bbar .x-toolbar{overflow:hidden;padding:2px;} -.x-plain-tbar .x-toolbar{overflow:hidden;padding:2px;} -.x-plain-bwrap{overflow:hidden;zoom:1;} -.x-plain{overflow:hidden;} -.x-tool{overflow:hidden;width:15px;height:15px;float:right;cursor:pointer;background:transparent url(../js/ext/resources/images/default/panel/tool-sprites.gif) no-repeat;margin-left:2px;} -.x-tool-toggle{background-position:0 -60px;} -.x-tool-toggle-over{background-position:-15px -60px;} -.x-panel-collapsed .x-tool-toggle{background-position:0 -75px;} -.x-panel-collapsed .x-tool-toggle-over{background-position:-15px -75px;} -.x-tool-close{background-position:0 -0;} -.x-tool-close-over{background-position:-15px 0;} -.x-tool-minimize{background-position:0 -15px;} -.x-tool-minimize-over{background-position:-15px -15px;} -.x-tool-maximize{background-position:0 -30px;} -.x-tool-maximize-over{background-position:-15px -30px;} -.x-tool-restore{background-position:0 -45px;} -.x-tool-restore-over{background-position:-15px -45px;} -.x-tool-gear{background-position:0 -90px;} -.x-tool-gear-over{background-position:-15px -90px;} -.x-tool-pin{background-position:0 -135px;} -.x-tool-pin-over{background-position:-15px -135px;} -.x-tool-unpin{background-position:0 -150px;} -.x-tool-unpin-over{background-position:-15px -150px;} -.x-tool-right{background-position:0 -165px;} -.x-tool-right-over{background-position:-15px -165px;} -.x-tool-left{background-position:0 -180px;} -.x-tool-left-over{background-position:-15px -180px;} -.x-tool-up{background-position:0 -210px;} -.x-tool-up-over{background-position:-15px -210px;} -.x-tool-down{background-position:0 -195px;} -.x-tool-down-over{background-position:-15px -195px;} -.x-tool-refresh{background-position:0 -225px;} -.x-tool-refresh-over{background-position:-15px -225px;} -.x-tool-minus{background-position:0 -255px;} -.x-tool-minus-over{background-position:-15px -255px;} -.x-tool-plus{background-position:0 -240px;} -.x-tool-plus-over{background-position:-15px -240px;} -.x-tool-search{background-position:0 -270px;} -.x-tool-search-over{background-position:-15px -270px;} -.x-tool-save{background-position:0 -285px;} -.x-tool-save-over{background-position:-15px -285px;} -.x-tool-help{background-position:0 -300px;} -.x-tool-help-over{background-position:-15px -300px;} -.x-tool-print{background-position:0 -315px;} -.x-tool-print-over{background-position:-15px -315px;} -.x-panel-ghost{background:#cbddf3;z-index:12000;overflow:hidden;position:absolute;left:0;top:0;opacity:.65;-moz-opacity:.65;filter:alpha(opacity=65);} -.x-panel-ghost ul{margin:0;padding:0;overflow:hidden;font-size:0;line-height:0;border:1px solid #99bbe8;border-top:0 none;display:block;} -.x-panel-ghost *{cursor:move!important;} -.x-panel-dd-spacer{border:2px dashed #99bbe8;} -.x-panel-btns-ct{padding:5px;} -.x-panel-btns-ct .x-btn{float:right;clear:none;} -.x-panel-btns-ct .x-panel-btns td{border:0;padding:0;} -.x-panel-btns-ct .x-panel-btns-right table{float:right;clear:none;} -.x-panel-btns-ct .x-panel-btns-left table{float:left;clear:none;} -.x-panel-btns-ct .x-panel-btns-center{text-align:center;} -.x-panel-btns-ct .x-panel-btns-center table{margin:0 auto;} -.x-panel-btns-ct table td.x-panel-btn-td{padding:3px;} -.x-panel-btns-ct .x-btn-focus .x-btn-left{background-position:0 -147px;} -.x-panel-btns-ct .x-btn-focus .x-btn-right{background-position:0 -168px;} -.x-panel-btns-ct .x-btn-focus .x-btn-center{background-position:0 -189px;} -.x-panel-btns-ct .x-btn-over .x-btn-left{background-position:0 -63px;} -.x-panel-btns-ct .x-btn-over .x-btn-right{background-position:0 -84px;} -.x-panel-btns-ct .x-btn-over .x-btn-center{background-position:0 -105px;} -.x-panel-btns-ct .x-btn-click .x-btn-center{background-position:0 -126px;} -.x-panel-btns-ct .x-btn-click .x-btn-right{background-position:0 -84px;} -.x-panel-btns-ct .x-btn-click .x-btn-left{background-position:0 -63px;} - -.x-window{zoom:1;} -.x-window .x-resizable-handle{opacity:0;-moz-opacity:0;filter:alpha(opacity=0);} -.x-window-proxy{background:#C7DFFC;border:1px solid #99bbe8;z-index:12000;overflow:hidden;position:absolute;left:0;top:0;display:none;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);} -.x-window-header{overflow:hidden;zoom:1;} -.x-window-bwrap{z-index:1;position:relative;zoom:1;} -.x-window-tl .x-window-header{color:#15428b;font:bold 100% arial,sans;padding:5px 0 4px 0;} -.x-window-header-text{cursor:pointer;} -.x-window-tc{background:transparent url(../js/ext/resources/images/default/window/top-bottom.png) repeat-x 0 0;overflow:hidden;zoom:1;} -.x-window-tl{background:transparent url(../js/ext/resources/images/default/window/left-corners.png) no-repeat 0 0;padding-left:6px;zoom:1;z-index:1;position:relative;} -.x-window-tr{background:transparent url(../js/ext/resources/images/default/window/right-corners.png) no-repeat right 0;padding-right:6px;} -.x-window-bc{background:transparent url(../js/ext/resources/images/default/window/top-bottom.png) repeat-x 0 bottom;zoom:1;} -.x-window-bc .x-window-footer{padding-bottom:6px;zoom:1;font-size:0;line-height:0;} -.x-window-bl{background:transparent url(../js/ext/resources/images/default/window/left-corners.png) no-repeat 0 bottom;padding-left:6px;zoom:1;} -.x-window-br{background:transparent url(../js/ext/resources/images/default/window/right-corners.png) no-repeat right bottom;padding-right:6px;zoom:1;} -.x-window-mc{border:1px solid #99bbe8;padding:0;margin:0;font:normal 100% arial,sans;background:#dfe8f6;} -.x-window-ml{background:transparent url(../js/ext/resources/images/default/window/left-right.png) repeat-y 0 0;padding-left:6px;zoom:1;} -.x-window-mr{background:transparent url(../js/ext/resources/images/default/window/left-right.png) repeat-y right 0;padding-right:6px;zoom:1;} -.x-panel-nofooter .x-window-bc{height:6px;} -.x-window-body{overflow:hidden;} -.x-window-bwrap{overflow:hidden;} -.x-window-maximized .x-window-bl,.x-window-maximized .x-window-br,.x-window-maximized .x-window-ml,.x-window-maximized .x-window-mr,.x-window-maximized .x-window-tl,.x-window-maximized .x-window-tr{padding:0;} -.x-window-maximized .x-window-footer{padding-bottom:0;} -.x-window-maximized .x-window-tc{padding-left:3px;padding-right:3px;background-color:white;} -.x-window-maximized .x-window-mc{border-left:0 none;border-right:0 none;} -.x-window-tbar .x-toolbar,.x-window-bbar .x-toolbar{border-left:0 none;border-right:0 none;} -.x-window-bbar .x-toolbar{border-top:1px solid #99bbe8;border-bottom:0 none;} -.x-window-draggable,.x-window-draggable .x-window-header-text{cursor:move;} -.x-window-maximized .x-window-draggable,.x-window-maximized .x-window-draggable .x-window-header-text{cursor:default;} -.x-window-body{background:transparent;} -.x-panel-ghost .x-window-tl{border-bottom:1px solid #99bbe8;} -.x-panel-collapsed .x-window-tl{border-bottom:1px solid #84a0c4;} -.x-window-maximized-ct{overflow:hidden;} -.x-window-maximized .x-resizable-handle{display:none;} -.x-window-sizing-ghost ul{border:0 none!important;} -.x-dlg-focus{-moz-outline:0 none;outline:0 none;width:0;height:0;overflow:hidden;position:absolute;top:0;left:0;} -.x-dlg-mask{z-index:10000;display:none;position:absolute;top:0;left:0;-moz-opacity:0.5;opacity:.50;filter:alpha(opacity=50);background-color:#CCC;} -body.ext-ie6.x-body-masked select{visibility:hidden;} -body.ext-ie6.x-body-masked .x-window select{visibility:visible;} -.x-window-plain .x-window-mc{background:#CAD9EC;border-right:1px solid #DFE8F6;border-bottom:1px solid #DFE8F6;border-top:1px solid #a3bae9;border-left:1px solid #a3bae9;} -.x-window-plain .x-window-body{border-left:1px solid #DFE8F6;border-top:1px solid #DFE8F6;border-bottom:1px solid #a3bae9;border-right:1px solid #a3bae9;background:transparent!important;} -body.x-body-masked .x-window-plain .x-window-mc{background:#C7D6E9;} - -.x-html-editor-wrap{border:1px solid #a9bfd3;background:white;} -.x-html-editor-tb .x-btn-text{background:transparent url(../js/ext/resources/images/default/editor/tb-sprite.gif) no-repeat;} -.x-html-editor-tb .x-edit-bold .x-btn-text{background-position:0 0;} -.x-html-editor-tb .x-edit-italic .x-btn-text{background-position:-16px 0;} -.x-html-editor-tb .x-edit-underline .x-btn-text{background-position:-32px 0;} -.x-html-editor-tb .x-edit-forecolor .x-btn-text{background-position:-160px 0;} -.x-html-editor-tb .x-edit-backcolor .x-btn-text{background-position:-176px 0;} -.x-html-editor-tb .x-edit-justifyleft .x-btn-text{background-position:-112px 0;} -.x-html-editor-tb .x-edit-justifycenter .x-btn-text{background-position:-128px 0;} -.x-html-editor-tb .x-edit-justifyright .x-btn-text{background-position:-144px 0;} -.x-html-editor-tb .x-edit-insertorderedlist .x-btn-text{background-position:-80px 0;} -.x-html-editor-tb .x-edit-insertunorderedlist .x-btn-text{background-position:-96px 0;} -.x-html-editor-tb .x-edit-increasefontsize .x-btn-text{background-position:-48px 0;} -.x-html-editor-tb .x-edit-decreasefontsize .x-btn-text{background-position:-64px 0;} -.x-html-editor-tb .x-edit-sourceedit .x-btn-text{background-position:-192px 0;} -.x-html-editor-tb .x-edit-createlink .x-btn-text{background-position:-208px 0;} -.x-html-editor-tip .x-tip-bd .x-tip-bd-inner{padding:5px;padding-bottom:1px;} -.x-html-editor-tb .x-toolbar{position:static!important;} - -.x-panel-noborder .x-panel-body-noborder{border-width:0;} -.x-panel-noborder .x-panel-header-noborder{border-width:0;border-bottom:1px solid #99bbe8;} -.x-panel-noborder .x-panel-tbar-noborder .x-toolbar{border-width:0;border-bottom:1px solid #99bbe8;} -.x-panel-noborder .x-panel-bbar-noborder .x-toolbar{border-width:0;border-top:1px solid #99bbe8;} -.x-window-noborder .x-window-mc{border-width:0;} -.x-window-plain .x-window-body-noborder{border-width:0;} -.x-tab-panel-noborder .x-tab-panel-body-noborder{border-width:0;} -.x-tab-panel-noborder .x-tab-panel-header-noborder{border-top-width:0;border-left-width:0;border-right-width:0;} -.x-tab-panel-noborder .x-tab-panel-footer-noborder{border-bottom-width:0;border-left-width:0;border-right-width:0;} -.x-tab-panel-bbar-noborder .x-toolbar{border-width:0;border-top:1px solid #99bbe8;} -.x-tab-panel-tbar-noborder .x-toolbar{border-width:0;border-bottom:1px solid #99bbe8;} - -.x-border-layout-ct{background:#dfe8f6;} -.x-border-panel{position:absolute;left:0;top:0;} -.x-tool-collapse-south{background-position:0 -195px;} -.x-tool-collapse-south-over{background-position:-15px -195px;} -.x-tool-collapse-north{background-position:0 -210px;} -.x-tool-collapse-north-over{background-position:-15px -210px;} -.x-tool-collapse-west{background-position:0 -180px;} -.x-tool-collapse-west-over{background-position:-15px -180px;} -.x-tool-collapse-east{background-position:0 -165px;} -.x-tool-collapse-east-over{background-position:-15px -165px;} -.x-tool-expand-south{background-position:0 -210px;} -.x-tool-expand-south-over{background-position:-15px -210px;} -.x-tool-expand-north{background-position:0 -195px;} -.x-tool-expand-north-over{background-position:-15px -195px;} -.x-tool-expand-west{background-position:0 -165px;} -.x-tool-expand-west-over{background-position:-15px -165px;} -.x-tool-expand-east{background-position:0 -180px;} -.x-tool-expand-east-over{background-position:-15px -180px;} -.x-tool-expand-north,.x-tool-expand-south{float:right;margin:3px;} -.x-tool-expand-east,.x-tool-expand-west{float:none;margin:3px auto;} -.x-accordion-hd .x-tool-toggle{background-position:0 -255px;} -.x-accordion-hd .x-tool-toggle-over{background-position:-15px -255px;} -.x-panel-collapsed .x-accordion-hd .x-tool-toggle{background-position:0 -240px;} -.x-panel-collapsed .x-accordion-hd .x-tool-toggle-over{background-position:-15px -240px;} -.x-accordion-hd{color:#222;padding-top:4px;padding-bottom:3px;border-top:0 none;font-weight:normal;background:transparent url(../js/ext/resources/images/default/panel/light-hd.gif) repeat-x 0 -9px;} -.x-layout-collapsed{position:absolute;left:-10000px;top:-10000px;visibility:hidden;background-color:#d2e0f2;width:20px;height:20px;overflow:hidden;border:1px solid #98c0f4;z-index:20;} -.ext-border-box .x-layout-collapsed{width:22px;height:22px;} -.x-layout-collapsed-over{cursor:pointer;background-color:#d9e8fb;} -.x-layout-collapsed-west .x-layout-collapsed-tools,.x-layout-collapsed-east .x-layout-collapsed-tools{position:absolute;top:0;left:0;width:20px;height:20px;} -.x-layout-split{position:absolute;height:5px;width:5px;line-height:1px;font-size:1px;z-index:3;background-color:transparent;} -.x-layout-split-h{background-image:url(../js/ext/resources/images/default/s.gif);background-position:left;} -.x-layout-split-v{background-image:url(../js/ext/resources/images/default/s.gif);background-position:top;} -.x-column-layout-ct{overflow:hidden;zoom:1;} -.x-column{float:left;padding:0;margin:0;overflow:hidden;zoom:1;} -.x-layout-mini{position:absolute;top:0;left:0;display:block;width:5px;height:35px;cursor:pointer;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);} -.x-layout-mini-over,.x-layout-collapsed-over .x-layout-mini{opacity:1;-moz-opacity:1;filter:none;} -.x-layout-split-west .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-left.gif);} -.x-layout-split-east .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-right.gif);} -.x-layout-split-north .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-top.gif);} -.x-layout-split-south .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-bottom.gif);} -.x-layout-cmini-west .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-right.gif);} -.x-layout-cmini-east .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-left.gif);} -.x-layout-cmini-north .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-bottom.gif);} -.x-layout-cmini-south .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-top.gif);} -.x-layout-cmini-west,.x-layout-cmini-east{border:0 none;width:5px!important;padding:0;background:transparent;} -.x-layout-cmini-north,.x-layout-cmini-south{border:0 none;height:5px!important;padding:0;background:transparent;} -.x-viewport,.x-viewport body{margin:0;padding:0;border:0 none;overflow:hidden;height:100%;} -.x-abs-layout-item{position:absolute;left:0;top:0;} -.ext-ie input.x-abs-layout-item,.ext-ie textarea.x-abs-layout-item{margin:0;} - -.x-progress-wrap{border:1px solid #6593cf;overflow:hidden;} -.x-progress-inner{height:18px;background:#e0e8f3 url(../js/ext/resources/images/default/qtip/bg.gif) repeat-x;position:relative;} -.x-progress-bar{height:18px;float:left;width:0;background:#9CBFEE url( ../js/ext/resources/images/default/progress/progress-bg.gif ) repeat-x left center;border-top:1px solid #D1E4FD;border-bottom:1px solid #7FA9E4;border-right:1px solid #7FA9E4;} -.x-progress-text{font-size:100%;font-weight:bold;color:#fff;padding:1px 5px;overflow:hidden;position:absolute;left:0;text-align:center;} -.x-progress-text-back{color:#396095;line-height:16px;} -.ext-ie .x-progress-text-back{line-height:15px;} - -.x-window-dlg .x-window-body{border:0 none!important;padding:5px 10px;overflow:hidden!important;} -.x-window-dlg .x-window-mc{border:0 none!important;} -.x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text{font-size:100%;} -.x-window-dlg .ext-mb-input{margin-top:4px;width:95%;} -.x-window-dlg .ext-mb-textarea{margin-top:4px;font:normal 100% arial,sans;} -.x-window-dlg .x-progress-wrap{margin-top:4px;} -.ext-ie .x-window-dlg .x-progress-wrap{margin-top:6px;} -.x-window-dlg .x-msg-box-wait{background:transparent url(../js/ext/resources/images/default/grid/loading.gif) no-repeat left;display:block;width:300px;padding-left:18px;line-height:18px;} -.x-window-dlg .ext-mb-icon{float:left;width:47px;height:32px;} -.ext-ie .x-window-dlg .ext-mb-icon{width:44px;} -.x-window-dlg .ext-mb-info{background:transparent url(../js/ext/resources/images/default/window/icon-info.gif) no-repeat top left;} -.x-window-dlg .ext-mb-warning{background:transparent url(../js/ext/resources/images/default/window/icon-warning.gif) no-repeat top left;} -.x-window-dlg .ext-mb-question{background:transparent url(../js/ext/resources/images/default/window/icon-question.gif) no-repeat top left;} -.x-window-dlg .ext-mb-error{background:transparent url(../js/ext/resources/images/default/window/icon-error.gif) no-repeat top left;} - - - -/* - * Ext JS Library 2.0.2 - * Copyright(c) 2006-2008, Ext JS, LLC. - * licensing(a)extjs.com - * - * http://extjs.com/license - */ - -.x-panel { - border-style: solid; - border-color: #d0d0d0; -} -.x-panel-header { - color:#333; - border:1px solid #d0d0d0; - background-image:url(../js/ext/resources/images/gray/panel/white-top-bottom.gif); -} - -.x-panel-body { - border-color:#d0d0d0; -} - -.x-panel-bbar .x-toolbar { - border-color:#d0d0d0; -} - -.x-panel-tbar .x-toolbar { - border-color:#d0d0d0; -} - -.x-panel-tbar-noheader .x-toolbar, .x-panel-mc .x-panel-tbar .x-toolbar { - border-color:#d0d0d0; -} -.x-panel-body-noheader, .x-panel-mc .x-panel-body { - border-color:#d0d0d0; -} -.x-panel-tl .x-panel-header { - color:#333; -} -.x-panel-tc { - background-image:url(../js/ext/resources/images/gray/panel/top-bottom.gif); -} -.x-panel-tl { - background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif); - border-color:#d0d0d0; -} -.x-panel-tr { - background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif); -} -.x-panel-bc { - background-image:url(../js/ext/resources/images/gray/panel/top-bottom.gif); -} -.x-panel-bl { - background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif); -} -.x-panel-br { - background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif); -} -.x-panel-mc { - background:#f1f1f1; -} -.x-panel-mc .x-panel-body { - background:transparent; - border: 0 none; -} -.x-panel-ml { - background-image:url(../js/ext/resources/images/gray/panel/left-right.gif); -} -.x-panel-mr { - background-image:url(../js/ext/resources/images/gray/panel/left-right.gif); -} - -/* Tools */ -.x-tool { - background-image:url(../js/ext/resources/images/gray/panel/tool-sprites.gif); -} - -/* Ghosting */ -.x-panel-ghost { - background:#e0e0e0; -} - -.x-panel-ghost ul { - border-color:#b0b0b0; -} - -.x-grid-panel .x-panel-mc .x-panel-body { - border:1px solid #d0d0d0; -} - -/* Buttons */ - -.x-btn-left{ - background-image:url(../js/ext/resources/images/gray/button/btn-sprite.gif); -} -.x-btn-right{ - background-image:url(../js/ext/resources/images/gray/button/btn-sprite.gif); -} -.x-btn-center{ - background-image:url(../js/ext/resources/images/gray/button/btn-sprite.gif); -} - -/* Layout classes */ - -.x-border-layout-ct { - background:#f0f0f0; -} - -.x-accordion-hd { - background-image:url(../js/ext/resources/images/gray/panel/light-hd.gif); -} - -.x-layout-collapsed{ - background-color:#eee; - border-color:#e0e0e0; -} -.x-layout-collapsed-over{ - background-color:#fbfbfb; -} - - -/* qtips */ -.x-tip .x-tip-top { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} -.x-tip .x-tip-top-left { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} -.x-tip .x-tip-top-right { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} -.x-tip .x-tip-ft { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} -.x-tip .x-tip-ft-left { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} -.x-tip .x-tip-ft-right { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} -.x-tip .x-tip-bd-left { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} -.x-tip .x-tip-bd-right { - background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif); -} - -/* Toolbars */ - -.x-toolbar{ - border-color:#d0d0d0; - background:#f0f4f5 url(../js/ext/resources/images/gray/toolbar/bg.gif) repeat-x top left; -} -.x-toolbar button { - color:#444; -} -.x-toolbar .x-btn-menu-arrow-wrap .x-btn-center button { - background-image:url(../js/ext/resources/images/gray/toolbar/btn-arrow.gif); -} -.x-toolbar .x-btn-text-icon .x-btn-menu-arrow-wrap .x-btn-center button { - background-image:url(../js/ext/resources/images/gray/toolbar/btn-arrow.gif); -} -.x-toolbar .x-btn-over .x-btn-left{ - background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif); -} -.x-toolbar .x-btn-over .x-btn-right{ - background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif); -} -.x-toolbar .x-btn-over .x-btn-center{ - background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif); -} -.x-toolbar .x-btn-over button { - color:#111; -} -.x-toolbar .x-btn-click .x-btn-left, .x-toolbar .x-btn-pressed .x-btn-left, .x-toolbar .x-btn-menu-active .x-btn-left{ - background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif); -} -.x-toolbar .x-btn-click .x-btn-right, .x-toolbar .x-btn-pressed .x-btn-right, .x-toolbar .x-btn-menu-active .x-btn-right{ - background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif); -} - -.x-toolbar .x-btn-click .x-btn-center, .x-toolbar .x-btn-pressed .x-btn-center, .x-toolbar .x-btn-menu-active .x-btn-center{ - background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif); -} -.x-toolbar .ytb-sep { - background-image: url(../js/ext/resources/images/default/grid/grid-split.gif); -} - -/* Tabs */ - -.x-tab-panel-header, .x-tab-panel-footer { - background: #EAEAEA; - border-color:#d0d0d0; -} - - -.x-tab-panel-header { - border-color:#d0d0d0; -} - -.x-tab-panel-footer { - border-color:#d0d0d0; -} - -ul.x-tab-strip-top{ - background:#dbdbdb url(../js/ext/resources/images/gray/tabs/tab-strip-bg.gif) repeat-x left top; - border-color:#d0d0d0; - padding-top: 2px; -} - -ul.x-tab-strip-bottom{ - background-image:url(../js/ext/resources/images/gray/tabs/tab-strip-btm-bg.gif); - border-color:#d0d0d0; -} - -.x-tab-strip span.x-tab-strip-text { - color:#333; -} -.x-tab-strip-over span.x-tab-strip-text { - color:#111; -} - -.x-tab-strip-active span.x-tab-strip-text { - color:#333; -} - -.x-tab-strip-disabled .x-tabs-text { - color:#aaaaaa; -} - -.x-tab-strip-top .x-tab-right { - background-image:url(../js/ext/resources/images/gray/tabs/tabs-sprite.gif); -} - -.x-tab-strip-top .x-tab-left { - background-image:url(../js/ext/resources/images/gray/tabs/tabs-sprite.gif); -} -.x-tab-strip-top .x-tab-strip-inner { - background-image:url(../js/ext/resources/images/gray/tabs/tabs-sprite.gif); -} - -.x-tab-strip-bottom .x-tab-right { - background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-inactive-right-bg.gif); -} - -.x-tab-strip-bottom .x-tab-left { - background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-inactive-left-bg.gif); -} - -.x-tab-strip-bottom .x-tab-strip-active .x-tab-right { - background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-right-bg.gif); -} - -.x-tab-strip-bottom .x-tab-strip-active .x-tab-left { - background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-left-bg.gif); -} - -.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close { - background-image:url(../js/ext/resources/images/gray/tabs/tab-close.gif); -} -.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover{ - background-image:url(../js/ext/resources/images/gray/tabs/tab-close.gif); -} - -.x-tab-panel-body { - border-color:#d0d0d0; - background:#fff; -} -.x-tab-panel-bbar .x-toolbar { - border-color: #d0d0d0; -} - -.x-tab-panel-tbar .x-toolbar { - border-color: #d0d0d0; -} - -.x-tab-panel-header-plain .x-tab-strip-spacer { - border-color:#d0d0d0; - background: #eaeaea; -} - -.x-tab-scroller-left { - background-image: url(../js/ext/resources/images/gray/tabs/scroll-left.gif); - border-color:#aeaeae; -} -.x-tab-scroller-right { - background-image: url(../js/ext/resources/images/gray/tabs/scroll-right.gif); - border-color:#aeaeae; -} - -/* Window */ - -.x-window-proxy { - background:#e0e0e0; - border-color:#b0b0b0; -} - -.x-window-tl .x-window-header { - color:#555; -} -.x-window-tc { - background-image:url(../js/ext/resources/images/gray/window/top-bottom.png); -} -.x-window-tl { - background-image:url(../js/ext/resources/images/gray/window/left-corners.png); -} -.x-window-tr { - background-image:url(../js/ext/resources/images/gray/window/right-corners.png); -} -.x-window-bc { - background-image:url(../js/ext/resources/images/gray/window/top-bottom.png); -} -.x-window-bl { - background-image:url(../js/ext/resources/images/gray/window/left-corners.png); -} -.x-window-br { - background-image:url(../js/ext/resources/images/gray/window/right-corners.png); -} -.x-window-mc { - border:1px solid #d0d0d0; - background:#e8e8e8; -} - -.x-window-ml { - background-image:url(../js/ext/resources/images/gray/window/left-right.png); -} -.x-window-mr { - background-image:url(../js/ext/resources/images/gray/window/left-right.png); -} -.x-panel-ghost .x-window-tl { - border-color:#d0d0d0; -} -.x-panel-collapsed .x-window-tl { - border-color:#d0d0d0; -} - -.x-window-plain .x-window-mc { - background: #e8e8e8; - border-right:1px solid #eee; - border-bottom:1px solid #eee; - border-top:1px solid #d0d0d0; - border-left:1px solid #d0d0d0; -} - -.x-window-plain .x-window-body { - border-left:1px solid #eee; - border-top:1px solid #eee; - border-bottom:1px solid #d0d0d0; - border-right:1px solid #d0d0d0; - background:transparent !important; -} - -body.x-body-masked .x-window-mc, body.x-body-masked .x-window-plain .x-window-mc { - background-color: #e4e4e4; -} - - -/* misc */ -.x-html-editor-wrap { - border-color:#d0d0d0; -} - -/* Borders go last for specificity */ -.x-panel-noborder .x-panel-body-noborder { - border-width:0; -} - -.x-panel-noborder .x-panel-header-noborder { - border-width:0; - border-bottom:1px solid #d0d0d0; -} - -.x-panel-noborder .x-panel-tbar-noborder .x-toolbar { - border-width:0; - border-bottom:1px solid #d0d0d0; -} - -.x-panel-noborder .x-panel-bbar-noborder .x-toolbar { - border-width:0; - border-top:1px solid #d0d0d0; -} - -.x-window-noborder .x-window-mc { - border-width:0; -} -.x-window-plain .x-window-body-noborder { - border-width:0; -} - -.x-tab-panel-noborder .x-tab-panel-body-noborder { - border-width:0; -} - -.x-tab-panel-noborder .x-tab-panel-header-noborder { - border-top-width:0; - border-left-width:0; - border-right-width:0; -} - -.x-tab-panel-noborder .x-tab-panel-footer-noborder { - border-bottom-width:0; - border-left-width:0; - border-right-width:0; -} - - -.x-tab-panel-bbar-noborder .x-toolbar { - border-width:0; - border-top:1px solid #d0d0d0; -} - -.x-tab-panel-tbar-noborder .x-toolbar { - border-width:0; - border-bottom:1px solid #d0d0d0; -} - -.kunebody { - background-color: #FFF; - color: #000; - font-family: arial, sans; - margin: 5px 5px 5px 5px; -} - -#kuneinitialcurtain { - position: absolute; - left: 0px; - top: 0px; - width: 100%; - height: 100%; - background-color: #FFF; - z-index: 9999; -} - -/* Global styles */ - -.gwt-HorizontalSplitPanel .hsplitter { - cursor: e-resize; - width: 6px; -} - -.gwt-DialogBox { - border: 8px solid #C3D9FF; - border: 2px outset; - background-color: white; -} - -.gwt-DialogBox .Caption { - background-color: #C3D9FF; - font-size: 85%; - font-weight: 700; - padding: 3px; - margin: 2px; - cursor: default; -} - -.gwt-MenuBar { - background-color: #F2F2F2; - border: 1px solid #999; - vertical-align: middle; - padding: 5px 0; -} - -.gwt-MenuBar .gwt-MenuItem { - cursor: pointer; - padding: 1px 10px; - white-space: nowrap; -} - -.gwt-MenuBar .gwt-MenuItem img { - vertical-align: middle; - margin-right: 3px; -} - -.gwt-MenuBar .gwt-MenuItem { - background-color: #F2F2F2; -} - -.gwt-MenuBar .gwt-MenuItem-selected { - background-color: #FFB958; -} - -.kune-MenuBar .gwt-MenuItem { - background: transparent url(img/button-bg-hard.gif) repeat-x 0 0; - border-left: 1px solid #AAA; - border-right: 1px solid #AAA; - color: #999; - cursor: pointer; - cursor: hand; - white-space: nowrap; - padding: 0 10px; -} - -.kune-MenuBar .gwt-MenuItem-selected { - background: transparent url(img/button-bg-soft.gif) repeat-x 0 0; - color: #996633; -} - -.kune-expandHoriz { - width: 100%; -} - -.kune-expandVert { - height: 100%; -} - -.kune-floatleft { - float: left; -} - -.kune-floatright { - float: right; -} - -/* Deprecated */ -.kune-Default-Form { - margin: 10px; -} - -.kune-valignmiddle { - vertical-align: middle; -} - -fieldset { - border:1px solid #B5B8C8; - /* margin-bottom:10px; */ - padding:10px 10px 5px; -} - -legend { - color:#15428B; - font-size: 85%; - font-size-adjust:none; - font-style:normal; - font-variant:normal; - font-weight:bold; - line-height:normal; -} - -.gwt-RadioButton input { - margin: 0 3px; - vertical-align:middle; -} - -.gwt-RadioButton label { - margin: 0 3px; - vertical-align:middle; -} - -.kune-pointer { - cursor: pointer; -} - -.kuneLabelPre { - white-space: pre !important; -} - -/* Buttons */ - -.kune-CustomPushButton-space { - margin-top: 3px; - margin-bottom: 3px; -} - -.kune-CustomPushButton { - background: transparent url(img/button-bg-hard.gif) repeat-x 0 0; - border-left: 1px solid #AAA; - border-right: 1px solid #AAA; - color: #999; - cursor: pointer; - white-space: nowrap; - padding: 0px 12px; -} - -.kune-CustomPushButton-up { - color: #161616; -} - -.kune-CustomPushButton-down { - color: black; -} - -.kune-CustomPushButton-up-hovering { - color: #161616; - background: transparent url(img/button-bg-soft.gif) repeat-x 0 0; -} - -.kune-CustomPushButton-down-hovering { - color: black; -} - -.kune-CustomPushButton-up-disabled { - background: transparent url(img/button-bg-soft.gif) repeat-x 0 0; - color: #E0E0E0; - cursor: default; -} - -.kune-CustomPushButton-down-disabled { - background: transparent url(img/button-bg-soft.gif) repeat-x 0 0; - color: #E0E0E0; - cursor: default; -} - -.kune-Button-Large-lrSpace { - margin-left: 12px; - margin-right: 12px; -} - -.kune-Button-Large-rSpace { - margin-right: 12px; -} - -.kune-Button-Large-lSpace { - margin-left: 12px; -} - -.kune-Button-Large-tbSpace { - margin-top: 12px; - margin-bottom: 12px; -} - -.kune-Button-Small-lrSpace { - margin-left: 10px; - margin-right: 10px; -} - -.kune-Button-Small-rSpace { - margin-right: 10px; -} - -.kune-Button-Small-lSpace { - margin-left: 10px; -} - -.kune-Button-Small-tbSpace { - margin-top: 10px; - margin-bottom: 10px; -} - -.kune-Button-Mini-lSpace { - margin-left: 8px; -} - -.kune-Button-Mini-lrSpace { - margin-left: 8px; - margin-right: 8px; -} - -.kune-Button-Mini-rSpace { - margin-right: 8px; -} - -.kune-Button-Mini-tbSpace { - margin-top: 8px; - margin-bottom: 8px; -} - -.kune-IconHyperlink { -} - -.kune-IconHyperlink a:link { - /* text-decoration: underline; */ - color: green; -} - -.kune-IconHyperlink a:hover { - text-decoration: underline; -} - -.kune-IconHyperlink a:visited { - color: #808000; -} - -.kune-IconHyperlink img { - margin-right: 4px; - vertical-align: middle; -} - -.kune-IconLabel { - -} - -.kune-IconLabel img { - margin-right: 4px; - vertical-align: middle; -} - -.kune-link { - text-decoration: underline; - color: green; - cursor: pointer; -} - -/* DropDowns */ - -.kune-DropDownOuter { - background-color: green; -} - -.kune-DropDownInner { - margin: 0 3px 1px 3px; - background: green; - background-color: #FFF; - padding: 3px; -} - -.kune-DropDownLabel { - color: #FFF; - cursor: pointer; -} - -.kune-DropDownLabel .gwt-Label { - margin: 0 5px 0 0; - width: 100%; -} - -.kune-DropDownLabel img { - margin: 0 3px 0 1px; -} - -.kune-IconLabel { - color: green; -} - -.kune-IconLabel img { - margin-right: 4px; - vertical-align: middle; -} - -/* Used in multi chat panel status change */ -.x-menu-item img { - margin-right: 4px; - vertical-align: middle; -} - -/* Margins */ - -.kune-Margin-40-trbl { - margin: 40px; -} - -.kune-Margin-40-lr { - margin-left: 40px; - margin-right: 40px; -} - -.kune-Margin-40-tl { - margin-top: 40px; - margin-left: 40px; -} - -.kune-Margin-40-tb { - margin-top: 40px; - margin-bottom: 40px; -} - -.kune-Margin-40-t { - margin-top: 40px; -} - -.kune-Margin-40-r { - margin-right: 40px; -} - -.kune-Margin-40-l { - margin-left: 40px; -} - -.kune-Margin-20-trbl { - margin: 20px; -} - -.kune-Margin-20-lr { - margin-left: 20px; - margin-right: 20px; -} - -.kune-Margin-20-tl { - margin-top: 20px; - margin-left: 20px; -} - -.kune-Margin-20-tb { - margin-top: 20px; - margin-bottom: 20px; -} - -.kune-Margin-20-t { - margin-top: 20px; -} - -.kune-Margin-20-r { - margin-right: 20px; -} - -.kune-Margin-20-l { - margin-left: 20px; -} - -.kune-Margin-Large-trbl { - margin: 10px; -} - -.kune-Margin-Large-lr { - margin-left: 10px; - margin-right: 10px; -} - -.kune-Margin-Large-tl { - margin-top: 10px; - margin-left: 10px; -} - -.kune-Margin-Large-tb { - margin-top: 10px; - margin-bottom: 10px; -} - -.kune-Margin-Large-t { - margin-top: 10px; -} - -.kune-Margin-Large-r { - margin-right: 10px; -} - -.kune-Margin-Large-l { - margin-left: 10px; -} - -.kune-Margin-7-trbl { - margin: 7px; -} - -.kune-Margin-7-lr { - margin-left: 7px; - margin-right: 7px; -} - -.kune-Margin-7-tl { - margin-top: 7px; - margin-left: 7px; -} - -.kune-Margin-7-tb { - margin-top: 7px; - margin-bottom: 7px; -} - -.kune-Margin-7-t { - margin-top: 7px; -} - -.kune-Margin-7-r { - margin-right: 7px; -} - -.kune-Margin-7-b { - margin-bottom: 7px; -} - -.kune-Margin-7-l { - margin-left: 7px; -} - -.kune-Margin-Medium-trbl { - margin: 5px; -} - -.kune-Margin-Medium-lr { - margin-left: 5px; - margin-right: 5px; -} - -.kune-Margin-Medium-tl { - margin-top: 5px; - margin-left: 5px; -} - -.kune-Margin-Medium-tb { - margin-top: 5px; - margin-bottom: 5px; -} - -.kune-Margin-Medium-t { - margin-top: 5px; -} - -.kune-Margin-Medium-r { - margin-right: 5px; -} - -.kune-Margin-Medium-b { - margin-bottom: 5px; -} - -.kune-Margin-Medium-l { - margin-left: 5px; -} - -.kune-Margin-Small-trbl { - margin: 3px; -} - -.kune-Margin-Small-lr { - margin-left: 3px; - margin-right: 3px; -} - -.kune-Margin-Small-tl { - margin-top: 3px; - margin-left: 3px; -} - -.kune-Margin-Small-tb { - margin-top: 3px; - margin-bottom: 3px; -} - -.kune-Margin-Small-t { - margin-top: 3px; -} - -.kune-Margin-Small-l { - margin-left: 3px; -} - -.kune-Margin-Small-r { - margin-right: 3px; -} - -.kune-Margin-Small-b { - margin-bottom: 3px; -} - -.kune-Margin-Mini-trbl { - margin: 1px; -} - -.kune-Margin-Mini-lr { - margin-left: 1px; - margin-right: 1px; -} - -.kune-Margin-Mini-tl { - margin-top: 1px; - margin-left: 1px; -} - -.kune-Margin-Mini-tb { - margin-top: 1px; - margin-bottom: 1px; -} - -.kune-Margin-Mini-t { - margin-top: 1px; -} - -.kune-Margin-Mini-r { - margin-right: 1px; -} - -.kune-Margin-Mini-b { - margin-bottom: 1px; -} - -.kune-Margin-Mini-l { - margin-left: 1px; -} - -/* Fonts -see: http://developer.yahoo.com/yui/fonts/ */ - -.kune-ft10px { - font-size: 77% -} - -.kune-ft11px { - font-size: 85% -} - -.kune-ft12px { - font-size: 93% -} - -.kune-ft13px { - font-size: 100% -} - -.kune-ft14px { - font-size: 108% -} - -.kune-ft15px { - font-size: 116% -} - -.kune-ft16px { - font-size: 123.1% -} - -.kune-ft17px { - font-size: 131% -} - -.kune-ft18px { - font-size: 138.5% -} - -.kune-ft19px { - font-size: 146.5% -} - -.kune-ft20px { - font-size: 153.9% -} - -.kune-ft21px { - font-size: 161.6% -} - -.kune-ft22px { - font-size: 167% -} - -.kune-ft23px { - font-size: 174% -} - -.kune-ft24px { - font-size: 182% -} - -.kune-ft25px { - font-size: 189% -} - -.kune-ft26px { - font-size: 197% -} - - -/* Sitebar */ - -.kune-SiteBarPanel .kune-IconHyperlink { - white-space: nowrap; -} - -.kune-SiteBarPanel .kune-IconHyperlink a:link { - cursor: pointer; - text-decoration: underline; - color: #B3B3B3; -} - -.kune-SiteBarPanel .kune-IconHyperlink a:hover { - text-decoration: underline; -} - -.kune-SiteBarPanel .kune-IconHyperlink a:visited { - color: #B3B3B3; -} - -.kune-SiteBarPanel { - margin-right: 10px; - height: 16px; -} - -.kune-SiteBarPanel .gwt-TextBox { - border: 1px solid #E4A374; - margin: 0 15px 0 3px; - padding-left: 3px; - color: #B3B3B3; -} - -.kune-SiteBarPanel .gwt-Hyperlink a { - white-space: nowrap; - color: #B3B3B3; - text-decoration: underline; - cursor: pointer; -} - -.kune-SiteBarPanel .gwt-PushButton { - cursor: pointer; -} - -.kune-SiteBarPanel-Separator { - color: #E4A374; - margin: 0 5px; -} - -.kune-SiteBarPanel-SpaceSeparator { - width: 10px; -} - -.kune-SiteMessagePanel { - color: #250; - position: absolute; - z-index: 10000; - vertical-align: middle; -} - -.kune-SiteMessagePanel .gwt-HTML { - margin: 15px 5px 15px 2px; -} - -.kune-SiteMessagePanel .gwt-Image { - margin: 5px; -} - -.kune-SiteMessagePanel-error { - background-color: #FFB380; - border: 1px solid #FF0066; -} - -.kune-SiteMessagePanel-veryimp { - background-color: #FFD4AA; - border: 1px solid #FF5599; -} - -.kune-SiteMessagePanel-imp { - background-color: #FFE6D5; - border: 1px solid #DE87AA; -} - -.kune-SiteMessagePanel-info { - background-color: #E5FF80; - border: 1px solid #87DE87; -} - -/* Workspace styles */ -.kune-WorkspacePanel { - width: 100%; - background-color: #FFF; -} - -.kune-WokspacePanel .Tab { - -} - -.kune-WorkspacePanel .GeneralHP { - -} - -.kune-WorkspacePanel .ContextPanel { - width: 100%; - border-right: 3px solid #DD8A3D; -} - -.kune-GroupSummaryPanel { - margin: 5px 0 0 5px; - width: 100%; -} - -.kune-GroupToolsBar { - width: 150px; -} - -.kune-GroupToolsBar-itemSelected { - margin-bottom: 5px; -} - -.kune-GroupToolsBar-itemSelected .gwt-Hyperlink a { - color: #FFF; - padding: 0 9px; - text-decoration: none; -} - -.kune-GroupToolsBar-itemSelected .gwt-Hyperlink a:hover { - text-decoration: none; -} - -.kune-GroupToolsBar-itemNotSelected { - margin-bottom: 5px; -} - -.kune-GroupToolsBar-itemNotSelected .gwt-Hyperlink a { - color: green; - padding: 0 9px; - text-decoration: none; -} - -.kune-GroupToolsBar-itemNotSelected .gwt-Hyperlink a:hover { - text-decoration: none; -} - -/* Content titles */ - -.kune-ContentToolBarPanel { - background-color: #F2F2F2; - padding: 2px; - height: 24px; - vertical-align: middle; -} - -.kune-ContentBottomBar { - vertical-align: middle; - height: 24px; -} - -.kune-ContentBottomBar .gwt-Image { - margin-left: 5px; - cursor: pointer; - float: left; -} - -.kune-ContentBottomBar .gwt-Label a { - -} - -/* Main Content & Context */ -.kune-WorkspacePanel-Content { - background-color: #FCFCFC; - width: 100%; - height: 100%; -} - -.kune-WorkspacePanel-Content .main-content { - margin: 7px 5px 5px 10px; -} - -.kune-WorkspacePanel-Context { - background-color: #CFA; - width: 100%; - height: 100%; -} - -.kune-NavigationBar { - width: 100%; -} - -.kune-NavigationBar .topBar { - background-color: #ececec; - background: #ececec; - border-bottom: 1px solid #e3dbdb; - vertical-align: middle; -} - -.kune-NavigationBar .topBar .gwt-PushButton { - margin: 1px 3px 1px 0; -} - -.kune-NavigationBar .topBar .gwt-Label { - vertical-align: middle; -} - -.kune-NavigationBar .kune-topBar-iconBar { - margin: 2px 0 2px 5px; -} - -.kune-NavigationBar .kune-ContextItemsPanel-LabelLink { - /* text-decoration: underline; */ - color: green; - cursor: pointer; - margin-left: 3px; -} - -/* +*/body{font:13px/1.22 arial,helvetica,clean,sans-serif;font-size:small;font:x-small;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;font-size:108%;line-height:99%;}/* + * Ext JS Library 2.0.2 + * Copyright(c) 2006-2008, Ext JS, LLC. + * licensing(a)extjs.com + * + * http://extjs.com/license + */html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}img,body,html{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}ol,ul{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;}q:before,q:after{content:'';}.ext-el-mask{z-index:20000;position:absolute;top:0;left:0;-moz-opacity:.5;opacity:.50;filter:alpha(opacity=50);background-color:#CCC;width:100%;height:100%;zoom:1;}.ext-el-mask-msg{z-index:20001;position:absolute;top:0;left:0;border:1px solid #6593cf;background:#c3daf9 url(../js/ext/resources/images/default/box/tb-blue.gif) repeat-x 0 -16px;padding:2px;}.ext-el-mask-msg div{padding:5px 10px;background:#eee;border:1px solid #a3bad9;color:#222;font:normal 100% arial,sans;cursor:wait;}.ext-shim{position:absolute;visibility:hidden;left:0;top:0;overflow:hidden;}.ext-ie .ext-shim{filter:alpha(opacity=0);}.ext-ie6 .ext-shim{margin-left:5px;margin-top:3px;}.x-mask-loading div{padding:5px 10px 5px 25px;background:#fbfbfb url(../js/ext/resources/images/default/grid/loading.gif) no-repeat 5px 5px;line-height:16px;}.x-hidden,.x-hide-offsets{position:absolute;left:-10000px;top:-10000px;visibility:hidden;}.x-hide-display{display:none!important;}.x-hide-visibility{visibility:hidden!important;}.x-masked{overflow:hidden!important;}.x-masked select,.x-masked object,.x-masked embed{visibility:hidden;}.x-layer{visibility:hidden;}.x-unselectable,.x-unselectable *{-moz-user-select:none;-khtml-user-select:none;}.x-repaint{zoom:1;background-color:transparent;-moz-outline:none;}.x-item-disabled{color:gray;cursor:default;opacity:.6;-moz-opacity:.6;filter:alpha(opacity=60);}.x-item-disabled *{color:gray!important;cursor:default!important;}.x-splitbar-proxy{position:absolute;visibility:hidden;z-index:20001;background:#aaa;zoom:1;line-height:1px;font-size:1px;overflow:hidden;}.x-splitbar-h,.x-splitbar-proxy-h{cursor:e-resize;cursor:col-resize;}.x-splitbar-v,.x-splitbar-proxy-v{cursor:s-resize;cursor:row-resize;}.x-color-palette{width:150px;height:92px;cursor:pointer;}.x-color-palette a{border:1px solid #fff;float:left;padding:2px;text-decoration:none;-moz-outline:0 none;outline:0 none;cursor:pointer;}.x-color-palette a:hover,.x-color-palette a.x-color-palette-sel{border:1px solid #8BB8F3;background:#deecfd;}.x-color-palette em{display:block;border:1px solid #ACA899;}.x-color-palette em span{cursor:pointer;display:block;height:10px;line-height:10px;width:10px;}.x-ie-shadow{display:none;position:absolute;overflow:hidden;left:0;top:0;background:#777;zoom:1;}.x-shadow{display:none;position:absolute;overflow:hidden;left:0;top:0;}.x-shadow *{overflow:hidden;}.x-shadow *{padding:0;border:0;margin:0;clear:none;zoom:1;}.x-shadow .xstc,.x-shadow .xsbc{height:6px;float:left;}.x-shadow .xstl,.x-shadow .xstr,.x-shadow .xsbl,.x-shadow .xsbr{width:6px;height:6px;float:left;}.x-shadow .xsc{width:100%;}.x-shadow .xsml,.x-shadow .xsmr{width:6px;float:left;height:100%;}.x-shadow .xsmc{float:left;height:100%;background:transparent url(../js/ext/resources/images/default/shadow-c.png);}.x-shadow .xst,.x-shadow .xsb{height:6px;overflow:hidden;width:100%;}.x-shadow .xsml{background:transparent url(../js/ext/resources/images/default/shadow-lr.png) repeat-y 0 0;}.x-shadow .xsmr{background:transparent url(../js/ext/resources/images/default/shadow-lr.png) repeat-y -6px 0;}.x-shadow .xstl{background:transparent url(../js/ext/resources/images/default/shadow.png) no-repeat 0 0;}.x-shadow .xstc{background:transparent url(../js/ext/resources/images/default/shadow.png) repeat-x 0 -30px;}.x-shadow .xstr{background:transparent url(../js/ext/resources/images/default/shadow.png) repeat-x 0 -18px;}.x-shadow .xsbl{background:transparent url(../js/ext/resources/images/default/shadow.png) no-repeat 0 -12px;}.x-shadow .xsbc{background:transparent url(../js/ext/resources/images/default/shadow.png) repeat-x 0 -36px;}.x-shadow .xsbr{background:transparent url(../js/ext/resources/images/default/shadow.png) repeat-x 0 -6px;}.loading-indicator{font-size:100%;background-image:url(../js/ext/resources/images/default/grid/loading.gif);background-repeat:no-repeat;background-position:left;padding-left:20px;line-height:16px;margin:3px;}.x-text-resize{position:absolute;left:-1000px;top:-1000px;visibility:hidden;zoom:1;}.x-drag-overlay{width:100%;height:100%;display:none;position:absolute;left:0;top:0;background-image:url(../js/ext/resources/images/default/s.gif);z-index:20000;}.x-clear{clear:both;height:0;overflow:hidden;line-height:0;font-size:0;}.x-spotlight{z-index:8999;position:absolute;top:0;left:0;-moz-opacity:.5;opacity:.50;filter:alpha(opacity=50);background-color:#CCC;width:0;height:0;zoom:1;}.x-tab-panel{overflow:hidden;}.x-tab-panel-header,.x-tab-panel-footer{background:#deecfd;border:1px solid #8db2e3;overflow:hidden;zoom:1;}.x-tab-panel-header{border:1px solid #8db2e3;padding-bottom:2px;}.x-tab-panel-footer{border:1px solid #8db2e3;padding-top:2px;}.x-tab-strip-wrap{width:100%;overflow:hidden;position:relative;zoom:1;}ul.x-tab-strip{display:block;width:5000px;zoom:1;}ul.x-tab-strip-top{padding-top:1px;background:url(../js/ext/resources/images/default/tabs/tab-strip-bg.gif) #cedff5 repeat-x bottom;border-bottom:1px solid #8db2e3;}ul.x-tab-strip-bottom{padding-bottom:1px;background:url(../js/ext/resources/images/default/tabs/tab-strip-btm-bg.gif) #cedff5 repeat-x top;border-top:1px solid #8db2e3;border-bottom:0 none;}.x-tab-panel-header-plain .x-tab-strip-top{background:transparent!important;padding-top:0!important;}.x-tab-panel-header-plain{background:transparent!important;border-width:0!important;padding-bottom:0!important;}.x-tab-panel-header-plain .x-tab-strip-spacer{border:1px solid #8db2e3;border-top:0 none;height:2px;background:#deecfd;font-size:1px;line-height:1px;}.ext-border-box .x-tab-panel-header-plain .x-tab-strip-spacer{height:3px;}ul.x-tab-strip li{float:left;margin-left:2px;}ul.x-tab-strip li.x-tab-edge{float:left;margin:0!important;padding:0!important;border:0 none!important;font-size:1px!important;line-height:1px!important;overflow:hidden;zoom:1;background:transparent!important;width:1px;}.x-tab-strip a,.x-tab-strip span,.x-tab-strip em{display:block;}.x-tab-strip a{text-decoration:none!important;-moz-outline:none;outline:none;cursor:pointer;}.x-tab-strip-inner{overflow:hidden;text-overflow:ellipsis;}.x-tab-strip span.x-tab-strip-text{font:normal 100% arial,sans;color:#416aa3;white-space:nowrap;cursor:pointer;padding:4px 0;}.x-tab-strip .x-tab-with-icon .x-tab-right{padding-left:6px;}.x-tab-strip .x-tab-with-icon span.x-tab-strip-text{padding-left:20px;background-position:0 3px;background-repeat:no-repeat;}.x-tab-strip-over span.x-tab-strip-text{color:#15428b;}.x-tab-strip-active{cursor:default;}.x-tab-strip-active span.x-tab-strip-text{cursor:default;color:#15428b;font-weight:700;}.x-tab-strip-disabled .x-tabs-text{cursor:default;color:#aaa;}.x-tab-panel-body{overflow:hidden;}.x-tab-panel-bwrap{overflow:hidden;}.ext-ie .x-tab-strip .x-tab-right{position:relative;}.x-tab-strip-top .x-tab-strip-active .x-tab-right{margin-bottom:-1px;}.x-tab-strip-top .x-tab-strip-active .x-tab-right span.x-tab-strip-text{padding-bottom:5px;}.x-tab-strip-bottom .x-tab-strip-active .x-tab-right{margin-top:-1px;}.x-tab-strip-bottom .x-tab-strip-active .x-tab-right span.x-tab-strip-text{padding-top:5px;}.x-tab-strip-top .x-tab-right{background:transparent url(../js/ext/resources/images/default/tabs/tabs-sprite.gif) no-repeat 0 -51px;padding-left:10px;}.x-tab-strip-top .x-tab-left{background:transparent url(../js/ext/resources/images/default/tabs/tabs-sprite.gif) no-repeat right -351px;padding-right:10px;}.x-tab-strip-top .x-tab-strip-inner{background:transparent url(../js/ext/resources/images/default/tabs/tabs-sprite.gif) repeat-x 0 -201px;}.x-tab-strip-top .x-tab-strip-over .x-tab-right{background-position:0 -101px;}.x-tab-strip-top .x-tab-strip-over .x-tab-left{background-position:right -401px;}.x-tab-strip-top .x-tab-strip-over .x-tab-strip-inner{background-position:0 -251px;}.x-tab-strip-top .x-tab-strip-active .x-tab-right{background-position:0 0;}.x-tab-strip-top .x-tab-strip-active .x-tab-left{background-position:right -301px;}.x-tab-strip-top .x-tab-strip-active .x-tab-strip-inner{background-position:0 -151px;}.x-tab-strip-bottom .x-tab-right{background:url(../js/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif) no-repeat bottom right;}.x-tab-strip-bottom .x-tab-left{background:url(../js/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif) no-repeat bottom left;}.x-tab-strip-bottom .x-tab-strip-active .x-tab-right{background:url(../js/ext/resources/images/default/tabs/tab-btm-right-bg.gif) no-repeat bottom left;}.x-tab-strip-bottom .x-tab-strip-active .x-tab-left{background:url(../js/ext/resources/images/default/tabs/tab-btm-left-bg.gif) no-repeat bottom right;}.x-tab-strip-bottom .x-tab-left{padding:0 10px;}.x-tab-strip-bottom .x-tab-right{padding:0;}.x-tab-strip .x-tab-strip-close{display:none;}.x-tab-strip-closable{position:relative;}.x-tab-strip-closable .x-tab-left{padding-right:19px;}.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close{background-image:url(../js/ext/resources/images/default/tabs/tab-close.gif);opacity:.6;-moz-opacity:.6;background-repeat:no-repeat;display:block;width:11px;height:11px;position:absolute;top:3px;right:3px;cursor:pointer;z-index:2;}.x-tab-strip .x-tab-strip-active a.x-tab-strip-close{opacity:.8;-moz-opacity:.8;}.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover{background-image:url(../js/ext/resources/images/default/tabs/tab-close.gif);opacity:1;-moz-opacity:1;}.x-tab-panel-body{border:1px solid #8db2e3;background:#fff;}.x-tab-panel-body-top{border-top:0 none;}.x-tab-panel-body-bottom{border-bottom:0 none;}.x-tab-scroller-left{background:transparent url(../js/ext/resources/images/default/tabs/scroll-left.gif) no-repeat -18px 0;border-bottom:1px solid #8db2e3;width:18px;position:absolute;left:0;top:0;z-index:10;cursor:pointer;}.x-tab-scroller-left-over{background-position:0 0;}.x-tab-scroller-left-disabled{background-position:-18px 0;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);cursor:default;}.x-tab-scroller-right{background:transparent url(../js/ext/resources/images/default/tabs/scroll-right.gif) no-repeat 0 0;border-bottom:1px solid #8db2e3;width:18px;position:absolute;right:0;top:0;z-index:10;cursor:pointer;}.x-tab-scroller-right-over{background-position:-18px 0;}.x-tab-scroller-right-disabled{background-position:0 0;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);cursor:default;}.x-tab-scrolling .x-tab-strip-wrap{margin-left:18px;margin-right:18px;}.x-tab-scrolling{position:relative;}.x-tab-panel-bbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;}.x-tab-panel-tbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;}.x-border-layout-ct .x-tab-panel{background:#FFF;}.x-form-field{margin:0;font:normal 100% arial,sans;}.x-form-text,textarea.x-form-field{padding:1px 3px;background:#fff url(../js/ext/resources/images/default/form/text-bg.gif) repeat-x 0 0;border:1px solid #B5B8C8;}textarea.x-form-field{padding:2px 3px;}.x-form-text{height:22px;line-height:18px;vertical-align:middle;}.ext-ie .x-form-text{margin:-1px 0;height:22px;line-height:18px;}.ext-ie textarea.x-form-field{margin:-1px 0;}.ext-strict .x-form-text{height:18px;}.ext-safari .x-form-text{height:20px;padding:0 3px;}.ext-safari.ext-mac textarea.x-form-field{margin-bottom:-2px;}.ext-gecko .x-form-text{padding-top:2px;padding-bottom:0;}textarea{resize:none;}.x-form-select-one{height:20px;line-height:18px;vertical-align:middle;background-color:#fff;border:1px solid #B5B8C8;}.x-form-field-wrap{position:relative;zoom:1;white-space:nowrap;}.x-editor .x-form-check-wrap{background:#fff;}.x-form-field-wrap .x-form-trigger{width:17px;height:21px;border:0;background:transparent url(../js/ext/resources/images/default/form/trigger.gif) no-repeat 0 0;cursor:pointer;border-bottom:1px solid #B5B8C8;position:absolute;top:0;}.ext-safari .x-form-field-wrap .x-form-trigger{height:21px;}.x-form-field-wrap .x-form-date-trigger{background-image:url(../js/ext/resources/images/default/form/date-trigger.gif);cursor:pointer;}.x-form-field-wrap .x-form-clear-trigger{background-image:url(../js/ext/resources/images/default/form/clear-trigger.gif);cursor:pointer;}.x-form-field-wrap .x-form-search-trigger{background-image:url(../js/ext/resources/images/default/form/search-trigger.gif);cursor:pointer;}.ext-safari .x-form-field-wrap .x-form-trigger{right:0;}.x-form-field-wrap .x-form-twin-triggers .x-form-trigger{position:static;top:auto;vertical-align:top;}.x-form-field-wrap .x-form-trigger-over{background-position:-17px 0;}.x-form-field-wrap .x-form-trigger-click{background-position:-34px 0;}.x-trigger-wrap-focus .x-form-trigger{background-position:-51px 0;}.x-trigger-wrap-focus .x-form-trigger-over{background-position:-68px 0;}.x-trigger-wrap-focus .x-form-trigger-click{background-position:-85px 0;}.x-trigger-wrap-focus .x-form-trigger{border-bottom:1px solid #7eadd9;}.x-item-disabled .x-form-trigger-over{background-position:0 0!important;border-bottom:1px solid #B5B8C8;}.x-item-disabled .x-form-trigger-click{background-position:0 0!important;border-bottom:1px solid #B5B8C8;}.x-form-focus,textarea.x-form-focus{border:1px solid #7eadd9;}.x-form-invalid,textarea.x-form-invalid{background:#fff url(../js/ext/resources/images/default/grid/invalid_line.gif) repeat-x bottom;border:1px solid #dd7870;}.ext-safari .x-form-invalid{background-color:#fee;border:1px solid #ff7870;}.x-editor{visibility:hidden;padding:0;margin:0;}.x-form-check-wrap{line-height:18px;}.ext-ie .x-form-check-wrap input{width:15px;height:15px;}.x-editor .x-form-check-wrap{padding:3px;}.x-editor .x-form-checkbox{height:13px;}.x-form-grow-sizer{font:normal 100% arial,sans;left:-10000px;padding:8px 3px;position:absolute;visibility:hidden;top:-10000px;white-space:pre-wrap;white-space:0;white-space:0;white-space:0;word-wrap:break-word;zoom:1;}.x-form-grow-sizer p{margin:0!important;border:0 none!important;padding:0!important;}.x-form-item{font:normal 100% arial,sans;display:block;margin-bottom:4px;}.x-form-item label{display:block;float:left;width:100px;padding:3px;padding-left:0;clear:left;z-index:2;position:relative;}.x-form-element{padding-left:105px;position:relative;}.x-form-invalid-msg{color:#e00;padding:2px;padding-left:18px;font:normal 100% arial,sans;background:transparent url(../js/ext/resources/images/default/shared/warning.gif) no-repeat 0 2px;line-height:16px;width:200px;}.x-form-label-right label{text-align:right;}.x-form-label-top .x-form-item label{width:auto;float:none;clear:none;display:inline;margin-bottom:4px;position:static;}.x-form-label-top .x-form-element{padding-left:0;padding-top:4px;}.x-form-label-top .x-form-item{padding-bottom:4px;}.x-form-empty-field{color:gray;}.x-small-editor .x-form-field{font:normal 100% arial,sans;}.x-small-editor .x-form-text{height:20px;line-height:16px;vertical-align:middle;}.ext-ie .x-small-editor .x-form-text{margin-top:-1px!important;margin-bottom:-1px!important;height:20px!important;line-height:16px!important;}.ext-strict .x-small-editor .x-form-text{height:16px!important;}.ext-safari .x-small-editor .x-form-field{font:normal 100% arial,sans;}.ext-ie .x-small-editor .x-form-text{height:20px;line-height:16px;}.ext-border-box .x-small-editor .x-form-text{height:20px;}.x-small-editor .x-form-select-one{height:20px;line-height:16px;vertical-align:middle;}.x-small-editor .x-form-num-field{text-align:right;}.x-small-editor .x-form-field-wrap .x-form-trigger{height:19px;}.x-form-clear{clear:both;height:0;overflow:hidden;line-height:0;font-size:0;}.x-form-clear-left{clear:left;height:0;overflow:hidden;line-height:0;font-size:0;}.x-form-cb-label{width:auto!important;float:none!important;clear:none!important;display:inline!important;margin-left:4px;}.x-form-column{float:left;padding:0;margin:0;width:48%;overflow:hidden;zoom:1;}.x-form .x-form-btns-ct .x-btn{float:right;clear:none;}.x-form .x-form-btns-ct .x-form-btns td{border:0;padding:0;}.x-form .x-form-btns-ct .x-form-btns-right table{float:right;clear:none;}.x-form .x-form-btns-ct .x-form-btns-left table{float:left;clear:none;}.x-form .x-form-btns-ct .x-form-btns-center{text-align:center;}.x-form .x-form-btns-ct .x-form-btns-center table{margin:0 auto;}.x-form .x-form-btns-ct table td.x-form-btn-td{padding:3px;}.x-form .x-form-btns-ct .x-btn-focus .x-btn-left{background-position:0 -147px;}.x-form .x-form-btns-ct .x-btn-focus .x-btn-right{background-position:0 -168px;}.x-form .x-form-btns-ct .x-btn-focus .x-btn-center{background-position:0 -189px;}.x-form .x-form-btns-ct .x-btn-click .x-btn-center{background-position:0 -126px;}.x-form .x-form-btns-ct .x-btn-click .x-btn-right{background-position:0 -84px;}.x-form .x-form-btns-ct .x-btn-click .x-btn-left{background-position:0 -63px;}.x-form-invalid-icon{width:16px;height:18px;visibility:hidden;position:absolute;left:0;top:0;display:block;background:transparent url(../js/ext/resources/images/default/form/exclamation.gif) no-repeat 0 2px;}.x-fieldset{border:1px solid #B5B8C8;padding:10px;margin-bottom:10px;}.x-fieldset legend{font:bold 100% arial,sans;color:#15428b;}.ext-ie .x-fieldset legend{margin-bottom:10px;}.ext-ie .x-fieldset{padding-top:0;padding-bottom:10px;}.x-fieldset legend .x-tool-toggle{margin-right:3px;margin-left:0;float:left!important;}.x-fieldset legend input{margin-right:3px;float:left!important;height:13px;width:13px;}fieldset.x-panel-collapsed{padding-bottom:0!important;border-width:1px 0 0!important;}fieldset.x-panel-collapsed .x-fieldset-bwrap{visibility:hidden;position:absolute;left:-1000px;top:-1000px;}.ext-ie .x-fieldset-bwrap{zoom:1;}.ext-ie td .x-form-text{position:relative;top:-1px;}.x-fieldset-noborder{border:0 none transparent;}.x-fieldset-noborder legend{margin-left:-3px;}.ext-ie .x-fieldset-noborder legend{position:relative;margin-bottom:23px;}.ext-ie .x-fieldset-noborder legend span{position:absolute;left:-5px;}.ext-gecko .x-window-body .x-form-item{-moz-outline:none;overflow:auto;}.ext-gecko .x-form-item{-moz-outline:none;}.x-hide-label label.x-form-item-label{display:none;}.x-hide-label .x-form-element{padding-left:0!important;}.x-fieldset{overflow:hidden;}.x-fieldset-bwrap{overflow:hidden;zoom:1;}.x-fieldset-body{overflow:hidden;}.x-btn{font:normal 100% arial,sans;cursor:pointer;white-space:nowrap;}.x-btn button{border:0 none;background:transparent;padding-left:3px;padding-right:3px;cursor:pointer;margin:0;overflow:visible;width:auto;-moz-outline:0 none;outline:0 none;}* html .ext-ie .x-btn button{width:1px;}.ext-gecko .x-btn button{padding-left:0;padding-right:0;}.ext-ie .x-btn button{padding-top:2px;}.x-btn-icon .x-btn-center .x-btn-text{background-position:center;background-repeat:no-repeat;height:16px;width:16px;cursor:pointer;white-space:nowrap;padding:0;}.x-btn-icon .x-btn-center{padding:1px;}.x-btn em{font-style:normal;font-weight:400;}.x-btn-text-icon .x-btn-center .x-btn-text{background-position:0 2px;background-repeat:no-repeat;padding-left:18px;padding-top:3px;padding-bottom:2px;padding-right:0;}.x-btn-left,.x-btn-right{font-size:1px;line-height:1px;}.x-btn-left{width:3px;height:21px;background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 0;}.x-btn-right{width:3px;height:21px;background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 -21px;}.x-btn-left i,.x-btn-right i{display:block;width:3px;overflow:hidden;font-size:1px;line-height:1px;}.x-btn-center{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) repeat-x 0 -42px;vertical-align:middle;text-align:center;padding:0 5px;cursor:pointer;white-space:nowrap;}.x-btn-over .x-btn-left{background-position:0 -63px;}.x-btn-over .x-btn-right{background-position:0 -84px;}.x-btn-over .x-btn-center{background-position:0 -105px;}.x-btn-click .x-btn-center,.x-btn-menu-active .x-btn-center{background-position:0 -126px;}.x-btn-disabled *{color:gray!important;cursor:default!important;}.x-btn-menu-text-wrap .x-btn-center{padding:0 3px;}.ext-gecko .x-btn-menu-text-wrap .x-btn-center{padding:0 1px;}.x-btn-menu-arrow-wrap .x-btn-center{padding:0;}.x-btn-menu-arrow-wrap .x-btn-center button{width:12px!important;height:21px;padding:0!important;display:block;background:transparent url(../js/ext/resources/images/default/button/btn-arrow.gif) no-repeat left 3px;}.x-btn-with-menu .x-btn-center{padding-right:2px!important;}.x-btn-with-menu .x-btn-center em{display:block;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat right 0;padding-right:10px;}.x-btn-text-icon .x-btn-with-menu .x-btn-center em{display:block;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat right 3px;padding-right:10px;}.x-btn-pressed .x-btn-left{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 -63px;}.x-btn-pressed .x-btn-right{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) no-repeat 0 -84px;}.x-btn-pressed .x-btn-center{background:url(../js/ext/resources/images/default/button/btn-sprite.gif) repeat-x 0 -126px;}.x-toolbar{border-color:#a9bfd3;border-style:solid;border-width:0 0 1px;display:block;padding:2px;background:#d0def0 url(../js/ext/resources/images/default/toolbar/bg.gif) repeat-x top left;position:relative;zoom:1;}.x-toolbar .x-item-disabled .x-btn-icon{opacity:.35;-moz-opacity:.35;filter:alpha(opacity=35);}.x-toolbar td{vertical-align:middle;}.mso .x-toolbar,.x-grid-mso .x-toolbar{border:0 none;background:url(../js/ext/resources/images/default/grid/mso-hd.gif);}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial,sans;}.x-toolbar .x-item-disabled{color:gray;cursor:default;opacity:.6;-moz-opacity:.6;filter:alpha(opacity=60);}.x-toolbar .x-item-disabled *{color:gray;cursor:default;}.x-toolbar .x-btn-left{background:none;}.x-toolbar .x-btn-right{background:none;}.x-toolbar .x-btn-center{background:none;padding:0;}.x-toolbar .x-btn-menu-text-wrap .x-btn-center button{padding-right:2px;}.ext-gecko .x-toolbar .x-btn-menu-text-wrap .x-btn-center button{padding-right:0;}.x-toolbar .x-btn-menu-arrow-wrap .x-btn-center button{padding:0 2px;}.x-toolbar .x-btn-menu-arrow-wrap .x-btn-center button{width:12px;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat 0 3px;}.x-toolbar .x-btn-text-icon .x-btn-menu-arrow-wrap .x-btn-center button{width:12px;background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow.gif) no-repeat 0 3px;}.x-toolbar .x-btn-over .x-btn-menu-arrow-wrap .x-btn-center button{background-position:0 -47px;}.x-toolbar .x-btn-over .x-btn-left{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 0;}.x-toolbar .x-btn-over .x-btn-right{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -21px;}.x-toolbar .x-btn-over .x-btn-center{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -42px;}.x-toolbar .x-btn-click .x-btn-left,.x-toolbar .x-btn-pressed .x-btn-left,.x-toolbar .x-btn-menu-active .x-btn-left{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -63px;}.x-toolbar .x-btn-click .x-btn-right,.x-toolbar .x-btn-pressed .x-btn-right,.x-toolbar .x-btn-menu-active .x-btn-right{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -84px;}.x-toolbar .x-btn-click .x-btn-center,.x-toolbar .x-btn-pressed .x-btn-center,.x-toolbar .x-btn-menu-active .x-btn-center{background:url(../js/ext/resources/images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -105px;}.x-toolbar .x-btn-with-menu .x-btn-center em{padding-right:8px;}.x-toolbar .ytb-text{padding:2px;}.x-toolbar .ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-blue-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.x-toolbar .ytb-spacer{width:2px;}.x-tbar-page-number{width:24px;height:14px;}.x-tbar-page-first{background-image:url(../js/ext/resources/images/default/grid/page-first.gif)!important;}.x-tbar-loading{background-image:url(../js/ext/resources/images/default/grid/done.gif)!important;}.x-tbar-page-last{background-image:url(../js/ext/resources/images/default/grid/page-last.gif)!important;}.x-tbar-page-next{background-image:url(../js/ext/resources/images/default/grid/page-next.gif)!important;}.x-tbar-page-prev{background-image:url(../js/ext/resources/images/default/grid/page-prev.gif)!important;}.x-item-disabled .x-tbar-loading{background-image:url(../js/ext/resources/images/default/grid/loading.gif)!important;}.x-item-disabled .x-tbar-page-first{background-image:url(../js/ext/resources/images/default/grid/page-first-disabled.gif)!important;}.x-item-disabled .x-tbar-page-last{background-image:url(../js/ext/resources/images/default/grid/page-last-disabled.gif)!important;}.x-item-disabled .x-tbar-page-next{background-image:url(../js/ext/resources/images/default/grid/page-next-disabled.gif)!important;}.x-item-disabled .x-tbar-page-prev{background-image:url(../js/ext/resources/images/default/grid/page-prev-disabled.gif)!important;}.x-paging-info{position:absolute;top:5px;right:8px;color:#444;}.x-resizable-handle{position:absolute;z-index:100;font-size:1px;line-height:6px;overflow:hidden;background:#FFF;filter:alpha(opacity=0);opacity:0;zoom:1;}.x-resizable-handle-east{width:6px;cursor:e-resize;right:0;top:0;height:100%;}.ext-ie .x-resizable-handle-east{margin-right:-1px;}.x-resizable-handle-south{width:100%;cursor:s-resize;left:0;bottom:0;height:6px;}.ext-ie .x-resizable-handle-south{margin-bottom:-1px;}.x-resizable-handle-west{width:6px;cursor:w-resize;left:0;top:0;height:100%;}.x-resizable-handle-north{width:100%;cursor:n-resize;left:0;top:0;height:6px;}.x-resizable-handle-southeast{width:6px;cursor:se-resize;right:0;bottom:0;height:6px;z-index:101;}.x-resizable-handle-northwest{width:6px;cursor:nw-resize;left:0;top:0;height:6px;z-index:101;}.x-resizable-handle-northeast{width:6px;cursor:ne-resize;right:0;top:0;height:6px;z-index:101;}.x-resizable-handle-southwest{width:6px;cursor:sw-resize;left:0;bottom:0;height:6px;z-index:101;}.x-resizable-over .x-resizable-handle,.x-resizable-pinned .x-resizable-handle{filter:alpha(opacity=100);opacity:1;}.x-resizable-over .x-resizable-handle-east,.x-resizable-pinned .x-resizable-handle-east{background:url(../js/ext/resources/images/default/sizer/e-handle.gif);background-position:left;}.x-resizable-over .x-resizable-handle-west,.x-resizable-pinned .x-resizable-handle-west{background:url(../js/ext/resources/images/default/sizer/e-handle.gif);background-position:left;}.x-resizable-over .x-resizable-handle-south,.x-resizable-pinned .x-resizable-handle-south{background:url(../js/ext/resources/images/default/sizer/s-handle.gif);background-position:top;}.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north{background:url(../js/ext/resources/images/default/sizer/s-handle.gif);background-position:top;}.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast{background:url(../js/ext/resources/images/default/sizer/se-handle.gif);background-position:top left;}.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest{background:url(../js/ext/resources/images/default/sizer/nw-handle.gif);background-position:bottom right;}.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast{background:url(../js/ext/resources/images/default/sizer/ne-handle.gif);background-position:bottom left;}.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest{background:url(../js/ext/resources/images/default/sizer/sw-handle.gif);background-position:top right;}.x-resizable-proxy{border:1px dashed #3b5a82;position:absolute;overflow:hidden;display:none;left:0;top:0;z-index:50000;}.x-resizable-overlay{width:100%;height:100%;display:none;position:absolute;left:0;top:0;background:#FFF;z-index:200000;-moz-opacity:0;opacity:0;filter:alpha(opacity=0);}.x-grid3{position:relative;overflow:hidden;background-color:#fff;}.x-grid-panel .x-panel-body{overflow:hidden!important;}.x-grid-panel .x-panel-mc .x-panel-body{border:1px solid #99bbe8;}.ext-ie .x-grid3 table,.ext-safari .x-grid3 table{table-layout:fixed;}.x-grid3-viewport{overflow:hidden;}.x-grid3-hd-row td,.x-grid3-row td,.x-grid3-summary-row td{font:normal 100% arial,sans;-moz-outline:none;-moz-user-focus:normal;}.x-grid3-row td,.x-grid3-summary-row td{line-height:13px;vertical-align:top;padding-left:1px;padding-right:1px;-moz-user-select:none;}.x-grid3-hd-row td{line-height:15px;vertical-align:middle;border-left:1px solid #eee;border-right:1px solid #d0d0d0;}.x-grid3-hd-row .x-grid3-marker-hd{padding:3px;}.x-grid3-row .x-grid3-marker{padding:3px;}.x-grid3-cell-inner,.x-grid3-hd-inner{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;padding:3px 3px 3px 5px;white-space:nowrap;}.x-grid3-hd-inner{position:relative;cursor:inherit;padding:4px 3px 4px 5px;}.x-grid3-row-body{white-space:normal;}.x-grid3-body-cell{-moz-outline:0 none;outline:0 none;}.ext-ie .x-grid3-cell-inner,.ext-ie .x-grid3-hd-inner{width:100%;}.ext-strict .x-grid3-cell-inner,.ext-strict .x-grid3-hd-inner{width:auto;}.x-grid-row-loading{background:#fff url(../js/ext/resources/images/default/shared/loading-balls.gif) no-repeat center center;}.x-grid-page{overflow:hidden;}.x-grid3-row{cursor:default;border:1px solid #ededed;border-top-color:#fff;width:100%;}.x-grid3-row-alt{background-color:#fafafa;}.x-grid3-row-over{border:1px solid #ddd;background:#efefef url(../js/ext/resources/images/default/grid/row-over.gif) repeat-x left top;}.x-grid3-resize-proxy{width:1px;left:0;background-color:#777;cursor:e-resize;cursor:col-resize;position:absolute;top:0;height:100px;overflow:hidden;visibility:hidden;border:0 none;z-index:7;}.x-grid3-resize-marker{width:1px;left:0;background-color:#777;position:absolute;top:0;height:100px;overflow:hidden;visibility:hidden;border:0 none;z-index:7;}.x-grid3-focus{position:absolute;top:0;-moz-outline:0 none;outline:0 none;-moz-user-select:normal;-khtml-user-select:normal;}.x-grid3-header{background:#f9f9f9 url(../js/ext/resources/images/default/grid/grid3-hrow.gif) repeat-x 0 bottom;cursor:default;zoom:1;padding:1px 0 0;}.x-grid3-header-pop{border-left:1px solid #d0d0d0;float:right;clear:none;}.x-grid3-header-pop-inner{border-left:1px solid #eee;width:14px;height:19px;background:transparent url(../js/ext/resources/images/default/grid/hd-pop.gif) no-repeat center center;}.ext-ie .x-grid3-header-pop-inner{width:15px;}.ext-strict .x-grid3-header-pop-inner{width:14px;}.x-grid3-header-inner{overflow:hidden;zoom:1;float:left;}.x-grid3-header-offset{padding-left:1px;width:10000px;}td.x-grid3-hd-over,td.sort-desc,td.sort-asc,td.x-grid3-hd-menu-open{border-left:1px solid #aaccf6;border-right:1px solid #aaccf6;}td.x-grid3-hd-over .x-grid3-hd-inner,td.sort-desc .x-grid3-hd-inner,td.sort-asc .x-grid3-hd-inner,td.x-grid3-hd-menu-open .x-grid3-hd-inner{background:#ebf3fd url(../js/ext/resources/images/default/grid/grid3-hrow-over.gif) repeat-x left bottom;}.x-grid3-sort-icon{background-repeat:no-repeat;display:none;height:4px;width:13px;margin-left:3px;vertical-align:middle;}.sort-asc .x-grid3-sort-icon{background-image:url(../js/ext/resources/images/default/grid/sort_asc.gif);display:inline;}.sort-desc .x-grid3-sort-icon{background-image:url(../js/ext/resources/images/default/grid/sort_desc.gif);display:inline;}.ext-strict .ext-ie .x-grid3-header-inner{position:relative;}.ext-strict .ext-ie6 .x-grid3-hd{position:relative;}.ext-strict .ext-ie6 .x-grid3-hd-inner{position:static;}.x-grid3-body{zoom:1;}.x-grid3-scroller{overflow:auto;zoom:1;position:relative;}.x-grid3-cell-text,.x-grid3-hd-text{display:block;padding:3px 5px;-moz-user-select:none;-khtml-user-select:none;color:#000;}.x-grid3-split{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;cursor:e-resize;cursor:col-resize;display:block;font-size:1px;height:16px;overflow:hidden;position:absolute;top:2px;width:6px;z-index:3;}.x-grid3-hd-text{color:#15428b;}.x-dd-drag-proxy .x-grid3-hd-inner{background:#ebf3fd url(../js/ext/resources/images/default/grid/grid3-hrow-over.gif) repeat-x left bottom;width:120px;padding:3px;border:1px solid #aaccf6;overflow:hidden;}.col-move-top,.col-move-bottom{width:9px;height:9px;position:absolute;top:0;line-height:1px;font-size:1px;overflow:hidden;visibility:hidden;z-index:20000;}.col-move-top{background:transparent url(../js/ext/resources/images/default/grid/col-move-top.gif) no-repeat left top;}.col-move-bottom{background:transparent url(../js/ext/resources/images/default/grid/col-move-bottom.gif) no-repeat left top;}.x-grid3-row-selected{background:#DFE8F6!important;border:1px dotted #a3bae9;}.x-grid3-cell-selected{background-color:#B8CFEE!important;color:#000;}.x-grid3-cell-selected span{color:#000!important;}.x-grid3-cell-selected .x-grid3-cell-text{color:#000;}.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{background:#ebeadb url(../js/ext/resources/images/default/grid/grid-hrow.gif) repeat-x 0 bottom!important;vertical-align:middle!important;color:#000;padding:0;border-top:1px solid #FFF;border-bottom:none!important;border-right:1px solid #6fa0df!important;text-align:center;}.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div{padding:0 4px;color:#15428b!important;text-align:center;}.x-grid3-dirty-cell{background:transparent url(../js/ext/resources/images/default/grid/dirty.gif) no-repeat 0 0;}.x-grid3-topbar,.x-grid3-bottombar{font:normal 100% arial,sans;overflow:hidden;display:none;zoom:1;position:relative;}.x-grid3-topbar .x-toolbar{border-right:0 none;}.x-grid3-bottombar .x-toolbar{border-right:0 none;border-bottom:0 none;border-top:1px solid #a9bfd3;}.x-props-grid .x-grid3-cell{padding:1px;}.x-props-grid .x-grid3-td-name .x-grid3-cell-inner{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y -16px!important;padding-left:12px;color:#000!important;}.x-props-grid .x-grid3-body .x-grid3-td-name{padding:1px;padding-right:0;background:#FFF!important;border:0 none;border-right:1px solid #eee;}.xg-hmenu-sort-asc .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-asc.gif);}.xg-hmenu-sort-desc .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-desc.gif);}.xg-hmenu-lock .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-lock.gif);}.xg-hmenu-unlock .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/grid/hmenu-unlock.gif);}.x-grid3-col-dd{border:0 none;padding:0;background:transparent;}.x-dd-drag-ghost .x-grid3-dd-wrap{padding:1px 3px 3px 1px;}.x-grid3-hd{-moz-user-select:none;}.x-grid3-hd-btn{display:none;position:absolute;width:14px;background:#c3daf9 url(../js/ext/resources/images/default/grid/grid3-hd-btn.gif) no-repeat left center;right:0;top:0;z-index:2;cursor:pointer;}.x-grid3-hd-over .x-grid3-hd-btn,.x-grid3-hd-menu-open .x-grid3-hd-btn{display:block;}a.x-grid3-hd-btn:hover{background-position:-14px center;}.x-grid3-body .x-grid3-td-expander{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y right;}.x-grid3-body .x-grid3-td-expander .x-grid3-cell-inner{padding:0!important;height:100%;}.x-grid3-row-expander{width:100%;height:18px;background-position:4px 2px;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/grid/row-expand-sprite.gif);}.x-grid3-row-collapsed .x-grid3-row-expander{background-position:4px 2px;}.x-grid3-row-expanded .x-grid3-row-expander{background-position:-21px 2px;}.x-grid3-row-collapsed .x-grid3-row-body{display:none!important;}.x-grid3-row-expanded .x-grid3-row-body{display:block!important;}.x-grid3-body .x-grid3-td-checker{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y right;}.x-grid3-body .x-grid3-td-checker .x-grid3-cell-inner,.x-grid3-header .x-grid3-td-checker .x-grid3-hd-inner{padding:0!important;height:100%;}.x-grid3-row-checker,.x-grid3-hd-checker{width:100%;height:18px;background-position:2px 2px;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/grid/row-check-sprite.gif);}.x-grid3-row .x-grid3-row-checker{background-position:2px 2px;}.x-grid3-row-selected .x-grid3-row-checker,.x-grid3-hd-checker-on .x-grid3-hd-checker{background-position:-23px 2px;}.x-grid3-hd-checker{background-position:2px 3px;}.x-grid3-hd-checker-on .x-grid3-hd-checker{background-position:-23px 3px;}.x-grid3-body .x-grid3-td-numberer{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-bg.gif) repeat-y right;}.x-grid3-body .x-grid3-td-numberer .x-grid3-cell-inner{padding:3px 5px 0 0!important;text-align:right;color:#444;}.x-grid3-body .x-grid3-row-selected .x-grid3-td-numberer,.x-grid3-body .x-grid3-row-selected .x-grid3-td-checker,.x-grid3-body .x-grid3-row-selected .x-grid3-td-expander{background:transparent url(../js/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif) repeat-y right;}.x-grid3-body .x-grid3-check-col-td .x-grid3-cell-inner{padding:1px 0 0!important;}.x-grid3-check-col{width:100%;height:16px;background-position:center center;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/menu/unchecked.gif);}.x-grid3-check-col-on{width:100%;height:16px;background-position:center center;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/menu/checked.gif);}.x-grid-group,.x-grid-group-body,.x-grid-group-hd{zoom:1;}.x-grid-group-hd{border-bottom:2px solid #99bbe8;cursor:pointer;padding-top:6px;}.x-grid-group-hd div{background:transparent url(../js/ext/resources/images/default/grid/group-expand-sprite.gif) no-repeat 3px -47px;padding:4px 4px 4px 17px;color:#3764a0;font:bold 100% arial,sans;}.x-grid-group-collapsed .x-grid-group-hd div{background-position:3px 3px;}.x-grid-group-collapsed .x-grid-group-body{display:none;}.x-group-by-icon{background-image:url(../js/ext/resources/images/default/grid/group-by.gif);}.x-cols-icon{background-image:url(../js/ext/resources/images/default/grid/columns.gif);}.x-show-groups-icon{background-image:url(../js/ext/resources/images/default/grid/group-by.gif);}.ext-ie .x-grid3 .x-editor .x-form-text{position:relative;top:-1px;}.ext-ie .x-props-grid .x-editor .x-form-text{position:static;top:0;}.x-grid-empty{padding:10px;color:gray;font:normal 100% arial,sans;}.ext-ie7 .x-grid-panel .x-panel-bbar{position:relative;}.x-dd-drag-proxy{position:absolute;left:0;top:0;visibility:hidden;z-index:15000;}.x-dd-drag-ghost{color:#000;font:normal 100% arial,helvetica,sans-serif;-moz-opacity:.85;opacity:.85;filter:alpha(opacity=85);border-top:1px solid #ddd;border-left:1px solid #ddd;border-right:1px solid #bbb;border-bottom:1px solid #bbb;padding:3px;padding-left:20px;background-color:#FFF;white-space:nowrap;}.x-dd-drag-repair .x-dd-drag-ghost{-moz-opacity:.4;opacity:.4;filter:alpha(opacity=40);border:0 none;padding:0;background-color:transparent;}.x-dd-drag-repair .x-dd-drop-icon{visibility:hidden;}.x-dd-drop-icon{position:absolute;top:3px;left:3px;display:block;width:16px;height:16px;background-color:transparent;background-position:center;background-repeat:no-repeat;z-index:1;}.x-dd-drop-nodrop .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/dd/drop-no.gif);}.x-dd-drop-ok .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/dd/drop-yes.gif);}.x-dd-drop-ok-add .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/dd/drop-add.gif);}.x-view-selector{position:absolute;left:0;top:0;width:0;background:#c3daf9;border:1px dotted #39b;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);zoom:1;}.x-tree .x-panel-body{background-color:#fff;}.ext-strict .ext-ie .x-tree .x-panel-bwrap{position:relative;overflow:hidden;}.x-tree-icon,.x-tree-ec-icon,.x-tree-elbow-line,.x-tree-elbow,.x-tree-elbow-end,.x-tree-elbow-plus,.x-tree-elbow-minus,.x-tree-elbow-end-plus,.x-tree-elbow-end-minus{border:0 none;height:18px;margin:0;padding:0;vertical-align:top;width:16px;background-repeat:no-repeat;}.x-tree-node-collapsed .x-tree-node-icon,.x-tree-node-expanded .x-tree-node-icon,.x-tree-node-leaf .x-tree-node-icon{border:0 none;height:18px;margin:0;padding:0;vertical-align:top;width:16px;background-position:center;background-repeat:no-repeat;}.ext-ie .x-tree-node-indent img,.ext-ie .x-tree-node-icon,.ext-ie .x-tree-ec-icon{vertical-align:middle!important;}.x-tree-node-expanded .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/folder-open.gif);}.x-tree-node-leaf .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/leaf.gif);}.x-tree-node-collapsed .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/folder.gif);}.ext-ie input.x-tree-node-cb{width:15px;height:15px;}input.x-tree-node-cb{margin-left:1px;}.ext-ie input.x-tree-node-cb{margin-left:0;}.x-tree-noicon .x-tree-node-icon{width:0;height:0;}.x-tree-node-loading .x-tree-node-icon{background-image:url(../js/ext/resources/images/default/tree/loading.gif)!important;}.x-tree-node-loading a span{font-style:italic;color:#444;}.ext-ie .x-tree-node-el input{width:15px;height:15px;}.x-tree-lines .x-tree-elbow{background-image:url(../js/ext/resources/images/default/tree/elbow.gif);}.x-tree-lines .x-tree-elbow-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-plus.gif);}.x-tree-lines .x-tree-elbow-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-minus.gif);}.x-tree-lines .x-tree-elbow-end{background-image:url(../js/ext/resources/images/default/tree/elbow-end.gif);}.x-tree-lines .x-tree-elbow-end-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-plus.gif);}.x-tree-lines .x-tree-elbow-end-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-minus.gif);}.x-tree-lines .x-tree-elbow-line{background-image:url(../js/ext/resources/images/default/tree/elbow-line.gif);}.x-tree-no-lines .x-tree-elbow{background:transparent;}.x-tree-no-lines .x-tree-elbow-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-plus-nl.gif);}.x-tree-no-lines .x-tree-elbow-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-minus-nl.gif);}.x-tree-no-lines .x-tree-elbow-end{background:transparent;}.x-tree-no-lines .x-tree-elbow-end-plus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-plus-nl.gif);}.x-tree-no-lines .x-tree-elbow-end-minus{background-image:url(../js/ext/resources/images/default/tree/elbow-end-minus-nl.gif);}.x-tree-no-lines .x-tree-elbow-line{background:transparent;}.x-tree-arrows .x-tree-elbow{background:transparent;}.x-tree-arrows .x-tree-elbow-plus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat 0 0;}.x-tree-arrows .x-tree-elbow-minus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat -16px 0;}.x-tree-arrows .x-tree-elbow-end{background:transparent;}.x-tree-arrows .x-tree-elbow-end-plus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat 0 0;}.x-tree-arrows .x-tree-elbow-end-minus{background:transparent url(../js/ext/resources/images/default/tree/arrows.gif) no-repeat -16px 0;}.x-tree-arrows .x-tree-elbow-line{background:transparent;}.x-tree-arrows .x-tree-ec-over .x-tree-elbow-plus{background-position:-32px 0;}.x-tree-arrows .x-tree-ec-over .x-tree-elbow-minus{background-position:-48px 0;}.x-tree-arrows .x-tree-ec-over .x-tree-elbow-end-plus{background-position:-32px 0;}.x-tree-arrows .x-tree-ec-over .x-tree-elbow-end-minus{background-position:-48px 0;}.x-tree-elbow-plus,.x-tree-elbow-minus,.x-tree-elbow-end-plus,.x-tree-elbow-end-minus{cursor:pointer;}.ext-ie ul.x-tree-node-ct{font-size:0;line-height:0;zoom:1;}.x-tree-node{color:#000;font:normal 100% arial,sans;white-space:nowrap;}.x-tree-node-el{line-height:18px;cursor:pointer;}.x-tree-node a,.x-dd-drag-ghost a{text-decoration:none;color:#000;-khtml-user-select:none;-moz-user-select:none;-kthml-user-focus:normal;-moz-user-focus:normal;-moz-outline:0 none;outline:0 none;}.x-tree-node a span,.x-dd-drag-ghost a span{text-decoration:none;color:#000;padding:1px 3px 1px 2px;}.x-tree-node .x-tree-node-disabled a span{color:gray!important;}.x-tree-node .x-tree-node-disabled .x-tree-node-icon{-moz-opacity:.5;opacity:.5;filter:alpha(opacity=50);}.x-tree-node .x-tree-node-inline-icon{background:transparent;}.x-tree-node a:hover,.x-dd-drag-ghost a:hover{text-decoration:none;}.x-tree-node div.x-tree-drag-insert-below{border-bottom:1px dotted #36c;}.x-tree-node div.x-tree-drag-insert-above{border-top:1px dotted #36c;}.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below{border-bottom:0 none;}.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above{border-top:0 none;}.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below a{border-bottom:2px solid #36c;}.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above a{border-top:2px solid #36c;}.x-tree-node .x-tree-drag-append a span{background:#ddd;border:1px dotted gray;}.x-tree-node .x-tree-node-over{background-color:#eee;}.x-tree-node .x-tree-selected{background-color:#d9e8fb;}.x-dd-drag-ghost .x-tree-node-indent,.x-dd-drag-ghost .x-tree-ec-icon{display:none!important;}.x-tree-drop-ok-append .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-add.gif);}.x-tree-drop-ok-above .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-over.gif);}.x-tree-drop-ok-below .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-under.gif);}.x-tree-drop-ok-between .x-dd-drop-icon{background-image:url(../js/ext/resources/images/default/tree/drop-between.gif);}.x-date-picker{border:1px solid #1b376c;border-top:0 none;background:#fff;position:relative;}.x-date-picker a{-moz-outline:0 none;outline:0 none;}.x-date-inner,.x-date-inner td,.x-date-inner th{border-collapse:separate;}.x-date-middle,.x-date-left,.x-date-right{background:url(../js/ext/resources/images/default/shared/hd-sprite.gif) repeat-x 0 -83px;color:#FFF;font:bold 100% arial,sans;overflow:hidden;}.x-date-middle .x-btn-left,.x-date-middle .x-btn-center,.x-date-middle .x-btn-right{background:transparent!important;vertical-align:middle;}.x-date-middle .x-btn .x-btn-text{color:#fff;}.x-date-middle .x-btn-with-menu .x-btn-center em{background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow-light.gif) no-repeat right 0;}.x-date-right,.x-date-left{width:18px;}.x-date-right{text-align:right;}.x-date-middle{padding-top:2px;padding-bottom:2px;}.x-date-right a,.x-date-left a{display:block;width:16px;height:16px;background-position:center;background-repeat:no-repeat;cursor:pointer;-moz-opacity:.6;opacity:.6;filter:alpha(opacity=60);}.x-date-right a:hover,.x-date-left a:hover{-moz-opacity:1;opacity:1;filter:alpha(opacity=100);}.x-date-right a{background-image:url(../js/ext/resources/images/default/shared/right-btn.gif);margin-right:2px;text-decoration:none!important;}.x-date-left a{background-image:url(../js/ext/resources/images/default/shared/left-btn.gif);margin-left:2px;text-decoration:none!important;}table.x-date-inner{width:100%;table-layout:fixed;}.x-date-inner th{width:25px;}.x-date-inner th{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;text-align:right!important;border-bottom:1px solid #a3bad9;font:normal 100% arial,sans;color:#233d6d;cursor:default;padding:0;border-collapse:separate;}.x-date-inner th span{display:block;padding:2px;padding-right:7px;}.x-date-inner td{border:1px solid #fff;text-align:right;padding:0;}.x-date-inner a{padding:2px 5px;display:block;font:normal 100% arial,sans;text-decoration:none;color:#000;text-align:right;zoom:1;}.x-date-inner .x-date-active{cursor:pointer;color:#000;}.x-date-inner .x-date-selected a{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;border:1px solid #8db2e3;padding:1px 4px;}.x-date-inner .x-date-today a{border:1px solid #8B0000;padding:1px 4px;}.x-date-inner .x-date-selected span{font-weight:700;}.x-date-inner .x-date-prevday a,.x-date-inner .x-date-nextday a{color:#aaa;text-decoration:none!important;}.x-date-bottom{padding:4px;border-top:1px solid #a3bad9;background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;}.x-date-inner a:hover,.x-date-inner .x-date-disabled a:hover{text-decoration:none!important;color:#000;background:#ddecfe;}.x-date-inner .x-date-disabled a{cursor:default;background:#eee;color:#bbb;}.x-date-mmenu{background:#eee!important;}.x-date-mmenu .x-menu-item{font-size:10px;padding:1px 24px 1px 4px;white-space:nowrap;color:#000;}.x-date-mmenu .x-menu-item .x-menu-item-icon{width:10px;height:10px;margin-right:5px;background-position:center -4px!important;}.x-date-mp{position:absolute;left:0;top:0;background:#FFF;display:none;}.x-date-mp td{padding:2px;font:normal 100% arial,sans;}td.x-date-mp-month,td.x-date-mp-year,td.x-date-mp-ybtn{border:0 none;text-align:center;vertical-align:middle;width:25%;}.x-date-mp-ok{margin-right:3px;}.x-date-mp-btns button{text-decoration:none;text-align:center;text-decoration:none!important;background:#083772;color:#FFF;border:1px solid;border-color:#36c #005 #005 #36c;padding:1px 3px;font:normal 100% arial,sans;cursor:pointer;}.x-date-mp-btns{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;}.x-date-mp-btns td{border-top:1px solid #c5d2df;text-align:center;}td.x-date-mp-month a,td.x-date-mp-year a{display:block;padding:2px 4px;text-decoration:none;text-align:center;color:#15428b;}td.x-date-mp-month a:hover,td.x-date-mp-year a:hover{color:#15428b;text-decoration:none;cursor:pointer;background:#ddecfe;}td.x-date-mp-sel a{padding:1px 3px;background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;border:1px solid #8db2e3;}.x-date-mp-ybtn a{overflow:hidden;width:15px;height:15px;cursor:pointer;background:transparent url(../js/ext/resources/images/default/panel/tool-sprites.gif) no-repeat;display:block;margin:0 auto;}.x-date-mp-ybtn a.x-date-mp-next{background-position:0 -120px;}.x-date-mp-ybtn a.x-date-mp-next:hover{background-position:-15px -120px;}.x-date-mp-ybtn a.x-date-mp-prev{background-position:0 -105px;}.x-date-mp-ybtn a.x-date-mp-prev:hover{background-position:-15px -105px;}.x-date-mp-ybtn{text-align:center;}td.x-date-mp-sep{border-right:1px solid #c5d2df;}.x-tip{position:absolute;top:0;left:0;visibility:hidden;z-index:20000;border:0 none;}.x-tip .x-tip-close{background-image:url(../js/ext/resources/images/default/qtip/close.gif);height:15px;float:right;width:15px;margin:0 0 2px 2px;cursor:pointer;display:none;}.x-tip .x-tip-tc{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -62px;padding-top:3px;overflow:hidden;zoom:1;}.x-tip .x-tip-tl{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 0;padding-left:6px;overflow:hidden;zoom:1;}.x-tip .x-tip-tr{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat right 0;padding-right:6px;overflow:hidden;zoom:1;}.x-tip .x-tip-bc{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -121px;height:3px;overflow:hidden;}.x-tip .x-tip-bl{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -59px;padding-left:6px;zoom:1;}.x-tip .x-tip-br{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat right -59px;padding-right:6px;zoom:1;}.x-tip .x-tip-mc{border:0 none;font:normal 100% arial,sans;}.x-tip .x-tip-ml{background:#fff url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -124px;padding-left:6px;zoom:1;}.x-tip .x-tip-mr{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat right -124px;padding-right:6px;zoom:1;}.ext-ie .x-tip .x-tip-header,.ext-ie .x-tip .x-tip-tc{font-size:0;line-height:0;}.x-tip .x-tip-header-text{font:bold 100% arial,sans;padding:0;margin:0 0 2px;color:#444;}.x-tip .x-tip-body{font:normal 100% arial,sans;margin:0!important;line-height:14px;color:#444;padding:0;}.x-tip .x-tip-body .loading-indicator{margin:0;}.x-tip-draggable .x-tip-header,.x-tip-draggable .x-tip-header-text{cursor:move;}.x-form-invalid-tip .x-tip-tc{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) repeat-x 0 -12px;padding-top:6px;}.x-form-invalid-tip .x-tip-tl{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);}.x-form-invalid-tip .x-tip-tr{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);}.x-form-invalid-tip .x-tip-bc{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) repeat-x 0 -18px;height:6px;}.x-form-invalid-tip .x-tip-bl{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) no-repeat 0 -6px;}.x-form-invalid-tip .x-tip-br{background:url(../js/ext/resources/images/default/form/error-tip-corners.gif) no-repeat right -6px;}.x-form-invalid-tip .x-tip-ml{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);}.x-form-invalid-tip .x-tip-mr{background-image:url(../js/ext/resources/images/default/form/error-tip-corners.gif);}.x-form-invalid-tip .x-tip-body{padding:2px;}.x-form-invalid-tip .x-tip-body{padding-left:24px;background:transparent url(../js/ext/resources/images/default/form/exclamation.gif) no-repeat 2px 2px;}.x-menu{border:1px solid #718bb7;z-index:15000;zoom:1;background:#f0f0f0 url(../js/ext/resources/images/default/menu/menu.gif) repeat-y;padding:2px;}.x-menu a{text-decoration:none!important;}.ext-ie .x-menu{zoom:1;overflow:hidden;}.x-menu-list{background:transparent;border:0 none;}.x-menu li{line-height:100%;}.x-menu li.x-menu-sep-li{font-size:1px;line-height:1px;}.x-menu-list-item{font:normal 100% arial,sans;white-space:nowrap;-moz-user-select:none;-khtml-user-select:none;display:block;padding:1px;}.x-menu-item-arrow{background:transparent url(../js/ext/resources/images/default/menu/menu-parent.gif) no-repeat right;}.x-menu-sep{display:block;font-size:1px;line-height:1px;margin:2px 3px;background-color:#e0e0e0;border-bottom:1px solid #fff;overflow:hidden;}.x-menu-focus{position:absolute;left:0;top:-5px;width:0;height:0;line-height:1px;}.x-menu a.x-menu-item{display:block;line-height:16px;padding:3px 21px 3px 3px;white-space:nowrap;text-decoration:none;color:#222;-moz-outline:0 none;outline:0 none;cursor:pointer;}.x-menu-item-active{background:#ebf3fd url(../js/ext/resources/images/default/menu/item-over.gif) repeat-x left bottom;border:1px solid #aaccf6;padding:0;}.x-menu-item-active a.x-menu-item{color:#233d6d;}.x-menu-item-icon{border:0 none;height:16px;padding:0;vertical-align:top;width:16px;margin:0 8px 0 0;background-position:center;}.x-menu-check-item .x-menu-item-icon{background:transparent url(../js/ext/resources/images/default/menu/unchecked.gif) no-repeat center;}.x-menu-item-checked .x-menu-item-icon{background-image:url(../js/ext/resources/images/default/menu/checked.gif);}.x-menu-group-item .x-menu-item-icon{background:transparent;}.x-menu-item-checked .x-menu-group-item .x-menu-item-icon{background:transparent url(../js/ext/resources/images/default/menu/group-checked.gif) no-repeat center;}.x-menu-plain{background:#fff!important;}.x-menu-date-item{padding:0;}.x-menu .x-color-palette,.x-menu .x-date-picker{margin-left:26px;margin-right:4px;}.x-menu .x-date-picker{border:1px solid #a3bad9;margin-top:2px;margin-bottom:2px;}.x-menu-plain .x-color-palette,.x-menu-plain .x-date-picker{margin:0;border:0 none;}.x-date-menu{padding:0!important;}.x-cycle-menu .x-menu-item-checked{border:1px dotted #a3bae9!important;background:#DFE8F6;padding:0;}.x-box-tl{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat 0 0;zoom:1;}.x-box-tc{height:8px;background:transparent url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 0;overflow:hidden;}.x-box-tr{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat right -8px;}.x-box-ml{background:transparent url(../js/ext/resources/images/default/box/l.gif) repeat-y 0;padding-left:4px;overflow:hidden;zoom:1;}.x-box-mc{background:#eee url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 -16px;padding:4px 10px;font-family:"Myriad Pro","Myriad Web",Tahoma,Helvetica,Arial,sans-serif;color:#393939;font-size:100%;}.x-box-mc h3{font-size:14px;font-weight:700;margin:0 0 4px;zoom:1;}.x-box-mr{background:transparent url(../js/ext/resources/images/default/box/r.gif) repeat-y right;padding-right:4px;overflow:hidden;}.x-box-bl{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat 0 -16px;zoom:1;}.x-box-bc{background:transparent url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 -8px;height:8px;overflow:hidden;}.x-box-br{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat right -24px;}.x-box-tl,.x-box-bl{padding-left:8px;overflow:hidden;}.x-box-tr,.x-box-br{padding-right:8px;overflow:hidden;}.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr{background-image:url(../js/ext/resources/images/default/box/corners-blue.gif);}.x-box-blue .x-box-bc,.x-box-blue .x-box-mc,.x-box-blue .x-box-tc{background-image:url(../js/ext/resources/images/default/box/tb-blue.gif);}.x-box-blue .x-box-mc{background-color:#c3daf9;}.x-box-blue .x-box-mc h3{color:#17385b;}.x-box-blue .x-box-ml{background-image:url(../js/ext/resources/images/default/box/l-blue.gif);}.x-box-blue .x-box-mr{background-image:url(../js/ext/resources/images/default/box/r-blue.gif);}#x-debug-browser .x-tree .x-tree-node a span{color:#222297;font-size:100%;padding-top:2px;font-family:monotype,"courier new",sans-serif;line-height:18px;}#x-debug-browser .x-tree a i{color:#FF4545;font-style:normal;}#x-debug-browser .x-tree a em{color:#999;}#x-debug-browser .x-tree .x-tree-node .x-tree-selected a span{background:#c3daf9;}#x-debug-browser .x-tool-toggle{background-position:0 -75px;}#x-debug-browser .x-tool-toggle-over{background-position:-15px -75px;}#x-debug-browser.x-panel-collapsed .x-tool-toggle{background-position:0 -60px;}#x-debug-browser.x-panel-collapsed .x-tool-toggle-over{background-position:-15px -60px;}.x-combo-list{border:1px solid #98c0f4;background:#ddecfe;zoom:1;overflow:hidden;}.x-combo-list-inner{overflow:auto;background:#FFF;position:relative;zoom:1;overflow-x:hidden;}.x-combo-list-hd{font:bold 100% arial,sans;color:#15428b;background-image:url(../js/ext/resources/images/default/layout/panel-title-light-bg.gif);border-bottom:1px solid #98c0f4;padding:3px;}.x-resizable-pinned .x-combo-list-inner{border-bottom:1px solid #98c0f4;}.x-combo-list-item{font:normal 100% arial,sans;padding:2px;border:1px solid #fff;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.x-combo-list .x-combo-selected{border:1px dotted #a3bae9!important;background:#DFE8F6;cursor:pointer;}.x-combo-noedit{cursor:pointer;}.x-combo-list .x-toolbar{border-top:1px solid #98c0f4;border-bottom:0 none;}.x-combo-list-small .x-combo-list-item{font:normal 100% arial,sans;}.x-panel{border-style:solid;border-color:#99bbe8;border-width:0;}.x-panel-header{overflow:hidden;zoom:1;color:#15428b;font:bold 100% arial,sans;padding:5px 3px 4px 5px;border:1px solid #99bbe8;line-height:15px;background:transparent url(../js/ext/resources/images/default/panel/white-top-bottom.gif) repeat-x 0 -1px;}.x-panel-body{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;background:#FFF;position:relative;}.x-panel-bbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;}.x-panel-tbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;}.x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar{border-top:1px solid #99bbe8;border-bottom:0 none;}.x-panel-body-noheader,.x-panel-mc .x-panel-body{border-top:1px solid #99bbe8;}.x-panel-header{overflow:hidden;zoom:1;}.x-panel-tl .x-panel-header{color:#15428b;font:bold 100% arial,sans;padding:5px 0 4px;border:0 none;background:transparent;}.x-panel-tl .x-panel-icon,.x-window-tl .x-panel-icon{padding-left:20px!important;background-repeat:no-repeat;background-position:0 4px;zoom:1;}.x-panel-inline-icon{width:16px;height:16px;background-repeat:no-repeat;background-position:0 0;vertical-align:middle;margin-right:4px;margin-top:-1px;margin-bottom:-1px;}.x-panel-tc{background:transparent url(../js/ext/resources/images/default/panel/top-bottom.gif) repeat-x 0 0;overflow:hidden;}.ext-strict .ext-ie7 .x-panel-tc{overflow:visible;}.x-panel-tl{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat 0 0;padding-left:6px;zoom:1;border-bottom:1px solid #99bbe8;}.x-panel-tr{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat right 0;zoom:1;padding-right:6px;}.x-panel-bc{background:transparent url(../js/ext/resources/images/default/panel/top-bottom.gif) repeat-x 0 bottom;zoom:1;}.x-panel-bc .x-panel-footer{zoom:1;}.x-panel-bl{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat 0 bottom;padding-left:6px;zoom:1;}.x-panel-br{background:transparent url(../js/ext/resources/images/default/panel/corners-sprite.gif) no-repeat right bottom;padding-right:6px;zoom:1;}.x-panel-mc{border:0 none;padding:0;margin:0;font:normal 100% arial,sans;padding-top:6px;background:#dfe8f6;}.x-panel-mc .x-panel-body{background:transparent;border:0 none;}.x-panel-ml{background:#fff url(../js/ext/resources/images/default/panel/left-right.gif) repeat-y 0 0;padding-left:6px;zoom:1;}.x-panel-mr{background:transparent url(../js/ext/resources/images/default/panel/left-right.gif) repeat-y right 0;padding-right:6px;zoom:1;}.x-panel-bc .x-panel-footer{padding-bottom:6px;}.x-panel-nofooter .x-panel-bc{height:6px;font-size:0;line-height:0;}.x-panel-bwrap{overflow:hidden;zoom:1;}.x-panel-body{overflow:hidden;zoom:1;}.x-panel-collapsed .x-resizable-handle{display:none;}.ext-gecko .x-panel-animated div{overflow:hidden!important;}.x-plain-body{overflow:hidden;}.x-plain-bbar .x-toolbar{overflow:hidden;padding:2px;}.x-plain-tbar .x-toolbar{overflow:hidden;padding:2px;}.x-plain-bwrap{overflow:hidden;zoom:1;}.x-plain{overflow:hidden;}.x-tool{overflow:hidden;width:15px;height:15px;float:right;cursor:pointer;background:transparent url(../js/ext/resources/images/default/panel/tool-sprites.gif) no-repeat;margin-left:2px;}.x-tool-toggle{background-position:0 -60px;}.x-tool-toggle-over{background-position:-15px -60px;}.x-panel-collapsed .x-tool-toggle{background-position:0 -75px;}.x-panel-collapsed .x-tool-toggle-over{background-position:-15px -75px;}.x-tool-close{background-position:0 0;}.x-tool-close-over{background-position:-15px 0;}.x-tool-minimize{background-position:0 -15px;}.x-tool-minimize-over{background-position:-15px -15px;}.x-tool-maximize{background-position:0 -30px;}.x-tool-maximize-over{background-position:-15px -30px;}.x-tool-restore{background-position:0 -45px;}.x-tool-restore-over{background-position:-15px -45px;}.x-tool-gear{background-position:0 -90px;}.x-tool-gear-over{background-position:-15px -90px;}.x-tool-pin{background-position:0 -135px;}.x-tool-pin-over{background-position:-15px -135px;}.x-tool-unpin{background-position:0 -150px;}.x-tool-unpin-over{background-position:-15px -150px;}.x-tool-right{background-position:0 -165px;}.x-tool-right-over{background-position:-15px -165px;}.x-tool-left{background-position:0 -180px;}.x-tool-left-over{background-position:-15px -180px;}.x-tool-up{background-position:0 -210px;}.x-tool-up-over{background-position:-15px -210px;}.x-tool-down{background-position:0 -195px;}.x-tool-down-over{background-position:-15px -195px;}.x-tool-refresh{background-position:0 -225px;}.x-tool-refresh-over{background-position:-15px -225px;}.x-tool-minus{background-position:0 -255px;}.x-tool-minus-over{background-position:-15px -255px;}.x-tool-plus{background-position:0 -240px;}.x-tool-plus-over{background-position:-15px -240px;}.x-tool-search{background-position:0 -270px;}.x-tool-search-over{background-position:-15px -270px;}.x-tool-save{background-position:0 -285px;}.x-tool-save-over{background-position:-15px -285px;}.x-tool-help{background-position:0 -300px;}.x-tool-help-over{background-position:-15px -300px;}.x-tool-print{background-position:0 -315px;}.x-tool-print-over{background-position:-15px -315px;}.x-panel-ghost{background:#cbddf3;z-index:12000;overflow:hidden;position:absolute;left:0;top:0;opacity:.65;-moz-opacity:.65;filter:alpha(opacity=65);}.x-panel-ghost ul{margin:0;padding:0;overflow:hidden;font-size:0;line-height:0;border:1px solid #99bbe8;border-top:0 none;display:block;}.x-panel-ghost *{cursor:move!important;}.x-panel-dd-spacer{border:2px dashed #99bbe8;}.x-panel-btns-ct{padding:5px;}.x-panel-btns-ct .x-btn{float:right;clear:none;}.x-panel-btns-ct .x-panel-btns td{border:0;padding:0;}.x-panel-btns-ct .x-panel-btns-right table{float:right;clear:none;}.x-panel-btns-ct .x-panel-btns-left table{float:left;clear:none;}.x-panel-btns-ct .x-panel-btns-center{text-align:center;}.x-panel-btns-ct .x-panel-btns-center table{margin:0 auto;}.x-panel-btns-ct table td.x-panel-btn-td{padding:3px;}.x-panel-btns-ct .x-btn-focus .x-btn-left{background-position:0 -147px;}.x-panel-btns-ct .x-btn-focus .x-btn-right{background-position:0 -168px;}.x-panel-btns-ct .x-btn-focus .x-btn-center{background-position:0 -189px;}.x-panel-btns-ct .x-btn-over .x-btn-left{background-position:0 -63px;}.x-panel-btns-ct .x-btn-over .x-btn-right{background-position:0 -84px;}.x-panel-btns-ct .x-btn-over .x-btn-center{background-position:0 -105px;}.x-panel-btns-ct .x-btn-click .x-btn-center{background-position:0 -126px;}.x-panel-btns-ct .x-btn-click .x-btn-right{background-position:0 -84px;}.x-panel-btns-ct .x-btn-click .x-btn-left{background-position:0 -63px;}.x-window{zoom:1;}.x-window .x-resizable-handle{opacity:0;-moz-opacity:0;filter:alpha(opacity=0);}.x-window-proxy{background:#C7DFFC;border:1px solid #99bbe8;z-index:12000;overflow:hidden;position:absolute;left:0;top:0;display:none;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);}.x-window-header{overflow:hidden;zoom:1;}.x-window-bwrap{z-index:1;position:relative;zoom:1;}.x-window-tl .x-window-header{color:#15428b;font:bold 100% arial,sans;padding:5px 0 4px;}.x-window-header-text{cursor:pointer;}.x-window-tc{background:transparent url(../js/ext/resources/images/default/window/top-bottom.png) repeat-x 0 0;overflow:hidden;zoom:1;}.x-window-tl{background:transparent url(../js/ext/resources/images/default/window/left-corners.png) no-repeat 0 0;padding-left:6px;zoom:1;z-index:1;position:relative;}.x-window-tr{background:transparent url(../js/ext/resources/images/default/window/right-corners.png) no-repeat right 0;padding-right:6px;}.x-window-bc{background:transparent url(../js/ext/resources/images/default/window/top-bottom.png) repeat-x 0 bottom;zoom:1;}.x-window-bc .x-window-footer{padding-bottom:6px;zoom:1;font-size:0;line-height:0;}.x-window-bl{background:transparent url(../js/ext/resources/images/default/window/left-corners.png) no-repeat 0 bottom;padding-left:6px;zoom:1;}.x-window-br{background:transparent url(../js/ext/resources/images/default/window/right-corners.png) no-repeat right bottom;padding-right:6px;zoom:1;}.x-window-mc{border:1px solid #99bbe8;padding:0;margin:0;font:normal 100% arial,sans;background:#dfe8f6;}.x-window-ml{background:transparent url(../js/ext/resources/images/default/window/left-right.png) repeat-y 0 0;padding-left:6px;zoom:1;}.x-window-mr{background:transparent url(../js/ext/resources/images/default/window/left-right.png) repeat-y right 0;padding-right:6px;zoom:1;}.x-panel-nofooter .x-window-bc{height:6px;}.x-window-body{overflow:hidden;}.x-window-bwrap{overflow:hidden;}.x-window-maximized .x-window-bl,.x-window-maximized .x-window-br,.x-window-maximized .x-window-ml,.x-window-maximized .x-window-mr,.x-window-maximized .x-window-tl,.x-window-maximized .x-window-tr{padding:0;}.x-window-maximized .x-window-footer{padding-bottom:0;}.x-window-maximized .x-window-tc{padding-left:3px;padding-right:3px;background-color:#FFF;}.x-window-maximized .x-window-mc{border-left:0 none;border-right:0 none;}.x-window-tbar .x-toolbar,.x-window-bbar .x-toolbar{border-left:0 none;border-right:0 none;}.x-window-bbar .x-toolbar{border-top:1px solid #99bbe8;border-bottom:0 none;}.x-window-draggable,.x-window-draggable .x-window-header-text{cursor:move;}.x-window-maximized .x-window-draggable,.x-window-maximized .x-window-draggable .x-window-header-text{cursor:default;}.x-window-body{background:transparent;}.x-panel-ghost .x-window-tl{border-bottom:1px solid #99bbe8;}.x-panel-collapsed .x-window-tl{border-bottom:1px solid #84a0c4;}.x-window-maximized-ct{overflow:hidden;}.x-window-maximized .x-resizable-handle{display:none;}.x-window-sizing-ghost ul{border:0 none!important;}.x-dlg-focus{-moz-outline:0 none;outline:0 none;width:0;height:0;overflow:hidden;position:absolute;top:0;left:0;}.x-dlg-mask{z-index:10000;display:none;position:absolute;top:0;left:0;-moz-opacity:.5;opacity:.50;filter:alpha(opacity=50);background-color:#CCC;}body.ext-ie6.x-body-masked select{visibility:hidden;}body.ext-ie6.x-body-masked .x-window select{visibility:visible;}.x-window-plain .x-window-mc{background:#CAD9EC;border-right:1px solid #DFE8F6;border-bottom:1px solid #DFE8F6;border-top:1px solid #a3bae9;border-left:1px solid #a3bae9;}.x-window-plain .x-window-body{border-left:1px solid #DFE8F6;border-top:1px solid #DFE8F6;border-bottom:1px solid #a3bae9;border-right:1px solid #a3bae9;background:transparent!important;}body.x-body-masked .x-window-plain .x-window-mc{background:#C7D6E9;}.x-html-editor-wrap{border:1px solid #a9bfd3;background:#FFF;}.x-html-editor-tb .x-btn-text{background:transparent url(../js/ext/resources/images/default/editor/tb-sprite.gif) no-repeat;}.x-html-editor-tb .x-edit-bold .x-btn-text{background-position:0 0;}.x-html-editor-tb .x-edit-italic .x-btn-text{background-position:-16px 0;}.x-html-editor-tb .x-edit-underline .x-btn-text{background-position:-32px 0;}.x-html-editor-tb .x-edit-forecolor .x-btn-text{background-position:-160px 0;}.x-html-editor-tb .x-edit-backcolor .x-btn-text{background-position:-176px 0;}.x-html-editor-tb .x-edit-justifyleft .x-btn-text{background-position:-112px 0;}.x-html-editor-tb .x-edit-justifycenter .x-btn-text{background-position:-128px 0;}.x-html-editor-tb .x-edit-justifyright .x-btn-text{background-position:-144px 0;}.x-html-editor-tb .x-edit-insertorderedlist .x-btn-text{background-position:-80px 0;}.x-html-editor-tb .x-edit-insertunorderedlist .x-btn-text{background-position:-96px 0;}.x-html-editor-tb .x-edit-increasefontsize .x-btn-text{background-position:-48px 0;}.x-html-editor-tb .x-edit-decreasefontsize .x-btn-text{background-position:-64px 0;}.x-html-editor-tb .x-edit-sourceedit .x-btn-text{background-position:-192px 0;}.x-html-editor-tb .x-edit-createlink .x-btn-text{background-position:-208px 0;}.x-html-editor-tip .x-tip-bd .x-tip-bd-inner{padding:5px;padding-bottom:1px;}.x-html-editor-tb .x-toolbar{position:static!important;}.x-panel-noborder .x-panel-body-noborder{border-width:0;}.x-panel-noborder .x-panel-header-noborder{border-width:0;border-bottom:1px solid #99bbe8;}.x-panel-noborder .x-panel-tbar-noborder .x-toolbar{border-width:0;border-bottom:1px solid #99bbe8;}.x-panel-noborder .x-panel-bbar-noborder .x-toolbar{border-width:0;border-top:1px solid #99bbe8;}.x-window-noborder .x-window-mc{border-width:0;}.x-window-plain .x-window-body-noborder{border-width:0;}.x-tab-panel-noborder .x-tab-panel-body-noborder{border-width:0;}.x-tab-panel-noborder .x-tab-panel-header-noborder{border-top-width:0;border-left-width:0;border-right-width:0;}.x-tab-panel-noborder .x-tab-panel-footer-noborder{border-bottom-width:0;border-left-width:0;border-right-width:0;}.x-tab-panel-bbar-noborder .x-toolbar{border-width:0;border-top:1px solid #99bbe8;}.x-tab-panel-tbar-noborder .x-toolbar{border-width:0;border-bottom:1px solid #99bbe8;}.x-border-layout-ct{background:#dfe8f6;}.x-border-panel{position:absolute;left:0;top:0;}.x-tool-collapse-south{background-position:0 -195px;}.x-tool-collapse-south-over{background-position:-15px -195px;}.x-tool-collapse-north{background-position:0 -210px;}.x-tool-collapse-north-over{background-position:-15px -210px;}.x-tool-collapse-west{background-position:0 -180px;}.x-tool-collapse-west-over{background-position:-15px -180px;}.x-tool-collapse-east{background-position:0 -165px;}.x-tool-collapse-east-over{background-position:-15px -165px;}.x-tool-expand-south{background-position:0 -210px;}.x-tool-expand-south-over{background-position:-15px -210px;}.x-tool-expand-north{background-position:0 -195px;}.x-tool-expand-north-over{background-position:-15px -195px;}.x-tool-expand-west{background-position:0 -165px;}.x-tool-expand-west-over{background-position:-15px -165px;}.x-tool-expand-east{background-position:0 -180px;}.x-tool-expand-east-over{background-position:-15px -180px;}.x-tool-expand-north,.x-tool-expand-south{float:right;margin:3px;}.x-tool-expand-east,.x-tool-expand-west{float:none;margin:3px auto;}.x-accordion-hd .x-tool-toggle{background-position:0 -255px;}.x-accordion-hd .x-tool-toggle-over{background-position:-15px -255px;}.x-panel-collapsed .x-accordion-hd .x-tool-toggle{background-position:0 -240px;}.x-panel-collapsed .x-accordion-hd .x-tool-toggle-over{background-position:-15px -240px;}.x-accordion-hd{color:#222;padding-top:4px;padding-bottom:3px;border-top:0 none;font-weight:400;background:transparent url(../js/ext/resources/images/default/panel/light-hd.gif) repeat-x 0 -9px;}.x-layout-collapsed{position:absolute;left:-10000px;top:-10000px;visibility:hidden;background-color:#d2e0f2;width:20px;height:20px;overflow:hidden;border:1px solid #98c0f4;z-index:20;}.ext-border-box .x-layout-collapsed{width:22px;height:22px;}.x-layout-collapsed-over{cursor:pointer;background-color:#d9e8fb;}.x-layout-collapsed-west .x-layout-collapsed-tools,.x-layout-collapsed-east .x-layout-collapsed-tools{position:absolute;top:0;left:0;width:20px;height:20px;}.x-layout-split{position:absolute;height:5px;width:5px;line-height:1px;font-size:1px;z-index:3;background-color:transparent;}.x-layout-split-h{background-image:url(../js/ext/resources/images/default/s.gif);background-position:left;}.x-layout-split-v{background-image:url(../js/ext/resources/images/default/s.gif);background-position:top;}.x-column-layout-ct{overflow:hidden;zoom:1;}.x-column{float:left;padding:0;margin:0;overflow:hidden;zoom:1;}.x-layout-mini{position:absolute;top:0;left:0;display:block;width:5px;height:35px;cursor:pointer;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);}.x-layout-mini-over,.x-layout-collapsed-over .x-layout-mini{opacity:1;-moz-opacity:1;filter:none;}.x-layout-split-west .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-left.gif);}.x-layout-split-east .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-right.gif);}.x-layout-split-north .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-top.gif);}.x-layout-split-south .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-bottom.gif);}.x-layout-cmini-west .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-right.gif);}.x-layout-cmini-east .x-layout-mini{top:48%;background-image:url(../js/ext/resources/images/default/layout/mini-left.gif);}.x-layout-cmini-north .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-bottom.gif);}.x-layout-cmini-south .x-layout-mini{left:48%;height:5px;width:35px;background-image:url(../js/ext/resources/images/default/layout/mini-top.gif);}.x-layout-cmini-west,.x-layout-cmini-east{border:0 none;width:5px!important;padding:0;background:transparent;}.x-layout-cmini-north,.x-layout-cmini-south{border:0 none;height:5px!important;padding:0;background:transparent;}.x-viewport,.x-viewport body{margin:0;padding:0;border:0 none;overflow:hidden;height:100%;}.x-abs-layout-item{position:absolute;left:0;top:0;}.ext-ie input.x-abs-layout-item,.ext-ie textarea.x-abs-layout-item{margin:0;}.x-progress-wrap{border:1px solid #6593cf;overflow:hidden;}.x-progress-inner{height:18px;background:#e0e8f3 url(../js/ext/resources/images/default/qtip/bg.gif) repeat-x;position:relative;}.x-progress-bar{height:18px;float:left;width:0;background:#9CBFEE url(../js/ext/resources/images/default/progress/progress-bg.gif) repeat-x left center;border-top:1px solid #D1E4FD;border-bottom:1px solid #7FA9E4;border-right:1px solid #7FA9E4;}.x-progress-text{font-size:100%;font-weight:700;color:#fff;padding:1px 5px;overflow:hidden;position:absolute;left:0;text-align:center;}.x-progress-text-back{color:#396095;line-height:16px;}.ext-ie .x-progress-text-back{line-height:15px;}.x-window-dlg .x-window-body{border:0 none!important;padding:5px 10px;overflow:hidden!important;}.x-window-dlg .x-window-mc{border:0 none!important;}.x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text{font-size:100%;}.x-window-dlg .ext-mb-input{margin-top:4px;width:95%;}.x-window-dlg .ext-mb-textarea{margin-top:4px;font:normal 100% arial,sans;}.x-window-dlg .x-progress-wrap{margin-top:4px;}.ext-ie .x-window-dlg .x-progress-wrap{margin-top:6px;}.x-window-dlg .x-msg-box-wait{background:transparent url(../js/ext/resources/images/default/grid/loading.gif) no-repeat left;display:block;width:300px;padding-left:18px;line-height:18px;}.x-window-dlg .ext-mb-icon{float:left;width:47px;height:32px;}.ext-ie .x-window-dlg .ext-mb-icon{width:44px;}.x-window-dlg .ext-mb-info{background:transparent url(../js/ext/resources/images/default/window/icon-info.gif) no-repeat top left;}.x-window-dlg .ext-mb-warning{background:transparent url(../js/ext/resources/images/default/window/icon-warning.gif) no-repeat top left;}.x-window-dlg .ext-mb-question{background:transparent url(../js/ext/resources/images/default/window/icon-question.gif) no-repeat top left;}.x-window-dlg .ext-mb-error{background:transparent url(../js/ext/resources/images/default/window/icon-error.gif) no-repeat top left;}/* + * Ext JS Library 2.0.2 + * Copyright(c) 2006-2008, Ext JS, LLC. + * licensing(a)extjs.com + * + * http://extjs.com/license + */.x-panel{border-style:solid;border-color:#d0d0d0;}.x-panel-header{color:#333;border:1px solid #d0d0d0;background-image:url(../js/ext/resources/images/gray/panel/white-top-bottom.gif);}.x-panel-body{border-color:#d0d0d0;}.x-panel-bbar .x-toolbar{border-color:#d0d0d0;}.x-panel-tbar .x-toolbar{border-color:#d0d0d0;}.x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar{border-color:#d0d0d0;}.x-panel-body-noheader,.x-panel-mc .x-panel-body{border-color:#d0d0d0;}.x-panel-tl .x-panel-header{color:#333;}.x-panel-tc{background-image:url(../js/ext/resources/images/gray/panel/top-bottom.gif);}.x-panel-tl{background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif);border-color:#d0d0d0;}.x-panel-tr{background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif);}.x-panel-bc{background-image:url(../js/ext/resources/images/gray/panel/top-bottom.gif);}.x-panel-bl{background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif);}.x-panel-br{background-image:url(../js/ext/resources/images/gray/panel/corners-sprite.gif);}.x-panel-mc{background:#f1f1f1;}.x-panel-mc .x-panel-body{background:transparent;border:0 none;}.x-panel-ml{background-image:url(../js/ext/resources/images/gray/panel/left-right.gif);}.x-panel-mr{background-image:url(../js/ext/resources/images/gray/panel/left-right.gif);}/* Tools */.x-tool{background-image:url(../js/ext/resources/images/gray/panel/tool-sprites.gif);}/* Ghosting */.x-panel-ghost{background:#e0e0e0;}.x-panel-ghost ul{border-color:#b0b0b0;}.x-grid-panel .x-panel-mc .x-panel-body{border:1px solid #d0d0d0;}/* Buttons */.x-btn-left{background-image:url(../js/ext/resources/images/gray/button/btn-sprite.gif);}.x-btn-right{background-image:url(../js/ext/resources/images/gray/button/btn-sprite.gif);}.x-btn-center{background-image:url(../js/ext/resources/images/gray/button/btn-sprite.gif);}/* Layout classes */.x-border-layout-ct{background:#f0f0f0;}.x-accordion-hd{background-image:url(../js/ext/resources/images/gray/panel/light-hd.gif);}.x-layout-collapsed{background-color:#eee;border-color:#e0e0e0;}.x-layout-collapsed-over{background-color:#fbfbfb;}/* qtips */.x-tip .x-tip-top{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}.x-tip .x-tip-top-left{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}.x-tip .x-tip-top-right{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}.x-tip .x-tip-ft{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}.x-tip .x-tip-ft-left{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}.x-tip .x-tip-ft-right{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}.x-tip .x-tip-bd-left{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}.x-tip .x-tip-bd-right{background-image:url(../js/ext/resources/images/gray/qtip/tip-sprite.gif);}/* Toolbars */.x-toolbar{border-color:#d0d0d0;background:#f0f4f5 url(../js/ext/resources/images/gray/toolbar/bg.gif) repeat-x top left;}.x-toolbar button{color:#444;}.x-toolbar .x-btn-menu-arrow-wrap .x-btn-center button{background-image:url(../js/ext/resources/images/gray/toolbar/btn-arrow.gif);}.x-toolbar .x-btn-text-icon .x-btn-menu-arrow-wrap .x-btn-center button{background-image:url(../js/ext/resources/images/gray/toolbar/btn-arrow.gif);}.x-toolbar .x-btn-over .x-btn-left{background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif);}.x-toolbar .x-btn-over .x-btn-right{background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif);}.x-toolbar .x-btn-over .x-btn-center{background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif);}.x-toolbar .x-btn-over button{color:#111;}.x-toolbar .x-btn-click .x-btn-left,.x-toolbar .x-btn-pressed .x-btn-left,.x-toolbar .x-btn-menu-active .x-btn-left{background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif);}.x-toolbar .x-btn-click .x-btn-right,.x-toolbar .x-btn-pressed .x-btn-right,.x-toolbar .x-btn-menu-active .x-btn-right{background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif);}.x-toolbar .x-btn-click .x-btn-center,.x-toolbar .x-btn-pressed .x-btn-center,.x-toolbar .x-btn-menu-active .x-btn-center{background-image:url(../js/ext/resources/images/gray/toolbar/tb-btn-sprite.gif);}.x-toolbar .ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);}/* Tabs */.x-tab-panel-header,.x-tab-panel-footer{background:#EAEAEA;border-color:#d0d0d0;}.x-tab-panel-header{border-color:#d0d0d0;}.x-tab-panel-footer{border-color:#d0d0d0;}ul.x-tab-strip-top{background:#dbdbdb url(../js/ext/resources/images/gray/tabs/tab-strip-bg.gif) repeat-x left top;border-color:#d0d0d0;padding-top:2px;}ul.x-tab-strip-bottom{background-image:url(../js/ext/resources/images/gray/tabs/tab-strip-btm-bg.gif);border-color:#d0d0d0;}.x-tab-strip span.x-tab-strip-text{color:#333;}.x-tab-strip-over span.x-tab-strip-text{color:#111;}.x-tab-strip-active span.x-tab-strip-text{color:#333;}.x-tab-strip-disabled .x-tabs-text{color:#AAA;}.x-tab-strip-top .x-tab-right{background-image:url(../js/ext/resources/images/gray/tabs/tabs-sprite.gif);}.x-tab-strip-top .x-tab-left{background-image:url(../js/ext/resources/images/gray/tabs/tabs-sprite.gif);}.x-tab-strip-top .x-tab-strip-inner{background-image:url(../js/ext/resources/images/gray/tabs/tabs-sprite.gif);}.x-tab-strip-bottom .x-tab-right{background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-inactive-right-bg.gif);}.x-tab-strip-bottom .x-tab-left{background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-inactive-left-bg.gif);}.x-tab-strip-bottom .x-tab-strip-active .x-tab-right{background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-right-bg.gif);}.x-tab-strip-bottom .x-tab-strip-active .x-tab-left{background-image:url(../js/ext/resources/images/gray/tabs/tab-btm-left-bg.gif);}.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close{background-image:url(../js/ext/resources/images/gray/tabs/tab-close.gif);}.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover{background-image:url(../js/ext/resources/images/gray/tabs/tab-close.gif);}.x-tab-panel-body{border-color:#d0d0d0;background:#fff;}.x-tab-panel-bbar .x-toolbar{border-color:#d0d0d0;}.x-tab-panel-tbar .x-toolbar{border-color:#d0d0d0;}.x-tab-panel-header-plain .x-tab-strip-spacer{border-color:#d0d0d0;background:#eaeaea;}.x-tab-scroller-left{background-image:url(../js/ext/resources/images/gray/tabs/scroll-left.gif);border-color:#aeaeae;}.x-tab-scroller-right{background-image:url(../js/ext/resources/images/gray/tabs/scroll-right.gif);border-color:#aeaeae;}/* Window */.x-window-proxy{background:#e0e0e0;border-color:#b0b0b0;}.x-window-tl .x-window-header{color:#555;}.x-window-tc{background-image:url(../js/ext/resources/images/gray/window/top-bottom.png);}.x-window-tl{background-image:url(../js/ext/resources/images/gray/window/left-corners.png);}.x-window-tr{background-image:url(../js/ext/resources/images/gray/window/right-corners.png);}.x-window-bc{background-image:url(../js/ext/resources/images/gray/window/top-bottom.png);}.x-window-bl{background-image:url(../js/ext/resources/images/gray/window/left-corners.png);}.x-window-br{background-image:url(../js/ext/resources/images/gray/window/right-corners.png);}.x-window-mc{border:1px solid #d0d0d0;background:#e8e8e8;}.x-window-ml{background-image:url(../js/ext/resources/images/gray/window/left-right.png);}.x-window-mr{background-image:url(../js/ext/resources/images/gray/window/left-right.png);}.x-panel-ghost .x-window-tl{border-color:#d0d0d0;}.x-panel-collapsed .x-window-tl{border-color:#d0d0d0;}.x-window-plain .x-window-mc{background:#e8e8e8;border-right:1px solid #eee;border-bottom:1px solid #eee;border-top:1px solid #d0d0d0;border-left:1px solid #d0d0d0;}.x-window-plain .x-window-body{border-left:1px solid #eee;border-top:1px solid #eee;border-bottom:1px solid #d0d0d0;border-right:1px solid #d0d0d0;background:transparent!important;}body.x-body-masked .x-window-mc,body.x-body-masked .x-window-plain .x-window-mc{background-color:#e4e4e4;}/* misc */.x-html-editor-wrap{border-color:#d0d0d0;}/* Borders go last for specificity */.x-panel-noborder .x-panel-body-noborder{border-width:0;}.x-panel-noborder .x-panel-header-noborder{border-width:0;border-bottom:1px solid #d0d0d0;}.x-panel-noborder .x-panel-tbar-noborder .x-toolbar{border-width:0;border-bottom:1px solid #d0d0d0;}.x-panel-noborder .x-panel-bbar-noborder .x-toolbar{border-width:0;border-top:1px solid #d0d0d0;}.x-window-noborder .x-window-mc{border-width:0;}.x-window-plain .x-window-body-noborder{border-width:0;}.x-tab-panel-noborder .x-tab-panel-body-noborder{border-width:0;}.x-tab-panel-noborder .x-tab-panel-header-noborder{border-top-width:0;border-left-width:0;border-right-width:0;}.x-tab-panel-noborder .x-tab-panel-footer-noborder{border-bottom-width:0;border-left-width:0;border-right-width:0;}.x-tab-panel-bbar-noborder .x-toolbar{border-width:0;border-top:1px solid #d0d0d0;}.x-tab-panel-tbar-noborder .x-toolbar{border-width:0;border-bottom:1px solid #d0d0d0;}.kunebody{background-color:#FFF;color:#000;font-family:arial, sans;margin:5px;}#kuneinitialcurtain{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#FFF;z-index:9999;}/* Global styles */.gwt-HorizontalSplitPanel .hsplitter{cursor:e-resize;width:6px;}.gwt-DialogBox{border:8px solid #C3D9FF;border:2px outset;background-color:#FFF;}.gwt-DialogBox .Caption{background-color:#C3D9FF;font-size:85%;font-weight:700;padding:3px;margin:2px;cursor:default;}.gwt-MenuBar{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;}.gwt-MenuBar .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.gwt-MenuBar .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.gwt-MenuBar .gwt-MenuItem{background-color:#F2F2F2;}.gwt-MenuBar .gwt-MenuItem-selected{background-color:#FFB958;}.kune-MenuBar .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;cursor:hand;white-space:nowrap;padding:0 10px;}.kune-MenuBar .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#963;}.kune-expandHoriz{width:100%;}.kune-expandVert{height:100%;}.kune-floatleft{float:left;}.kune-floatright{float:right;}/* Deprecated */.kune-Default-Form{margin:10px;}.kune-valignmiddle{vertical-align:middle;}fieldset{border:1px solid #B5B8C8;/* margin-bottom:10px; */padding:10px 10px 5px;}legend{color:#15428B;font-size:85%;font-size-adjust:none;font-style:normal;font-variant:normal;font-weight:700;line-height:normal;}.gwt-RadioButton input{margin:0 3px;vertical-align:middle;}.gwt-RadioButton label{margin:0 3px;vertical-align:middle;}.kune-pointer{cursor:pointer;}.kuneLabelPre{white-space:pre!important;}/* Buttons */.kune-CustomPushButton-space{margin-top:3px;margin-bottom:3px;}.kune-CustomPushButton{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:0 12px;}.kune-CustomPushButton-up{color:#161616;}.kune-CustomPushButton-down{color:#000;}.kune-CustomPushButton-up-hovering{color:#161616;background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;}.kune-CustomPushButton-down-hovering{color:#000;}.kune-CustomPushButton-up-disabled{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#E0E0E0;cursor:default;}.kune-CustomPushButton-down-disabled{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#E0E0E0;cursor:default;}.kune-Button-Large-lrSpace{margin-left:12px;margin-right:12px;}.kune-Button-Large-rSpace{margin-right:12px;}.kune-Button-Large-lSpace{margin-left:12px;}.kune-Button-Large-tbSpace{margin-top:12px;margin-bottom:12px;}.kune-Button-Small-lrSpace{margin-left:10px;margin-right:10px;}.kune-Button-Small-rSpace{margin-right:10px;}.kune-Button-Small-lSpace{margin-left:10px;}.kune-Button-Small-tbSpace{margin-top:10px;margin-bottom:10px;}.kune-Button-Mini-lSpace{margin-left:8px;}.kune-Button-Mini-lrSpace{margin-left:8px;margin-right:8px;}.kune-Button-Mini-rSpace{margin-right:8px;}.kune-Button-Mini-tbSpace{margin-top:8px;margin-bottom:8px;}.kune-IconHyperlink{}.kune-IconHyperlink a:link{/* text-decoration: underline; */color:green;}.kune-IconHyperlink a:hover{text-decoration:underline;}.kune-IconHyperlink a:visited{color:olive;}.kune-IconHyperlink img{margin-right:4px;vertical-align:middle;}.kune-IconLabel{}.kune-IconLabel img{margin-right:4px;vertical-align:middle;}.kune-link{text-decoration:underline;color:green;cursor:pointer;}/* DropDowns */.kune-DropDownOuter{background-color:green;}.kune-DropDownInner{margin:0 3px 1px;background:green;background-color:#FFF;padding:3px;}.kune-DropDownLabel{color:#FFF;cursor:pointer;}.kune-DropDownLabel .gwt-Label{margin:0 5px 0 0;width:100%;}.kune-DropDownLabel img{margin:0 3px 0 1px;}.kune-IconLabel{color:green;}.kune-IconLabel img{margin-right:4px;vertical-align:middle;}/* Used in multi chat panel status change */.x-menu-item img{margin-right:4px;vertical-align:middle;}/* Margins */.kune-Margin-40-trbl{margin:40px;}.kune-Margin-40-lr{margin-left:40px;margin-right:40px;}.kune-Margin-40-tl{margin-top:40px;margin-left:40px;}.kune-Margin-40-tb{margin-top:40px;margin-bottom:40px;}.kune-Margin-40-t{margin-top:40px;}.kune-Margin-40-r{margin-right:40px;}.kune-Margin-40-l{margin-left:40px;}.kune-Margin-20-trbl{margin:20px;}.kune-Margin-20-lr{margin-left:20px;margin-right:20px;}.kune-Margin-20-tl{margin-top:20px;margin-left:20px;}.kune-Margin-20-tb{margin-top:20px;margin-bottom:20px;}.kune-Margin-20-t{margin-top:20px;}.kune-Margin-20-r{margin-right:20px;}.kune-Margin-20-l{margin-left:20px;}.kune-Margin-Large-trbl{margin:10px;}.kune-Margin-Large-lr{margin-left:10px;margin-right:10px;}.kune-Margin-Large-tl{margin-top:10px;margin-left:10px;}.kune-Margin-Large-tb{margin-top:10px;margin-bottom:10px;}.kune-Margin-Large-t{margin-top:10px;}.kune-Margin-Large-r{margin-right:10px;}.kune-Margin-Large-l{margin-left:10px;}.kune-Margin-7-trbl{margin:7px;}.kune-Margin-7-lr{margin-left:7px;margin-right:7px;}.kune-Margin-7-tl{margin-top:7px;margin-left:7px;}.kune-Margin-7-tb{margin-top:7px;margin-bottom:7px;}.kune-Margin-7-t{margin-top:7px;}.kune-Margin-7-r{margin-right:7px;}.kune-Margin-7-b{margin-bottom:7px;}.kune-Margin-7-l{margin-left:7px;}.kune-Margin-Medium-trbl{margin:5px;}.kune-Margin-Medium-lr{margin-left:5px;margin-right:5px;}.kune-Margin-Medium-tl{margin-top:5px;margin-left:5px;}.kune-Margin-Medium-tb{margin-top:5px;margin-bottom:5px;}.kune-Margin-Medium-t{margin-top:5px;}.kune-Margin-Medium-r{margin-right:5px;}.kune-Margin-Medium-b{margin-bottom:5px;}.kune-Margin-Medium-l{margin-left:5px;}.kune-Margin-Small-trbl{margin:3px;}.kune-Margin-Small-lr{margin-left:3px;margin-right:3px;}.kune-Margin-Small-tl{margin-top:3px;margin-left:3px;}.kune-Margin-Small-tb{margin-top:3px;margin-bottom:3px;}.kune-Margin-Small-t{margin-top:3px;}.kune-Margin-Small-l{margin-left:3px;}.kune-Margin-Small-r{margin-right:3px;}.kune-Margin-Small-b{margin-bottom:3px;}.kune-Margin-Mini-trbl{margin:1px;}.kune-Margin-Mini-lr{margin-left:1px;margin-right:1px;}.kune-Margin-Mini-tl{margin-top:1px;margin-left:1px;}.kune-Margin-Mini-tb{margin-top:1px;margin-bottom:1px;}.kune-Margin-Mini-t{margin-top:1px;}.kune-Margin-Mini-r{margin-right:1px;}.kune-Margin-Mini-b{margin-bottom:1px;}.kune-Margin-Mini-l{margin-left:1px;}/* Fonts +see: http://developer.yahoo.com/yui/fonts/ */.kune-ft10px{font-size:77%;}.kune-ft11px{font-size:85%;}.kune-ft12px{font-size:93%;}.kune-ft13px{font-size:100%;}.kune-ft14px{font-size:108%;}.kune-ft15px{font-size:116%;}.kune-ft16px{font-size:123.099998%;}.kune-ft17px{font-size:131%;}.kune-ft18px{font-size:138.5%;}.kune-ft19px{font-size:146.5%;}.kune-ft20px{font-size:153.899994%;}.kune-ft21px{font-size:161.600006%;}.kune-ft22px{font-size:167%;}.kune-ft23px{font-size:174%;}.kune-ft24px{font-size:182%;}.kune-ft25px{font-size:189%;}.kune-ft26px{font-size:197%;}/* Sitebar */.kune-SiteBarPanel .kune-IconHyperlink{white-space:nowrap;}.kune-SiteBarPanel .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.kune-SiteBarPanel .kune-IconHyperlink a:hover{text-decoration:underline;}.kune-SiteBarPanel .kune-IconHyperlink a:visited{color:#B3B3B3;}.kune-SiteBarPanel{margin-right:10px;height:16px;}.kune-SiteBarPanel .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.kune-SiteBarPanel .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.kune-SiteBarPanel .gwt-PushButton{cursor:pointer;}.kune-SiteBarPanel-Separator{color:#E4A374;margin:0 5px;}.kune-SiteBarPanel-SpaceSeparator{width:10px;}.kune-SiteMessagePanel{color:#250;position:absolute;z-index:10000;vertical-align:middle;}.kune-SiteMessagePanel .gwt-HTML{margin:15px 5px 15px 2px;}.kune-SiteMessagePanel .gwt-Image{margin:5px;}.kune-SiteMessagePanel-error{background-color:#FFB380;border:1px solid #F06;}.kune-SiteMessagePanel-veryimp{background-color:#FFD4AA;border:1px solid #F59;}.kune-SiteMessagePanel-imp{background-color:#FFE6D5;border:1px solid #DE87AA;}.kune-SiteMessagePanel-info{background-color:#E5FF80;border:1px solid #87DE87;}/* Workspace styles */.kune-WorkspacePanel{width:100%;background-color:#FFF;}.kune-WokspacePanel .Tab{}.kune-WorkspacePanel .GeneralHP{}.kune-WorkspacePanel .ContextPanel{width:100%;border-right:3px solid #DD8A3D;}.kune-GroupSummaryPanel{margin:5px 0 0 5px;width:100%;}.kune-GroupToolsBar{width:150px;}.kune-GroupToolsBar-itemSelected{margin-bottom:5px;}.kune-GroupToolsBar-itemSelected .gwt-Hyperlink a{color:#FFF;padding:0 9px;text-decoration:none;}.kune-GroupToolsBar-itemSelected .gwt-Hyperlink a:hover{text-decoration:none;}.kune-GroupToolsBar-itemNotSelected{margin-bottom:5px;}.kune-GroupToolsBar-itemNotSelected .gwt-Hyperlink a{color:green;padding:0 9px;text-decoration:none;}.kune-GroupToolsBar-itemNotSelected .gwt-Hyperlink a:hover{text-decoration:none;}/* Content titles */.kune-ContentToolBarPanel{background-color:#F2F2F2;padding:2px;height:24px;vertical-align:middle;}.kune-ContentBottomBar{vertical-align:middle;height:24px;}.kune-ContentBottomBar .gwt-Image{margin-left:5px;cursor:pointer;float:left;}.kune-ContentBottomBar .gwt-Label a{}/* Main Content & Context */.kune-WorkspacePanel-Content{background-color:#FCFCFC;width:100%;height:100%;}.kune-WorkspacePanel-Content .main-content{margin:7px 5px 5px 10px;}.kune-WorkspacePanel-Context{background-color:#CFA;width:100%;height:100%;}.kune-NavigationBar{width:100%;}.kune-NavigationBar .topBar{background-color:#ececec;background:#ececec;border-bottom:1px solid #e3dbdb;vertical-align:middle;}.kune-NavigationBar .topBar .gwt-PushButton{margin:1px 3px 1px 0;}.kune-NavigationBar .topBar .gwt-Label{vertical-align:middle;}.kune-NavigationBar .kune-topBar-iconBar{margin:2px 0 2px 5px;}.kune-NavigationBar .kune-ContextItemsPanel-LabelLink{/* text-decoration: underline; */color:green;cursor:pointer;margin-left:3px;}/* .topBar .gwt-PushButton-up-disabled { filter: alpha(opacity = 20); -moz-opacity: 0.2; @@ -2167,1359 +33,6 @@ -moz-opacity: 0.2; opacity: 0.2; } -*/ -.kune-NavigationBar .topBar .gwt-Image { - margin: 0 2px 0 5px; -} - -.kune-NavigationBar .Items { - margin: 2px 0; -} - -.kune-NavigationBar .Items .gwt-Image { - margin: 2px 0; - vertical-align: middle; -} - -.kune-NavigationBar .Items .gwt-Hyperlink a { - color: green; /* FIXME: other color */ -} - -.kune-NavigationBar .topBar .topBar-margin { - margin-left: 5px; -} - -.kune-NavigationBar .pathMenu { - vertical-align: middle; -} - -.kune-NavigationBar .pathMenu .gwt-MenuItem { - background: transparent url(img/button-bg-hard.gif) repeat-x 0 0; - border-left: 1px solid #AAA; - border-right: 1px solid #AAA; - color: #999; - cursor: pointer; - white-space: nowrap; - padding: 3px 6px; -} - -.kune-NavigationBar .pathMenu .gwt-MenuItem-selected { - background: transparent url(img/button-bg-soft.gif) repeat-x 0 0; - color: #000; -} - -.kune-NavigationBar .kune-IconHyperlink { - vertical-align: middle; - margin-left: 5px; -} - -.kune-NavigationBar .kune-IconHyperlink a { - color: green; - text-decoration: none; -} - -.kune-NavigationBar .kune-IconHyperlink .gwt-Image { - margin-right: 3px; - vertical-align: middle; -} - -/* Social Network */ -.kune-StackedDropDownPanel { - -} - -.kune-StackedDropDownPanel .gwt-StackPanelItem { - border-top: 1px solid #CCC; - border-bottom: 1px solid #CCC; - background-color: #EEFFAA; - cursor: pointer; - padding: 1px 3px 0 6px; - overflow: hidden; -} - -.kune-StackedDropDownPanel .gwt-StackPanelItem img { - margin: 0 0 0 3px; - vertical-align: middle; -} - -.kune-StackedDropDownPanel .kune-DropDownInner table { - width: 100%; -} - -.kune-StackedDropDownPanel .gwt-StackPanelItem-selected { - -} - -.kune-StackedDropDownPanelLink { - background-color: #E6E6E6; - border-top: 1px solid #CCC; - border-bottom: 1px solid #F2F2F2; -/* white-space: nowrap; */ - cursor: pointer; -} - -.kune-StackedDropDownPanel .kune-DropDownInner { - padding: 0px; -} - -/* StackedDropDownPanel Members */ -.kune-StackSubItemLabel { - overflow: hidden; -} - -.kune-StackSubItemLabel .gwt-MenuItem { - white-space: nowrap; - cursor: pointer; - border-bottom: 1px solid #F2F2F2; -} - -.kune-StackSubItemLabel table { - width: 100%; -} - -.kune-StackSubItemLabel .gwt-MenuItem img { - vertical-align: middle; - margin-top: 1px; - margin-bottom: 1px; - margin-left: 5px; - margin-right: 3px; -} - -.kune-StackSubItemLabel .gwt-MenuItem-selected { - background-color: #FFE6D5; -} - -.kune-StackSubItemActions { - background-color: #F2F2F2; - border: 1px solid #999; - vertical-align: middle; - padding: 5px 0; - margin-left: -120px; - margin-top: -2px; -} - -.kune-StackSubItemActions .gwt-MenuItem { - cursor: pointer; - padding: 1px 10px; - white-space: nowrap; -} - -.kune-StackSubItemActions .gwt-MenuItem img { - vertical-align: middle; - margin-right: 3px; -} - -.kune-StackSubItemActions .gwt-MenuItem-selected { - background-color: #FFB958; -} - -/* AccessList */ -.kune-AccessListSubLabel { - font-style: italic; -} - -.kune-AccessList { - margin: 5px; - width: 100%; -} - -.kune-AccessList .gwt-DisclosurePanel { - margin: 5px; - width: 100%; -} - -.kune-AccessList .gwt-DisclosurePanel-open { - width: 100%; -} - -.kune-AccessList .gwt-DisclosurePanel-closed { - width: 100%; -} - -.kune-AccessList .header { - margin: 0 0 3px 0; - text-decoration: none; - width: 100%; - background-color: #8DD35F; -} - -.kune-AccessList .header table { - margin: 0 5px 0 0; - width: 100%; - color: #FFF; -} - -.kune-AccessList .header img { - margin: 0 3px 0 0; -} - -.kune-AccessList .content { - margin: 0 0 0 7px; - width: 100%; -} - -.kune-AccessList .content table { - margin-bottom: 5px; - width: 100%; -} - -/* Rate */ -.kune-RatePanel-Label { - white-space: nowrap; - vertical-align: middle; -} - -.kune-RatePanel-Stars { - margin-left: 5px; - vertical-align: middle; -} - -.kune-RatePanel-Stars-RateIt { - cursor: pointer; -} - -/* Licenses */ -.kune-License-CC-Header { - color: #15428B; - font-weight: bold; - font-size: 85%; - margin-top: 5px; -} - -.kune-License-CC-Header .gwt-Label { - color: #15428B; - font-weight: bold; - font-size: 85%; - margin-top: 5px; -} - -/* Theme */ -.kune-IconBottomPanel .gwt-MenuItem { - cursor: pointer; - background-color: #FFF; - margin: 2px 2px 2px 5px; -} - -.kune-IconBottomPanel .gwt-MenuItem-selected { - background-color: #F2F2F2; -} - -.gwt-MenuBar-bottomMenu { - margin-left: -60px; - margin-top: -120px; -} - -/* i18n */ -.kune-I18nTranslatorCell { - white-space: normal; -} - -.kune-i18nTranslator-recommend { - margin: 10px; -} - -.kune-i18nTranslator-recommend h1 { - font-size: 131%; - font-weight: bold; -} - -.kune-i18nTranslator-recommend h2 { - font-size: 116%; - font-weight: bold; -} - -.kune-i18nTranslator-recommend h3 { - font-size: 108%; - font-weight: bold; - font-style: italic; -} - -.kune-i18nTranslator-recommend em { - font-weight: bold; -} - -.kune-i18nTranslator-recommend strong { - font-weight: bold; -} - -/* Admin Context */ -.kune-AdminContextPanel { - margin: 6px; - width: 100%; -} - -.kune-AdminContextPanel .gwt-StackPanelItem { - background: transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px; - cursor: pointer; - padding: 3px 10px 1px 20px; - overflow: hidden; - width: 100%; -} - -.kune-AdminContextPanel .gwt-StackPanelItem img { - margin: 0 0 0 3px; - vertical-align: middle; -} - -.kune-AdminContextPanel .gwt-StackPanelItem-selected { - background: transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px; - background-color: #DEE3DB; -} - -.kune-AdminContextPanelLink { - background-color: #E6E6E6; - border-top: 1px solid #CCC; - border-bottom: 1px solid #F2F2F2; - /* white-space: nowrap; */ - cursor: pointer; -} - -.kune-AdminContextPanel-inner { - background-color: #FFF; -} - -.kune-AdminContextPanel-inner-wrap { - margin: 5px; -} - -.kune-EditableLabel { - -} - -.kune-EditableLabel .kune-EditableLabel-editable { - -} - -.kune-EditableLabel-high { - background-color: #FFFBC1; - cursor: pointer; -} - -.kune-EditableLabel-high span { - background-color: #FFFBC1; -} - -.kune-EditableLabel a { - margin-left: 5px; -} - -.kune-EditableLabel a:link { - color: green; -} - -.kune-EditableLabel a:hover { - text-decoration: underline; -} - -.kune-EditableLabel a:visited { - color: #808000; -} - -.kune-EditableLabel img { - margin-right: 4px; - vertical-align: middle; -} - -.kune-EditableLabel-editable img { - margin-right: 4px; - vertical-align: middle; -} - -.kune-EditableLabel-editable span { - margin: 3px; -} - -.kune-EditableLabel span { - margin: 3px; -} - -.kune-BottomIconsTrayPanel { - width: 165px; - height: 21px; - vertical-align: middle; - background-color: #EFEFEF; -} - -.kune-TagsPanel-tag { - float: left; - margin-right: 5px; - cursor: pointer; -} - -.kune-Content-Main { - margin: 5px; -} - -/* Yahoo ui base.css */ - -.kune-Content-Main h1 { - font-size: 138.5%; -} - -.kune-Content-Main h2 { - font-size: 123.1%; -} - -.kune-Content-Main h3 { - font-size: 108%; -} - -.kune-Content-Main h1 { - margin: 1em 0; -} - -.kune-Content-Main h2 { - margin: 1em 0; -} - -.kune-Content-Main h3 { - margin: 1em 0; -} - -.kune-Content-Main h1 { - font-weight: bold; -} - -.kune-Content-Main h2 { - font-weight: bold; -} - -.kune-Content-Main h3 { - font-weight: bold; -} - -.kune-Content-Main h4 { - font-weight: bold; -} - -.kune-Content-Main h5 { - font-weight: bold; -} - -.kune-Content-Main h6 { - font-weight: bold; -} - -.kune-Content-Main strong { - font-weight: bold; -} - -.kune-Content-Main abbr { - border-bottom: 1px dotted #000; - cursor: help; -} - -.kune-Content-Main acronym { - border-bottom: 1px dotted #000; - cursor: help; -} - -.kune-Content-Main em { - font-style: italic; -} - -.kune-Content-Main blockquote { - margin: 1em; -} - -.kune-Content-Main ul { - margin: 1em; -} - -.kune-Content-Main ol { - margin: 1em; -} - -.kune-Content-Main dl { - margin: 1em; -} - -.kune-Content-Main ol { - margin-left: 2em; -} - -.kune-Content-Main ul { - margin-left: 2em; -} - -.kune-Content-Main dl { - margin-left: 2em; -} - -.kune-Content-Main ol { - list-style: decimal outside; -} - -.kune-Content-Main li { - list-style: decimal outside; -} - -.kune-Content-Main li { - list-style: disc outside; -} - -.kune-Content-Main ul { - list-style: disc outside; -} - - -.kune-Content-Main dl { - margin-left: 1em; -} - -.kune-Content-Main dd { - margin-left: 1em; -} - -.kune-Content-Main th { - border: 1px solid #000; - padding: .5em; - font-weight: bold; - text-align: center; -} - -.kune-Content-Main td { - border: 1px solid #000; - padding: .5em; -} - -.kune-Content-Main caption { - margin-bottom: .5em; - text-align: center; -} - -.kune-Content-Main p { - margin-bottom: 1em; -} - -.kune-Content-Main fieldset { - margin-bottom: 1em; -} -.kune-Content-Main table { - margin-bottom: 1em; -} - -.kune-Content-Main pre { - margin-bottom: 1em; -} - -.kune-Content-Main input[type=text] { - width: 12.25em;*width: 11.9em;} - -.kune-Content-Main input[type=password] { - width: 12.25em;*width: 11.9em;} - -.kune-Content-Main textarea {width: 12.25em;*width: 11.9em;} - -.search-icon { - background-image: url(img/search.gif) !important; -} - -.i18n-icon { - background-image: url(img/language.gif) !important; -} - - - - -/* RTE Text editor */ -.kune-TexEditorPanel-TextArea { - margin: 3px; -} - -.gwt-RichTextArea { /* border: 1px solid #000; - background-color: #FFF; */ - border: 1px solid #4D4D4D; - background-color: #FFF; - margin: 5px 0px 5px 10px; -} - -.gwt-RichTextToolbar { - /* background-color: #F2F2F2; - padding: 5px; */ - height: 24px; - vertical-align: middle; -} - -.gwt-RichTextToolbar table { - vertical-align: middle; -} - -.gwt-RichTextToolbar .gwt-ToggleButton { - float: left; - margin-top: 2px; -} - -.gwt-RichTextToolbar .gwt-PushButton { - float: left; - margin-top: 2px; -} - -.gwt-RichTextToolbar .gwt-PushButton-up { - margin-right: 2px; - border: 1px solid #F2F2F2; -} - -.gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF #9daecd #9daecd #e8f1ff; -} - -.gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD #e8f1ff #e8f1ff #9daecd; -} - -.gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD #e8f1ff #e8f1ff #9daecd; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 2px; - border: 1px solid #F2F2F2; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF #9daecd #9daecd #e8f1ff; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD #e8f1ff #e8f1ff #9daecd; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD #e8f1ff #e8f1ff #9daecd; -} - -.gwt-RichTextToolbar .x-btn { - float: left; -} - -.gwt-RichTextToolbar .kune-Button-Large-lSpace { - float: left; -} - -.gwt-RichTextToolbar .kune-Button-Large-lrSpace { - float: left; -} - -.RichTextToolbar-menu { - float: left; - margin-top: 2px; - z-index: 4; -} - -.RichTextToolbar-menu table { - border-collapse: collapse; - border-spacing: 0; - margin: 0; - z-index: 4; -} - -.RichTextToolbar-menu .gwt-MenuItem { - margin-right: 2px; - border: 1px solid #F2F2F2; -} - -.RichTextToolbar-menu .gwt-MenuItem-selected { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD #e8f1ff #e8f1ff #9daecd; -} - -.RichTextToolbar-submenu { - background-color: #FFFCD5; - border: 1px solid #D38D5F; - cursor: default; - z-index: 4; -} - -.RichTextToolbar-submenu .gwt-MenuItem { - cursor: default; - white-space: nowrap; - border: 1px solid #FFFCD5; - padding: 0 4px; -} - -.RichTextToolbar-submenu .gwt-MenuItem-selected { - background-color: #FFB958; - border: 1px solid #C83737; -} - -.kune-WebSafePalette { - background-color: #FFF; - border: 1px solid #AAA; - margin: 1px; -} - -.kune-WebSafePalette td { - width: 12px; - height: 10px; -} - - -.k-site-traybar { - background: #FFF none repeat scroll 0% 50%; -} - -.k-sitebar .kune-IconHyperlink { - white-space: nowrap; -} - -.k-sitebar .kune-IconHyperlink a:link { - cursor: pointer; - text-decoration: underline; - color: #B3B3B3; -} - -.k-sitebar .kune-IconHyperlink a:hover { - text-decoration: underline; -} - -.k-sitebar .kune-IconHyperlink a:visited { - color: #B3B3B3; -} - -.k-sitebar-labellink { - white-space: nowrap; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; -} - -.k-sitebar { - margin-right: 10px; - height: 16px; -} - -.k-sitebar .gwt-TextBox { - border: 1px solid #E4A374; - margin: 0 15px 0 3px; - padding-left: 3px; - color: #B3B3B3; -} - -.k-sitebar .gwt-Hyperlink a { - white-space: nowrap; - color: #B3B3B3; - text-decoration: underline; - cursor: pointer; -} - -.k-sitebar .gwt-PushButton { - cursor: pointer; -} - -.k-sitebar-LabelLink { - white-space: nowrap; - color: #B3B3B3; - cursor: pointer; - text-decoration: underline; -} - -.k-entity-summary { - border-left-color: #FFF; - border-left-width: 5px; -} - -.k-entitytextlogo { - border: 2px solid #F2F2F2; - height: 60px; - margin: 0 0 4px -1px; - overflow: hidden; - width: 468px; -} - -.k-entitytextlogo .gwt-Label { - font-size: 167%; - font-weight: 700; - margin: 5px; - height: 27px; -} - -.k-entitytextlogo-default .gwt-Label { - color: #69312F; -} - -.k-entitytextlogo-green .gwt-Label { - color: #250; -} - -.k-entitytextlogo-blue .gwt-Label { - color: #000080; -} - -.k-entitytextlogo-grey .gwt-Label { - color: #1A1A1A; -} - -.k-entitytextlogo-purple .gwt-Label { - color: #440055; -} - -.k-entitytextlogo-red .gwt-Label { - color: #800000; -} - -.k-entitytextlogo .gwt-Hyperlink a { - color: #CCC; - font-size: 85%; - margin: 5px; - text-decoration: underline; - white-space: nowrap; - background-color: #FFF; -} - -.k-entity-default .x-layout-split { - background: #DD8A3D none repeat scroll 0% 50%; -} - -.k-entity-green .x-layout-split { - background: #5FD35F none repeat scroll 0% 50%; -} - -.k-entity-blue .x-layout-split { - background: #0066FF none repeat scroll 0% 50%; -} - -.k-entity-grey .x-layout-split { - background: #4D4D4D none repeat scroll 0% 50%; -} - -.k-entity-purple .x-layout-split { - background: #660080 none repeat scroll 0% 50%; -} - -.k-entity-red .x-layout-split { - background: #D40000 none repeat scroll 0% 50%; -} - -.k-entityworkspace .x-layout-split { - background: transparent none repeat scroll 0% 50%; -} - -.k-entityworkspace-default .x-layout-split { - background: #DEAA87 none repeat scroll 0% 50%; -} - -.k-entityworkspace-green .x-layout-split { - background: #DCE8AB none repeat scroll 0% 50%; -} - -.k-entityworkspace-blue .x-layout-split { - background: #D5D5FF none repeat scroll 0% 50%; -} - -.k-entityworkspace-grey .x-layout-split { - background: #999999 none repeat scroll 0% 50%; -} - -.k-entityworkspace-purple .x-layout-split { - background: #A793AC none repeat scroll 0% 50%; -} - -.k-entityworkspace-red .x-layout-split { - background: #FF5555 none repeat scroll 0% 50%; -} - -.k-entity-title { - border-left-style: solid; - border-left-width: 2px; -} - -.k-entity-title div { - line-height: 22px; - white-space: nowrap; -} - -.k-entity-subtitle { -} - -.k-entity-subtitle div { - line-height: 22px; - white-space: nowrap; -} - -.k-entity-title-rd-default { - background: #DD8A3D; -} - -.k-entity-title-rd-green { - background: #5FD35F; -} - -.k-entity-title-rd-blue { - background: #0066FF; -} - -.k-entity-title-rd-grey { - background: #4D4D4D; -} - -.k-entity-title-rd-purple { - background: #660080; -} - -.k-entity-title-rd-red { - background: #D40000; -} - -.k-entity-title-default { - background: #F1BB59 none repeat scroll 0% 50%; - border-left-color: #DD8A3D; -} - -.k-entity-title-green { - background: #AFA none repeat scroll 0% 50%; - border-left-color: #5FD35F; -} - -.k-entity-title-blue { - background: #AFDDE9 none repeat scroll 0% 50%; - border-left-color: #0066FF; -} - -.k-entity-title-grey { - background: #CCCCCC none repeat scroll 0% 50%; - border-left-color: #4D4D4D; -} - -.k-entity-title-purple { - background: #DDAFE9 none repeat scroll 0% 50%; - border-left-color: #660080; -} - -.k-entity-title-red { - background: #FF8080 none repeat scroll 0% 50%; - border-left-color: #D40000; -} - -.k-entity-title-default div { - color: #69312F; -} - -.k-entity-title-green div { - color: #250; -} - -.k-entity-title-blue div { - color: #000080; -} - -.k-entity-title-grey div { - color: #1A1A1A; -} - -.k-entity-title-purple div { - color: #440055; -} - -.k-entity-title-red div { - color: #800000; -} - -.k-entity-subtitle-default { - background: #DD8A3D none repeat scroll 0% 50%; -} - -.k-entity-subtitle-green { - background: #5FD35F none repeat scroll 0% 50%; -} - -.k-entity-subtitle-blue { - background: #0066FF none repeat scroll 0% 50%; -} - -.k-entity-subtitle-grey { - background: #4D4D4D none repeat scroll 0% 50%; -} - -.k-entity-subtitle-purple { - background: #660080 none repeat scroll 0% 50%; -} - -.k-entity-subtitle-red { - background: #D40000 none repeat scroll 0% 50%; -} - -.k-entity-subtitle-default div { - color: #FFF; -} - -.k-entity-subtitle-green div { - color: #FFF; -} - -.k-entity-subtitle-blue div { - color: #FFF; -} - -.k-entity-subtitle-grey div { - color: #FFF; -} - -.k-entity-subtitle-purple div { - color: #FFF; -} - -.k-entity-subtitle-red div { - color: #FFF; -} - -.k-entity-bottom-rd-default, .k-entity-bottom-default, .k-toolselectoritem-sel-default { - background: #DD8A3D; -} - -.k-entity-bottom-rd-green, .k-entity-bottom-green, .k-toolselectoritem-sel-green { - background: #5FD35F; -} - -.k-entity-bottom-rd-blue, .k-entity-bottom-blue, .k-toolselectoritem-sel-blue { - background: #0066FF; -} - -.k-entity-bottom-rd-grey, .k-entity-bottom-grey, .k-toolselectoritem-sel-grey { - background: #4D4D4D; -} - -.k-entity-bottom-rd-purple, .k-entity-bottom-purple, .k-toolselectoritem-sel-purple { - background: #660080; -} - -.k-entity-bottom-rd-red, .k-entity-bottom-red, .k-toolselectoritem-sel-red { - background: #D40000; -} - -.k-entitylicensepanel-licensetext { - cursor: pointer; - margin-left: 5px; - text-decoration: underline; -} - -.k-entity-context-default div, .k-entity-context-default .x-tree .x-panel-body { - background: #FFD09D none repeat scroll 0% 50%; -} - -.k-entity-context-green div, .k-entity-context-green .x-tree .x-panel-body { - background: #CFA none repeat scroll 0% 50%; -} - -.k-entity-context-blue div, .k-entity-context-blue .x-tree .x-panel-body { - background: #AACCFF none repeat scroll 0% 50%; -} - -.k-entity-context-grey div, .k-entity-context-grey .x-tree .x-panel-body { - background: #B3B3B3 none repeat scroll 0% 50%; -} - -.k-entity-context-purple div, .k-entity-context-purple .x-tree .x-panel-body { - background: #DDAFE9 none repeat scroll 0% 50%; -} - -.k-entity-context-red div, .k-entity-context-red .x-tree .x-panel-body { - background: #FFAAAA none repeat scroll 0% 50%; -} - - -.k-entity-context-purple .x-tree .x-panel-body { - background: #DDAFE9 none repeat scroll 0% 50%; -} - - -.k-entity-bottom div { - line-height: 2em; - color: #FFF; -} - -.k-toolbar-top-line { - border-top-color: rgb( 208, 208, 208 ); - border-top-style: solid; - border-top-width: 1px; -} - -.k-toolbar-bottom-line { - border-bottom-color: rgb( 208, 208, 208 ); - border-bottom-style: solid; - border-bottom-width: 1px; -} - -.x-toolbar td, .x-toolbar span, .x-toolbar input, .x-toolbar div, .x-toolbar select, .x-toolbar label { - white-space: nowrap; - font: normal 100% arial,sans; - line-height: 19px; -} - -.k-toolbar-sep { - padding-top: 4px; - padding-left: 5px; -} -/* Custom gwt-ext styles */ -.ytb-sep { - background-image: url(../js/ext/resources/images/default/grid/grid-split.gif); - background-position: center; - background-repeat: no-repeat; - display: block; - font-size: 1px; - height: 16px; - width: 4px; - overflow: hidden; - cursor: default; - margin: 0 2px 0; - border: 0; -} - -.ytb-spacer { - width: 2px; -} - -.x-grid-group-hd { - border-bottom: 2px solid grey; - cursor: pointer; - padding-top: 3px; -} -/* Drop down */ -.k-dropdownouter { - background-color: grey; -} - -.k-dropdownouter-members { -} - -.k-dropdownouter-members-default { - background-color: #DF5244; -} - -.k-dropdownouter-members-green { - background-color: #008000; -} - -.k-dropdownouter-members-blue { - background-color: #5500D4; -} - -.k-dropdownouter-members-grey { - background-color: #4D4D4D; -} - -.k-dropdownouter-members-purple { - background-color: #672178; -} - -.k-dropdownouter-members-red { - background-color: #A02C2C; -} - -.k-dropdownouter-part { -} - -.k-dropdownouter-part-default { - background-color: #CA5842; -} - -.k-dropdownouter-part-green { - background-color: #00AA00; -} - -.k-dropdownouter-part-blue { - background-color: #6600FF; -} - -.k-dropdownouter-part-grey { - background-color: #666666; -} - -.k-dropdownouter-part-purple { - background-color: #892CA0; -} - -.k-dropdownouter-part-red { - background-color: #C83737; -} - -.k-dropdownouter-tags { -} - -.k-dropdownouter-tags-default { - background-color: #87501E; -} - -.k-dropdownouter-tags-green { - background-color: #00D400; -} - -.k-dropdownouter-tags-blue { - background-color: #9955FF; -} - -.k-dropdownouter-tags-grey { - background-color: #808080; -} - -.k-dropdownouter-tags-purple { - background-color: #AB37C8; -} - -.k-dropdownouter-tags-red { - background-color: #D35F5F; -} - -.k-dropdownouter-summary { -} - -.k-dropdownouter-summary-default { - background-color: #9F734B; -} - -.k-dropdownouter-summary-green { - background-color: #4CE14C; -} - -.k-dropdownouter-summary-blue { - background-color: #69A5FF; -} - -.k-dropdownouter-summary-grey { - background-color: #A6A6A6; -} - -.k-dropdownouter-summary-purple { - background-color: #C473D8; -} - -.k-dropdownouter-summary-red { - background-color: #E08F8F; -} - -.k-dropdowninner { - margin: 0 3px 1px 3px; - background: green; - background-color: #FFF; - /* padding: 3px; */ -} - -.k-dropdownlabel { - color: #FFF; - cursor: pointer; -} - -.k-dropdownlabel .gwt-Label { - margin: 0 5px 0 0; - width: 100%; -} - -.k-dropdownlabel img { - margin: 0 3px 0 1px; -} -/* WsTheme */ -.k-wstheme-icon-default { - background: #FF8C00; -} - -.k-wstheme-icon-green { - background: green; -} - -.k-wstheme-icon-blue { - background: blue; -} - -.k-wstheme-icon-grey { - background: grey; -} - -.k-wstheme-icon-purple { - background: purple; -} - -.k-wstheme-icon-red { - background: red; -} - -/* Tool selector items */ - -.k-toolselectoritem { - width: auto; - margin-bottom: 5px; - cursor: pointer; -} - -.k-toolselectoritem-sel { -} - -.k-toolselectoritem-notsel-default { - background: #FFE9A5; -} - -.k-toolselectoritem-notsel-green { - background: #D6F4D6; -} - -.k-toolselectoritem-notsel-blue { - background: #D7D7F4; -} - -.k-toolselectoritem-notsel-grey { - background: #E6E6E6; -} - -.k-toolselectoritem-notsel-purple { - background: #EED7F4; -} - -.k-toolselectoritem-notsel-red { - background: #FFD5D5; -} - -.k-toolselectoritem-sel a { - color: #FFF; - padding: 0 9px; - text-decoration: none; -} - -.k-toolselectoritem-sel a:hover { - text-decoration: none; -} - -.k-toolselectoritem-notsel { -} - -.k-toolselectoritem-notsel a { - color: #0000FF; - padding: 0 9px; - text-decoration: none; -} - -.k-toolselectoritem-notsel a:hover { - text-decoration: underline; -} - -/* others */ -.k-textlinethrough { - text-decoration: line-through; - color: red; -} - -.k-textnormal { - text-decoration: inherit; - color: green; -} - -.k-textunderline { - text-decoration: underline; - color: gray; -} - - +*/.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-TagsPanel-tag{float:left;margin-right:5px;cursor:pointer;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; + background-color: #FFF; */border:1px solid #4D4D4D;background-color:#FFF;margin:5px 0 5px 10px;}.gwt-RichTextToolbar{/* background-color: #F2F2F2; + padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial,sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css 2008-10-06 17:05:30 UTC (rev 902) @@ -1,32 +1,16 @@ - /* Copyright (c) 2007, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt version: 2.3.1 -*/ -body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input, textarea, select{font-family:inherit;font-size:inherit;font-weight:inherit;} - -/* +*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}/* Copyright (c) 2007, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt version: 2.3.1 -*/ -body {font:13px/1.22 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}table {font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:99%;} - - -/* +*/body{font:13px/1.22 arial,helvetica,clean,sans-serif;font-size:small;font:x-small;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;font-size:108%;line-height:99%;}/* Copyright (c) 2007, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt version: 2.4.1 -*/ -h1{font-size:138.5%;}h2{font-size:123.1%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:bold;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;} em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:bold;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;*width:11.9em;} - - -body { - font-family: arial, sans; - margin: 5px; -} - +*/h1{font-size:138.5%;}h2{font-size:123.099998%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:700;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:700;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;width:11.9em;}body{font-family:arial, sans;margin:5px;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/chat/Kune-Chat.gwt.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -1,3 +1,4 @@ +<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> <module> <inherits name='org.ourproject.kune.platf.Kune-Platform' /> <inherits name='org.ourproject.kune.workspace.Kune-Workspace' /> Modified: trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/docs/Kune-Docs.gwt.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -1,3 +1,4 @@ +<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> <module> <inherits name='org.ourproject.kune.platf.Kune-Platform' /> <inherits name='org.ourproject.kune.workspace.Kune-Workspace' /> Modified: trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/Kune-Platform.gwt.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -1,3 +1,4 @@ +<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> <module>  <inherits name='com.google.gwt.user.User' /> Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-06 17:05:30 UTC (rev 902) @@ -33,7 +33,7 @@ import org.ourproject.kune.platf.client.tool.ToolSelector; import org.ourproject.kune.platf.client.tool.ToolSelectorPresenter; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; +import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPanel; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPresenter; @@ -289,7 +289,7 @@ final TextEditorPresenter presenter = new TextEditorPresenter(true, toolbar, $(I18nUITranslationService.class)); final TextEditorPanel panel = new TextEditorPanel(presenter, $(I18nTranslationService.class), - $(WorkspaceSkeleton.class), $(WebSafePalette.class)); + $(WorkspaceSkeleton.class), $(ColorWebSafePalette.class)); presenter.init(panel); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2008-10-06 17:05:30 UTC (rev 902) @@ -1,9 +1,9 @@ package org.ourproject.kune.platf.client.services; import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePanel; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePresenter; +import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; +import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalettePanel; +import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalettePresenter; import org.ourproject.kune.platf.client.ui.upload.FileUploader; import org.ourproject.kune.platf.client.ui.upload.FileUploaderDialog; import org.ourproject.kune.platf.client.ui.upload.FileUploaderPresenter; @@ -19,10 +19,10 @@ @Override protected void onLoad() { - register(Singleton.class, new Factory<WebSafePalette>(WebSafePalette.class) { - public WebSafePalette create() { - final WebSafePalettePresenter presenter = new WebSafePalettePresenter(); - final WebSafePalettePanel panel = new WebSafePalettePanel(presenter); + register(Singleton.class, new Factory<ColorWebSafePalette>(ColorWebSafePalette.class) { + public ColorWebSafePalette create() { + final ColorWebSafePalettePresenter presenter = new ColorWebSafePalettePresenter(); + final ColorWebSafePalettePanel panel = new ColorWebSafePalettePanel(presenter); presenter.init(panel); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java 2008-10-06 17:05:30 UTC (rev 902) @@ -120,7 +120,7 @@ public void doLayoutIfNeeded() { if (mainPanel.isRendered()) { - mainPanel.doLayout(); + mainPanel.doLayout(false); } } Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java 2008-10-06 17:05:30 UTC (rev 902) @@ -0,0 +1,11 @@ +package org.ourproject.kune.platf.client.ui.palette; + +import com.calclab.suco.client.listener.Listener; + +public interface ColorWebSafePalette { + + void hide(); + + void show(int left, int top, Listener<String> onColorSelected); + +} Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePanel.java 2008-10-06 17:05:30 UTC (rev 902) @@ -0,0 +1,91 @@ +/* + * + * Copyright (C) 2007-2008 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 org.ourproject.kune.platf.client.ui.palette; + +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.Grid; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.SourcesTableEvents; +import com.google.gwt.user.client.ui.TableListener; + +/** + * + * A Web safe colors palette. See: + * http://en.wikipedia.org/wiki/Web_colors#Web-safe_colors + * + */ +public class ColorWebSafePalettePanel implements WebSafePaletteView { + + Grid paletteGrid; + private final ColorWebSafePalettePresenter presenter; + private PopupPanel popupPalette; + + public ColorWebSafePalettePanel(final ColorWebSafePalettePresenter initPresenter) { + this.presenter = initPresenter; + } + + public void hide() { + if (popupPalette != null) { + popupPalette.hide(); + } + } + + public void show(final int left, final int top) { + if (paletteGrid == null) { + createPalette(); + } + popupPalette = new PopupPanel(true, true); + popupPalette.setVisible(false); + popupPalette.show(); + popupPalette.setPopupPosition(left, top); + popupPalette.setWidget(paletteGrid); + popupPalette.setVisible(true); + } + + private void createPalette() { + paletteGrid = new Grid(ROWS, COLS); + + paletteGrid.setCellSpacing(1); + // Put color values in the grid cells + + int row; + int col; + int n = 0; + for (int a = 0; a < COLORS.length; a++) { + for (int b = 0; b < COLORS.length; b++) { + for (int c = 0; c < COLORS.length; c++) { + row = n / COLS; + col = n % COLS; + final String currentColor = "#" + COLORS[c] + COLORS[a] + COLORS[b]; + paletteGrid.setText(row, col, " "); + DOM.setStyleAttribute(paletteGrid.getCellFormatter().getElement(row, col), "backgroundColor", + currentColor); + n++; + } + } + } + paletteGrid.addStyleName("kune-WebSafePalette"); + paletteGrid.addTableListener(new TableListener() { + public void onCellClicked(final SourcesTableEvents sender, final int row, final int col) { + presenter.onColorSelected(row, col); + } + }); + } +} Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java 2008-10-06 17:05:30 UTC (rev 902) @@ -0,0 +1,64 @@ +/* + * + * Copyright (C) 2007-2008 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 org.ourproject.kune.platf.client.ui.palette; + +import com.calclab.suco.client.listener.Listener; + +public class ColorWebSafePalettePresenter implements ColorWebSafePalette { + + private Listener<String> onColorSelected; + private WebSafePaletteView view; + + public ColorWebSafePalettePresenter() { + } + + public void hide() { + this.view.hide(); + } + + public void init(final WebSafePaletteView view) { + this.view = view; + } + + public void show(final int left, final int top, final Listener<String> onColorSelected) { + view.show(left, top); + this.onColorSelected = onColorSelected; + } + + protected void onColorSelected(final int row, final int col) { + final String color = getColor(row, col); + onColorSelected.onEvent(color); + } + + private String getColor(final int row, final int col) { + String color = null; + final int pd = row * WebSafePaletteView.COLS + col; + final int da = pd / 6; + final int ra = pd % 6; + final int aa = da - ra / 6; + final int db = aa / 6; + final int rb = aa % 6; + final int rc = (db - rb / 6) % 6; + color = "rgb(" + ra * 51 + ", " + rc * 51 + ", " + rb * 51 + ")"; + return color; + } + +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java 2008-10-06 17:05:30 UTC (rev 902) @@ -1,11 +0,0 @@ -package org.ourproject.kune.platf.client.ui.palette; - -import com.calclab.suco.client.listener.Listener; - -public interface WebSafePalette { - - void hide(); - - void show(int left, int top, Listener<String> onColorSelected); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java 2008-10-06 17:05:30 UTC (rev 902) @@ -1,91 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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 org.ourproject.kune.platf.client.ui.palette; - -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.Grid; -import com.google.gwt.user.client.ui.PopupPanel; -import com.google.gwt.user.client.ui.SourcesTableEvents; -import com.google.gwt.user.client.ui.TableListener; - -/** - * - * A Web safe colors palette. See: - * http://en.wikipedia.org/wiki/Web_colors#Web-safe_colors - * - */ -public class WebSafePalettePanel implements WebSafePaletteView { - - Grid paletteGrid; - private final WebSafePalettePresenter presenter; - private PopupPanel popupPalette; - - public WebSafePalettePanel(final WebSafePalettePresenter initPresenter) { - this.presenter = initPresenter; - } - - public void hide() { - if (popupPalette != null) { - popupPalette.hide(); - } - } - - public void show(final int left, final int top) { - if (paletteGrid == null) { - createPalette(); - } - popupPalette = new PopupPanel(true, true); - popupPalette.setVisible(false); - popupPalette.show(); - popupPalette.setPopupPosition(left, top); - popupPalette.setWidget(paletteGrid); - popupPalette.setVisible(true); - } - - private void createPalette() { - paletteGrid = new Grid(ROWS, COLS); - - paletteGrid.setCellSpacing(1); - // Put color values in the grid cells - - int row; - int col; - int n = 0; - for (int a = 0; a < COLORS.length; a++) { - for (int b = 0; b < COLORS.length; b++) { - for (int c = 0; c < COLORS.length; c++) { - row = n / COLS; - col = n % COLS; - final String currentColor = "#" + COLORS[c] + COLORS[a] + COLORS[b]; - paletteGrid.setText(row, col, " "); - DOM.setStyleAttribute(paletteGrid.getCellFormatter().getElement(row, col), "backgroundColor", - currentColor); - n++; - } - } - } - paletteGrid.addStyleName("kune-WebSafePalette"); - paletteGrid.addTableListener(new TableListener() { - public void onCellClicked(final SourcesTableEvents sender, final int row, final int col) { - presenter.onColorSelected(row, col); - } - }); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java 2008-10-06 17:05:30 UTC (rev 902) @@ -1,64 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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 org.ourproject.kune.platf.client.ui.palette; - -import com.calclab.suco.client.listener.Listener; - -public class WebSafePalettePresenter implements WebSafePalette { - - private Listener<String> onColorSelected; - private WebSafePaletteView view; - - public WebSafePalettePresenter() { - } - - public void hide() { - this.view.hide(); - } - - public void init(final WebSafePaletteView view) { - this.view = view; - } - - public void show(final int left, final int top, final Listener<String> onColorSelected) { - view.show(left, top); - this.onColorSelected = onColorSelected; - } - - protected void onColorSelected(final int row, final int col) { - final String color = getColor(row, col); - onColorSelected.onEvent(color); - } - - private String getColor(final int row, final int col) { - String color = null; - final int pd = row * WebSafePaletteView.COLS + col; - final int da = pd / 6; - final int ra = pd % 6; - final int aa = da - ra / 6; - final int db = aa / 6; - final int rb = aa % 6; - final int rc = (db - rb / 6) % 6; - color = "rgb(" + ra * 51 + ", " + rc * 51 + ", " + rb * 51 + ")"; - return color; - } - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -1,3 +1,4 @@ +<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/releases/1.5/distro-source/cor…"> <module> <inherits name='org.ourproject.kune.platf.Kune-Platform' /> <inherits name="com.google.gwt.core.Core" /> Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-06 17:05:30 UTC (rev 902) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; +import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.workspace.client.skel.Toolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; @@ -46,7 +46,7 @@ private final WorkspaceSkeleton ws; public TextEditorPanel(final TextEditorPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws, final WebSafePalette colorPalette) { + final WorkspaceSkeleton ws, final ColorWebSafePalette colorPalette) { this.presenter = presenter; this.i18n = i18n; this.ws = ws; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-06 17:05:30 UTC (rev 902) @@ -27,7 +27,7 @@ import org.ourproject.kune.platf.client.ui.imgchooser.ImageChooser; import org.ourproject.kune.platf.client.ui.imgchooser.ImageChooserCallback; import org.ourproject.kune.platf.client.ui.imgchooser.ImageData; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; +import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.workspace.client.site.Site; import com.calclab.suco.client.listener.Listener; @@ -281,7 +281,7 @@ private PushButton fontColor; private MenuBar fonts; private MenuBar fontSizes; - private final WebSafePalette colorPalette; + private final ColorWebSafePalette colorPalette; private final TextEditorPresenter presenter; private final I18nTranslationService i18n; @@ -292,7 +292,7 @@ * the rich text area to be controlled */ public TextEditorToolbar(final RichTextArea richText, final TextEditorPresenter presenter, - final WebSafePalette colorPalette, final I18nTranslationService i18n) { + final ColorWebSafePalette colorPalette, final I18nTranslationService i18n) { this.richText = richText; this.colorPalette = colorPalette; this.i18n = i18n; Modified: trunk/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/src/main/resources/META-INF/persistence.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/resources/META-INF/persistence.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -81,7 +81,7 @@ <property name="hibernate.search.default.directory_provider" value="org.hibernate.search.store.FSDirectoryProvider" /> <property name="hibernate.search.default.indexBase" - value="/var/lib/lucene/kune_test/indexes" /> + value="/var/lib/kune/lucene/kune_test/indexes" /> </properties> </persistence-unit> </persistence> Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/main/webapp/WEB-INF/web.xml 2008-10-06 17:05:30 UTC (rev 902) @@ -1,9 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_3.xsd" - version="2.3"> - +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> <display-name>kune</display-name> <description>kune</description> @@ -45,5 +41,4 @@ <servlet-name>Proxy</servlet-name> <url-pattern>/http-bind/</url-pattern> </servlet-mapping> - </web-app> Modified: trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2008-10-03 12:36:42 UTC (rev 901) +++ trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2008-10-06 17:05:30 UTC (rev 902) @@ -51,7 +51,6 @@ (StateToken) Mockito.anyObject(), (AsyncCallback<StateDTO>) Mockito.anyObject()); } - @SuppressWarnings("unchecked") @Before public void init() { contentProvider = Mockito.mock(ContentProvider.class);

1 0

r901 - in trunk/src/main/java/org/ourproject/kune: app/public/css docs/client platf/server/init workspace/client/ctxnav workspace/client/editor workspace/client/socialnet
by vjrj 03 Oct '08

03 Oct '08

Author: vjrj Date: 2008-10-03 14:36:42 +0200 (Fri, 03 Oct 2008) New Revision: 901 Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/docs.css trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java Log: Incomplete - task 80: Text editor refactorization other minor changes Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-02 19:57:49 UTC (rev 900) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-03 12:36:42 UTC (rev 901) @@ -2818,12 +2818,14 @@ .RichTextToolbar-menu { float: left; margin-top: 2px; + z-index: 4; } .RichTextToolbar-menu table { border-collapse: collapse; border-spacing: 0; margin: 0; + z-index: 4; } .RichTextToolbar-menu .gwt-MenuItem { @@ -2842,6 +2844,7 @@ background-color: #FFFCD5; border: 1px solid #D38D5F; cursor: default; + z-index: 4; } .RichTextToolbar-submenu .gwt-MenuItem { Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/docs.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/docs.css 2008-10-02 19:57:49 UTC (rev 900) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/docs.css 2008-10-03 12:36:42 UTC (rev 901) @@ -94,12 +94,14 @@ .RichTextToolbar-menu { float: left; margin-top: 2px; + z-index: 4; } .RichTextToolbar-menu table { border-collapse: collapse; border-spacing: 0; margin: 0; + z-index: 4; } .RichTextToolbar-menu .gwt-MenuItem { @@ -118,6 +120,7 @@ background-color: #FFFCD5; border: 1px solid #D38D5F; cursor: default; + z-index: 4; } .RichTextToolbar-submenu .gwt-MenuItem { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-02 19:57:49 UTC (rev 900) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-03 12:36:42 UTC (rev 901) @@ -15,6 +15,7 @@ import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; @@ -316,6 +317,7 @@ translateContent.setTextDescription(i18n.tWithNT("Translate", "used in button")); translateContent.setToolTip(i18n.t("Translate this document to other languages")); translateContent.setIconUrl("images/language.gif"); + translateContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { @@ -364,6 +366,7 @@ }); editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); editContent.setIconUrl("images/content_edit.png"); + editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_DOCUMENT, TYPE_GALLERY, TYPE_BLOG, TYPE_POST, TYPE_WIKI, TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2008-10-02 19:57:49 UTC (rev 900) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2008-10-03 12:36:42 UTC (rev 901) @@ -123,32 +123,34 @@ groupManager.reIndex(); final Content defaultContent = siteGroup.getDefaultContent(); - contentManager.save(user, defaultContent, - "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " - + "align=\"right\">This a initial demo of " - + "<a href=\"http://kune.ourproject.org\">kune</a>." - + "<br><div style=\"text-align: right;\"><br></div>" - + "Kune is currently under initial development.<br>" - + "<br>To test it, <a href=\"#login\">sign in registering an user</a>, " - + "but take into account that:<br><ul><li>kune is not optimized yet, " - + "then the initial load and other operations maybe are slow.</li>" - + "<li>Don\'t use passwords that you are using in other sites " - + "(kune isn\'t secure yet storing passwords).</li>" - + "<li>The site is divided in two main areas: the public " - + "space and the workspace:</li><ul>" - + "<li>The workspace is the most important part of kune, " - + "because is where users collaborate and communicates which each others. " - + "This part is the most dynamic and we are using modern " - + "(and sometimes experimental) web technologies to improve the end user " - + "experience. I heavily under development.<br></li>" - + "<li>The public space is currently lest developed. " - + "Our main goal is to offer customs and configurable styles " - + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" - + "We need your feedback<br><br></font>Please help us to improve this software " - + "reporting <a href=\"http://code.google.com/p/kune/issues\">bugs and/or " - + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " - + "into other languages.<br><br>Thank you,<br>" - + "<br>--<br><span style=\"font-style: italic;\">" + "The kune development team</span><br>"); + contentManager + .save(user, defaultContent, + "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " + + "align=\"right\">This a initial demo of " + + "<a href=\"http://kune.ourproject.org\">kune</a>." + + "<br><div style=\"text-align: right;\"><br></div>" + + "Kune is currently under initial development.<br>" + + "<br>To test it, <a href=\"#signin\">sign in registering an user</a>, " + + "but take into account that:<br><ul><li>kune is not optimized yet, " + + "then the initial load and other operations maybe are slow.</li>" + + "<li>Don\'t use passwords that you are using in other sites " + + "(kune isn\'t secure yet storing passwords).</li>" + + "<li>The site is divided in two main areas: the public " + + "space and the workspace:</li><ul>" + + "<li>The workspace is the most important part of kune, " + + "because is where users collaborate and communicates which each others. " + + "This part is the most dynamic and we are using modern " + + "(and sometimes experimental) web technologies to improve the end user " + + "experience. I heavily under development.<br></li>" + + "<li>The public space is currently lest developed. " + + "Our main goal is to offer customs and configurable styles " + + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" + + "We need your feedback<br><br></font>Please help us to improve this software " + + "reporting <a href=\"http://code.google.com/p/kune/issues\">bugs and/or " + + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " + + "into other languages.<br><br>Thank you,<br>" + + "<br>--<br><span style=\"font-style: italic;\">" + + "The kune development team</span><br><br>"); contentManager.renameContent(user, defaultContent.getId(), "Welcome to kune demo"); contentManager.setStatus(defaultContent.getId(), ContentStatus.publishedOnline); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-02 19:57:49 UTC (rev 900) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-03 12:36:42 UTC (rev 901) @@ -97,6 +97,14 @@ // Log.info("Adding child node: " + nodeId + " to folder: " + // item.getParentId()); child.addListener(new TreeNodeListenerAdapter() { + // @Override + // public void onClick(final Node node, final EventObject e) + // { + // Log.info("Tree node clicked: " + getToken(node)); + // // treePanel.getNodeById(node.getId()).select(); + // presenter.gotoToken(getToken(node)); + // } + @Override public void onTextChange(final Node node, final String text, final String oldText) { if (fireOnTextChange) { @@ -112,6 +120,7 @@ public void onExpand(final Node node) { treePanel.getNodeById(node.getId()).select(); presenter.gotoToken(getToken(node)); + child.setIcon("public/nav/folder.png"); } }); } else { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-02 19:57:49 UTC (rev 900) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-03 12:36:42 UTC (rev 901) @@ -142,6 +142,6 @@ private void adjustSize(final int height) { gwtRTarea.setHeight("" - + (height - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT - 5)); + + (height - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT)); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2008-10-02 19:57:49 UTC (rev 900) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2008-10-03 12:36:42 UTC (rev 901) @@ -87,8 +87,6 @@ final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); Log.info(participation.toString()); - Log.info("Is admin in " + groupsIsAdmin.size() + " groups."); - Log.info("Is collab in " + groupsIsCollab.size() + " groups."); final int numAdmins = groupsIsAdmin.size(); final int numCollaborators = groupsIsCollab.size(); if (numAdmins == 0) {

1 0

r900 - in trunk: . src/main/java/org/ourproject/kune/app/client src/main/java/org/ourproject/kune/platf/client/services src/main/java/org/ourproject/kune/platf/client/ui/palette src/main/java/org/ourproject/kune/workspace/client/editor
by vjrj 02 Oct '08

02 Oct '08

Author: vjrj Date: 2008-10-02 21:57:49 +0200 (Thu, 02 Oct 2008) New Revision: 900 Added: trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java Removed: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorSelectListener.java Modified: trunk/TODO trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java Log: Incomplete - task 80: Text editor refactorization Modified: trunk/TODO =================================================================== --- trunk/TODO 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/TODO 2008-10-02 19:57:49 UTC (rev 900) @@ -5,16 +5,6 @@ SHORT-TERM (URGENT): -------------------------------------------------------------------------------- -<vjrj> - - Room join fails - - Revisited ExtPoint system - - " Desktop - - LoginPanel issues - - NGPanel issues - - use of http://google-web-toolkit-doc-1-5.googlecode.com/svn/javadoc/1.5/com/google… - ---> vjrj -<vjrj/> <vjrj> IconHyperlink.java and IconLabel.java to gwt1.5 <vjrj> chat add new room name validation (do a form with validation) --> vjrj @@ -57,8 +47,6 @@ --> vjrj <danigb> click in new group, reload sn innecessary --> vjrj -<vjrj> Test: -http://gwtforge.com/ <vjrj> for dev, study jetty hot deploy (if scanIntervalSeconds > 0 also reload with client changes ... ). It will be nice to send a signal or something like that. See: http://jetty.mortbay.org/jetty5/faq/faq_s_200-General_t_HotDeploy.html See, I think is what we are looking for: Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2008-10-02 19:57:49 UTC (rev 900) @@ -23,6 +23,7 @@ import org.ourproject.kune.docs.client.DocumentClientModule; import org.ourproject.kune.platf.client.services.KuneCoreModule; import org.ourproject.kune.platf.client.services.KuneModule; +import org.ourproject.kune.platf.client.services.KunePlatformModule; import org.ourproject.kune.platf.client.services.KuneWorkspaceModule; import com.allen_sauer.gwt.log.client.Log; @@ -51,7 +52,7 @@ } public void onModuleLoadCont() { - Suco.install(new KuneCoreModule(), new KuneWorkspaceModule(), new EmiteUIModule(), new DocumentClientModule(), - new ChatClientModule(), new KuneModule()); + Suco.install(new KuneCoreModule(), new KunePlatformModule(), new KuneWorkspaceModule(), new EmiteUIModule(), + new DocumentClientModule(), new ChatClientModule(), new KuneModule()); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-02 19:57:49 UTC (rev 900) @@ -33,9 +33,7 @@ import org.ourproject.kune.platf.client.tool.ToolSelector; import org.ourproject.kune.platf.client.tool.ToolSelectorPresenter; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.upload.FileUploader; -import org.ourproject.kune.platf.client.ui.upload.FileUploaderDialog; -import org.ourproject.kune.platf.client.ui.upload.FileUploaderPresenter; +import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPanel; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPresenter; @@ -287,9 +285,11 @@ ActionToolbarPanel.Position.content, $$(ActionManager.class), $(WorkspaceSkeleton.class)); final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( contentNavigatorToolbar); + final TextEditorPresenter presenter = new TextEditorPresenter(true, toolbar, $(I18nUITranslationService.class)); - final TextEditorPanel panel = new TextEditorPanel(presenter, i18n, $(WorkspaceSkeleton.class)); + final TextEditorPanel panel = new TextEditorPanel(presenter, $(I18nTranslationService.class), + $(WorkspaceSkeleton.class), $(WebSafePalette.class)); presenter.init(panel); return presenter; } @@ -352,16 +352,6 @@ } }); - register(Singleton.class, new Factory<FileUploader>(FileUploader.class) { - public FileUploader create() { - final FileUploaderPresenter presenter = new FileUploaderPresenter($(Session.class), - $$(ContextNavigator.class)); - final FileUploaderDialog panel = new FileUploaderDialog(presenter, i18n, $(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; - } - }); - register(Singleton.class, new Factory<FileDownloadUtils>(FileDownloadUtils.class) { public FileDownloadUtils create() { return new FileDownloadUtils($(Session.class)); Added: trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java 2008-10-02 19:57:49 UTC (rev 900) @@ -0,0 +1,43 @@ +package org.ourproject.kune.platf.client.services; + +import org.ourproject.kune.platf.client.state.Session; +import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; +import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePanel; +import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePresenter; +import org.ourproject.kune.platf.client.ui.upload.FileUploader; +import org.ourproject.kune.platf.client.ui.upload.FileUploaderDialog; +import org.ourproject.kune.platf.client.ui.upload.FileUploaderPresenter; +import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import com.calclab.suco.client.ioc.decorator.Singleton; +import com.calclab.suco.client.ioc.module.AbstractModule; +import com.calclab.suco.client.ioc.module.Factory; + +public class KunePlatformModule extends AbstractModule { + + @Override + protected void onLoad() { + register(Singleton.class, new Factory<WebSafePalette>(WebSafePalette.class) { + public WebSafePalette create() { + final WebSafePalettePresenter presenter = new WebSafePalettePresenter(); + final WebSafePalettePanel panel = new WebSafePalettePanel(presenter); + presenter.init(panel); + return presenter; + } + }); + + register(Singleton.class, new Factory<FileUploader>(FileUploader.class) { + public FileUploader create() { + final FileUploaderPresenter presenter = new FileUploaderPresenter($(Session.class), + $$(ContextNavigator.class)); + final FileUploaderDialog panel = new FileUploaderDialog(presenter, $(I18nUITranslationService.class), + $(WorkspaceSkeleton.class)); + presenter.init(panel); + return presenter; + } + }); + + } +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorSelectListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorSelectListener.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorSelectListener.java 2008-10-02 19:57:49 UTC (rev 900) @@ -1,25 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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 org.ourproject.kune.platf.client.ui.palette; - -public interface ColorSelectListener { - void onColorSelected(String color); -} Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalette.java 2008-10-02 19:57:49 UTC (rev 900) @@ -0,0 +1,11 @@ +package org.ourproject.kune.platf.client.ui.palette; + +import com.calclab.suco.client.listener.Listener; + +public interface WebSafePalette { + + void hide(); + + void show(int left, int top, Listener<String> onColorSelected); + +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePanel.java 2008-10-02 19:57:49 UTC (rev 900) @@ -20,8 +20,8 @@ package org.ourproject.kune.platf.client.ui.palette; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Grid; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.SourcesTableEvents; import com.google.gwt.user.client.ui.TableListener; @@ -31,42 +31,61 @@ * http://en.wikipedia.org/wiki/Web_colors#Web-safe_colors * */ -public class WebSafePalettePanel extends Composite implements WebSafePaletteView { +public class WebSafePalettePanel implements WebSafePaletteView { + Grid paletteGrid; private final WebSafePalettePresenter presenter; + private PopupPanel popupPalette; public WebSafePalettePanel(final WebSafePalettePresenter initPresenter) { - this.presenter = initPresenter; + this.presenter = initPresenter; + } - Grid paletteGrid = new Grid(ROWS, COLS); + public void hide() { + if (popupPalette != null) { + popupPalette.hide(); + } + } - initWidget(paletteGrid); + public void show(final int left, final int top) { + if (paletteGrid == null) { + createPalette(); + } + popupPalette = new PopupPanel(true, true); + popupPalette.setVisible(false); + popupPalette.show(); + popupPalette.setPopupPosition(left, top); + popupPalette.setWidget(paletteGrid); + popupPalette.setVisible(true); + } - paletteGrid.setCellSpacing(1); - // Put color values in the grid cells + private void createPalette() { + paletteGrid = new Grid(ROWS, COLS); - int row; - int col; - int n = 0; - for (int a = 0; a < COLORS.length; a++) { - for (int b = 0; b < COLORS.length; b++) { - for (int c = 0; c < COLORS.length; c++) { - row = n / COLS; - col = n % COLS; - String currentColor = "#" + COLORS[c] + COLORS[a] + COLORS[b]; - paletteGrid.setText(row, col, " "); - DOM.setStyleAttribute(paletteGrid.getCellFormatter().getElement(row, col), "backgroundColor", - currentColor); - n++; - } - } - } - paletteGrid.addStyleName("kune-WebSafePalette"); - paletteGrid.addTableListener(new TableListener() { - public void onCellClicked(final SourcesTableEvents sender, final int row, final int col) { - presenter.onColorSelected(row, col); - } - }); + paletteGrid.setCellSpacing(1); + // Put color values in the grid cells + + int row; + int col; + int n = 0; + for (int a = 0; a < COLORS.length; a++) { + for (int b = 0; b < COLORS.length; b++) { + for (int c = 0; c < COLORS.length; c++) { + row = n / COLS; + col = n % COLS; + final String currentColor = "#" + COLORS[c] + COLORS[a] + COLORS[b]; + paletteGrid.setText(row, col, " "); + DOM.setStyleAttribute(paletteGrid.getCellFormatter().getElement(row, col), "backgroundColor", + currentColor); + n++; + } + } + } + paletteGrid.addStyleName("kune-WebSafePalette"); + paletteGrid.addTableListener(new TableListener() { + public void onCellClicked(final SourcesTableEvents sender, final int row, final int col) { + presenter.onColorSelected(row, col); + } + }); } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePalettePresenter.java 2008-10-02 19:57:49 UTC (rev 900) @@ -20,47 +20,45 @@ package org.ourproject.kune.platf.client.ui.palette; -import java.util.ArrayList; -import java.util.Iterator; +import com.calclab.suco.client.listener.Listener; -public class WebSafePalettePresenter { +public class WebSafePalettePresenter implements WebSafePalette { - private final ArrayList<ColorSelectListener> colorSelectListeners; + private Listener<String> onColorSelected; + private WebSafePaletteView view; public WebSafePalettePresenter() { - colorSelectListeners = new ArrayList<ColorSelectListener>(); } - public void addColorSelectListener(final ColorSelectListener listener) { - colorSelectListeners.add(listener); + public void hide() { + this.view.hide(); } - protected void fireColorSelectListeners(final String color) { - for (Iterator<ColorSelectListener> it = colorSelectListeners.iterator(); it.hasNext();) { - (it.next()).onColorSelected(color); - } + public void init(final WebSafePaletteView view) { + this.view = view; } - public void onColorSelected(final int row, final int col) { - String color = getColor(row, col); - fireColorSelectListeners(color); + public void show(final int left, final int top, final Listener<String> onColorSelected) { + view.show(left, top); + this.onColorSelected = onColorSelected; } - private String getColor(final int row, final int col) { - String color = null; - int pd = row * WebSafePaletteView.COLS + col; - int da = pd / 6; - int ra = pd % 6; - int aa = da - ra / 6; - int db = aa / 6; - int rb = aa % 6; - int rc = (db - rb / 6) % 6; - color = "rgb(" + ra * 51 + ", " + rc * 51 + ", " + rb * 51 + ")"; - return color; + protected void onColorSelected(final int row, final int col) { + final String color = getColor(row, col); + onColorSelected.onEvent(color); } - public void reset() { - colorSelectListeners.clear(); + private String getColor(final int row, final int col) { + String color = null; + final int pd = row * WebSafePaletteView.COLS + col; + final int da = pd / 6; + final int ra = pd % 6; + final int aa = da - ra / 6; + final int db = aa / 6; + final int rb = aa % 6; + final int rc = (db - rb / 6) % 6; + color = "rgb(" + ra * 51 + ", " + rc * 51 + ", " + rb * 51 + ")"; + return color; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/WebSafePaletteView.java 2008-10-02 19:57:49 UTC (rev 900) @@ -28,4 +28,8 @@ final String COLORS[] = { "0", "3", "6", "9", "C", "F" }; + void hide(); + + void show(int left, int top); + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-02 19:57:49 UTC (rev 900) @@ -22,6 +22,7 @@ import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; +import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; import org.ourproject.kune.workspace.client.skel.Toolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; @@ -45,7 +46,7 @@ private final WorkspaceSkeleton ws; public TextEditorPanel(final TextEditorPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws) { + final WorkspaceSkeleton ws, final WebSafePalette colorPalette) { this.presenter = presenter; this.i18n = i18n; this.ws = ws; @@ -58,7 +59,7 @@ final Toolbar editorTopBar = new Toolbar(); editorTopBar.getPanel().setWidth("auto"); - textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, i18n); + textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, colorPalette, i18n); editorTopBar.add(textEditorToolbar); editorTopBar.addStyleName("k-toolbar-bottom-line"); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-01 21:12:10 UTC (rev 899) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-02 19:57:49 UTC (rev 900) @@ -27,11 +27,10 @@ import org.ourproject.kune.platf.client.ui.imgchooser.ImageChooser; import org.ourproject.kune.platf.client.ui.imgchooser.ImageChooserCallback; import org.ourproject.kune.platf.client.ui.imgchooser.ImageData; -import org.ourproject.kune.platf.client.ui.palette.ColorSelectListener; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePanel; -import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePresenter; +import org.ourproject.kune.platf.client.ui.palette.WebSafePalette; import org.ourproject.kune.workspace.client.site.Site; +import com.calclab.suco.client.listener.Listener; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.AbstractImagePrototype; @@ -41,7 +40,6 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.KeyboardListener; import com.google.gwt.user.client.ui.MenuBar; -import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.RichTextArea; import com.google.gwt.user.client.ui.ToggleButton; @@ -112,21 +110,17 @@ }); showLinkPanel(); } else if (sender == backColor) { - showPalette(sender, sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20); - palettePresenter.addColorSelectListener(new ColorSelectListener() { - public void onColorSelected(final String color) { + colorPalette.show(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20, new Listener<String>() { + public void onEvent(final String color) { basic.setBackColor(color); - popupPalette.hide(); - palettePresenter.reset(); + colorPalette.hide(); } }); } else if (sender == fontColor) { - showPalette(sender, sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20); - palettePresenter.addColorSelectListener(new ColorSelectListener() { - public void onColorSelected(final String color) { + colorPalette.show(sender.getAbsoluteLeft(), sender.getAbsoluteTop() + 20, new Listener<String>() { + public void onEvent(final String color) { basic.setForeColor(color); - popupPalette.hide(); - palettePresenter.reset(); + colorPalette.hide(); } }); } else if (sender == removeLink) { @@ -287,10 +281,8 @@ private PushButton fontColor; private MenuBar fonts; private MenuBar fontSizes; - private WebSafePalettePanel palettePanel; + private final WebSafePalette colorPalette; private final TextEditorPresenter presenter; - private PopupPanel popupPalette; - private WebSafePalettePresenter palettePresenter; private final I18nTranslationService i18n; /** @@ -300,8 +292,9 @@ * the rich text area to be controlled */ public TextEditorToolbar(final RichTextArea richText, final TextEditorPresenter presenter, - final I18nTranslationService i18n) { + final WebSafePalette colorPalette, final I18nTranslationService i18n) { this.richText = richText; + this.colorPalette = colorPalette; this.i18n = i18n; this.basic = richText.getBasicFormatter(); this.extended = richText.getExtendedFormatter(); @@ -394,19 +387,6 @@ } } - public void showPalette(final Widget sender, final int left, final int top) { - if (palettePanel == null) { - palettePresenter = new WebSafePalettePresenter(); - palettePanel = new WebSafePalettePanel(palettePresenter); - } - popupPalette = new PopupPanel(true, true); - popupPalette.setVisible(false); - popupPalette.show(); - popupPalette.setPopupPosition(left, top); - popupPalette.setWidget(palettePanel); - popupPalette.setVisible(true); - } - private MenuBar createFontSizesMenu() { final MenuBar menu = new MenuBar(); final MenuBar submenu = new MenuBar(true);

1 0

01 Oct '08

Author: vjrj Date: 2008-10-01 23:12:10 +0200 (Wed, 01 Oct 2008) New Revision: 899 Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbarView.java Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionEnableCondition.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbar.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarView.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java Log: more editors refactorization and some fixes Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-01 21:12:10 UTC (rev 899) @@ -1729,6 +1729,41 @@ margin-left: 10px; } +.kune-Margin-7-trbl { + margin: 7px; +} + +.kune-Margin-7-lr { + margin-left: 7px; + margin-right: 7px; +} + +.kune-Margin-7-tl { + margin-top: 7px; + margin-left: 7px; +} + +.kune-Margin-7-tb { + margin-top: 7px; + margin-bottom: 7px; +} + +.kune-Margin-7-t { + margin-top: 7px; +} + +.kune-Margin-7-r { + margin-right: 7px; +} + +.kune-Margin-7-b { + margin-bottom: 7px; +} + +.kune-Margin-7-l { + margin-left: 7px; +} + .kune-Margin-Medium-trbl { margin: 5px; } @@ -3191,7 +3226,7 @@ background: #DDAFE9 none repeat scroll 0% 50%; } -.k-entity-context-red div, .k-entity-context-purple .x-tree .x-panel-body { +.k-entity-context-red div, .k-entity-context-red .x-tree .x-panel-body { background: #FFAAAA none repeat scroll 0% 50%; } Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css 2008-10-01 21:12:10 UTC (rev 899) @@ -411,6 +411,41 @@ margin-left: 10px; } +.kune-Margin-7-trbl { + margin: 7px; +} + +.kune-Margin-7-lr { + margin-left: 7px; + margin-right: 7px; +} + +.kune-Margin-7-tl { + margin-top: 7px; + margin-left: 7px; +} + +.kune-Margin-7-tb { + margin-top: 7px; + margin-bottom: 7px; +} + +.kune-Margin-7-t { + margin-top: 7px; +} + +.kune-Margin-7-r { + margin-right: 7px; +} + +.kune-Margin-7-b { + margin-bottom: 7px; +} + +.kune-Margin-7-l { + margin-left: 7px; +} + .kune-Margin-Medium-trbl { margin: 5px; } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-01 21:12:10 UTC (rev 899) @@ -149,10 +149,10 @@ delContent.setConfirmationTitle(i18n.t("Please confirm")); delContent.setConfirmationText(i18n.t("Are you sure?")); delContent.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken currentStateToken) { + public boolean mustBeEnabled(final StateToken itemToken) { final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() .getStateToken(); - return !currentStateToken.equals(defContentToken); + return !itemToken.equals(defContentToken); } }); @@ -166,8 +166,8 @@ go.setTextDescription(i18n.t("Open")); go.setIconUrl("images/nav/go.png"); go.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken currentStateToken) { - return !contextNavigator.isSelected(currentStateToken); + public boolean mustBeEnabled(final StateToken itemToken) { + return !contextNavigator.isSelected(itemToken); } }); @@ -198,10 +198,10 @@ goGroupHome.setMustBeAuthenticated(false); goGroupHome.setIconUrl("images/group-home.png"); goGroupHome.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken currentStateToken) { + public boolean mustBeEnabled(final StateToken itemToken) { final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() .getStateToken(); - return !currentStateToken.equals(defContentToken); + return !itemToken.equals(defContentToken); } }); @@ -290,7 +290,7 @@ setGroupLogo.setTextDescription(i18n.t("Set this as the group logo")); setGroupLogo.setIconUrl("images/nav/picture.png"); setGroupLogo.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken param) { + public boolean mustBeEnabled(final StateToken itemToken) { final BasicMimeTypeDTO mime = session.getCurrentState().getMimeType(); return mime != null && mime.getType().equals("image"); } @@ -344,19 +344,18 @@ public void onSuccess(final Integer newVersion) { Site.hideProgress(); + session.getCurrentState().setVersion(newVersion); + session.getCurrentState().setContent(html); editor.onSaved(); - if (session.getCurrentStateToken().equals(stateToken)) { - session.getCurrentState().setVersion(newVersion); - session.getCurrentState().setContent(html); - documentContent.refreshState(); - } } }); } }, new Listener0() { public void onEvent() { // onClose - documentContent.refreshState(); + if (session.getCurrentStateToken().equals(stateToken)) { + documentContent.refreshState(); + } } }); } @@ -444,10 +443,10 @@ setAsDefGroupContent.setTextDescription(i18n.t("Set this as the group default page")); setAsDefGroupContent.setIconUrl("images/group-home.png"); setAsDefGroupContent.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken currentStateToken) { + public boolean mustBeEnabled(final StateToken itemToken) { final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent() .getStateToken(); - return !currentStateToken.equals(defContentToken); + return !itemToken.equals(defContentToken); } }); return setAsDefGroupContent; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java 2008-10-01 21:12:10 UTC (rev 899) @@ -96,7 +96,7 @@ .getContainerRights(), true); } toolbar.disableMenusAndClearButtons(); - toolbar.showActions(collection, true); + toolbar.setActions(collection); toolbar.attach(); showContent(); } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/ui/DocumentReaderPanel.java 2008-10-01 21:12:10 UTC (rev 899) @@ -34,6 +34,9 @@ } public void setContent(final String content) { - ws.getEntityWorkspace().setContent(new HTML(content)); + final HTML html = new HTML(content); + html.setStyleName("kune-Content-Main"); + html.addStyleName("kune-Margin-7-trbl"); + ws.getEntityWorkspace().setContent(html); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionEnableCondition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionEnableCondition.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionEnableCondition.java 2008-10-01 21:12:10 UTC (rev 899) @@ -1,5 +1,5 @@ package org.ourproject.kune.platf.client.actions; public interface ActionEnableCondition<T> { - boolean mustBeEnabled(T param); + boolean mustBeEnabled(T item); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java 2008-10-01 21:12:10 UTC (rev 899) @@ -16,6 +16,11 @@ this.item = item; } + public boolean checkEnabling() { + final ActionEnableCondition<T> enableCondition = action.getEnableCondition(); + return enableCondition != null ? enableCondition.mustBeEnabled(getItem()) : true; + } + public ActionDescriptor<T> getAction() { return action; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbar.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbar.java 2008-10-01 21:12:10 UTC (rev 899) @@ -1,6 +1,7 @@ package org.ourproject.kune.platf.client.actions.toolbar; import org.ourproject.kune.platf.client.actions.ActionItemCollection; +import org.ourproject.kune.platf.client.actions.ActionToolbarDescriptor; public interface ActionToolbar<T> { @@ -12,6 +13,8 @@ void disableMenusAndClearButtons(); - void showActions(ActionItemCollection<T> actionItemCollection, boolean isItemSelected); + void setActions(ActionItemCollection<T> actionItemCollection); + void setEnableAction(ActionToolbarDescriptor<T> action, boolean enable); + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2008-10-01 21:12:10 UTC (rev 899) @@ -1,17 +1,19 @@ package org.ourproject.kune.platf.client.actions.toolbar; -import java.util.ArrayList; import java.util.HashMap; +import org.ourproject.kune.platf.client.actions.ActionDescriptor; import org.ourproject.kune.platf.client.actions.ActionItem; import org.ourproject.kune.platf.client.actions.ActionManager; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; +import org.ourproject.kune.platf.client.actions.ActionToolbarDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.workspace.client.skel.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.EventObject; @@ -31,7 +33,7 @@ } private final HashMap<String, Menu> toolbarMenus; - private final ArrayList<Widget> removableToolbarItems; + private final HashMap<String, ToolbarButton> toolbarButtons; private final HashMap<String, Item> menuItems; private final Provider<ActionManager> actionManagerProvider; private final Position position; @@ -48,11 +50,11 @@ this.actionManagerProvider = actionManagerProvider; toolbarMenus = new HashMap<String, Menu>(); - removableToolbarItems = new ArrayList<Widget>(); + toolbarButtons = new HashMap<String, ToolbarButton>(); menuItems = new HashMap<String, Item>(); } - public void addButtonAction(final ActionItem<T> actionItem) { + public void addButtonAction(final ActionItem<T> actionItem, final boolean enable) { final ActionToolbarButtonDescriptor<T> action = (ActionToolbarButtonDescriptor<T>) actionItem.getAction(); final ActionToolbarPosition pos = action.getActionPosition(); final ToolbarButton button = new ToolbarButton(); @@ -72,15 +74,16 @@ } button.setTooltip(action.getToolTip()); + setEnableButton(button, enable); final SimpleToolbar toolbar = getToolbar(pos); if (action.hasLeftSeparator()) { - removableToolbarItems.add(add(toolbar, action.getLeftSeparator())); + add(toolbar, action.getLeftSeparator()); } toolbar.add(button); if (action.hasRightSeparator()) { - removableToolbarItems.add(add(toolbar, action.getRightSeparator())); + add(toolbar, action.getRightSeparator()); } - removableToolbarItems.add(button); + toolbarButtons.put(genButtonKey(pos, text), button); } public void addMenuAction(final ActionItem<T> actionItem, final boolean enable) { @@ -94,11 +97,7 @@ item = createToolbarMenu(pos, menuTitle, menuSubTitle, actionItem); menuItems.put(itemKey, item); } - if (enable) { - item.enable(); - } else { - item.disable(); - } + setEnableMenuItem(item, enable); } public void attach() { @@ -119,20 +118,13 @@ public void clear() { toolbarMenus.clear(); menuItems.clear(); - removableToolbarItems.clear(); + toolbarButtons.clear(); topbar.removeAll(); bottombar.removeAll(); getToolbar(ActionToolbarPosition.topbar).removeAll(); getToolbar(ActionToolbarPosition.bottombar).removeAll(); } - public void clearRemovableActions() { - for (final Widget widget : removableToolbarItems) { - widget.removeFromParent(); - } - removableToolbarItems.clear(); - } - public void detach() { if (topbar.isAttached()) { switch (position) { @@ -154,6 +146,25 @@ } } + public void setButtonEnable(final ActionDescriptor<T> action, final boolean enable) { + final ActionToolbarPosition pos = ((ActionToolbarDescriptor<T>) action).getActionPosition(); + final ToolbarButton button = toolbarButtons.get(genButtonKey(pos, action.getText())); + if (button != null) { + setEnableButton(button, enable); + } else { + Log.error("Tryng to enable/disable a non existent toolbar button"); + } + } + + public void setMenuEnable(final ActionDescriptor<T> action, final boolean enable) { + final Item item = menuItems.get(genMenuKey((ActionToolbarMenuDescriptor<T>) action)); + if (item != null) { + setEnableMenuItem(item, enable); + } else { + Log.error("Tryng to enable/disable a non existent toolbar menu item"); + } + } + private void add(final ActionToolbarPosition toolbar, final Widget widget) { getToolbar(toolbar).add(widget); } @@ -220,10 +231,20 @@ return menu; } + private String genButtonKey(final ActionToolbarPosition pos, final String actionText) { + final String basePart = "km-ctx-btn-" + pos.toString().substring(0, 2) + "-" + actionText; + return basePart; + } + + private String genMenuKey(final ActionToolbarMenuDescriptor<T> action) { + return genMenuKey(action.getActionPosition(), action.getParentMenuTitle(), action.getParentSubMenuTitle(), + action.getText()); + } + private String genMenuKey(final ActionToolbarPosition pos, final String menuTitle, final String menuSubTitle, final String actionText) { - final String basePart = "km-ctx-" + pos.toString().substring(0, 2) + "-" + menuTitle; + final String basePart = "km-ctx-menu-" + pos.toString().substring(0, 2) + "-" + menuTitle; final String subMenuPart = menuSubTitle != null ? "-subm-" + menuSubTitle : ""; final String itemPart = actionText != null ? "-item-" + actionText : ""; return basePart + subMenuPart + itemPart; @@ -238,4 +259,20 @@ return topbar; } } + + private void setEnableButton(final ToolbarButton button, final boolean enable) { + if (enable) { + button.enable(); + } else { + button.disable(); + } + } + + private void setEnableMenuItem(final Item item, final boolean enable) { + if (enable) { + item.enable(); + } else { + item.disable(); + } + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2008-10-01 21:12:10 UTC (rev 899) @@ -1,59 +1,71 @@ package org.ourproject.kune.platf.client.actions.toolbar; import org.ourproject.kune.platf.client.actions.ActionDescriptor; -import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionItem; import org.ourproject.kune.platf.client.actions.ActionItemCollection; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; import com.allen_sauer.gwt.log.client.Log; public class ActionToolbarPresenter<T> implements ActionToolbar<T> { - private final ActionToolbarView<T> toolbar; + private final ActionToolbarView<T> view; public ActionToolbarPresenter(final ActionToolbarView<T> toolbar) { - this.toolbar = toolbar; + this.view = toolbar; } public void attach() { - toolbar.attach(); + view.attach(); } - public boolean checkEnabling(final ActionDescriptor<T> action, final T T) { - final ActionEnableCondition<T> enableCondition = action.getEnableCondition(); - return enableCondition != null ? enableCondition.mustBeEnabled(T) : true; - } - public void clear() { - toolbar.clear(); + view.clear(); } public void detach() { - toolbar.detach(); + view.detach(); } public void disableMenusAndClearButtons() { - toolbar.clear(); + view.clear(); } - public void showActions(final ActionItemCollection<T> actions, final boolean isItemSelected) { + public void setActions(final ActionItemCollection<T> actions) { for (final ActionItem<T> actionItem : actions) { final ActionDescriptor<T> action = actionItem.getAction(); - if (action instanceof ActionToolbarMenuDescriptor || action instanceof ActionToolbarMenuAndItemDescriptor) { - toolbar.addMenuAction(actionItem, isItemSelected && checkEnabling(action, actionItem.getItem())); + if (isToolbarMenu(action)) { + view.addMenuAction(actionItem, actionItem.checkEnabling()); } else { - if (action instanceof ActionToolbarButtonDescriptor - || action instanceof ActionToolbarButtonAndItemDescriptor) { - if (isItemSelected && checkEnabling(action, actionItem.getItem())) { - toolbar.addButtonAction(actionItem); - } + if (isToolbarButton(action)) { + view.addButtonAction(actionItem, actionItem.checkEnabling()); } else { Log.error("Code error: Not an ActionMenuDescriptor or ActionButtonDescriptor: " + action.getText()); } } } } + + public void setEnableAction(final ActionToolbarDescriptor<T> action, final boolean enable) { + if (isToolbarMenu(action)) { + view.setMenuEnable(action, enable); + } else { + if (isToolbarButton(action)) { + view.setButtonEnable(action, enable); + } + } + + } + + private boolean isToolbarButton(final ActionDescriptor<T> action) { + return action instanceof ActionToolbarButtonDescriptor + || action instanceof ActionToolbarButtonAndItemDescriptor; + } + + private boolean isToolbarMenu(final ActionDescriptor<T> action) { + return action instanceof ActionToolbarMenuDescriptor || action instanceof ActionToolbarMenuAndItemDescriptor; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarView.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarView.java 2008-10-01 21:12:10 UTC (rev 899) @@ -1,21 +1,24 @@ package org.ourproject.kune.platf.client.actions.toolbar; +import org.ourproject.kune.platf.client.actions.ActionDescriptor; import org.ourproject.kune.platf.client.actions.ActionItem; public interface ActionToolbarView<T> { - void addButtonAction(ActionItem<T> action); + void addButtonAction(ActionItem<T> actionItem, boolean enable); - void addMenuAction(ActionItem<T> action, boolean enable); + void addMenuAction(ActionItem<T> actionItem, boolean enable); void attach(); void clear(); - void clearRemovableActions(); - void detach(); void disableAllMenuItems(); + void setButtonEnable(ActionDescriptor<T> action, boolean enable); + + void setMenuEnable(ActionDescriptor<T> action, boolean enable); + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2008-10-01 21:12:10 UTC (rev 899) @@ -55,10 +55,6 @@ } public String toString() { - String groupString = ""; - for (final GroupDTO group : list) { - groupString = groupString + group.getShortName() + ", "; - } - return "GroupDTO[(" + mode + "): " + groupString + "]"; + return "GroupListDTO[(" + mode + "): " + list + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java 2008-10-01 21:12:10 UTC (rev 899) @@ -116,11 +116,7 @@ } public String toString() { - String groupString = ""; - for (final Group group : list) { - groupString = groupString + group.getShortName() + ", "; - } - return "Group[(" + mode + "): " + groupString + "]"; + return "GroupList[(" + mode + "): " + list + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2008-10-01 21:12:10 UTC (rev 899) @@ -132,7 +132,10 @@ final Long groupId = group.getId(); final List<Group> adminInGroups = finder.findAdminInGroups(groupId); // Don't show self user group - adminInGroups.remove(userLogged.getUserGroup()); + if (group.getType().equals(GroupType.PERSONAL)) { + adminInGroups.remove(group); + } + // adminInGroups.remove(userLogged.getUserGroup()); final List<Group> collabInGroups = finder.findCollabInGroups(groupId); return new ParticipationData(adminInGroups, collabInGroups); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-01 21:12:10 UTC (rev 899) @@ -163,7 +163,7 @@ public void selectItem(final StateToken stateToken) { view.selectItem(genId(stateToken)); toolbar.disableMenusAndClearButtons(); - toolbar.showActions(actionsByItem.get(stateToken), true); + toolbar.setActions(actionsByItem.get(stateToken)); } public void setEditOnNextStateChange(final boolean edit) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-01 21:12:10 UTC (rev 899) @@ -20,7 +20,6 @@ package org.ourproject.kune.workspace.client.editor; -import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; import org.ourproject.kune.workspace.client.skel.Toolbar; @@ -28,12 +27,11 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.WindowResizeListener; import com.google.gwt.user.client.ui.RichTextArea; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.gwtext.client.widgets.BoxComponent; import com.gwtext.client.widgets.MessageBox; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.layout.FitLayout; +import com.gwtext.client.widgets.event.ContainerListenerAdapter; public class TextEditorPanel implements TextEditorView { private static final String BACKCOLOR_ENABLED = "#FFF"; @@ -43,7 +41,7 @@ private final TextEditorPresenter presenter; private final Timer saveTimer; private final I18nTranslationService i18n; - private final DefaultBorderLayout mainPanel; + private final VerticalPanel mainPanel; private final WorkspaceSkeleton ws; public TextEditorPanel(final TextEditorPresenter presenter, final I18nTranslationService i18n, @@ -51,29 +49,30 @@ this.presenter = presenter; this.i18n = i18n; this.ws = ws; - mainPanel = new DefaultBorderLayout(); - final Panel centerPanel = new Panel(); - centerPanel.setLayout(new FitLayout()); + mainPanel = new VerticalPanel(); + mainPanel.setWidth("100%"); + gwtRTarea = new RichTextArea(); - // centerPanel.add(gwtRTarea); gwtRTarea.setWidth("97%"); gwtRTarea.addStyleName("kune-TexEditorPanel-TextArea"); final Toolbar editorTopBar = new Toolbar(); + editorTopBar.getPanel().setWidth("auto"); textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, i18n); editorTopBar.add(textEditorToolbar); editorTopBar.addStyleName("k-toolbar-bottom-line"); - // mainPanel.add(editorTopBar.getPanel(), Position.NORTH, false, - // DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); - mainPanel.add(centerPanel, DefaultBorderLayout.Position.CENTER); + mainPanel.add(editorTopBar.getPanel()); + mainPanel.add(gwtRTarea); - adjustSize("" + (Window.getClientHeight() - 265)); - Window.addWindowResizeListener(new WindowResizeListener() { - public void onWindowResized(final int arg0, final int arg1) { - adjustSize("" + (Window.getClientHeight() - 265)); + ws.getEntityWorkspace().addContentListener(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + adjustSize(adjHeight); } }); + saveTimer = new Timer() { public void run() { presenter.onSave(); @@ -82,12 +81,11 @@ } public void attach() { - // ws.getEntityWorkspace().setContent(mainPanel.getPanel()); - ws.getEntityWorkspace().setContent(gwtRTarea); + ws.getEntityWorkspace().setContent(mainPanel); } public void detach() { - mainPanel.getPanel().removeFromParent(); + mainPanel.removeFromParent(); } public void editHTML(final boolean edit) { @@ -102,10 +100,6 @@ return gwtRTarea.getText(); } - public View getToolBar() { - return this.textEditorToolbar; - } - public void saveTimerCancel() { saveTimer.cancel(); } @@ -120,14 +114,6 @@ gwtRTarea.setEnabled(enabled); } - public void setEnabledCancelButton(final boolean enabled) { - textEditorToolbar.setEnabledCloseButton(enabled); - } - - public void setEnabledSaveButton(final boolean enabled) { - textEditorToolbar.setEnabledSaveButton(enabled); - } - public void setHeight(final String height) { gwtRTarea.setHeight(height); } @@ -140,10 +126,6 @@ gwtRTarea.setText(text); } - public void setTextSaveButton(final String text) { - textEditorToolbar.setTextSaveButton(text); - } - public void showSaveBeforeDialog() { MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Save before close?"), new MessageBox.ConfirmCallback() { public void execute(final String btnID) { @@ -157,9 +139,8 @@ } - @Deprecated - private void adjustSize(final String height) { - // While refactoring - // gwtRTarea.setHeight(height); + private void adjustSize(final int height) { + gwtRTarea.setHeight("" + + (height - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT - 5)); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2008-10-01 21:12:10 UTC (rev 899) @@ -75,14 +75,14 @@ public void init(final TextEditorView view) { this.view = view; - this.view.setEnabledSaveButton(false); + toolbar.setEnableAction(save, false); this.view.setEnabled(true); } public void onEdit() { if (!savePending) { savePending = true; - view.setEnabledSaveButton(true); + toolbar.setEnableAction(save, true); if (autoSave) { view.scheduleSave(10000); } @@ -113,9 +113,7 @@ view.saveTimerCancel(); savePending = false; saveAndCloseConfirmed = false; - view.setEnabledSaveButton(false); - view.detach(); - toolbar.detach(); + toolbar.setEnableAction(save, false); } protected void onCancel() { @@ -129,6 +127,8 @@ protected void onCancelConfirmed() { reset(); + view.detach(); + toolbar.detach(); onEditCancelled.onEvent(); } @@ -174,7 +174,7 @@ final ActionItemCollection<StateToken> collection = new ActionItemCollection<StateToken>(); collection.add(new ActionItem<StateToken>(save, null)); collection.add(new ActionItem<StateToken>(close, null)); - toolbar.showActions(collection, true); + toolbar.setActions(collection); } private void setContent(final String html) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-01 21:12:10 UTC (rev 899) @@ -30,6 +30,7 @@ import org.ourproject.kune.platf.client.ui.palette.ColorSelectListener; import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePanel; import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePresenter; +import org.ourproject.kune.workspace.client.site.Site; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Command; @@ -46,7 +47,6 @@ import com.google.gwt.user.client.ui.ToggleButton; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.gwtext.client.core.EventObject; import com.gwtext.client.data.ArrayReader; import com.gwtext.client.data.DateFieldDef; import com.gwtext.client.data.FieldDef; @@ -55,18 +55,15 @@ import com.gwtext.client.data.RecordDef; import com.gwtext.client.data.Store; import com.gwtext.client.data.StringFieldDef; -import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.MessageBox; -import com.gwtext.client.widgets.ToolbarButton; import com.gwtext.client.widgets.MessageBox.PromptCallback; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; /** * A sample toolbar for use with {@link RichTextArea}. It provides a simple UI * for all rich text formatting, dynamically displayed only for the available * functionality. */ -public class TextEditorToolbar extends Composite implements TextEditorToolbarView { +public class TextEditorToolbar extends Composite { /** * We use an inner EventListener class to avoid exposing event methods on @@ -230,7 +227,7 @@ ic = new ImageChooser("Image Chooser", 515, 400, store); } - + Site.important("This is in development and very experimental..."); ic.show(new ImageChooserCallback() { public void onImageSelection(final ImageData data) { // Element el = DomHelper.append("images", @@ -290,10 +287,8 @@ private PushButton fontColor; private MenuBar fonts; private MenuBar fontSizes; - private final ToolbarButton save; - private final ToolbarButton close; private WebSafePalettePanel palettePanel; - private final TextEditorPresenter panelListener; + private final TextEditorPresenter presenter; private PopupPanel popupPalette; private WebSafePalettePresenter palettePresenter; private final I18nTranslationService i18n; @@ -304,43 +299,20 @@ * @param richText * the rich text area to be controlled */ - public TextEditorToolbar(final RichTextArea richText, final TextEditorPresenter panelListener, + public TextEditorToolbar(final RichTextArea richText, final TextEditorPresenter presenter, final I18nTranslationService i18n) { this.richText = richText; this.i18n = i18n; this.basic = richText.getBasicFormatter(); this.extended = richText.getExtendedFormatter(); + this.presenter = presenter; - this.panelListener = panelListener; - initWidget(outer); outer.add(topPanel); outer.setVerticalAlignment(VerticalPanel.ALIGN_MIDDLE); setStyleName("gwt-RichTextToolbar"); - save = new ToolbarButton(i18n.tWithNT("Save", "used in button"), new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - if (!save.isDisabled()) { - fireSave(); - } - } - }); - - close = new ToolbarButton(i18n.tWithNT("Close", "used in button"), new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - if (!close.isDisabled()) { - fireCancel(); - } - } - }); - - close.addStyleName("kune-Button-Large-lrSpace"); - topPanel.add(save); - topPanel.add(close); - if (basic != null) { topPanel.add(bold = createToggleButton(images.bold(), i18n.t("Toggle Bold"))); topPanel.add(italic = createToggleButton(images.italic(), i18n.t("Toggle Italic"))); @@ -422,26 +394,6 @@ } } - public void setEnabledCloseButton(final boolean enabled) { - if (enabled) { - close.enable(); - } else { - close.disable(); - } - } - - public void setEnabledSaveButton(final boolean enabled) { - if (enabled) { - save.enable(); - } else { - save.disable(); - } - } - - public void setTextSaveButton(final String text) { - save.setText(text); - } - public void showPalette(final Widget sender, final int left, final int top) { if (palettePanel == null) { palettePresenter = new WebSafePalettePresenter(); @@ -513,22 +465,14 @@ return tb; } - private void fireCancel() { - panelListener.onCancel(); - } - private void fireEdit() { - panelListener.onEdit(); + presenter.onEdit(); } private void fireEditHTML() { - panelListener.onEditHTML(); + presenter.onEditHTML(); } - private void fireSave() { - panelListener.onSave(); - } - /** * Updates the status of all the stateful buttons. */ Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbarView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbarView.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbarView.java 2008-10-01 21:12:10 UTC (rev 899) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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 org.ourproject.kune.workspace.client.editor; - -import org.ourproject.kune.platf.client.View; - -public interface TextEditorToolbarView extends View { - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java 2008-10-01 21:12:10 UTC (rev 899) @@ -34,26 +34,18 @@ String getText(); - View getToolBar(); - void saveTimerCancel(); void scheduleSave(int delayMillis); void setEnabled(boolean enabled); - void setEnabledCancelButton(boolean enabled); - - void setEnabledSaveButton(boolean enabled); - void setHeight(String height); void setHTML(String html); void setText(String text); - void setTextSaveButton(String text); - void showSaveBeforeDialog(); } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java 2008-10-01 21:12:10 UTC (rev 899) @@ -31,50 +31,51 @@ */ public class WrappedRichTextAreaImplMozilla extends RichTextAreaImplMozilla { - @Override - public native void initElement() /*-{ - // Mozilla doesn't allow designMode to be set reliably until the iframe is - // fully loaded. - var _this = this; - var iframe = [email protected]::elem; - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + @Override + public native void initElement() /*-{ + // Mozilla doesn't allow designMode to be set reliably until the iframe is + // fully loaded. + var _this = this; + var iframe = [email protected]::elem; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; - iframe.onload = function() { - // Some Mozillae have the nasty habit of calling onload again when you set - // designMode, so let's avoid doing it more than once. - iframe.onload = null; + iframe.onload = function() { + // Some Mozillae have the nasty habit of calling onload again when you set + // designMode, so let's avoid doing it more than once. + iframe.onload = null; - // patch ccs inject: + // patch ccs inject: - var doc = [email protected]::elem.contentWindow.document; - head=doc.getElementsByTagName('head')[0]; - link=document.createElement('link'); - link.setAttribute('rel',"stylesheet"); - link.setAttribute('type',"text/css"); - link.setAttribute('href',"css/richtext.css" ); - head.appendChild(link); + var doc = [email protected]::elem.contentWindow.document; + head=doc.getElementsByTagName('head')[0]; + link=document.createElement('link'); + link.setAttribute('rel',"stylesheet"); + link.setAttribute('type',"text/css"); + link.setAttribute('href',"css/richtext.css" ); + head.appendChild(link); - var styles = document.createElement('style'); - styles.setAttribute('type', 'text/css'); - var newStyle = document.createTextNode('\n\n'); - styles.appendChild(newStyle); - head.appendChild(styles); + var styles = document.createElement('style'); + styles.setAttribute('type', 'text/css'); + var newStyle = document.createTextNode('\n\n'); + styles.appendChild(newStyle); + head.appendChild(styles); - // -- patch + // -- patch - // Send notification that the iframe has finished loading. - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + // Send notification that the iframe has finished loading. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); - // Don't set designMode until the RTA actually gets focused. This is - // necessary because editing won't work on Mozilla if the iframe is - // *hidden, but attached*. Waiting for focus gets around this issue. - // - // Note: This onfocus will not conflict with the addEventListener('focus', - // ...) // in RichTextAreaImplStandard. - iframe.contentWindow.onfocus = function() { - iframe.contentWindow.onfocus = null; - iframe.contentWindow.document.designMode = 'On'; - + // Don't set designMode until the RTA actually gets focused. This is + // necessary because editing won't work on Mozilla if the iframe is + // *hidden, but attached*. Waiting for focus gets around this issue. + // + // Note: This onfocus will not conflict with the addEventListener('focus', + // ...) // in RichTextAreaImplStandard. + iframe.contentWindow.onfocus = function() { + iframe.contentWindow.onfocus = null; + iframe.contentWindow.document.designMode = 'On'; }; - }-*/; + }; + }-*/; } + Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-01 21:12:10 UTC (rev 899) @@ -41,7 +41,6 @@ }); final Item userHomePage = new Item(i18n.t("Your homepage")); userHomePage.setIcon("images/group-home.gif"); - userHomePage.ensureDebugId(USER_HOME_PAGE_MENU_ITEM); userHomePage.addListener(new BaseItemListenerAdapter() { @Override public void onClick(final BaseItem item, final EventObject e) { @@ -49,9 +48,10 @@ presenter.onUserHomePage(); } }); + userHomePage.setId(USER_HOME_PAGE_MENU_ITEM); userMenu.addItem(userHomePage); final Item userPreferences = new Item(i18n.t("Your preferences")); - userPreferences.ensureDebugId(USER_PREFERENCES_MENU_ITEM); + userPreferences.setId(USER_PREFERENCES_MENU_ITEM); userPreferences.setIcon("images/kune-preferences.gif"); userPreferences.addListener(new BaseItemListenerAdapter() { @Override @@ -62,7 +62,7 @@ }); userMenu.addItem(userPreferences); userParticipation = new Menu(); - userParticipation.ensureDebugId(USER_PARTICIPATION_MENU_ITEM); + userParticipation.setId(USER_PARTICIPATION_MENU_ITEM); final MenuItem userParticipationItem = new MenuItem(i18n.t("Your groups"), userParticipation); userParticipationItem.setIcon(""); userMenu.addItem(userParticipationItem); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-01 21:12:10 UTC (rev 899) @@ -28,7 +28,6 @@ private final Toolbar contextBottomBar; private final RoundedPanel roundedTitle; private final RoundedPanel roundedBottom; - private final DefaultBorderLayout contextWrap; public EntityWorkspace() { final Panel titles = new Panel(); @@ -58,7 +57,7 @@ bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); final DefaultBorderLayout contentWrap = new DefaultBorderLayout(); - contextWrap = new DefaultBorderLayout(); + final DefaultBorderLayout contextWrap = new DefaultBorderLayout(); contentWrap.setBorder(true); contextWrap.setBorder(true); content = new Panel(); @@ -69,7 +68,7 @@ content.setBorder(false); context.setBorder(false); context.setCollapsible(true); - content.setPaddings(7); + // content.setPaddings(7); content.setAutoScroll(true); // context.setAutoScroll(true); Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2008-10-01 01:29:01 UTC (rev 898) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2008-10-01 21:12:10 UTC (rev 899) @@ -17,7 +17,7 @@ @Test public void testSave() { viewInit(); - view.setEnabledSaveButton(true); + // view.setEnabledSaveButton(true); view.scheduleSave(10000); EasyMock.expect(view.getHTML()).andReturn("foo"); viewReset(); @@ -35,7 +35,7 @@ @Test public void testSavePending() { viewInit(); - view.setEnabledSaveButton(true); + // view.setEnabledSaveButton(true); view.scheduleSave(10000); EasyMock.replay(view); presenter.init(view); @@ -46,7 +46,7 @@ @Test public void testSavePendingCancel() { viewInit(); - view.setEnabledSaveButton(true); + // view.setEnabledSaveButton(true); view.scheduleSave(10000); view.saveTimerCancel(); view.showSaveBeforeDialog(); @@ -68,7 +68,7 @@ @Test public void testSavePendingCancelSaveFails() { viewInit(); - view.setEnabledSaveButton(true); + // view.setEnabledSaveButton(true); view.scheduleSave(10000); view.saveTimerCancel(); view.showSaveBeforeDialog(); @@ -95,12 +95,12 @@ } private void viewInit() { - view.setEnabledSaveButton(false); + // view.setEnabledSaveButton(false); view.setEnabled(true); } private void viewReset() { view.saveTimerCancel(); - view.setEnabledSaveButton(false); + // view.setEnabledSaveButton(false); } }

1 0

01 Oct '08

Author: vjrj Date: 2008-10-01 03:29:01 +0200 (Wed, 01 Oct 2008) New Revision: 898 Added: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorListener.java Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContent.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java Log: Editor refactorization (not finished) RichTextArea css injets. toStrings in DTOs for better logs. Complete - task 62: ContextNav tree scroll problem Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-10-01 01:29:01 UTC (rev 898) @@ -10,6 +10,7 @@ import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_WIKI; import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_WIKIPAGE; +import org.ourproject.kune.docs.client.cnt.DocumentContent; import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; @@ -27,20 +28,25 @@ import org.ourproject.kune.platf.client.dto.InitDataDTO; import org.ourproject.kune.platf.client.dto.StateDTO; import org.ourproject.kune.platf.client.dto.StateToken; +import org.ourproject.kune.platf.client.errors.SessionExpiredException; import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; +import org.ourproject.kune.platf.client.services.KuneErrorHandler; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.upload.FileUploader; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entitylogo.EntityLogo; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.site.Site; import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.listener.Listener0; +import com.google.gwt.user.client.rpc.AsyncCallback; public class DocumentClientActions { @@ -55,13 +61,18 @@ private final Provider<GroupServiceAsync> groupServiceProvider; private final Provider<FileDownloadUtils> fileDownloadProvider; private final EntityLogo entityLogo; + private final Provider<TextEditor> textEditorProvider; + private final KuneErrorHandler errorHandler; + private final DocumentContent documentContent; public DocumentClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, final Session session, final StateManager stateManager, final Provider<ContentServiceAsync> contentServiceProvider, final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityLogo entityLogo) { + final Provider<FileDownloadUtils> fileDownloadProvider, final EntityLogo entityLogo, + final Provider<TextEditor> textEditorProvider, final KuneErrorHandler errorHandler, + final DocumentContent documentContent) { this.i18n = i18n; this.contextNavigator = contextNavigator; this.session = session; @@ -73,6 +84,9 @@ this.contentActionRegistry = contentActionRegistry; this.fileDownloadProvider = fileDownloadProvider; this.entityLogo = entityLogo; + this.textEditorProvider = textEditorProvider; + this.errorHandler = errorHandler; + this.documentContent = documentContent; createActions(); } @@ -306,6 +320,47 @@ final ActionToolbarButtonDescriptor<StateToken> editContent = new ActionToolbarButtonDescriptor<StateToken>( AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken stateToken) { + session.check(new AsyncCallbackSimple<Object>() { + public void onSuccess(final Object result) { + final TextEditor editor = textEditorProvider.get(); + documentContent.detach(); + editor.editContent(session.getCurrentState().getContent(), new Listener<String>() { + public void onEvent(final String html) { + Site.showProgressSaving(); + contentServiceProvider.get().save(session.getUserHash(), stateToken, html, + new AsyncCallback<Integer>() { + public void onFailure(final Throwable caught) { + Site.hideProgress(); + try { + throw caught; + } catch (final SessionExpiredException e) { + errorHandler.doSessionExpired(); + } catch (final Throwable e) { + Site.error(i18n.t("Error saving document. Retrying...")); + errorHandler.process(caught); + editor.onSaveFailed(); + } + } + + public void onSuccess(final Integer newVersion) { + Site.hideProgress(); + editor.onSaved(); + if (session.getCurrentStateToken().equals(stateToken)) { + session.getCurrentState().setVersion(newVersion); + session.getCurrentState().setContent(html); + documentContent.refreshState(); + } + } + }); + } + }, new Listener0() { + public void onEvent() { + // onClose + documentContent.refreshState(); + } + }); + } + }); } }); editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-01 01:29:01 UTC (rev 898) @@ -35,7 +35,6 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.tool.ToolSelector; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.platf.client.ui.rate.RateIt; import org.ourproject.kune.platf.client.ui.upload.FileUploader; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.editor.TextEditor; @@ -74,7 +73,8 @@ return new DocumentClientActions($(I18nUITranslationService.class), $(ContextNavigator.class), $(Session.class), $(StateManager.class), $$(ContentServiceAsync.class), $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), - $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityLogo.class)); + $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityLogo.class), + $$(TextEditor.class), $(KuneErrorHandler.class), $(DocumentContent.class)); } }); @@ -83,12 +83,11 @@ final ActionToolbarPanel<StateToken> contentNavigatorToolbar = new ActionToolbarPanel<StateToken>( ActionToolbarPanel.Position.content, $$(ActionManager.class), $(WorkspaceSkeleton.class)); final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( - contentNavigatorToolbar, $(ContentActionRegistry.class)); + contentNavigatorToolbar); final DocumentContentPresenter presenter = new DocumentContentPresenter($(StateManager.class), - $(I18nUITranslationService.class), $(KuneErrorHandler.class), $(Session.class), - $(RateIt.class), $$(DocumentReader.class), $$(TextEditor.class), $$(FolderViewer.class), - $$(ContentServiceAsync.class), toolbar, $(ContentActionRegistry.class)); + $(Session.class), $$(DocumentReader.class), $$(TextEditor.class), $$(FolderViewer.class), + toolbar, $(ContentActionRegistry.class)); final DocumentContentPanel panel = new DocumentContentPanel($(WorkspaceSkeleton.class)); presenter.init(panel); return presenter; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContent.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContent.java 2008-10-01 01:29:01 UTC (rev 898) @@ -20,20 +20,10 @@ package org.ourproject.kune.docs.client.cnt; -import com.calclab.suco.client.listener.Listener0; - public interface DocumentContent { - void onEditCancelled(Listener0 listener); + void detach(); - void onDeleteClicked(); + void refreshState(); - void onEditClicked(); - - void onEditing(Listener0 listener); - - void onSaved(); - - void onSaveFailed(); - } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java 2008-10-01 01:29:01 UTC (rev 898) @@ -28,165 +28,62 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.dto.StateDTO; import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.services.KuneErrorHandler; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; -import org.ourproject.kune.platf.client.ui.rate.RateIt; import org.ourproject.kune.workspace.client.editor.TextEditor; -import org.ourproject.kune.workspace.client.editor.TextEditorListener; -import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; -import org.ourproject.kune.workspace.client.site.Site; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Event0; import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; import com.calclab.suco.client.listener.Listener2; -import com.google.gwt.user.client.rpc.AsyncCallback; -public class DocumentContentPresenter implements DocumentContent, TextEditorListener { +public class DocumentContentPresenter implements DocumentContent { private DocumentContentView view; - private final StateManager stateManager; private StateDTO content; private final Session session; - private final RateIt rateIt; private final Provider<DocumentReader> docReaderProvider; private final Provider<TextEditor> textEditorProvider; private final Provider<FolderViewer> folderViewerProvider; - private final Event0 onEditing; - private final Event0 onEditCancelled; - private final Provider<ContentServiceAsync> contentServiceProvider; - private final I18nUITranslationService i18n; - private final KuneErrorHandler errorHandler; private final ActionToolbar<StateToken> toolbar; private final ActionRegistry<StateToken> actionRegistry; - public DocumentContentPresenter(final StateManager stateManager, final I18nUITranslationService i18n, - final KuneErrorHandler errorHandler, final Session session, final RateIt rateIt, + public DocumentContentPresenter(final StateManager stateManager, final Session session, final Provider<DocumentReader> docReaderProvider, final Provider<TextEditor> textEditorProvider, - final Provider<FolderViewer> folderViewerProvider, - final Provider<ContentServiceAsync> contentServiceProvider, final ActionToolbar<StateToken> toolbar, + final Provider<FolderViewer> folderViewerProvider, final ActionToolbar<StateToken> toolbar, final ActionRegistry<StateToken> actionRegistry) { - this.stateManager = stateManager; - this.i18n = i18n; - this.errorHandler = errorHandler; this.session = session; - this.rateIt = rateIt; this.docReaderProvider = docReaderProvider; this.textEditorProvider = textEditorProvider; this.folderViewerProvider = folderViewerProvider; - this.contentServiceProvider = contentServiceProvider; this.toolbar = toolbar; this.actionRegistry = actionRegistry; - this.onEditing = new Event0("onEditing"); - this.onEditCancelled = new Event0("onEditCancelled"); stateManager.onStateChanged(new Listener<StateDTO>() { public void onEvent(final StateDTO state) { if (state.getToolName().equals(DocumentClientTool.NAME)) { setState(state); - toolbar.attach(); } } }); stateManager.onToolChanged(new Listener2<String, String>() { public void onEvent(final String oldTool, final String newTool) { if (oldTool != null && oldTool.equals(DocumentClientTool.NAME)) { - // Detach + toolbar.detach(); } } }); } + public void detach() { + toolbar.detach(); + } + public void init(final DocumentContentView view) { this.view = view; } - public void onDeleteClicked() { - Site.showProgressProcessing(); - contentServiceProvider.get().delContent(session.getUserHash(), content.getStateToken(), - new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - Site.hideProgress(); - stateManager.reload(); - } - }); + public void refreshState() { + setState(session.getCurrentState()); } - public void onEditCancelled() { - showContent(); - onEditCancelled.fire(); - // Re-enable rateIt widget - rateIt.setVisible(true); - textEditorProvider.get().setToolbarVisible(false); - } - - public void onEditCancelled(final Listener0 listener) { - onEditCancelled.add(listener); - } - - public void onEditClicked() { - session.check(new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - if (content.hasDocument()) { - // Don't permit rate content while your are editing - rateIt.setVisible(false); - final TextEditor editor = textEditorProvider.get(); - editor.setContent(content.getContent()); - editor.setToolbarVisible(true); - view.setContent(editor.getView()); - } else { - // final FolderEditor editor = folderEditorProvider.get(); - // editor.setFolder(content.getContainer()); - // view.setContent(editor.getView()); - } - onEditing.fire(); - } - }); - } - - public void onEditing(final Listener0 listener) { - onEditing.add(listener); - } - - public void onSave(final String text) { - content.setContent(text); - Site.showProgressSaving(); - contentServiceProvider.get().save(session.getUserHash(), content.getStateToken(), content.getContent(), - new AsyncCallback<Integer>() { - public void onFailure(final Throwable caught) { - Site.hideProgress(); - try { - throw caught; - } catch (final SessionExpiredException e) { - errorHandler.doSessionExpired(); - } catch (final Throwable e) { - Site.error(i18n.t("Error saving document. Retrying...")); - errorHandler.process(caught); - onSaveFailed(); - } - } - - public void onSuccess(final Integer result) { - Site.hideProgress(); - onSaved(); - } - }); - } - - public void onSaved() { - textEditorProvider.get().onSaved(); - } - - public void onSaveFailed() { - textEditorProvider.get().onSaveFailed(); - } - - public void onTranslate() { - } - private void setState(final StateDTO state) { content = state; final String typeId = content.getTypeId(); @@ -200,11 +97,12 @@ } toolbar.disableMenusAndClearButtons(); toolbar.showActions(collection, true); + toolbar.attach(); showContent(); } private void showContent() { - textEditorProvider.get().setToolbarVisible(false); + // textEditorProvider.get().setToolbarVisible(false); if (content.hasDocument()) { docReaderProvider.get().showDocument(content.getStateToken(), content.getContent(), content.getTypeId(), content.getMimeType()); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2008-10-01 01:29:01 UTC (rev 898) @@ -19,11 +19,6 @@ } } - public boolean checkEnabling(final ActionDescriptor<T> action, final T T) { - final ActionEnableCondition<T> enableCondition = action.getEnableCondition(); - return enableCondition != null ? enableCondition.mustBeEnabled(T) : true; - } - public ActionItemCollection<T> getCurrentActions(final T item, final String contentTypeId, final boolean isLogged, final AccessRightsDTO rights, final boolean toolbarItems) { final ActionItemCollection<T> collection = new ActionItemCollection<T>(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2008-10-01 01:29:01 UTC (rev 898) @@ -1,9 +1,9 @@ package org.ourproject.kune.platf.client.actions.toolbar; import org.ourproject.kune.platf.client.actions.ActionDescriptor; +import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionItem; import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import org.ourproject.kune.platf.client.actions.ActionRegistry; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; @@ -13,17 +13,20 @@ public class ActionToolbarPresenter<T> implements ActionToolbar<T> { private final ActionToolbarView<T> toolbar; - private final ActionRegistry<T> actionRegistry; - public ActionToolbarPresenter(final ActionToolbarView<T> toolbar, final ActionRegistry<T> actionRegistry) { + public ActionToolbarPresenter(final ActionToolbarView<T> toolbar) { this.toolbar = toolbar; - this.actionRegistry = actionRegistry; } public void attach() { toolbar.attach(); } + public boolean checkEnabling(final ActionDescriptor<T> action, final T T) { + final ActionEnableCondition<T> enableCondition = action.getEnableCondition(); + return enableCondition != null ? enableCondition.mustBeEnabled(T) : true; + } + public void clear() { toolbar.clear(); } @@ -34,21 +37,17 @@ public void disableMenusAndClearButtons() { toolbar.clear(); - // With action-item, this must be redesigned - // toolbar.clearRemovableActions(); - // toolbar.disableAllMenuItems(); } public void showActions(final ActionItemCollection<T> actions, final boolean isItemSelected) { for (final ActionItem<T> actionItem : actions) { final ActionDescriptor<T> action = actionItem.getAction(); if (action instanceof ActionToolbarMenuDescriptor || action instanceof ActionToolbarMenuAndItemDescriptor) { - toolbar.addMenuAction(actionItem, isItemSelected - && actionRegistry.checkEnabling(action, actionItem.getItem())); + toolbar.addMenuAction(actionItem, isItemSelected && checkEnabling(action, actionItem.getItem())); } else { if (action instanceof ActionToolbarButtonDescriptor || action instanceof ActionToolbarButtonAndItemDescriptor) { - if (isItemSelected && actionRegistry.checkEnabling(action, actionItem.getItem())) { + if (isItemSelected && checkEnabling(action, actionItem.getItem())) { toolbar.addButtonAction(actionItem); } } else { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -28,37 +28,42 @@ private GroupListDTO viewers; public AccessListsDTO() { - this(null, null, null); + this(null, null, null); } public AccessListsDTO(final GroupListDTO admins, final GroupListDTO editors, final GroupListDTO viewers) { - this.admins = admins; - this.editors = editors; - this.viewers = viewers; + this.admins = admins; + this.editors = editors; + this.viewers = viewers; } public GroupListDTO getAdmins() { - return admins; + return admins; } - public void setAdmins(final GroupListDTO admins) { - this.admins = admins; + public GroupListDTO getEditors() { + return editors; } - public GroupListDTO getEditors() { - return editors; + public GroupListDTO getViewers() { + return viewers; } - public void setEditors(final GroupListDTO editors) { - this.editors = editors; + public void setAdmins(final GroupListDTO admins) { + this.admins = admins; } - public GroupListDTO getViewers() { - return viewers; + public void setEditors(final GroupListDTO editors) { + this.editors = editors; } public void setViewers(final GroupListDTO viewers) { - this.viewers = viewers; + this.viewers = viewers; } + @Override + public String toString() { + return "AccessListDTO[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -27,63 +27,62 @@ private boolean isEditable; private boolean isVisible; + public AccessRightsDTO() { + this(false, false, false); + } + public AccessRightsDTO(final boolean isAdministrable, final boolean isEditable, final boolean isVisible) { - this.isAdministrable = isAdministrable; - this.isEditable = isEditable; - this.isVisible = isVisible; + this.isAdministrable = isAdministrable; + this.isEditable = isEditable; + this.isVisible = isVisible; } - public AccessRightsDTO() { - this(false, false, false); + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + final AccessRightsDTO other = (AccessRightsDTO) obj; + if (isAdministrable != other.isAdministrable) { + return false; + } + if (isEditable != other.isEditable) { + return false; + } + if (isVisible != other.isVisible) { + return false; + } + return true; } public boolean isAdministrable() { - return isAdministrable; + return isAdministrable; } - public void setAdministrable(final boolean isAdministrable) { - this.isAdministrable = isAdministrable; + public boolean isEditable() { + return isEditable; } - public boolean isEditable() { - return isEditable; + public boolean isVisible() { + return isVisible; } - public void setEditable(final boolean isEditable) { - this.isEditable = isEditable; + public void setAdministrable(final boolean isAdministrable) { + this.isAdministrable = isAdministrable; } - public boolean isVisible() { - return isVisible; + public void setEditable(final boolean isEditable) { + this.isEditable = isEditable; } public void setVisible(final boolean isVisible) { - this.isVisible = isVisible; + this.isVisible = isVisible; } public String toString() { - return "[" + isAdministrable + ", " + isEditable + ", " + isVisible + "]"; + return "AccessRightsDTO[a: " + isAdministrable + ", e: " + isEditable + ", v: " + isVisible + "]"; } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - final AccessRightsDTO other = (AccessRightsDTO) obj; - if (isAdministrable != other.isAdministrable) { - return false; - } - if (isEditable != other.isEditable) { - return false; - } - if (isVisible != other.isVisible) { - return false; - } - return true; - } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -54,34 +54,6 @@ return false; } final GroupDTO other = (GroupDTO) obj; - if (defaultLicense == null) { - if (other.defaultLicense != null) { - return false; - } - } else if (!defaultLicense.equals(other.defaultLicense)) { - return false; - } - if (id == null) { - if (other.id != null) { - return false; - } - } else if (!id.equals(other.id)) { - return false; - } - if (longName == null) { - if (other.longName != null) { - return false; - } - } else if (!longName.equals(other.longName)) { - return false; - } - if (publicDesc == null) { - if (other.publicDesc != null) { - return false; - } - } else if (!publicDesc.equals(other.publicDesc)) { - return false; - } if (shortName == null) { if (other.shortName != null) { return false; @@ -89,9 +61,6 @@ } else if (!shortName.equals(other.shortName)) { return false; } - if (type != other.type) { - return false; - } return true; } @@ -187,4 +156,7 @@ this.workspaceTheme = workspaceTheme; } + public String toString() { + return "GroupDTO[" + shortName + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -31,27 +31,34 @@ private String mode; public GroupListDTO() { - this(null); + this(null); } public GroupListDTO(final List<GroupDTO> list) { - this.list = list; + this.list = list; } public List<GroupDTO> getList() { - return list; + return list; } - public void setList(final List<GroupDTO> list) { - this.list = list; + public String getMode() { + return mode; } - public String getMode() { - return mode; + public void setList(final List<GroupDTO> list) { + this.list = list; } public void setMode(final String mode) { - this.mode = mode; + this.mode = mode; } + public String toString() { + String groupString = ""; + for (final GroupDTO group : list) { + groupString = groupString + group.getShortName() + ", "; + } + return "GroupDTO[(" + mode + "): " + groupString + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -32,62 +32,62 @@ private List<TagDTO> tags; public LinkDTO() { - this(null, null, null, null); + this(null, null, null, null); } public LinkDTO(final String shortName, final String longName, final String iconUrl, final String link) { - this.shortName = shortName; - this.longName = longName; - this.iconUrl = iconUrl; - this.link = link; + this.shortName = shortName; + this.longName = longName; + this.iconUrl = iconUrl; + this.link = link; } - public String getShortName() { - return shortName; + public String getIconUrl() { + return iconUrl; } - public void setShortName(final String shortName) { - this.shortName = shortName; - } - public String getLink() { - return link; + return link; } - public void setLink(final String link) { - this.link = link; + public String getLongName() { + return longName; } - public String getLongName() { - return longName; + public Double getRate() { + return rate; } - public void setLongName(final String longName) { - this.longName = longName; + public String getShortName() { + return shortName; } - public String getIconUrl() { - return iconUrl; + public List<TagDTO> getTags() { + return tags; } public void setIconUrl(final String iconUrl) { - this.iconUrl = iconUrl; + this.iconUrl = iconUrl; } - public Double getRate() { - return rate; + public void setLink(final String link) { + this.link = link; } + public void setLongName(final String longName) { + this.longName = longName; + } + public void setRate(final Double rate) { - this.rate = rate; + this.rate = rate; } - public List<TagDTO> getTags() { - return tags; + public void setShortName(final String shortName) { + this.shortName = shortName; } public void setTags(final List<TagDTO> tags) { - this.tags = tags; + this.tags = tags; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -53,4 +53,9 @@ this.groupsIsCollab = groupsIsCollab; } + @Override + public String toString() { + return "ParticipationDataDTO[admin in: " + groupsIsAdmin.toString() + ", collab in: " + + groupsIsCollab.toString() + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -48,4 +48,8 @@ this.pendingCollaborators = pendingCollaborators; } + public String toString() { + return "SocialNetworkDTO[accessList: " + accessLists + "; pendingsCollabs: " + pendingCollaborators + "]"; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkResultDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -28,28 +28,31 @@ ParticipationDataDTO userParticipation; public SocialNetworkResultDTO() { - this(null, null); + this(null, null); } public SocialNetworkResultDTO(final SocialNetworkDTO groupMembers, final ParticipationDataDTO userParticipation) { - this.groupMembers = groupMembers; - this.userParticipation = userParticipation; + this.groupMembers = groupMembers; + this.userParticipation = userParticipation; } public SocialNetworkDTO getGroupMembers() { - return groupMembers; + return groupMembers; } - public void setGroupMembers(final SocialNetworkDTO groupMembers) { - this.groupMembers = groupMembers; + public ParticipationDataDTO getUserParticipation() { + return userParticipation; } - public ParticipationDataDTO getUserParticipation() { - return userParticipation; + public void setGroupMembers(final SocialNetworkDTO groupMembers) { + this.groupMembers = groupMembers; } public void setUserParticipation(final ParticipationDataDTO userParticipation) { - this.userParticipation = userParticipation; + this.userParticipation = userParticipation; } + public String toString() { + return "SocialNetworkResultDTO[members: " + groupMembers + "; participation: " + userParticipation + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; - import com.google.gwt.user.client.rpc.IsSerializable; public class StateDTO implements IsSerializable { @@ -304,4 +303,8 @@ this.version = version; } + public String toString() { + return "StateDTO[" + stateToken + "/" + typeId + "]"; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -26,19 +26,23 @@ private String name; public TagDTO() { - this(null); + this(null); } public TagDTO(final String name) { - this.name = name; + this.name = name; } public String getName() { - return name; + return name; } public void setName(final String name) { - this.name = name; + this.name = name; } + public String toString() { + return name; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagResultDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -27,28 +27,32 @@ private Long count; public TagResultDTO() { - this(null, null); + this(null, null); } public TagResultDTO(final String name, final Long count) { - this.name = name; - this.count = count; + this.name = name; + this.count = count; } public Long getCount() { - return count; + return count; } - public void setCount(final Long count) { - this.count = count; + public String getName() { + return name; } - public String getName() { - return name; + public void setCount(final Long count) { + this.count = count; } public void setName(final String name) { - this.name = name; + this.name = name; } + public String toString() { + return name + "(" + count + ")"; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -153,4 +153,8 @@ this.timezone = timezone; } + public String toString() { + return "UserDTO[" + shortName + "]"; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java 2008-10-01 01:29:01 UTC (rev 898) @@ -22,41 +22,35 @@ import com.google.gwt.user.client.rpc.IsSerializable; public class UserSimpleDTO implements IsSerializable { - private Long id; - private String name; - private String shortName; - private I18nLanguageDTO language; - private I18nCountryDTO country; - private TimeZoneDTO timezone; public UserSimpleDTO() { - this(null, null, null, null, null); + this(null, null, null, null, null); } public UserSimpleDTO(final String name, final String shortName, final I18nLanguageDTO language, - final I18nCountryDTO country, final TimeZoneDTO timezone) { - this.name = name; - this.shortName = shortName; - this.language = language; - this.country = country; - this.timezone = timezone; + final I18nCountryDTO country, final TimeZoneDTO timezone) { + this.name = name; + this.shortName = shortName; + this.language = language; + this.country = country; + this.timezone = timezone; } @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - final UserSimpleDTO other = (UserSimpleDTO) obj; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + final UserSimpleDTO other = (UserSimpleDTO) obj; if (id == null) { if (other.id != null) { return false; @@ -64,71 +58,75 @@ } else if (!id.equals(other.id)) { return false; } - if (shortName == null) { - if (other.shortName != null) { - return false; - } - } else if (!shortName.equals(other.shortName)) { - return false; - } - return true; + if (shortName == null) { + if (other.shortName != null) { + return false; + } + } else if (!shortName.equals(other.shortName)) { + return false; + } + return true; } public I18nCountryDTO getCountry() { - return country; + return country; } public Long getId() { - return id; + return id; } public I18nLanguageDTO getLanguage() { - return language; + return language; } public String getName() { - return name; + return name; } public String getShortName() { - return shortName; + return shortName; } public TimeZoneDTO getTimezone() { - return timezone; + return timezone; } @Override public int hashCode() { - final int prime = 31; - int result = 1; + final int prime = 31; + int result = 1; result = prime * result + (id == null ? 0 : id.hashCode()); - result = prime * result + (shortName == null ? 0 : shortName.hashCode()); - return result; + result = prime * result + (shortName == null ? 0 : shortName.hashCode()); + return result; } public void setCountry(final I18nCountryDTO country) { - this.country = country; + this.country = country; } public void setId(final Long id) { - this.id = id; + this.id = id; } public void setLanguage(final I18nLanguageDTO language) { - this.language = language; + this.language = language; } public void setName(final String name) { - this.name = name; + this.name = name; } public void setShortName(final String shortName) { - this.shortName = shortName; + this.shortName = shortName; } public void setTimezone(final TimeZoneDTO timezone) { - this.timezone = timezone; + this.timezone = timezone; } + public String toString() { + return "UserSimpleDTO(" + shortName + ")"; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-10-01 01:29:01 UTC (rev 898) @@ -283,7 +283,12 @@ register(Singleton.class, new Factory<TextEditor>(TextEditor.class) { public TextEditor create() { - final TextEditorPresenter presenter = new TextEditorPresenter(null, true); + final ActionToolbarPanel<StateToken> contentNavigatorToolbar = new ActionToolbarPanel<StateToken>( + ActionToolbarPanel.Position.content, $$(ActionManager.class), $(WorkspaceSkeleton.class)); + final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( + contentNavigatorToolbar); + final TextEditorPresenter presenter = new TextEditorPresenter(true, toolbar, + $(I18nUITranslationService.class)); final TextEditorPanel panel = new TextEditorPanel(presenter, i18n, $(WorkspaceSkeleton.class)); presenter.init(panel); return presenter; @@ -334,14 +339,14 @@ final ActionToolbarPanel<StateToken> contextNavigatorToolbar = new ActionToolbarPanel<StateToken>( ActionToolbarPanel.Position.context, $$(ActionManager.class), $(WorkspaceSkeleton.class)); final ActionToolbar<StateToken> toolbar = new ActionToolbarPresenter<StateToken>( - contextNavigatorToolbar, $(ContentActionRegistry.class)); + contextNavigatorToolbar); final ContextNavigatorPresenter presenter = new ContextNavigatorPresenter($(StateManager.class), $(Session.class), $$(ContentServiceAsync.class), i18n, $(EntityTitle.class), $(ContentIconsRegistry.class), $(DragDropContentRegistry.class), toolbar, $(ContextActionRegistry.class)); final ContextNavigatorPanel panel = new ContextNavigatorPanel(presenter, i18n, - $(WorkspaceSkeleton.class), $(ActionManager.class), $(WsThemePresenter.class)); + $(WorkspaceSkeleton.class), $(ActionManager.class)); presenter.init(panel); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2008-10-01 01:29:01 UTC (rev 898) @@ -33,8 +33,6 @@ void addSiteToken(String token, Listener<StateToken> whenToken); - void gotoContainer(Long containerId); - void gotoToken(StateToken state); void gotoToken(String token); @@ -51,7 +49,7 @@ void removeSiteToken(String token); - void setRetrievedState(StateDTO content); + void setRetrievedState(StateDTO state); void setSocialNetwork(SocialNetworkResultDTO socialNet); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2008-10-01 01:29:01 UTC (rev 898) @@ -63,7 +63,11 @@ this.onSocialNetworkChanged = new Event<StateDTO>("onSocialNetworkChanged"); session.onUserSignIn(new Listener<UserInfoDTO>() { public void onEvent(final UserInfoDTO parameter) { - restorePreviousState(); + if (oldState != null) { + restorePreviousState(); + } else { + reload(); + } } }); session.onUserSignOut(new Listener0() { @@ -78,14 +82,8 @@ siteTokens.put(token, listener); } - public void gotoContainer(final Long containerId) { - final StateToken newStateToken = session.getCurrentState().getStateToken().clone(); - newStateToken.clearDocument(); - newStateToken.setFolder(containerId); - gotoToken(newStateToken); - } - public void gotoToken(final StateToken state) { + Log.debug("StateManager: history goto-token newItem (" + state + ")"); history.newItem(state.getEncoded()); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2008-10-01 01:29:01 UTC (rev 898) @@ -25,38 +25,41 @@ boolean isEditable; boolean isVisible; + public AccessRights() { + this(false, false, false); + } + public AccessRights(final boolean isAdministrable, final boolean isEditable, final boolean isVisible) { this.isAdministrable = isAdministrable; this.isEditable = isEditable; this.isVisible = isVisible; } - public AccessRights() { - this(false, false, false); - } - public boolean isAdministrable() { return isAdministrable; } + public boolean isEditable() { + return isEditable; + } + + public boolean isVisible() { + return isVisible; + } + public void setAdministrable(final boolean isAdministrable) { this.isAdministrable = isAdministrable; } - public boolean isEditable() { - return isEditable; - } - public void setEditable(final boolean isEditable) { this.isEditable = isEditable; } - public boolean isVisible() { - return isVisible; - } - public void setVisible(final boolean isVisible) { this.isVisible = isVisible; } + public String toString() { + return "AccessRights[a: " + isAdministrable + ", e: " + isEditable + ", v: " + isVisible + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java 2008-10-01 01:29:01 UTC (rev 898) @@ -32,16 +32,16 @@ @Entity @Table(name = "access_lists") public class AccessLists { - @Id - @GeneratedValue - private Long id; - @OneToOne(cascade = CascadeType.ALL) protected GroupList admins; + @OneToOne(cascade = CascadeType.ALL) protected GroupList editors; @OneToOne(cascade = CascadeType.ALL) protected GroupList viewers; + @Id + @GeneratedValue + private Long id; public AccessLists() { this.admins = new GroupList(); @@ -49,14 +49,6 @@ this.viewers = new GroupList(); } - public Long getId() { - return id; - } - - public void setId(final Long id) { - this.id = id; - } - public void addAdmin(final Group group) { admins.add(group); } @@ -69,6 +61,18 @@ viewers.add(group); } + public GroupList getAdmins() { + return admins; + } + + public GroupList getEditors() { + return editors; + } + + public Long getId() { + return id; + } + public GroupList getList(final AccessRol rol) { if (rol == AccessRol.Administrator) { return getAdmins(); @@ -79,14 +83,6 @@ } } - public GroupList getAdmins() { - return admins; - } - - public GroupList getEditors() { - return editors; - } - public GroupList getViewers() { return viewers; } @@ -102,4 +98,13 @@ public void removeViewer(final Group group) { viewers.remove(group); } + + public void setId(final Long id) { + this.id = id; + } + + @Override + public String toString() { + return "AccessList[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2008-10-01 01:29:01 UTC (rev 898) @@ -281,4 +281,7 @@ this.workspaceTheme = workspaceTheme; } + public String toString() { + return "Group[" + shortName + "]"; + } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java 2008-10-01 01:29:01 UTC (rev 898) @@ -39,80 +39,88 @@ @Table(name = "group_list") @Inheritance(strategy = InheritanceType.SINGLE_TABLE) public class GroupList { + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + List<Group> list; + @Id @GeneratedValue private Long id; - @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) - List<Group> list; - @Enumerated(EnumType.ORDINAL) @Basic private GroupListMode mode; public GroupList() { - this(new ArrayList<Group>()); - this.mode = GroupListMode.NORMAL; + this(new ArrayList<Group>()); + this.mode = GroupListMode.NORMAL; } public GroupList(final List<Group> list) { - this.list = list; + this.list = list; } - public Long getId() { - return id; + public void add(final Group group) { + // No group duplicate + // TODO: Get this outside Domain? + if (!list.contains(group)) { + list.add(group); + } + // TODO: Get this outside Domain? + if (getMode() == GroupListMode.NOBODY) { + setMode(GroupListMode.NORMAL); + } } - public void setId(final Long id) { - this.id = id; + public ArrayList<Group> duplicate() { + return new ArrayList<Group>(list); } - public List<Group> getList() { - return list; + public Long getId() { + return id; } - public void setList(final List<Group> list) { - this.list = list; + public List<Group> getList() { + return list; } - public void add(final Group group) { - // No group duplicate - // TODO: Get this outside Domain? - if (!list.contains(group)) { - list.add(group); - } - // TODO: Get this outside Domain? - if (getMode() == GroupListMode.NOBODY) { - setMode(GroupListMode.NORMAL); - } + public GroupListMode getMode() { + return mode; } public boolean includes(final Group group) { - return mode.checkIfIncludes(group, this.list); + return mode.checkIfIncludes(group, this.list); } - public ArrayList<Group> duplicate() { - return new ArrayList<Group>(list); + public boolean isEmpty() { + return list.size() == 0; } - public boolean isEmpty() { - return list.size() == 0; + public void remove(final Group group) { + list.remove(group); + // TODO: Get this outside Domain? + if (list.isEmpty()) { + setMode(GroupListMode.NOBODY); + } } - public GroupListMode getMode() { - return mode; + public void setId(final Long id) { + this.id = id; } + public void setList(final List<Group> list) { + this.list = list; + } + public void setMode(final GroupListMode mode) { - this.mode = mode; + this.mode = mode; } - public void remove(final Group group) { - list.remove(group); - // TODO: Get this outside Domain? - if (list.isEmpty()) { - setMode(GroupListMode.NOBODY); - } + public String toString() { + String groupString = ""; + for (final Group group : list) { + groupString = groupString + group.getShortName() + ", "; + } + return "Group[(" + mode + "): " + groupString + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2008-10-01 01:29:01 UTC (rev 898) @@ -103,179 +103,184 @@ private String scope; public I18nLanguage() { - this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); + this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } + // Only for tests + public I18nLanguage(final Long id, final String englishName, final String nativeName, final String code) { + this.id = id; + this.englishName = englishName; + this.nativeName = nativeName; + this.code = code; + } + // code is iso6391 || iso6392 || rfc3306 (see DatabaInicializer) public I18nLanguage(final Long id, final String code, final String direction, final String englishName, - final String englishNameLocale, final String englishNameModifier, final String iso6391, - final String iso6392, final String iso6393, final Boolean macroLanguage, final String nativeName, - final String nativeNameLocale, final String nativeNameModifier, final String pluralization, - final String rfc3066, final String scope) { - this.id = id; - this.iso6391 = iso6391; - this.iso6392 = iso6392; - this.iso6393 = iso6393; - this.rfc3066 = rfc3066; - this.englishName = englishName; - this.englishNameLocale = englishNameLocale; - this.englishNameModifier = englishNameModifier; - this.nativeName = nativeName; - this.nativeNameLocale = nativeNameLocale; - this.nativeNameModifier = nativeNameModifier; - this.macroLanguage = macroLanguage; - this.direction = direction; - this.pluralization = pluralization; - this.scope = scope; - this.code = code; + final String englishNameLocale, final String englishNameModifier, final String iso6391, + final String iso6392, final String iso6393, final Boolean macroLanguage, final String nativeName, + final String nativeNameLocale, final String nativeNameModifier, final String pluralization, + final String rfc3066, final String scope) { + this.id = id; + this.iso6391 = iso6391; + this.iso6392 = iso6392; + this.iso6393 = iso6393; + this.rfc3066 = rfc3066; + this.englishName = englishName; + this.englishNameLocale = englishNameLocale; + this.englishNameModifier = englishNameModifier; + this.nativeName = nativeName; + this.nativeNameLocale = nativeNameLocale; + this.nativeNameModifier = nativeNameModifier; + this.macroLanguage = macroLanguage; + this.direction = direction; + this.pluralization = pluralization; + this.scope = scope; + this.code = code; } - // Only for tests - public I18nLanguage(final Long id, final String englishName, final String nativeName, final String code) { - this.id = id; - this.englishName = englishName; - this.nativeName = nativeName; - this.code = code; + @Finder(query = "FROM I18nLanguage l WHERE code = :language") + public I18nLanguage findByCode(@Named("language") + final String language) { + return null; } - public Long getId() { - return this.id; + @Finder(query = "FROM I18nLanguage") + public List<I18nLanguage> getAll() { + return null; } - public void setId(final Long id) { - this.id = id; + public String getCode() { + return code; } - public String getIso6391() { - return this.iso6391; + public String getDirection() { + return this.direction; } - public void setIso6391(final String iso6391) { - this.iso6391 = iso6391; + public String getEnglishName() { + return this.englishName; } - public String getIso6392() { - return this.iso6392; + public String getEnglishNameLocale() { + return this.englishNameLocale; } - public void setIso6392(final String iso6392) { - this.iso6392 = iso6392; + public String getEnglishNameModifier() { + return this.englishNameModifier; } - public String getIso6393() { - return this.iso6393; + public Long getId() { + return this.id; } - public void setIso6393(final String iso6393) { - this.iso6393 = iso6393; + public String getIso6391() { + return this.iso6391; } - public String getRfc3066() { - return this.rfc3066; + public String getIso6392() { + return this.iso6392; } - public void setRfc3066(final String rfc3066) { - this.rfc3066 = rfc3066; + public String getIso6393() { + return this.iso6393; } - public String getEnglishName() { - return this.englishName; + public Boolean getMacroLanguage() { + return this.macroLanguage; } - public void setEnglishName(final String englishName) { - this.englishName = englishName; + public String getNativeName() { + return this.nativeName; } - public String getEnglishNameLocale() { - return this.englishNameLocale; + public String getNativeNameLocale() { + return this.nativeNameLocale; } - public void setEnglishNameLocale(final String englishNameLocale) { - this.englishNameLocale = englishNameLocale; + public String getNativeNameModifier() { + return this.nativeNameModifier; } - public String getEnglishNameModifier() { - return this.englishNameModifier; + public String getPluralization() { + return this.pluralization; } - public void setEnglishNameModifier(final String englishNameModifier) { - this.englishNameModifier = englishNameModifier; + public String getRfc3066() { + return this.rfc3066; } - public String getNativeName() { - return this.nativeName; + public String getScope() { + return this.scope; } - public void setNativeName(final String nativeName) { - this.nativeName = nativeName; + @Column(unique = true) + public void setCode(final String code) { + this.code = code; } - public String getNativeNameLocale() { - return this.nativeNameLocale; + public void setDirection(final String direction) { + this.direction = direction; } - public void setNativeNameLocale(final String nativeNameLocale) { - this.nativeNameLocale = nativeNameLocale; + public void setEnglishName(final String englishName) { + this.englishName = englishName; } - public String getNativeNameModifier() { - return this.nativeNameModifier; + public void setEnglishNameLocale(final String englishNameLocale) { + this.englishNameLocale = englishNameLocale; } - public void setNativeNameModifier(final String nativeNameModifier) { - this.nativeNameModifier = nativeNameModifier; + public void setEnglishNameModifier(final String englishNameModifier) { + this.englishNameModifier = englishNameModifier; } - public Boolean getMacroLanguage() { - return this.macroLanguage; + public void setId(final Long id) { + this.id = id; } - public void setMacroLanguage(final Boolean macroLanguage) { - this.macroLanguage = macroLanguage; + public void setIso6391(final String iso6391) { + this.iso6391 = iso6391; } - public String getDirection() { - return this.direction; + public void setIso6392(final String iso6392) { + this.iso6392 = iso6392; } - public void setDirection(final String direction) { - this.direction = direction; + public void setIso6393(final String iso6393) { + this.iso6393 = iso6393; } - public String getPluralization() { - return this.pluralization; + public void setMacroLanguage(final Boolean macroLanguage) { + this.macroLanguage = macroLanguage; } - public void setPluralization(final String pluralization) { - this.pluralization = pluralization; + public void setNativeName(final String nativeName) { + this.nativeName = nativeName; } - public String getScope() { - return this.scope; + public void setNativeNameLocale(final String nativeNameLocale) { + this.nativeNameLocale = nativeNameLocale; } - public void setScope(final String scope) { - this.scope = scope; + public void setNativeNameModifier(final String nativeNameModifier) { + this.nativeNameModifier = nativeNameModifier; } - @Finder(query = "FROM I18nLanguage l WHERE code = :language") - public I18nLanguage findByCode(@Named("language") - final String language) { - return null; + public void setPluralization(final String pluralization) { + this.pluralization = pluralization; } - public String getCode() { - return code; + public void setRfc3066(final String rfc3066) { + this.rfc3066 = rfc3066; } - @Column(unique = true) - public void setCode(final String code) { - this.code = code; + public void setScope(final String scope) { + this.scope = scope; } - @Finder(query = "FROM I18nLanguage") - public List<I18nLanguage> getAll() { - return null; + @Override + public String toString() { + return "I18nLanguage[" + englishName + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java 2008-10-01 01:29:01 UTC (rev 898) @@ -49,20 +49,20 @@ @Indexed @Table(name = "globalize_translations") @NamedQueries( { - @NamedQuery(name = "untranslated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text=null"), - @NamedQuery(name = "translated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text!=null"), - @NamedQuery(name = "untranslatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text=null"), - @NamedQuery(name = "translatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text!=null") }) + @NamedQuery(name = "untranslated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text=null"), + @NamedQuery(name = "translated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text!=null"), + @NamedQuery(name = "untranslatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text=null"), + @NamedQuery(name = "translatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text!=null") }) public class I18nTranslation implements HasId { + public static final String DEF_NAMESPACE = "kune_core"; + public static final Integer DEF_PLUR_INDEX = 1; + public static final String DEFAULT_LANG = "en"; + public static final String UNTRANSLATED_VALUE = null; private static final String TRANSLATED_QUERY = "translated"; private static final String UNTRANSLATED_QUERY = "untranslated"; private static final String TRANSLATED_COUNT_QUERY = "translatedcount"; private static final String UNTRANSLATED_COUNT_QUERY = "untranslatedcount"; - public static final String DEF_NAMESPACE = "kune_core"; - public static final Integer DEF_PLUR_INDEX = 1; - public static final String DEFAULT_LANG = "en"; - public static final String UNTRANSLATED_VALUE = null; @Id @GeneratedValue @@ -96,115 +96,112 @@ private String text; public I18nTranslation() { - this(null, null, null, null, null, null, null, null); + this(null, null, null, null, null, null, null, null); } - public I18nTranslation(final String facet, final Integer itemId, final Integer pluralizationIndex, - final String tableName, final String text, final String trKey, final String type, - final I18nLanguage language) { - this.type = type; - this.trKey = trKey; - this.tableName = tableName; - this.itemId = itemId; - this.facet = facet; - this.language = language; - this.pluralizationIndex = pluralizationIndex; - this.text = text; - } - public I18nTranslation(final String trKey, final I18nLanguage language, final String text) { - this("", null, DEF_PLUR_INDEX, "", text, trKey, DEF_NAMESPACE, language); + this("", null, DEF_PLUR_INDEX, "", text, trKey, DEF_NAMESPACE, language); } - public Long getId() { - return this.id; + public I18nTranslation(final String facet, final Integer itemId, final Integer pluralizationIndex, + final String tableName, final String text, final String trKey, final String type, + final I18nLanguage language) { + this.type = type; + this.trKey = trKey; + this.tableName = tableName; + this.itemId = itemId; + this.facet = facet; + this.language = language; + this.pluralizationIndex = pluralizationIndex; + this.text = text; } - public void setId(final Long id) { - this.id = id; + public I18nTranslation cloneForNewLanguage() { + final I18nTranslation clone = new I18nTranslation(); + clone.type = type; + clone.trKey = trKey; + clone.tableName = tableName; + clone.itemId = itemId; + clone.facet = facet; + clone.language = null; + clone.pluralizationIndex = pluralizationIndex; + clone.text = null; + return clone; } - public String getType() { - return this.type; + @Finder(query = "SELECT gt FROM I18nTranslation gt JOIN gt.language gl WHERE gl.code = :language") + public List<I18nTranslation> findByLanguage(@Named("language") + final String language) { + return null; } - public void setType(final String type) { - this.type = type; + public String getFacet() { + return this.facet; } - public String getTrKey() { - return this.trKey; + public Long getId() { + return this.id; } - public void setTrKey(final String trKey) { - this.trKey = trKey; - } - - public String getTableName() { - return this.tableName; - } - - public void setTableName(final String tableName) { - this.tableName = tableName; - } - public Integer getItemId() { - return this.itemId; + return this.itemId; } - public void setItemId(final Integer itemId) { - this.itemId = itemId; + public I18nLanguage getLanguage() { + return language; } - public String getFacet() { - return this.facet; + @Finder(query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :deflanguage AND gt.trKey NOT IN (SELECT gt.trKey FROM I18nTranslation gt WHERE gt.language = :language)") + public List<I18nTranslation> getNonExistentFromDefault(@Named("deflanguage") + final I18nLanguage deflanguage, @Named("language") + final I18nLanguage language) { + return null; } - public void setFacet(final String facet) { - this.facet = facet; - } - public Integer getPluralizationIndex() { - return this.pluralizationIndex; + return this.pluralizationIndex; } - public void setPluralizationIndex(final Integer pluralizationIndex) { - this.pluralizationIndex = pluralizationIndex; + public String getTableName() { + return this.tableName; } public String getText() { - return this.text; + return this.text; } - public void setText(final String text) { - this.text = text; + @Finder(namedQuery = TRANSLATED_QUERY) + public List<I18nTranslation> getTranslatedLexicon(@Named("language") + final I18nLanguage language) { + return null; } - public I18nLanguage getLanguage() { - return language; + @Finder(namedQuery = TRANSLATED_QUERY) + public List<I18nTranslation> getTranslatedLexicon(@Named("language") + final I18nLanguage language, @FirstResult + final int first, @MaxResults + final int max) { + return null; } - public void setLanguage(final I18nLanguage language) { - this.language = language; + @Finder(namedQuery = TRANSLATED_COUNT_QUERY) + public Long getTranslatedLexiconCount(@Named("language") + final I18nLanguage language) { + return null; } - @Finder(query = "SELECT gt FROM I18nTranslation gt JOIN gt.language gl WHERE gl.code = :language") - public List<I18nTranslation> findByLanguage(@Named("language") - final String language) { - return null; + public String getTrKey() { + return this.trKey; } - @Finder(query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :deflanguage AND gt.trKey NOT IN (SELECT gt.trKey FROM I18nTranslation gt WHERE gt.language = :language)") - public List<I18nTranslation> getNonExistentFromDefault(@Named("deflanguage") - final I18nLanguage deflanguage, @Named("language") - final I18nLanguage language) { - return null; + public String getType() { + return this.type; } @Finder(namedQuery = UNTRANSLATED_QUERY) public List<I18nTranslation> getUnstranslatedLexicon(@Named("language") final I18nLanguage language) { - return null; + return null; } @Finder(namedQuery = UNTRANSLATED_QUERY) @@ -212,46 +209,54 @@ final I18nLanguage language, @FirstResult final int first, @MaxResults final int max) { - return null; + return null; } @Finder(namedQuery = UNTRANSLATED_COUNT_QUERY) public Long getUnstranslatedLexiconCount(@Named("language") final I18nLanguage language) { - return null; + return null; } - @Finder(namedQuery = TRANSLATED_QUERY) - public List<I18nTranslation> getTranslatedLexicon(@Named("language") - final I18nLanguage language) { - return null; + public void setFacet(final String facet) { + this.facet = facet; } - @Finder(namedQuery = TRANSLATED_QUERY) - public List<I18nTranslation> getTranslatedLexicon(@Named("language") - final I18nLanguage language, @FirstResult - final int first, @MaxResults - final int max) { - return null; + public void setId(final Long id) { + this.id = id; } - @Finder(namedQuery = TRANSLATED_COUNT_QUERY) - public Long getTranslatedLexiconCount(@Named("language") - final I18nLanguage language) { - return null; + public void setItemId(final Integer itemId) { + this.itemId = itemId; } - public I18nTranslation cloneForNewLanguage() { - I18nTranslation clone = new I18nTranslation(); - clone.type = type; - clone.trKey = trKey; - clone.tableName = tableName; - clone.itemId = itemId; - clone.facet = facet; - clone.language = null; - clone.pluralizationIndex = pluralizationIndex; - clone.text = null; - return clone; + public void setLanguage(final I18nLanguage language) { + this.language = language; } + public void setPluralizationIndex(final Integer pluralizationIndex) { + this.pluralizationIndex = pluralizationIndex; + } + + public void setTableName(final String tableName) { + this.tableName = tableName; + } + + public void setText(final String text) { + this.text = text; + } + + public void setTrKey(final String trKey) { + this.trKey = trKey; + } + + public void setType(final String type) { + this.type = type; + } + + @Override + public String toString() { + return "I18nTranslation[" + trKey + " (" + language + ") " + text + "]"; + } + } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java 2008-10-01 01:29:01 UTC (rev 898) @@ -41,80 +41,83 @@ GroupList pendingCollaborators; public SocialNetwork() { - accessLists = new AccessLists(); - pendingCollaborators = new GroupList(); + accessLists = new AccessLists(); + pendingCollaborators = new GroupList(); } - public Long getId() { - return id; + public void addAdmin(final Group group) { + accessLists.addAdmin(group); } - public GroupList getPendingCollaborators() { - return pendingCollaborators; + public void addCollaborator(final Group group) { + accessLists.addEditor(group); } - public void setPendingCollaborators(final GroupList pendingCollaborators) { - this.pendingCollaborators = pendingCollaborators; + public void addPendingCollaborator(final Group group) { + pendingCollaborators.add(group); } - public void setAccessLists(final AccessLists accessList) { - this.accessLists = accessList; + public void addViewer(final Group group) { + accessLists.addViewer(group); } - public void setId(final Long id) { - this.id = id; + public AccessLists getAccessLists() { + return accessLists; } - public void addAdmin(final Group group) { - accessLists.addAdmin(group); + public Long getId() { + return id; } - public void addCollaborator(final Group group) { - accessLists.addEditor(group); + public GroupList getPendingCollaborators() { + return pendingCollaborators; } - public void addViewer(final Group group) { - accessLists.addViewer(group); + public boolean isAdmin(final Group group) { + return accessLists.getAdmins().includes(group); } - public void addPendingCollaborator(final Group group) { - pendingCollaborators.add(group); + public boolean isCollab(final Group group) { + return accessLists.getEditors().includes(group); } + public boolean isPendingCollab(final Group group) { + return pendingCollaborators.getList().contains(group); + } + + public boolean isViewer(final Group group) { + return accessLists.getViewers().includes(group); + } + public void removeAdmin(final Group group) { - accessLists.removeAdmin(group); + accessLists.removeAdmin(group); } public void removeCollaborator(final Group group) { - accessLists.removeEditor(group); + accessLists.removeEditor(group); } - public void removeViewer(final Group group) { - accessLists.removeViewer(group); - } - public void removePendingCollaborator(final Group group) { - pendingCollaborators.getList().remove(group); + pendingCollaborators.getList().remove(group); } - public AccessLists getAccessLists() { - return accessLists; + public void removeViewer(final Group group) { + accessLists.removeViewer(group); } - public boolean isAdmin(final Group group) { - return accessLists.getAdmins().includes(group); + public void setAccessLists(final AccessLists accessList) { + this.accessLists = accessList; } - public boolean isCollab(final Group group) { - return accessLists.getEditors().includes(group); + public void setId(final Long id) { + this.id = id; } - public boolean isViewer(final Group group) { - return accessLists.getViewers().includes(group); + public void setPendingCollaborators(final GroupList pendingCollaborators) { + this.pendingCollaborators = pendingCollaborators; } - public boolean isPendingCollab(final Group group) { - return pendingCollaborators.getList().contains(group); + public String toString() { + return "SocialNetwork[accessList: " + accessLists + "; pendingsCollabs: " + pendingCollaborators + "]"; } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2008-10-01 01:29:01 UTC (rev 898) @@ -213,4 +213,7 @@ this.userGroup = userGroup; } + public String toString() { + return "User[" + shortName + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/State.java 2008-10-01 01:29:01 UTC (rev 898) @@ -293,4 +293,7 @@ this.typeId = typeId; } + public String toString() { + return "State[" + stateToken + "/" + typeId + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/Kune-Workspace.gwt.xml 2008-10-01 01:29:01 UTC (rev 898) @@ -1,27 +1,47 @@ <module> - <inherits name='org.ourproject.kune.platf.Kune-Platform' /> - <inherits name="com.google.gwt.core.Core" /> - <inherits name="com.google.gwt.user.UserAgent" /> -  + <inherits name='org.ourproject.kune.platf.Kune-Platform' /> + <inherits name="com.google.gwt.core.Core" /> + <inherits name="com.google.gwt.user.UserAgent" /> +  +  - <replace-with - class="org.ourproject.kune.workspace.client.editor.WrappedRichTextAreaImplIE6"> - <when-type-is - class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" /> - <when-property-is name="user.agent" value="ie6" /> - </replace-with> +  + <replace-with + class="org.ourproject.kune.workspace.client.editor.WrappedRichTextAreaImplIE6"> + <when-type-is + class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" /> + <when-property-is name="user.agent" value="ie6" /> + </replace-with> - <replace-with - class="org.ourproject.kune.workspace.client.editor.WrappedRichTextAreaImplMozilla"> - <when-type-is - class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" /> - <any> - <when-property-is name="user.agent" value="gecko1_8" /> - <when-property-is name="user.agent" value="gecko" /> - </any> - </replace-with> +  + <replace-with + class="org.ourproject.kune.workspace.client.editor.WrappedRichTextAreaImplMozilla"> + <when-type-is + class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" /> + <any> + <when-property-is name="user.agent" value="gecko1_8" /> + <when-property-is name="user.agent" value="gecko" /> + </any> + </replace-with> -  +  + <replace-with + class="org.ourproject.kune.workspace.client.editor.WrappedRichTextAreaImplSafari"> + <when-type-is + class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" /> + <any> + <when-property-is name="user.agent" value="safari" /> + </any> + </replace-with> + +  + <replace-with + class="org.ourproject.kune.workspace.client.editor.WrappedRichTextAreaImplOpera"> + <when-type-is + class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" /> + <any> + <when-property-is name="user.agent" value="opera" /> + </any> + </replace-with> + </module> Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-01 01:29:01 UTC (rev 898) @@ -30,11 +30,8 @@ import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsTheme; -import org.ourproject.kune.workspace.client.themes.WsThemePresenter; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Listener2; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.gwtext.client.core.EventObject; @@ -71,15 +68,10 @@ private final ContextNavigatorPresenter presenter; public ContextNavigatorPanel(final ContextNavigatorPresenter presenter, final I18nTranslationService i18n, - final WorkspaceSkeleton ws, final ActionManager actionManager, final WsThemePresenter wsTheme) { + final WorkspaceSkeleton ws, final ActionManager actionManager) { this.presenter = presenter; this.ws = ws; this.actionManager = actionManager; - wsTheme.onThemeChanged(new Listener2<WsTheme, WsTheme>() { - public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) { - setTheme(oldTheme, newTheme); - } - }); contextMenus = new HashMap<String, Menu>(); fireOnTextChange = true; @@ -203,16 +195,6 @@ } } - public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) { - if (treePanel != null) { - if (oldTheme != null) { - final String previousThemeS = oldTheme.toString(); - treePanel.removeStyleName("k-entity-context-" + previousThemeS); - } - treePanel.addStyleName("k-entity-context-" + newTheme); - } - } - private void createItemMenu(final String nodeId, final ActionItemCollection<StateToken> actionCollection) { DeferredCommand.addCommand(new Command() { public void execute() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java 2008-10-01 01:29:01 UTC (rev 898) @@ -20,22 +20,17 @@ package org.ourproject.kune.workspace.client.editor; -import org.ourproject.kune.platf.client.View; +import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.listener.Listener0; public interface TextEditor { - public String getContent(); + void editContent(String content, Listener<String> onSave, Listener0 onEditCancelled); - public View getView(); + void onSaved(); - public void onSaved(); + void onSaveFailed(); - public void onSaveFailed(); + void reset(); - public void reset(); - - public void setContent(String content); - - public void setToolbarVisible(boolean visible); - } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorListener.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorListener.java 2008-10-01 01:29:01 UTC (rev 898) @@ -1,29 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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 org.ourproject.kune.workspace.client.editor; - -public interface TextEditorListener { - - void onEditCancelled(); - - void onSave(String text); - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-01 01:29:01 UTC (rev 898) @@ -22,17 +22,20 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.DefaultBorderLayout; +import org.ourproject.kune.workspace.client.skel.Toolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.WindowResizeListener; -import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.RichTextArea; import com.gwtext.client.widgets.MessageBox; +import com.gwtext.client.widgets.Panel; +import com.gwtext.client.widgets.layout.FitLayout; -public class TextEditorPanel extends Composite implements TextEditorView { +public class TextEditorPanel implements TextEditorView { private static final String BACKCOLOR_ENABLED = "#FFF"; private static final String BACKCOLOR_DISABLED = "#CCC"; private final RichTextArea gwtRTarea; @@ -40,18 +43,31 @@ private final TextEditorPresenter presenter; private final Timer saveTimer; private final I18nTranslationService i18n; + private final DefaultBorderLayout mainPanel; + private final WorkspaceSkeleton ws; public TextEditorPanel(final TextEditorPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws) { - this.presenter = presenter; this.i18n = i18n; + this.ws = ws; + mainPanel = new DefaultBorderLayout(); + final Panel centerPanel = new Panel(); + centerPanel.setLayout(new FitLayout()); gwtRTarea = new RichTextArea(); - textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, i18n, ws); - initWidget(gwtRTarea); - + // centerPanel.add(gwtRTarea); gwtRTarea.setWidth("97%"); gwtRTarea.addStyleName("kune-TexEditorPanel-TextArea"); + + final Toolbar editorTopBar = new Toolbar(); + textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, i18n); + editorTopBar.add(textEditorToolbar); + editorTopBar.addStyleName("k-toolbar-bottom-line"); + + // mainPanel.add(editorTopBar.getPanel(), Position.NORTH, false, + // DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); + mainPanel.add(centerPanel, DefaultBorderLayout.Position.CENTER); + adjustSize("" + (Window.getClientHeight() - 265)); Window.addWindowResizeListener(new WindowResizeListener() { public void onWindowResized(final int arg0, final int arg1) { @@ -65,6 +81,15 @@ }; } + public void attach() { + // ws.getEntityWorkspace().setContent(mainPanel.getPanel()); + ws.getEntityWorkspace().setContent(gwtRTarea); + } + + public void detach() { + mainPanel.getPanel().removeFromParent(); + } + public void editHTML(final boolean edit) { textEditorToolbar.editHTML(edit); } @@ -119,10 +144,6 @@ textEditorToolbar.setTextSaveButton(text); } - public void setToolBarVisible(final boolean visible) { - textEditorToolbar.setVisible(visible); - } - public void showSaveBeforeDialog() { MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Save before close?"), new MessageBox.ConfirmCallback() { public void execute(final String btnID) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2008-10-01 01:29:01 UTC (rev 898) @@ -21,23 +21,50 @@ package org.ourproject.kune.workspace.client.editor; import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.actions.ActionItem; +import org.ourproject.kune.platf.client.actions.ActionItemCollection; +import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; +import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; +import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import org.ourproject.kune.platf.client.dto.StateToken; +import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.listener.Listener0; + public class TextEditorPresenter implements TextEditor { private boolean editingHtml; private TextEditorView view; private boolean savePending; private final boolean autoSave; - private final TextEditorListener listener; private boolean saveAndCloseConfirmed; + private Listener<String> onSave; + private Listener0 onEditCancelled; + private final ActionToolbar<StateToken> toolbar; + private ActionToolbarButtonDescriptor<StateToken> save; + private ActionToolbarButtonDescriptor<StateToken> close; + private final I18nUITranslationService i18n; - public TextEditorPresenter(final TextEditorListener listener, final boolean isAutoSave) { - this.listener = listener; + public TextEditorPresenter(final boolean isAutoSave, final ActionToolbar<StateToken> toolbar, + final I18nUITranslationService i18n) { + this.toolbar = toolbar; autoSave = isAutoSave; + this.i18n = i18n; savePending = false; editingHtml = false; saveAndCloseConfirmed = false; + createActions(); } + public void editContent(final String content, final Listener<String> onSave, final Listener0 onEditCancelled) { + this.onSave = onSave; + this.onEditCancelled = onEditCancelled; + toolbar.attach(); + view.attach(); + setContent(content); + } + public String getContent() { return view.getHTML(); } @@ -87,16 +114,10 @@ savePending = false; saveAndCloseConfirmed = false; view.setEnabledSaveButton(false); + view.detach(); + toolbar.detach(); } - public void setContent(final String html) { - this.view.setHTML(html); - } - - public void setToolbarVisible(final boolean visible) { - view.setToolBarVisible(visible); - } - protected void onCancel() { if (savePending) { view.saveTimerCancel(); @@ -108,7 +129,7 @@ protected void onCancelConfirmed() { reset(); - listener.onEditCancelled(); + onEditCancelled.onEvent(); } protected void onEditHTML() { @@ -128,6 +149,35 @@ } protected void onSave() { - listener.onSave(view.getHTML()); + onSave.onEvent(view.getHTML()); } + + private void createActions() { + save = new ActionToolbarButtonDescriptor<StateToken>(AccessRolDTO.Viewer, ActionToolbarPosition.topbar, + new Listener<StateToken>() { + public void onEvent(final StateToken token) { + onSave(); + } + }); + save.setTextDescription(i18n.tWithNT("Save", "used in button")); + // save.setIconUrl("images/"); + + close = new ActionToolbarButtonDescriptor<StateToken>(AccessRolDTO.Viewer, ActionToolbarPosition.topbar, + new Listener<StateToken>() { + public void onEvent(final StateToken token) { + onCancel(); + } + }); + close.setTextDescription(i18n.tWithNT("Close", "used in button")); + // close.setIconUrl("images/"); + + final ActionItemCollection<StateToken> collection = new ActionItemCollection<StateToken>(); + collection.add(new ActionItem<StateToken>(save, null)); + collection.add(new ActionItem<StateToken>(close, null)); + toolbar.showActions(collection, true); + } + + private void setContent(final String html) { + this.view.setHTML(html); + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-10-01 01:29:01 UTC (rev 898) @@ -30,7 +30,6 @@ import org.ourproject.kune.platf.client.ui.palette.ColorSelectListener; import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePanel; import org.ourproject.kune.platf.client.ui.palette.WebSafePalettePresenter; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Command; @@ -264,11 +263,9 @@ private final TextEditorImages images = (TextEditorImages) GWT.create(TextEditorImages.class); private final EventListener listener = new EventListener(); - private final RichTextArea richText; private final RichTextArea.BasicFormatter basic; private final RichTextArea.ExtendedFormatter extended; - private final VerticalPanel outer = new VerticalPanel(); private final HorizontalPanel topPanel = new HorizontalPanel(); private ToggleButton bold; @@ -308,7 +305,7 @@ * the rich text area to be controlled */ public TextEditorToolbar(final RichTextArea richText, final TextEditorPresenter panelListener, - final I18nTranslationService i18n, final WorkspaceSkeleton ws) { + final I18nTranslationService i18n) { this.richText = richText; this.i18n = i18n; this.basic = richText.getBasicFormatter(); @@ -392,8 +389,7 @@ // i18n.t("Edit HTML"))); // } - ws.getEntityWorkspace().getContentTopBar().add(this); - super.setVisible(false); + // super.setVisible(false); } public void editHTML(final boolean edit) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorView.java 2008-10-01 01:29:01 UTC (rev 898) @@ -24,34 +24,36 @@ public interface TextEditorView extends View { - public void editHTML(boolean edit); + void attach(); - public String getHTML(); + void detach(); - public String getText(); + void editHTML(boolean edit); - public View getToolBar(); + String getHTML(); - public void saveTimerCancel(); + String getText(); - public void scheduleSave(int delayMillis); + View getToolBar(); - public void setEnabled(boolean enabled); + void saveTimerCancel(); - public void setEnabledCancelButton(boolean enabled); + void scheduleSave(int delayMillis); - public void setEnabledSaveButton(boolean enabled); + void setEnabled(boolean enabled); - public void setHeight(String height); + void setEnabledCancelButton(boolean enabled); - public void setHTML(String html); + void setEnabledSaveButton(boolean enabled); - public void setText(String text); + void setHeight(String height); - public void setTextSaveButton(String text); + void setHTML(String html); - public void setToolBarVisible(boolean visible); + void setText(String text); - public void showSaveBeforeDialog(); + void setTextSaveButton(String text); + void showSaveBeforeDialog(); + } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplIE6.java 2008-10-01 01:29:01 UTC (rev 898) @@ -31,17 +31,35 @@ */ public class WrappedRichTextAreaImplIE6 extends RichTextAreaImplIE6 { - public native void initElement() - /*-{ + @Override + public native void initElement() /*-{ var _this = this; - window.setTimeout(function() { + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + + setTimeout(function() { + if (_this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing == false) { + return; + } + + // Attempt to set the iframe document's body to 'contentEditable' mode. + // There's no way to know when the body will actually be available, so + // keep trying every so often until it is. + // Note: The body seems to be missing only rarely, so please don't remove + // this retry loop just because it's hard to reproduce. var elem = [email protected]::elem; var doc = elem.contentWindow.document; + if (!doc.body) { + // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower + // would increase the probability of a user-visible delay. + setTimeout(arguments.callee, 50); + return; + } var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; doc.write( ct ); + doc.body.contentEditable = true; // Send notification that the iframe has reached design mode. _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); }, 1); - }-*/; -} \ No newline at end of file + }-*/; +} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplMozilla.java 2008-10-01 01:29:01 UTC (rev 898) @@ -31,51 +31,50 @@ */ public class WrappedRichTextAreaImplMozilla extends RichTextAreaImplMozilla { - public native void initElement() - /*-{ - // Mozilla doesn't allow designMode to be set reliably until the iframe is - // fully loaded. - var _this = this; - var iframe = [email protected]::elem; + @Override + public native void initElement() /*-{ + // Mozilla doesn't allow designMode to be set reliably until the iframe is + // fully loaded. + var _this = this; + var iframe = [email protected]::elem; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; - iframe.onload = function() { - // Some Mozillae have the nasty habit of calling onload again when you set - // designMode, so let's avoid doing it more than once. - iframe.onload = null; + iframe.onload = function() { + // Some Mozillae have the nasty habit of calling onload again when you set + // designMode, so let's avoid doing it more than once. + iframe.onload = null; - // patch ccs inject: + // patch ccs inject: - var doc = [email protected]::elem.contentWindow.document; - head=doc.getElementsByTagName('head')[0]; - link=document.createElement('link'); - link.setAttribute('rel',"stylesheet"); - link.setAttribute('type',"text/css"); - link.setAttribute('href',"css/richtext.css" ); - head.appendChild(link); + var doc = [email protected]::elem.contentWindow.document; + head=doc.getElementsByTagName('head')[0]; + link=document.createElement('link'); + link.setAttribute('rel',"stylesheet"); + link.setAttribute('type',"text/css"); + link.setAttribute('href',"css/richtext.css" ); + head.appendChild(link); - var styles = document.createElement('style'); - styles.setAttribute('type', 'text/css'); - var newStyle = document.createTextNode('\n\n'); - styles.appendChild(newStyle); - head.appendChild(styles); + var styles = document.createElement('style'); + styles.setAttribute('type', 'text/css'); + var newStyle = document.createTextNode('\n\n'); + styles.appendChild(newStyle); + head.appendChild(styles); - // -- patch + // -- patch - // Send notification that the iframe has finished loading. - _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + // Send notification that the iframe has finished loading. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); - // Don't set designMode until the RTA actually gets focused. This is - // necessary because editing won't work on Mozilla if the iframe is - // *hidden, but attached*. Waiting for focus gets around this issue. - // - // Note: This onfocus will not conflict with the addEventListener('focus', - // ...) // in RichTextAreaImplStandard. - iframe.contentWindow.onfocus = function() { - iframe.contentWindow.onfocus = null; - iframe.contentWindow.document.designMode = 'On'; - }; + // Don't set designMode until the RTA actually gets focused. This is + // necessary because editing won't work on Mozilla if the iframe is + // *hidden, but attached*. Waiting for focus gets around this issue. + // + // Note: This onfocus will not conflict with the addEventListener('focus', + // ...) // in RichTextAreaImplStandard. + iframe.contentWindow.onfocus = function() { + iframe.contentWindow.onfocus = null; + iframe.contentWindow.document.designMode = 'On'; - }; - }-*/; - + }; + }-*/; } Added: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplOpera.java 2008-10-01 01:29:01 UTC (rev 898) @@ -0,0 +1,29 @@ +package org.ourproject.kune.workspace.client.editor; + +import com.google.gwt.user.client.ui.impl.RichTextAreaImplOpera; + +public class WrappedRichTextAreaImplOpera extends RichTextAreaImplOpera { + + @Override + public native void initElement() /*-{ + // Most browsers don't like setting designMode until slightly _after_ + // the iframe becomes attached to the DOM. Any non-zero timeout will do + // just fine. + var _this = this; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + setTimeout(function() { + // Turn on design mode. + [email protected]::elem.contentWindow.document.designMode = 'On'; + // patch css inject: + var elem = [email protected]::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch + + // Send notification that the iframe has reached design mode. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1); + }-*/; + +} Added: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/WrappedRichTextAreaImplSafari.java 2008-10-01 01:29:01 UTC (rev 898) @@ -0,0 +1,30 @@ +package org.ourproject.kune.workspace.client.editor; + +import com.google.gwt.user.client.ui.impl.RichTextAreaImplSafari; + +public class WrappedRichTextAreaImplSafari extends RichTextAreaImplSafari { + + @Override + public native void initElement() /*-{ + // Most browsers don't like setting designMode until slightly _after_ + // the iframe becomes attached to the DOM. Any non-zero timeout will do + // just fine. + var _this = this; + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::initializing = true; + setTimeout(function() { + // Turn on design mode. + [email protected]::elem.contentWindow.document.designMode = 'On'; + + // patch css inject: + var elem = [email protected]::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch + + // Send notification that the iframe has reached design mode. + _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1); + }-*/; + +} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2008-10-01 01:29:01 UTC (rev 898) @@ -86,6 +86,7 @@ view.clear(); final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); + Log.info(participation.toString()); Log.info("Is admin in " + groupsIsAdmin.size() + " groups."); Log.info("Is collab in " + groupsIsCollab.size() + " groups."); final int numAdmins = groupsIsAdmin.size(); Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2008-10-01 01:29:01 UTC (rev 898) @@ -1,7 +1,6 @@ package org.ourproject.kune.platf.client.actions; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; @@ -87,30 +86,6 @@ checkActionLists(1, new AccessRightsDTO(false, false, true), false); } - @Test - public void testEnablingFalse() { - Mockito.stub(session.isLogged()).toReturn(true); - adminAction.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken param) { - return false; - } - }); - registry.addAction(adminAction, DEF_CONTENT_TYPE_ID); - assertTrue(!registry.checkEnabling(adminAction, new StateToken())); - } - - @Test - public void testEnablingTrue() { - Mockito.stub(session.isLogged()).toReturn(true); - adminAction.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken param) { - return true; - } - }); - registry.addAction(adminAction, DEF_CONTENT_TYPE_ID); - assertTrue(registry.checkEnabling(adminAction, new StateToken())); - } - private void addDefActions() { registry.addAction(adminAction, DEF_CONTENT_TYPE_ID); registry.addAction(editorAction, DEF_CONTENT_TYPE_ID); Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2008-09-30 01:49:58 UTC (rev 897) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2008-10-01 01:29:01 UTC (rev 898) @@ -5,105 +5,102 @@ import org.junit.Test; public class TextEditorPresenterTest { - private TextEditorListener listener; private TextEditorPresenter presenter; private TextEditorView view; @Before public void createObjects() { - listener = EasyMock.createStrictMock(TextEditorListener.class); - presenter = new TextEditorPresenter(listener, true); - view = EasyMock.createStrictMock(TextEditorView.class); + presenter = new TextEditorPresenter(true, null, null); + view = EasyMock.createStrictMock(TextEditorView.class); } @Test - public void testViewInitialization() { - viewInit(); - EasyMock.replay(view); - presenter.init(view); - EasyMock.verify(view); + public void testSave() { + viewInit(); + view.setEnabledSaveButton(true); + view.scheduleSave(10000); + EasyMock.expect(view.getHTML()).andReturn("foo"); + viewReset(); + EasyMock.replay(view); + // listener.onSave("foo"); + // EasyMock.replay(listener); + presenter.init(view); + presenter.onEdit(); + presenter.onSave(); + presenter.onSaved(); + EasyMock.verify(view); + // EasyMock.verify(listener); } @Test public void testSavePending() { - viewInit(); - view.setEnabledSaveButton(true); - view.scheduleSave(10000); - EasyMock.replay(view); - presenter.init(view); - presenter.onEdit(); - EasyMock.verify(view); + viewInit(); + view.setEnabledSaveButton(true); + view.scheduleSave(10000); + EasyMock.replay(view); + presenter.init(view); + presenter.onEdit(); + EasyMock.verify(view); } @Test - public void testSave() { - viewInit(); - view.setEnabledSaveButton(true); - view.scheduleSave(10000); - EasyMock.expect(view.getHTML()).andReturn("foo"); - viewReset(); - EasyMock.replay(view); - listener.onSave("foo"); - EasyMock.replay(listener); - presenter.init(view); - presenter.onEdit(); - presenter.onSave(); - presenter.onSaved(); - EasyMock.verify(view); - EasyMock.verify(listener); + public void testSavePendingCancel() { + viewInit(); + view.setEnabledSaveButton(true); + view.scheduleSave(10000); + view.saveTimerCancel(); + view.showSaveBeforeDialog(); + EasyMock.expect(view.getHTML()).andReturn("foo"); + viewReset(); + EasyMock.replay(view); + // listener.onSave("foo"); + // listener.onEditCancelled(); + // EasyMock.replay(listener); + presenter.init(view); + presenter.onEdit(); + presenter.onCancel(); + presenter.onSaveAndClose(); + presenter.onSaved(); + EasyMock.verify(view); + // EasyMock.verify(listener); } @Test - public void testSavePendingCancel() { - viewInit(); - view.setEnabledSaveButton(true); - view.scheduleSave(10000); - view.saveTimerCancel(); - view.showSaveBeforeDialog(); - EasyMock.expect(view.getHTML()).andReturn("foo"); - viewReset(); - EasyMock.replay(view); - listener.onSave("foo"); - listener.onEditCancelled(); - EasyMock.replay(listener); - presenter.init(view); - presenter.onEdit(); - presenter.onCancel(); - presenter.onSaveAndClose(); - presenter.onSaved(); - EasyMock.verify(view); - EasyMock.verify(listener); + public void testSavePendingCancelSaveFails() { + viewInit(); + view.setEnabledSaveButton(true); + view.scheduleSave(10000); + view.saveTimerCancel(); + view.showSaveBeforeDialog(); + EasyMock.expect(view.getHTML()).andReturn("foo"); + view.scheduleSave(20000); + EasyMock.replay(view); + // listener.onSave("foo"); + // EasyMock.replay(listener); + presenter.init(view); + presenter.onEdit(); + presenter.onCancel(); + presenter.onSaveAndClose(); + presenter.onSaveFailed(); + EasyMock.verify(view); + // EasyMock.verify(listener); } @Test - public void testSavePendingCancelSaveFails() { - viewInit(); - view.setEnabledSaveButton(true); - view.scheduleSave(10000); - view.saveTimerCancel(); - view.showSaveBeforeDialog(); - EasyMock.expect(view.getHTML()).andReturn("foo"); - view.scheduleSave(20000); - EasyMock.replay(view); - listener.onSave("foo"); - EasyMock.replay(listener); - presenter.init(view); - presenter.onEdit(); - presenter.onCancel(); - presenter.onSaveAndClose(); - presenter.onSaveFailed(); - EasyMock.verify(view); - EasyMock.verify(listener); + public void testViewInitialization() { + viewInit(); + EasyMock.replay(view); + presenter.init(view); + EasyMock.verify(view); } private void viewInit() { - view.setEnabledSaveButton(false); - view.setEnabled(true); + view.setEnabledSaveButton(false); + view.setEnabled(true); } private void viewReset() { - view.saveTimerCancel(); - view.setEnabledSaveButton(false); + view.saveTimerCancel(); + view.setEnabledSaveButton(false); } - }

1 0