December 2008 - xwiki-devs@xwiki.org

[xwiki-devs] [VOTE][UI] WYSIWYG Image dialogs (SUMMARY)
by Jean-Vincent Drean 16 Dec '08

16 Dec '08

Winners : 1) With height +1 : offer predefined image sizes. 2) With five +1 : allow to edit image width _and_ height. 3) With seven +1 : offer text flow option. 4) With height +1 : have a simple preview using images. 5) With height +1 : source + options in the same screen for external images (b). See the mockups here : http://dev.xwiki.org/xwiki/bin/view/Design/NewWysiwygEditorInterface#HImage A question from Vincent has not been answered here nor in the link thread : ability to filter nodes appearing in the tree. The suggest input under the tree must be powerful enough to avoid this need. Thanks, JV.

1 0

[xwiki-devs] [VOTE][UI] WYSIWYG Link dialogs (SUMMARY)
by Jean-Vincent Drean 16 Dec '08

16 Dec '08

Winners : 1) With seven +1 : display the tooltip option. 2) With seven +1 : have a one-step dialog for external links. See the mockups here : http://dev.xwiki.org/xwiki/bin/view/Design/NewWysiwygEditorInterface#HLink Vincent raised an important issue, how do we handle special parameters in the WYSIWYG (%%), this will be discussed later since it not only related to links but any element. Thanks, JV.

1 0

[xwiki-devs] [ANN] XWiki Enterprise 1.6.2 and XWiki Enterprise Manager 1.4.1 released
by Thomas Mortagne 16 Dec '08

16 Dec '08

The XWiki development team is pleased to announce the release of XWiki Enterprise 1.6.2 and XWiki Enterprise Manager 1.4.1. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This are the last bug fixes version before deleting the 1.6 branch. Changes from XE 1.6.0: * XWIKI-2790 - Jboss cache load configuration in the wrong place * XWIKI-2821 - Older document revisions have the wrong contentUpdateDate * XWIKI-2835 - New object may not have their wiki (database) sets, and defaults is not applied * XWIKI-2836 - Property validation does not report classname in context * XWIKI-2852 - The old LDAP authenticator is still used by default in some cases * XWIKI-2905 - XWiki#parseGroovyFromPage(page, jarPage) is not loading jars from jarPage Changes from XEM 1.4: * XAWM-91 - When wiki template don't have pretty name it shows empty string in wiki creation template list For more information see the respective releases notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise162 and http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM141 Thanks -The XWiki dev team

1 0

[xwiki-devs] [Rendering] Remove XHTML parser and XHTML macro
by Vincent Massol 16 Dec '08

16 Dec '08

Hi devs, We currently have 2 parsers and 2 macros depending on whether the content is HTML 4.01 or XHTML 1.0. This is way too complex for users. In addition the XHTML parser/macro expect the content to have the DOCTYPE declaration + a root element which make them even harder to use. I propose to simply all this by doing the following: * A single HTML parser * A single html macro * The HTMLCleaner is always called thus transforming HTML into clean XHTML and not doing anything in case of clean XHTML (actually it'll add the DOCTYPE and a root element if it's not there) This simplifies code, documentation and more importantly its usage for our end users. Since the xhtml macro was released not long ago I'd rather not go through a deprecation period and instead commit the changes above for 1.7.1 (with a nice message in the release notes). I've started working on this (should be finished tonight). Please shout if you don't agree. Thanks -Vincent

4 5

[xwiki-devs] spaces right and navigation panel
by antoine Seilles 16 Dec '08

16 Dec '08

I would like to modify navigation panel to list only spaces for wich a user has at least the view access level. How to test the access Level of a user for a space? How to get the current user? Thank for your time.

3 4

[xwiki-devs] [VOTE] Release XE 1.6.2 and XEM 1.4.1
by Thomas Mortagne 16 Dec '08

16 Dec '08

Hi devs, I would like to release XE 1.6.2 before closing the 1.6 branch (since 1.7 final is released) and XEM 1.4.1 based on it next Monday (because I don't have time to do a release this week). WDYT ? Here is my +1 -- Thomas Mortagne

4 4

[xwiki-devs] Query Generator review
by Artem Melentyev 16 Dec '08

16 Dec '08

Hi, devs. I have a small review of XWIKI-1090: XWiki Query Generator, XWikiQuery/makeQuery in order to move it to new XWQLanguage instead of old QueryPlugin. >This features allows to generate a Query UI and the corresponding query automatically to run on the storage engine. >The displaySearch APIs allow to display the query UI and makeQuery allow to generate the query It is easy to rewrite syntax to XWQL, but there are some problems in design. 1. To make it run on XWQL we just need to replace QueryPlugin#makeQuery with something similar. I propose: 1.1 move XWikiCriteria to xwiki-query/manager module (it is not depend on core. except only one util method) 1.2 add Query QueryManager#createQuery(XWikiCriteria) as analogue to QueryPlugin#makeQuery 1.3 fix all affected references. There are one method that need be bridged (xwiki-bridge) for this: BaseClass#makeQuery. I don't like to bridge it, so looking other ways. 2. General overview of query generator: It is very connected with core and distributed across many classes. This is not good for our component architecture. There are: UI Generator: XWiki#displaySearch* PropertyClass#displaySearch* and overrides XWikiDocument#displaySearch Query Generator: XWiki#createQueryFromRequest BaseClass#makeQuery PropertyClass#makeQuery, #fromSearchMap and overrides Executers: XWiki#search*(XWikiQuery, ...) I'm doing 1. now. Query Generator redesign(2) is not important for now, I think. It works well.

3 3

Re: [xwiki-devs] [xwiki-notifications] r14754 - in platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources: domain views/pages
by Sergiu Dumitriu 16 Dec '08

16 Dec '08

asiri (SVN) wrote: > Author: asiri > Date: 2008-12-15 17:45:22 +0100 (Mon, 15 Dec 2008) > New Revision: 14754 > > Modified: > platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/domain/DavPage.java > platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/views/pages/PagesBySpaceNameSubView.java > Log: > XWIKI-2982: Not possible to rename pages / spaces via the WebDAV interface > > Fixed. > > Modified: platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/domain/DavPage.java > =================================================================== > --- platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/domain/DavPage.java 2008-12-15 16:44:07 UTC (rev 14753) > +++ platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/domain/DavPage.java 2008-12-15 16:45:22 UTC (rev 14754) > @@ -284,7 +284,9 @@ > */ > public void move(DavResource destination) throws DavException > { > - getContext().checkAccess("delete", this.name); > + // Renaming a page requires edit rights on the current document, delete rights on the > + // target document (if it exists) and edit rights on all the children of current document. > + getContext().checkAccess("edit", this.name); > XWikiDavResource dResource = (XWikiDavResource) destination; > String dSpaceName = null; > String dPageName = null; > @@ -302,8 +304,10 @@ > String sql = "where doc.parent='" + this.name + "'"; > List<String> childDocNames = getContext().searchDocumentsNames(sql); > // Validate access rights for the destination page. > - getContext().checkAccess("edit", newDocName); > - // Validate access rights for all the renamed pages. > + if (getContext().exists(newDocName)) { > + getContext().checkAccess("delete", newDocName); > + } You still have to check for edit right: } else { getContext().checkAccess("edit", newDocName); } > + // Validate access rights for all the child pages. > for (String childDocName : childDocNames) { > getContext().checkAccess("edit", childDocName); > } > > Modified: platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/views/pages/PagesBySpaceNameSubView.java > =================================================================== > --- platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/views/pages/PagesBySpaceNameSubView.java 2008-12-15 16:44:07 UTC (rev 14753) > +++ platform/core/trunk/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/resources/views/pages/PagesBySpaceNameSubView.java 2008-12-15 16:45:22 UTC (rev 14754) > @@ -168,11 +168,10 @@ > removeTempResource((DavTempFile) member); > } else if (member instanceof DavPage) { > String pName = ((DavPage) member).getDisplayName(); > - if (getContext().hasAccess("delete", pName)) { > - XWikiDocument childDoc = getContext().getDocument(pName); > - if (!childDoc.isNew()) { > - getContext().deleteDocument(childDoc); > - } > + getContext().checkAccess("delete", pName); > + XWikiDocument childDoc = getContext().getDocument(pName); > + if (!childDoc.isNew()) { > + getContext().deleteDocument(childDoc); > } > } else { > throw new DavException(DavServletResponse.SC_BAD_REQUEST); > @@ -192,13 +191,15 @@ > if (getCollection().equals(dSpace.getCollection())) { > String sql = "where doc.web='" + this.name + "'"; > List<String> docNames = getContext().searchDocumentsNames(sql); > - // To rename an entire space, user should have delete rights on all the > - // documents in the current space and edit rights on all the documents that > - // will be created after the rename operation. > + // To rename an entire space, user should have edit rights on all the > + // documents in the current space and delete rights on all the documents that > + // will be replaced (if they exist). > for (String docName : docNames) { > String newDocName = dSpace.getDisplayName() + "." + docName; > - getContext().checkAccess("delete", docName); > - getContext().checkAccess("edit", newDocName); > + getContext().checkAccess("edit", docName); > + if (getContext().exists(newDocName)) { > + getContext().checkAccess("delete", newDocName); > + } This looks like duplication. Can you move this check in a common method? > } > for (String docName : docNames) { > XWikiDocument doc = getContext().getDocument(docName); -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

Re: [xwiki-devs] [xwiki-notifications] r14756 - platform/skins/trunk/toucan/src/main/resources/toucan
by Sergiu Dumitriu 15 Dec '08

15 Dec '08

tmortagne (SVN) wrote: > Author: tmortagne > Date: 2008-12-15 18:26:50 +0100 (Mon, 15 Dec 2008) > New Revision: 14756 > > Modified: > platform/skins/trunk/toucan/src/main/resources/toucan/toucan.css > Log: > STOUCAN-62: Add support for BoxMacro > > Modified: platform/skins/trunk/toucan/src/main/resources/toucan/toucan.css > =================================================================== > --- platform/skins/trunk/toucan/src/main/resources/toucan/toucan.css 2008-12-15 17:26:24 UTC (rev 14755) > +++ platform/skins/trunk/toucan/src/main/resources/toucan/toucan.css 2008-12-15 17:26:50 UTC (rev 14756) > @@ -274,6 +274,14 @@ > font-size: inherit; > } > > +#xwikimaincontainerinner .box { > + margin: 1em 0; > + padding: 0 1px; > + overflow: auto; > + background-color: #F1F7FF; > + border: 1px dotted #555555; > +} How about putting these rules in a CSS file stored in the macro jar, and pull it as a resource SSX extension? Jerome can help. -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

Re: [xwiki-devs] [xwiki-notifications] r14755 - platform/skins/trunk/albatross/src/main/resources/albatross
by Sergiu Dumitriu 15 Dec '08

15 Dec '08

tmortagne (SVN) wrote: > Author: tmortagne > Date: 2008-12-15 18:26:24 +0100 (Mon, 15 Dec 2008) > New Revision: 14755 > > Modified: > platform/skins/trunk/albatross/src/main/resources/albatross/wiki.css > Log: > XSALBATROSS-44: Add support for BoxMacro > > Modified: platform/skins/trunk/albatross/src/main/resources/albatross/wiki.css > =================================================================== > --- platform/skins/trunk/albatross/src/main/resources/albatross/wiki.css 2008-12-15 16:45:22 UTC (rev 14754) > +++ platform/skins/trunk/albatross/src/main/resources/albatross/wiki.css 2008-12-15 17:26:24 UTC (rev 14755) > @@ -75,6 +75,20 @@ > font-size: inherit; > } > > +.box { > + margin-top: 4px; > + margin-bottom: 4px; Could be replaced with the shorter: margin: 0 4px; > + padding: 5px 5px 5px 5px; Could be replaced with the shorter: padding: 5px; > + color: inherit; That's useless, since this is the default. Should be removed. If there's another CSS rule that overrides this, than that rule should be either removed or narrowed down to a more specific set of elements. > + background-color: #eeeeee; Could be replaced with the shorter: background-color: #EEE; > + border: 1px dotted #003366; Could be replaced with the shorter: border: 1px dotted #036; > + font-size: 12px; I prefer not to use px for font sizes, since this prevents increasing the font size in IE6, for those that don't see so well. > + line-height: 100%; > + white-space: pre; > + width: 70%; > + overflow: auto; > +} -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1