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) {