- xwiki-devs@xwiki.org - lists.xwiki.org

[xwiki-devs] [Proposal] Wiki logo as a property of the ColorTheme object
by Sergiu Dumitriu 10 Feb '10

10 Feb '10

Hi devs, Caty suggested a while ago to allow the users to set custom logos in the color theme. At first I thought this was not OK, since normally the logo should be the same regardless of the site colors, but now I realize it's a pretty good idea, because it ensures more flexibility, and, more importantly, it allows to workaround transparency issues that appear in some browsers (yes, I'm talking about IE6) by setting logos with the same background color as the header. The necessary changes would be: - in "ColorThemes.ColorThemeClass" add a property called 'logo' whose values are names of files attaches to the ColorTheme document - in "global.vm", when searching for the wiki logo, start by looking in the current ColorTheme, and, if not found, continue as before. WDYT? -- Sergiu Dumitriu http://purl.org/net/sergiu/

3 2

[xwiki-devs] [VOTE] Release a XE 2.2 RC 2 before the 2.2 final
by Thomas Mortagne 10 Feb '10

10 Feb '10

Hi devs, We are not ready to release the 2.2 final version so I'm proposing to release a 2.2 RC 2 today and the final version on next Monday. Here is my +1. WDYT ? -- Thomas Mortagne

5 8

[xwiki-devs] [VOTE] Releasing XE 2.1.2
by Vincent Massol 10 Feb '10

10 Feb '10

Hi, I think it's time to release XE 2.1.2, since there are quite a lot of fixes in it: http://jira.xwiki.org/jira/secure/IssueNavigator.jspa?reset=true&pid=10010&… Thomas, you have this one planned for 2.1.2, what's the status: http://jira.xwiki.org/jira/browse/XWIKI-4723 Thanks -Vincent

3 3

[xwiki-devs] [VOTE] Use current database instead of current document database in Current*ReferenceResolver
by Thomas Mortagne 10 Feb '10

10 Feb '10

Hi devs, Currently when the reference does not contains any wiki name it's resolved using the wiki of the current document. Problem is that we generally use context wiki as the current wiki and references used to be resolved that way before the refactoring using official Resolver component. In many places we set the wiki we want to work on before doing a bunch of tasks: loading documents, executing queries etc... the problem is that when Current*ReferenceResolver is used you have to create some empty document and put it in the context just to set the wiki you want to work on. So i propose to change the behavior of all the Current*ReferenceResolver to get context wiki as default wiki name. Here is my +1 -- Thomas Mortagne

5 8

[xwiki-devs] Disable some macros in wysiwyg
by farouk korteby 09 Feb '10

09 Feb '10

Hi, I want to disable some developpement macros in GWT based wysiwyg, how can i do it ? Thanks. -- Farouk Korteby

4 7

[xwiki-devs] Removing viewheader.vm?
by Vincent Massol 09 Feb '10

09 Feb '10

Hi, I think viewheader.vm is not used anymore. I couldn't find any reference of it in other vm nor in skins. However it's still referenced from XWiki.java, in getSkinClass() (and from ApplicationResources*.properties files): needsUpdate |= bclass.addTemplateField("viewheader.vm", "View Header"); But I think this field is now not only useless but even misleading since filling it will have no effect AFAIK. Could someone confirm this? Does it mean people with custom skin will find their skin not working anymore? Anyone knows when viewheader.vm was stopped to be used because AFAICS this will break all existing custom skins? What new properties should we add t o the XWikiSkins class? Thanks -Vincent

3 3

Re: [xwiki-devs] [xwiki-notifications] r26828 - platform/xwiki-applications/trunk/administration/src/main/resources/XWiki
by Vincent Massol 09 Feb '10

09 Feb '10

Hi Caleb, This commit has broken a functional test, please see: http://bit.ly/aNzmAF Thanks -Vincent On Tue, Feb 9, 2010 at 6:49 AM, cjdelisle <platform-notifications(a)xwiki.org> wrote: > Author: cjdelisle > Date: 2010-02-09 06:49:32 +0100 (Tue, 09 Feb 2010) > New Revision: 26828 > > Modified: > platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Registration.xml > Log: > XAADMINISTRATION-103: Make registration page support lightbox so administrator can use it to add users in admin users sheet. - Modified registration page to be compatable with lightbox, also moved form tags and submit button outside of generateHtml macro. > > Modified: platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Registration.xml > =================================================================== > --- platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Registration.xml 2010-02-09 05:46:48 UTC (rev 26827) > +++ platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Registration.xml 2010-02-09 05:49:32 UTC (rev 26828) > @@ -74,6 +74,11 @@ > #set($loginPage = 'XWiki.XWikiLogin') > #set($loginAction = 'loginsubmit') > ## > +## If this is true, then assume the registration page is being viewed inside of a lightbox > +#if($request.get('xpage')) > + #set($assumeLightbox = true) > +#end > +## > ## Use javascript based live validation see: http://www.livevalidation.com > ## Set false to stop using LiveValidation > #set($useLiveValidation = true) > @@ -457,16 +462,68 @@ > ## Then we display the registration form. > #if(!$registrationDone) > $welcomeMessage > - {{html clean=false}} > - ## I do not want to put this inside of a paragraph block so I end the block here and > - ## start it at the end. > - </p> > + {{html clean=false wiki=false}} > + <div> > + <form id="register" action="" method="post"> > + <div> > #generateHtml($fields, $fieldMandatoryStar, $failureMessageParams) > + <span class="buttonwrapper"> > + #if($assumeLightbox) > + ## LightBox detected... > + <script type="text/javascript"> > + ## Make the X button not reload the page. (overriding LbClose) > + window.lb.lbClose = function() { > + this.lbHide(); > + this.lbClearData(); > + ##return false; > + } > + ## Post the form entry to the page and load the result. (we override lbSaveForm) > + window.lb.lbSaveForm = function() { > + var formParams = Form.serialize(this.form); > + Form.disable(this.form); > + var ajaxRequest = new Ajax.Request(this.saveUrl, { > + parameters: formParams, > + asynchronous: false > + }); > + window.lb.lbFormDataLoaded(ajaxRequest.transport); > + } > + </script> > + ## It doesn't really matter where these are, the scripts will be relocated to the head. > +  > +  > + ## > + <input class="button" type="submit" value="$msg.get('save')" onclick="window.lb.lbSaveForm();"/> > + </span>#* End ButtonWrapper then start another...*#<span class="buttonwrapper"> > + <input class="button" type="submit" value="$msg.get("cancel")" onclick="Form.disable(window.lb.form); window.lb.lbClose();"/> > + #else > + ## Not using the LightBox > + <input type="submit" value="$msg.get('core.register.submit')" class="button"/> > + #end > + </span>## ButtonWrapper > + </div> > + </form> > #if($useLiveValidation) > #generateJavascript($fields) > #end > - <p> > + </div> > {{/html}} > +## If the registration is done (successful) and we detect the Lightbox simply send the user back to the original page. > +#elseif($assumeLightbox) > + {{html clean=false wiki=false}} > + <script type="text/javascript"> > + var url = window.lb.redirectUrl; > + window.lb.lbClose; > + if (url != undefined) { > + if(window.location.pathname + window.location.search == url) { > + ## Under certain circumstances (bug) Opera will not load a page if the location is the same as the current page. > + ## In these cases, location.reload() doesn't work either, the only solution (I could find) was to change the URL. > + window.location.href = url + "&"; > + } else { > + window.location.href = url; > + } > + } > + </script> > + {{/html}} > #end > ## > ####### The Macros (nothing below this point is run directly) ######### > @@ -608,7 +665,8 @@ > </span> > </div> > </form> > - #if($autoLogin) > + ## We don't want autoLogin if we are administrators adding users... > + #if($autoLogin && !$assumeLightbox) > <script type='text/javascript'> > document.observe('dom:loaded', function() { > document.forms['loginForm'].submit(); > @@ -632,59 +690,54 @@ > ## Put the same values back into the fields. > #getParams($fields) > ## > - <form id="register" action="" method="post"> > - <div><dl> > - ## > - #foreach($field in $fields) > - #if($field.get('name')) > - #set($fieldName = $field.get('name')) > - #if($field.get('label')) > - #set($label = $field.get('label')) > - <dt><label for="$fieldName">$label</label> > - #if($field.get('validate').get('mandatory')) > - <span > - #foreach($entry in $fieldMandatoryStar.entrySet()) > - $entry.getKey()="$entry.getValue()" > - #end > - >*</span> > + <dl> > + #foreach($field in $fields) > + #if($field.get('name')) > + #set($fieldName = $field.get('name')) > + #if($field.get('label')) > + #set($label = $field.get('label')) > + <dt><label for="$fieldName">$label</label> > + #if($field.get('validate').get('mandatory')) > + <span > + #foreach($entry in $fieldMandatoryStar.entrySet()) > + $entry.getKey()="$entry.getValue()" > #end > - </dt> > + >*</span> > #end > - ## If no tag then default tag is <input> > - #if($field.get('tag')) > - #set($tag = $field.get('tag')) > - #else > - #set($tag = 'input') > + </dt> > + #end > + ## If no tag then default tag is <input> > + #if($field.get('tag')) > + #set($tag = $field.get('tag')) > + #else > + #set($tag = 'input') > + #end > + <dd><$tag id="$fieldName" > + #set($params = $field.get('params')) > + ## If no name parameter is spacified, then we use the field name > + #if(!$params.get('name')) > + #set($discard = $params.put('name', $fieldName)) > + #end > + #foreach($entry in $params.entrySet()) > + ## If a parameter is specified as '' then we don't include it. > + #if($entry.getValue() != '') > + $entry.getKey()="$escapetool.html($entry.getValue())" > #end > - <dd><$tag id="$fieldName" > - #set($params = $field.get('params')) > - ## If no name parameter is spacified, then we use the field name > - #if(!$params.get('name')) > - #set($discard = $params.put('name', $fieldName)) > + #end > + ></$tag> > + #if($field.get('error')) > + <span > + #foreach($entry in $failureMessageParams.entrySet()) > + $entry.getKey()="$entry.getValue()" > #end > - #foreach($entry in $params.entrySet()) > - ## If a parameter is specified as '' then we don't include it. > - #if($entry.getValue() != '') > - $entry.getKey()="$escapetool.html($entry.getValue())" > - #end > - #end > - ></$tag> > - #if($field.get('error')) > - <span > - #foreach($entry in $failureMessageParams.entrySet()) > - $entry.getKey()="$entry.getValue()" > - #end > - >$field.get('error')</span> > - #end > - </dd> > - #else > - ERROR: Field with no name. > - #end##if fieldName exists > - #end > - </dl> > - <span class="buttonwrapper"><input type="submit" value="$msg.get('core.register.submit')" class="button"/></span> > - </div> > - </form> > + >$field.get('error')</span> > + #end > + </dd> > + #else > + ERROR: Field with no name. > + #end##if fieldName exists > + #end > + </dl> > #end > ## > ## Remove newlines inside of tags because tags are generated by loops.

1 0

Re: [xwiki-devs] [xwiki-notifications] r26812 - platform/xwiki-applications/trunk/watchlist/src/main/resources/XWiki
by Sergiu Dumitriu 08 Feb '10

08 Feb '10

On 02/08/2010 05:40 PM, jvdrean (SVN) wrote: > Author: jvdrean > Date: 2010-02-08 17:40:01 +0100 (Mon, 08 Feb 2010) > New Revision: 26812 > > Modified: > platform/xwiki-applications/trunk/watchlist/src/main/resources/XWiki/WatchListManager.xml > Log: > XPWATCHLIST-101 : Various accessibility issues in XWiki.WatchListManager > > Modified: platform/xwiki-applications/trunk/watchlist/src/main/resources/XWiki/WatchListManager.xml > =================================================================== > --- platform/xwiki-applications/trunk/watchlist/src/main/resources/XWiki/WatchListManager.xml 2010-02-08 16:37:47 UTC (rev 26811) > +++ platform/xwiki-applications/trunk/watchlist/src/main/resources/XWiki/WatchListManager.xml 2010-02-08 16:40:01 UTC (rev 26812) > @@ -117,7 +227,7 @@ > <tr> > #set ($idoc = $xwiki.getDocument($item)) > #if (!$idoc.isNew()) This was just removed, bad merge. > -<td><a href="$idoc.getURL()">$idoc.getDisplayTitle()</a></td> > +<td><a href="$idoc.getURL()">$idoc.getDisplayTitle().replaceAll("[^\\.,:]+:", "")</a></td> > <td>$idoc.space</td> > <td><a href="$doc.getURL("view", "removedocument=${item}")" title="$msg.get("watchlist.delete.tooltip")">$msg.get("watchlist.delete")</a></td> > #else -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

[xwiki-devs] [VOTE] Remove Main.RecentMembers from XE wiki
by Jean-Vincent Drean 08 Feb '10

08 Feb '10

Hi devs, While fixing WCAG issues I've discovered the Main.RecentMembers page. It looks deprecated and AFAIK it's not linked from anywhere. In order to keep the distrbution clean I'd like to remove it before 2.2 final. Here's my +1. Thanks, JV.

6 5

[xwiki-devs] Problem in XEM with entity references refactoring
by Vincent Massol 08 Feb '10

08 Feb '10

Hi, Just to let you know I've found an important problem in XEM, caused by the changes brought by the entity references. The pb is in XWikiDocument's code for object manipulation. I've replaced the Map of String that was used to store objects with a Map of DocumentReference. So when you have code like: XWikiDocument doc = context.getWiki().getDocument("wiki:space.page", context); BaseObject obj = doc.getObject("XWiki.SomeClass); And if context.getDatabse() = "currentWiki" (with "currentWiki" != "wiki") Then doc.getObject will check if there's an object of ref "currentWiki:XWiki.SomeClass" in doc, which won't be found since there might indeed be an object but of ref "wiki:XWiki.SomeClass"... Basically we now allow objects and classes in a document to reference classes located in another wiki. To fix this all calling code should be modified to use full references. However since this isn't going to happen fast enough for 2.2 final and since in any case it could break user's code I think we need to modify XWikiDocument so that all class/object methods ignore the wiki part of the references, thus assuming all classes/objects refer to classes/objects in the current wiki, as it was assumed before... Let me know if you agree. I'll start looking at the code to see how much there is to do that in the meantime. Thanks -Vincent

2 4