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

by Paul Libbrecht

Hello fellow developers, there seems to be some magic in creating a new, simple, login page. I tried making my own Main/Login with the usage of checkAuth in case the params are found but that seems not to work. Should the form post to loginsubmit? To view? Is there something "against me doing that" ? XWiki.XWikiLogin sounds to have content generated by some magic I cannot edit. thanks in advance paul

14 years, 10 months

2
1
0 0

[xwiki-devs] [proposal] Promote xwiki-reporting-tool out of the sandbox and start sending periodic reports.

by Caleb James DeLisle

I would like to get reports going out so that we can get a feel for the periodic reports, and work out bugs and make improvements in real time. I'm +1 to getting reports going. A technical challenge is that unless one of the build agents has access to a mail relay, it will not be able to send mail. If this is a problem, it can be fixed by signing up with an email service and placing the password in a file on the filesystem of the agent which the job is bound to. The file can be loaded by the configuration script. Caleb

14 years, 10 months

5
12
0 0

Re: [xwiki-devs] [xwiki-notifications] r32928 - platform/skins/trunk/colibri/src/main/resources/colibri

by Ecaterina Moraru (Valica)

Marius please revert this commit because ie-all means IE6, IE7 and IE8. * hacks are supposed to go for the IE6, IE7 part, while the non-affected property goes for IE8. for example: .xwikiintracontent legend { margin: -5px 0 5px 0; - *margin: 5px 0 10px -7px; + margin: 5px 0 10px -7px; } even if you made this clean - you supposed to delete the overridden margin property, but all these properties are needed to display correctly. Thanks, Caty On Wed, Nov 17, 2010 at 09:52, mflorea <platform-notifications(a)xwiki.org>wrote: > Author: mflorea > Date: 2010-11-17 08:52:49 +0100 (Wed, 17 Nov 2010) > New Revision: 32928 > > Modified: > platform/skins/trunk/colibri/src/main/resources/colibri/ie-all.css > Log: > XSCOLIBRI-251: ie-all.css uses color theme variables without importing the > color theme template > * Also removed useless * hack since it's a IE dedicated stylesheet. > > > Modified: > platform/skins/trunk/colibri/src/main/resources/colibri/ie-all.css > =================================================================== > --- platform/skins/trunk/colibri/src/main/resources/colibri/ie-all.css > 2010-11-17 07:43:03 UTC (rev 32927) > +++ platform/skins/trunk/colibri/src/main/resources/colibri/ie-all.css > 2010-11-17 07:52:49 UTC (rev 32928) > @@ -1,3 +1,4 @@ > +#template('colorThemeInit.vm') > body { > behavior: url("$xwiki.getSkinFile('/htc/csshover3.htc')"); > } > @@ -7,7 +8,7 @@ > } > > #docextrapanes { > - *display: inline-block; > + display: inline-block; > } > > .minwidth, .minwidthb, .minwidthc, .minwidthd { > @@ -29,7 +30,7 @@ > > .xwikiintracontent legend { > margin: -5px 0 5px 0; > - *margin: 5px 0 10px -7px; > + margin: 5px 0 10px -7px; > } > > #commentscontent #AddComment .commentcontainer label { > @@ -37,7 +38,7 @@ > } > > input.button { > - *padding: 0 0 1px; > + padding: 0 0 1px; > } > > fieldset.xwikimessage { > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

14 years, 10 months

4
8
0 0

[xwiki-devs] maven error when trying to write my own component

by Mark Wallace

Hi all, It's my first time trying to develop my own component per this page: http://platform.xwiki.org/xwiki/bin/view/DevGuide/WritingComponents I ran the maven create component steps as follows: C:\dev\xwiki\xwiki-enterprise-2.5-rc-1> mvn install:install-file -Dfile="C:/Downloads/xwiki-archetype-component-1.0-SNAPSHOT.jar" -DartifactId=xwiki-archetype-component -DgroupId=com.xpn.xwiki.platform.tools -Dversion=1.0-SNAPSHOT -Dpackaging=jar . . . C:\dev\xwiki\xwiki-enterprise-2.5-rc-1>mvn archetype:generate -DarchetypeGroupId=com.xpn.xwiki.platform.tools -DarchetypeArtifactId=xwiki-archetype-component -DarchetypeVersion=1.0-SNAPSHOT -DgroupId=com.modusoperandi.xwiki.extentions -DartifactId=xwiki-marktest -Dpackage=com.modusoperandi.xwiki.ext -Dversion=0.1 -Dpackaging=jar . . . Now I have an xwiki-marktest project. Had to comment out the "1.8-SNAPSHOT" property value, making my pom.xml look like this: C:\dev\xwiki\xwiki-enterprise-2.5-rc-1\xwiki-marktest> type pom.xml <?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> <parent> <artifactId>xwiki-enterprise-parent</artifactId> <groupId>com.xpn.xwiki.products</groupId> <version>2.5-rc-1</version> </parent> <groupId>com.modusoperandi.xwiki.extentions</groupId> <artifactId>xwiki-marktest</artifactId> <version>0.1</version> <properties>  </properties> <dependencies> <dependency> <groupId>org.xwiki.platform</groupId> <artifactId>xwiki-core-component</artifactId> <version>${platform.core.version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> <scope>test</scope> </dependency>  </dependencies> </project> But when I try to compile I get the "Failure to find..." error shown below. C:\dev\xwiki\xwiki-enterprise-2.5-rc-1\xwiki-marktest>mvn compile [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building xwiki-marktest 0.1 [INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 0.188s [INFO] Finished at: Fri Nov 12 16:24:05 EST 2010 [INFO] Final Memory: 2M/254M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal on project xwiki-marktest: Could not resolve dependencies for project com.modusoperandi.xwiki.extentions:xwiki-marktest:jar:0.1: Failure to find org.xwiki.platform:xwiki-core-component:jar:2.5-rc-1 in http://maven.xwiki.org/externals was cached in the local repository, resolution will not be reattempted until the update interval of xwiki-externals has elapsed or updates are forced -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/DependencyResolutionExcept… C:\dev\xwiki\xwiki-enterprise-2.5-rc-1\xwiki-marktest> What do I do now?? Any help would be greatly appreciated. -Mark

14 years, 10 months

5
8
0 0

[xwiki-devs] [VOTE] Release Cycles (a.k.a Major Releases)

by Vincent Massol

Hi committers, I've started a thread recently on this list about the Roadmap leading to the 3.0 release. The outcome of this thread is that we need a global strategy for our major releases (e.g. the "2" in the "2.N" releases). First here's the rationale for doing major releases: * It's a way to mark progress to the outside world and to be able to do open source marketing * It's a milestone in the project's life and it feels good to do it. It makes us developers feel proud of our achievements too. * It allows us to move forward since it's a good time to think back about what the xwiki project is and where it wants to go I've tried to capture all arguments from the past discussion to come up with a Release Cycle strategy that take them into account without changing our core values which is to do timeboxing (rather than featuritis). So here goes the proposal: 1) Introduce the notion of "Release Cycle". - A release cycle means all the release of the type X.N where X is the major and represent the cycle (and N is a non constrained number 0 <= N < infinity) - Duration: 6 minor releases (e.g. 2.0 till 2.5). That's approximatively 1 year since each minor release is about 2.5 months. <fun>For the geeks in us, six is a unitary perfect number, a harmonic divisor number and a highly composite number (see http://en.wikipedia.org/wiki/6_(number)).</fun> 2) When we release the last minor of the cycle we announce it: - Send mail mentioning that the cycle is over and that version X.N is the last minor release of that cycle (but there can still be bugfix releases: X.N.P) - In that mail, explain all the major features that were implemented during that release cycle (make a special Release Notes for a Cycle) Advantages: * Users are satisfied since it means X.0 is the first release of a cycle (this was one of the major comment in our past discussion thread) * For developers, we have a notion of "work done", ie when a cycle is over. * We have 2 points of communication: ** When a cycle is finished (with the last minor release of the cycle) ** When a new cycle begins (to describe the rough directions of the new cycle and internally to decide where the project is heading) Note: The rule about 6 minor releases is really important for several reasons: * It implements timeboxing our core tenet regarding releases * It allows us to not have to rediscuss when is the major going to happen every time * It allows us to know well in advance when the major release is going to happen and thus to adjust our commits during the whole cycle * It prevents featuritis Note 2: Having rule doesn't mean we'll never have good reasons to do things differently. It may happen that from time to time we need one more release for a cycle for example but this will be treated as an exception and will need to be justified. What's important is to have defined rules in order to give a stable rythm to the dev process. Here's my +1. Thanks -Vincent

14 years, 10 months

10
10
0 0

[xwiki-devs] Using XInclude for parsing XAR documents?

by Paul Libbrecht

Hello fellow developers, in order for the current source file to be a real source file outside of the XML of the xar, e.g. a .properties, a .vm, a .groovy, it would be enough to enable XInclude on the parser that reads the XML document. Which source should I look into? Also, where for xwiki 1.5? thanks in advance paul

14 years, 10 months

3
2
0 0

[xwiki-devs] [ANN] XWiki Enterprise 2.6 RC2 Released

by Vincent Massol

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.6 RC2. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download Changes from 2.5: • Revamped Recent Activity Dashboard, which is now called Activity Stream • Share page by mail feature • Icon/Emoticon Support • Auto linking of WikiWords • New Recent Activity Macro For more information see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise26RC2 Thanks -The XWiki dev team

14 years, 10 months

2
1
0 0

[xwiki-devs] [VOTE] Make XE 2.7 the last minor release of the 2.x cycle

by Vincent Massol

Hi devs, Now that we've agreed to have major release cycles we need to define what we do for the current cycle (see http://dev.xwiki.org/xwiki/bin/view/Community/DevelopmentPractices#HRelease…). I'm proposing here to make XE 2.7 the last minor release of the 2.x cycle. Here's my +1 Thanks -Vincent

14 years, 10 months

4
9
0 0

[xwiki-devs] [Test] XE 2.6 RC2 Ready for testing

by Vincent Massol

Hi guys, If you can please test XE 2.6 RC2: http://maven.xwiki.org/releases/org/xwiki/enterprise/ Once I get a few confirmations that it works well, I'll finish the release and publish it. Thanks for your help! -Vincent Acting Release Manager for XE 2.6 RC2

14 years, 10 months

5
5
0 0

[xwiki-devs] [Proposal] Add xwiki-archetype-component module in tools

by Vincent Massol

Hi, I'm planning to add a xwiki-archetype-component module in tools, in the same manner that we have a xwiki-archetype-macro module. Thanks -Vincent

14 years, 10 months

5
4
0 0

[xwiki-devs] Activity Stream and Events refactoring

by Stefan abageru

Hi devs ! I thought about adding some changes in Events and Activity Stream. First of all, I want to remove all the listeners from Activity Stream and make this class listen to AllEvent, making it capable of cathcing all events that occur in the wiki (and this way, when adding a new event, you wouldn't need any modifications to this class in order to catch it). Secondly, I would like to modify onEvent function in the class so that it uses the simpleClassName of the event occurred in order to log the event (the eventType would be this simpleClassName...for example DocumentSavedEvent, AnnotationAddedEvent and so on). And thirdly i thought about adding one field in AbstractFilterableEvent called /identifier/ and make all events extend directly this class. And that /identifier/ would be used in a different way by the events themselves. But it would be used to retrieve infos about that events. And so, when logging an event, we could use classname + identifier. For example AnnotationAddedEvent + "This is my annotation" . CommentAddedEvent + "This is my comment" or the number of the comment. WDYT ? Stefan

14 years, 10 months

5
16
0 0

Re: [xwiki-devs] [xwiki-notifications] r32790 - platform/skins/trunk/colibri

by Sergiu Dumitriu

On 11/12/2010 08:04 PM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-11-12 20:04:15 +0100 (Fri, 12 Nov 2010) > New Revision: 32790 > > Modified: > platform/skins/trunk/colibri/pom.xml > Log: > Continue work after 1.25 release > > > Modified: platform/skins/trunk/colibri/pom.xml > =================================================================== > --- platform/skins/trunk/colibri/pom.xml 2010-11-12 18:53:53 UTC (rev 32789) > +++ platform/skins/trunk/colibri/pom.xml 2010-11-12 19:04:15 UTC (rev 32790) > @@ -27,7 +27,7 @@ > <parent> > <groupId>org.xwiki.platform.skins</groupId> > <artifactId>xwiki-skins</artifactId> > -<version>26</version> > +<version>27-SNAPSHOT</version> > </parent> > <artifactId>xwiki-skin-colibri</artifactId> > <name>XWiki Platform - Skins - Colibri</name> > @@ -42,7 +42,7 @@ > <dependency> > <groupId>org.xwiki.platform.skins</groupId> > <artifactId>xwiki-skin-albatross</artifactId> > -<version>1.30</version> > +<version>1.31-SNAPSHOT</version> I think you can leave 1.30 for the moment, since Albatross is not expected to be updated in the future (it was voted as unmaintained). > <type>zip</type> > <scope>runtime</scope> > </dependency> -- Sergiu Dumitriu http://purl.org/net/sergiu/

14 years, 10 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r32479 - in platform: web/trunk/standard/src/main/webapp/resources/js/xwiki web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets web/trunk/s

by Jerome Velociter

On Fri, Nov 12, 2010 at 4:29 PM, Ecaterina Moraru (Valica) <valicac(a)gmail.com> wrote: > On Thu, Nov 4, 2010 at 18:34, jvelociter > <platform-notifications(a)xwiki.org>wrote: > >> Author: jvelociter >> Date: 2010-11-04 17:34:35 +0100 (Thu, 04 Nov 2010) >> New Revision: 32479 >> >> Added: >> >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/ >> >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js >> Modified: >> >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css >> >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js >> >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js >> >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js >> platform/web/trunk/standard/src/main/webapp/templates/javascript.vm >> platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm >> >> platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml >> >> platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml >> Log: >> XWIKI-5648 New visual design for the AJAX suggest module >> XWIKI-5649 CSS classes to support automatic users and groups suggestions on >> field input >> XWIKI-3655 Clean the JS code of the ajax suggest - Continued work >> XWIKI-5105 When several suggest are used on the same page, suggests results >> interfer from one field to another - Fixed >> >> + some formatting on xwiki.js >> >> >> >> Modified: >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css >> =================================================================== >> --- >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -1,167 +1,60 @@ >> -body >> -{ >> - position: relative; >> -} >> +#template('colorThemeInit.vm') >> >> -div.ajaxsuggest >> -{ >> - position: absolute; >> - background-image: url(suggest_img/as_pointer.gif); >> - background-position: top; >> - background-repeat: no-repeat; >> - padding: 10px 0 0 0; >> -z-index: 100013; >> +.xhover { >> + background:red; >> } >> >> -div.ajaxsuggest div.as_header, >> -div.ajaxsuggest div.as_footer >> -{ >> - position: relative; >> - height: 6px; >> - padding: 0 6px; >> - background-image: url(suggest_img/ul_corner_tr.gif); >> - background-position: top right; >> - background-repeat: no-repeat; >> - overflow: hidden; >> +input[type="text"].suggest { >> + border-width: 1px; >> } >> -div.ajaxsuggest div.as_footer >> -{ >> - background-image: url(suggest_img/ul_corner_br.gif); >> -} >> >> -div.ajaxsuggest div.as_header div.as_corner, >> -div.ajaxsuggest div.as_footer div.as_corner >> -{ >> - position: absolute; >> - top: 0; >> - left: 0; >> - height: 6px; >> - width: 6px; >> - background-image: url(suggest_img/ul_corner_tl.gif); >> - background-position: top left; >> - background-repeat: no-repeat; >> -} >> -div.ajaxsuggest div.as_footer div.as_corner >> -{ >> - background-image: url(suggest_img/ul_corner_bl.gif); >> -} >> -div.ajaxsuggest div.as_header div.as_bar, >> -div.ajaxsuggest div.as_footer div.as_bar >> -{ >> - height: 6px; >> - overflow: hidden; >> - background-color: #333; >> -} >> - >> - >> -div.ajaxsuggest ul >> -{ >> - list-style: none; >> - margin: 0 0 -4px 0; >> - padding: 0; >> - overflow: hidden; >> - background-color: #333; >> -} >> - >> -div.ajaxsuggest ul li >> -{ >> - color: #ccc; >> - padding: 0; >> - margin: 0 4px 4px; >> - text-align: left; >> -} >> - >> -div.ajaxsuggest ul li a >> -{ >> - color: #ccc; >> - display: block; >> - text-decoration: none; >> - background-color: transparent; >> +body { >> position: relative; >> - padding: 0; >> - width: 100%; >> } >> -div.ajaxsuggest ul li a:hover >> -{ >> - background-color: #444; >> -} >> -div.ajaxsuggest ul li.as_highlight a:hover >> -{ >> - background-color: #1B5CCD; >> -} >> >> -div.ajaxsuggest ul li a span >> -{ >> - display: block; >> - padding: 3px 6px; >> - font-weight: bold; >> +div.suggestItems { >> + position:absolute; >> + border: 1px solid $theme.borderColor; >> + border-top: none; >> + background: white; /* theme color ? */ >> + z-index: 100013; >> + text-align:left; >> } >> >> -div.ajaxsuggest ul li a span small >> -{ >> - font-weight: normal; >> - color: #fff; >> +div.suggestItems ul { >> + margin: 0px; >> } >> >> -div.ajaxsuggest ul li.as_highlight a span small >> -{ >> - color: #ccc; >> +ul.suggestList { >> + margin:0px !important; >> + text-transform:none; >> + color:$theme.textColor; >> + font-weight:normal; >> } >> >> -div.ajaxsuggest ul li.as_highlight a >> -{ >> - color: #fff; >> - background-color: #1B5CCD; >> - background-image: url(suggest_img/hl_corner_br.gif); >> - background-position: bottom right; >> - background-repeat: no-repeat; >> +ul.suggestList .xhighlight { >> + background-color: $theme.highlightColor; >> } >> >> -div.ajaxsuggest ul li.as_highlight a span >> -{ >> - background-image: url(suggest_img/hl_corner_bl.gif); >> - background-position: bottom left; >> - background-repeat: no-repeat; >> +div.suggestItemName { >> + text-indent: 0; >> } >> >> -div.ajaxsuggest ul li a .tl, >> -div.ajaxsuggest ul li a .tr >> -{ >> - background-repeat: no-repeat; >> - width: 6px; >> - height: 6px; >> - position: absolute; >> - top: 0; >> - padding: 0; >> - margin: 0; >> +div.suggestItemInfo { >> + color: #556677; >> + font-size: 0.8em; >> + padding-left: 20px; >> + text-indent: 0; >> } >> -div.ajaxsuggest ul li a .tr >> -{ >> - right: 0; >> -} >> >> -div.ajaxsuggest ul li.as_highlight a .tl >> -{ >> - left: 0; >> - background-image: url(suggest_img/hl_corner_tl.gif); >> - background-position: bottom left; >> +div.suggestItemName, >> +div.suggestItemInfo { >> + text-decoration: inherit; >> } >> >> -div.ajaxsuggest ul li.as_highlight a .tr >> -{ >> - right: 0; >> - background-image: url(suggest_img/hl_corner_tr.gif); >> - background-position: bottom right; >> +.highlight { >> + background-color: $theme.highlightColor; >> + font-weight:bold; >> + text-decoration: inherit; >> } >> >> -div.ajaxsuggest ul em >> -{ >> - font-style: normal; >> - color: #6EADE7; >> -} >> - >> -div.ajaxsuggest ul li.as_warning >> -{ >> - font-weight: bold; >> - text-align: center; >> -} >> >> Modified: >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js >> =================================================================== >> --- >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -2,6 +2,12 @@ >> >> var widgets = XWiki.widgets = XWiki.widgets || {}; >> >> + if (typeof widgets.XList == 'undefined') { >> + if (typeof console != "undefined" && typeof console.warn == "function") >> { >> + console.warn("[Suggest widget] Required class missing: >> XWiki.widgets.XList"); >> + } >> + } else { >> + >> /** >> * Suggest class. >> * Provide value suggestions to users when starting to type in a text >> input. >> @@ -18,7 +24,7 @@ >> className : "ajaxsuggest", >> timeout : 2500, >> delay : 500, >> - offsety : -5, >> + offsety : 0, >> // Display a "no results" message, or simply hide the suggest box when >> no suggestions are available >> shownoresults : true, >> // The message to display as the "no results" message >> @@ -26,6 +32,7 @@ >> maxheight : 250, >> cache : false, >> seps : "", >> + icon : null, >> // The name of the JSON variable or XML element holding the results. >> // "results" for the old suggest, "searchResults" for the REST search. >> resultsParameter : "results", >> @@ -59,8 +66,8 @@ >> return false; >> } >> >> - // parameters object >> - Object.extend(this.options, param || { }); >> + // Clone default options from the prototype so that they are not >> shared and extend options with passed parameters >> + this.options = Object.extend(Object.clone(this.options), param || { >> }); >> >> // Reset the container if the configured parameter is not valid >> if (!$(this.options.parentContainer)) { >> @@ -127,7 +134,7 @@ >> * value inside the target field, Escape closes the suggest dropdown, Up >> and Down move the current selection. >> */ >> onKeyPress: function(event) { >> - if(!$(this.idAs)) { >> + if(!$(this.suggest)) { >> // Let the key events pass through if the UI is not displayed >> return; >> } >> @@ -136,7 +143,7 @@ >> switch(key) { >> case Event.KEY_RETURN: >> if(this.aSuggestions.length == 1) { >> - this.setHighlight(1); >> + this.highlightFirst(); >> } >> this.setHighlightedValue(); >> Event.stop(event); >> @@ -234,7 +241,7 @@ >> requestHeaders: headers, >> onSuccess: this.setSuggestions.bindAsEventListener(this), >> onFailure: function (response) { >> - alert("AJAX error: " + response.statusText); >> + new XWiki.widgets.Notification("Failed to retrieve suggestions : >> ')" + response.statusText, "error", {timeout: 5}); >> } >> }); >> }, >> @@ -281,8 +288,6 @@ >> } >> >> } >> - >> - this.idAs = "as_"+this.fld.id; >> this.createList(this.aSuggestions); >> }, >> >> @@ -298,8 +303,8 @@ >> // get rid of old list >> // and clear the list removal timeout >> // >> - if ($(this.idAs)) { >> - $(this.idAs).remove(); >> + if (this.suggest && this.suggest.parentNode) { >> + this.suggest.remove(); >> } >> this.killTimeout(); >> >> @@ -309,69 +314,46 @@ >> >> // create holding div >> // >> - var div = new Element("div", { >> - id: this.idAs, >> - className: this.options.className >> + var div = new Element("div", { 'class': "suggestItems "+ >> this.options.className }); >> + >> + // create and populate list >> + var list = new XWiki.widgets.XList([], { >> + icon: this.options.icon, >> + classes: 'suggestList', >> + eventListeners: { >> + 'click' : function () { pointer.setHighlightedValue(); return >> false; }, >> + 'mouseover' : function () { pointer.setHighlight( >> this.getElement() ); } >> + } >> }); >> >> - var hcorner = new Element("div", {className: "as_corner"}); >> - var hbar = new Element("div", {className: "as_bar"}); >> - var header = new Element("div", {className: "as_header"}); >> - header.appendChild(hcorner); >> - header.appendChild(hbar); >> - div.appendChild(header); >> - >> - // create and populate ul >> - var ul = new Element("ul", {id: "as_ul"}); >> - >> // loop throught arr of suggestions >> - // creating an LI element for each suggestion >> + // creating an XlistItem for each suggestion >> // >> for (var i=0;i<arr.length;i++) >> { >> // format output with the input enclosed in a EM element >> // (as HTML, not DOM) >> // >> - var val = arr[i].value; >> - var st = val.toLowerCase().indexOf( this.sInput.toLowerCase() ); >> - var output = val.substring(0,st) + "<em>" + val.substring(st, >> st+this.sInput.length) + "</em>" + val.substring(st+this.sInput.length); >> - >> + var val = arr[i].value, st = val.toLowerCase().indexOf( >> this.sInput.toLowerCase() ); >> + var output = val.substring(0,st) + "<span class='highlight'>" + >> val.substring(st, st+this.sInput.length) + "</span>" + >> val.substring(st+this.sInput.length); >> var span = new Element("span").update(output); >> >> - var a = new Element("a", {href: "#"}); >> + var item = new XWiki.widgets.XListItem( span , { >> + containerClasses: 'suggestItem', >> + value: arr[i].value, >> + noHighlight: true // we do the highlighting ourselves >> + }); >> >> - var tl = new Element("span", {className:"tl"}).update(" "); >> - var tr = new Element("span", {className:"tr"}).update(" "); >> - a.appendChild(tl); >> - a.appendChild(tr); >> - >> - a.appendChild(span); >> - >> - a.name = i+1; >> - a.onclick = function () { pointer.setHighlightedValue(); return >> false; } >> - a.onmouseover = function () { pointer.setHighlight(this.name); } >> - >> - var li = new Element("li").update(a); >> - >> - ul.appendChild( li ); >> + list.addItem(item); >> } >> >> // no results >> if (arr.length == 0) >> { >> - var li = new Element("li", >> {className:"as_warning"}).update(this.options.noresults); >> - >> - ul.appendChild( li ); >> + list.addItem( new XWiki.widgets.XListItem(this.options.noresults, >> {'classes' : 'noSuggestion'})) >> } >> - div.appendChild( ul ); >> + div.appendChild( list.getElement() ); >> >> - var fcorner = new Element("div", {className: "as_corner"}); >> - var fbar = new Element("div", {className: "as_bar"}); >> - var footer = new Element("div", {className: "as_footer"}); >> - footer.appendChild(fcorner); >> - footer.appendChild(fbar); >> - div.appendChild(footer); >> - >> // get position of target textfield >> // position holding div below it >> // set width of holding div to width of field >> @@ -388,7 +370,8 @@ >> div.onmouseout = function(){ pointer.resetTimeout() } >> >> // add DIV to document >> - $(this.options.parentContainer).appendChild(div); >> + $(this.options.parentContainer).insert(div); >> + this.suggest = div; >> >> // currently no item is highlighted >> this.iHighlighted = 0; >> @@ -405,23 +388,30 @@ >> */ >> changeHighlight: function(key) >> { >> - var list = $("as_ul"); >> + var list = this.suggest.down('ul'); >> if (!list) >> return false; >> >> var n; >> >> - if (key == 40) >> - n = this.iHighlighted + 1; >> - else if (key == 38) >> - n = this.iHighlighted - 1; >> + if (this.iHighlighted) { >> + if (key == 40) >> + elem = this.iHighlighted.next(); >> + else if (key == 38) >> + elem = this.iHighlighted.previous(); >> + } >> + else { >> + if (key == 40) >> + elem = list.down('li'); >> + else if (key == 38) >> + if (list.select('li') > 0) { >> + elem = list.select('li')[list.select('li').length]; >> + } >> + } >> >> - if (n > list.childNodes.length) >> - n = list.childNodes.length; >> - if (n < 1) >> - n = 1; >> - >> - this.setHighlight(n); >> + if (typeof elem != 'undefined') { >> + this.setHighlight(elem); >> + } >> }, >> >> /** >> @@ -429,18 +419,14 @@ >> * >> * @param {Object} n >> */ >> - setHighlight: function(n) >> + setHighlight: function(highlightedItem) >> { >> - var list = $("as_ul"); >> - if (!list) >> - return false; >> - >> - if (this.iHighlighted > 0) >> + if (this.iHighlighted) >> this.clearHighlight(); >> >> - this.iHighlighted = Number(n); >> + highlightedItem.addClassName("xhighlight"); >> >> - list.childNodes[this.iHighlighted-1].className = "as_highlight"; >> + this.iHighlighted = highlightedItem; >> >> this.killTimeout(); >> }, >> @@ -450,14 +436,19 @@ >> */ >> clearHighlight: function() >> { >> - var list = $("as_ul"); >> - if (!list) >> - return false; >> + if (this.iHighlighted) { >> + this.iHighlighted.removeClassName("xhighlight"); >> + delete this.iHighlighted; >> + } >> + }, >> >> - if (this.iHighlighted > 0) >> - { >> - list.childNodes[this.iHighlighted-1].className = ""; >> - this.iHighlighted = 0; >> + highlightFirst: function() >> + { >> + if (this.suggest && this.suggest.down('ul')) { >> + var first = this.suggest.down('ul').down('li'); >> + if (first) { >> + this.setHighlight(first); >> + } >> } >> }, >> >> @@ -466,7 +457,7 @@ >> if (this.iHighlighted) >> { >> if(this.sInput == "" && this.fld.value == "") >> - this.sInput = this.fld.value = this.aSuggestions[ >> this.iHighlighted-1 ].value; >> + this.sInput = this.fld.value = >> this.iHighlighted.down(".value").innerHTML; >> else { >> if(this.seps) { >> var lastIndx = -1; >> @@ -474,15 +465,15 @@ >> if(this.fld.value.lastIndexOf(this.seps.charAt(i)) > lastIndx) >> lastIndx = this.fld.value.lastIndexOf(this.seps.charAt(i)); >> if(lastIndx == -1) >> - this.sInput = this.fld.value = this.aSuggestions[ >> this.iHighlighted-1 ].value; >> + this.sInput = this.fld.value = >> this.iHighlighted.down(".value").innerHTML; >> else >> { >> - this.fld.value = this.fld.value.substring(0, lastIndx+1) + >> this.aSuggestions[ this.iHighlighted-1 ].value; >> + this.fld.value = this.fld.value.substring(0, lastIndx+1) + >> this.iHighlighted.down(".value").innerHTML; >> this.sInput = this.fld.value.substring(lastIndx+1); >> } >> } >> else >> - this.sInput = this.fld.value = this.aSuggestions[ >> this.iHighlighted-1 ].value; >> + this.sInput = this.fld.value = >> this.iHighlighted.down(".value").innerHTML; >> } >> >> Event.fire(this.fld, "xwiki:suggest:selected"); >> @@ -537,12 +528,13 @@ >> */ >> clearSuggestions: function() { >> this.killTimeout(); >> - var ele = $(this.idAs); >> + var ele = $(this.suggest); >> var pointer = this; >> if (ele) { >> var fade = new Effect.Fade(ele, {duration: "0.25", afterFinish : >> function() { >> - if($(pointer.idAs)) { >> - $(pointer.idAs).remove(); >> + if($(pointer.suggest)) { >> + $(pointer.suggest).remove(); >> + delete pointer.suggest; >> } >> }}); >> } >> @@ -550,6 +542,8 @@ >> >> }); >> >> + } >> + >> return XWiki; >> >> })(XWiki || {}); >> >> Modified: >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js >> =================================================================== >> --- >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -57,6 +57,7 @@ >> // Prefixed with & since the current (as of 1.7) Suggest code does >> not automatically append it. >> varname: "q", >> noresults: "Document not found", >> + icon: "${xwiki.getSkinFile('icons/silk/page_white_text.gif')}", >> json: true, >> resultsParameter : "searchResults", >> resultId : "id", >> >> Modified: >> platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js >> =================================================================== >> --- platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -537,55 +537,55 @@ >> }, >> >> cookies: { >> - /** >> - * Create a cookie, with or without expiration date. >> - * >> - * @param name Name of the cookie. >> - * @param value Value of the cookie. >> - * @param days Days to keep the cookie (can be null). >> - * @return >> - */ >> - create: function(name,value,days) { >> - if (days) { >> - var date = new Date(); >> - date.setTime(date.getTime()+(days*24*60*60*1000)); >> - var expires = "; expires="+date.toGMTString(); >> - } >> - else var expires = ""; >> - document.cookie = name+"="+value+expires+"; path=/"; >> - }, >> + /** >> + * Create a cookie, with or without expiration date. >> + * >> + * @param name Name of the cookie. >> + * @param value Value of the cookie. >> + * @param days Days to keep the cookie (can be null). >> + * @return >> + */ >> + create: function(name,value,days) { >> + if (days) { >> + var date = new Date(); >> + date.setTime(date.getTime()+(days*24*60*60*1000)); >> + var expires = "; expires="+date.toGMTString(); >> + } >> + else var expires = ""; >> + document.cookie = name+"="+value+expires+"; path=/"; >> + }, >> >> - /** >> - * Read a cookie. >> - * >> - * @param name Name of the cookie. >> - * @return Value for the given cookie. >> - */ >> - read:function(name) { >> - var nameEQ = name + "="; >> - var ca = document.cookie.split(';'); >> - for(var i=0;i < ca.length;i++) { >> - var c = ca[i]; >> - while (c.charAt(0)==' ') { >> - c = c.substring(1,c.length); >> - } >> - if (c.indexOf(nameEQ) == 0) { >> - return c.substring(nameEQ.length,c.length); >> - } >> - } >> - return null; >> - }, >> + /** >> + * Read a cookie. >> + * >> + * @param name Name of the cookie. >> + * @return Value for the given cookie. >> + */ >> + read:function(name) { >> + var nameEQ = name + "="; >> + var ca = document.cookie.split(';'); >> + for(var i=0;i < ca.length;i++) { >> + var c = ca[i]; >> + while (c.charAt(0)==' ') { >> + c = c.substring(1,c.length); >> + } >> + if (c.indexOf(nameEQ) == 0) { >> + return c.substring(nameEQ.length,c.length); >> + } >> + } >> + return null; >> + }, >> >> - /** >> - * Erase a cookie. >> - * >> - * @param name Name of the cookie to erase. >> - * @return >> - */ >> - erase:function(name) { >> - XWiki.cookies.create(name,"",-1); >> - } >> - >> + /** >> + * Erase a cookie. >> + * >> + * @param name Name of the cookie to erase. >> + * @return >> + */ >> + erase:function(name) { >> + XWiki.cookies.create(name,"",-1); >> + } >> + >> }, >> >> /** >> @@ -1337,27 +1337,57 @@ >> /** >> * Small JS improvement, which suggests document names (doc.fullName) when >> typing in an input. >> * >> - * To activate this behavior on an input elements, add the >> "suggestDocuments" classname to it. >> + * To activate this behavior on an input elements, add one of the >> following classname to it : >> + * <ul> >> + * <li><tt>suggestDocuments</tt> to suggest from any available >> document</li> >> + * <li><tt>suggestUsers</tt> to suggest from documents that contains user >> objects</li> >> + * <li><tt>suggestGroups</tt> to suggest from documents that contains >> group objects</li> >> + * </ul> >> */ >> document.observe('xwiki:dom:loaded', function() { >> - if (typeof(XWiki.widgets.Suggest) != "undefined") { >> - $$("input.suggestDocuments").each(function(item) { >> - // Create the Suggest. >> - new XWiki.widgets.Suggest(item, { >> - // This document also provides the suggestions. >> - script: >> XWiki.Document.getRestSearchURL("scope=name&number=10&media=json&"), >> - varname: "q", >> - noresults: "Document not found", >> - json: true, >> - resultsParameter : "searchResults", >> - resultId : "id", >> - resultValue : "pageFullName", >> - resultInfo : "pageFullName", >> - timeout : 30000, >> - parentContainer : item.up() >> - }); >> - }); >> - } >> + var suggestionsMapping = { >> + "documents" : { >> + script: >> XWiki.Document.getRestSearchURL("scope=name&number=10&media=json&"), >> + varname: "q", >> + icon: "$xwiki.getSkinFile('icons/silk/page_white_text.gif')", >> + noresults: "Document not found", >> + json: true, >> + resultsParameter : "searchResults", >> + resultId : "id", >> + resultValue : "pageFullName", >> + resultInfo : "pageFullName" >> + }, >> + "users" : { >> + script: XWiki.currentDocument.getURL('get', >> 'xpage=uorgsuggest&classname=XWiki.XWikiUsers&wiki=local&uorg=user&'), >> + varname: "input", >> + icon: "$xwiki.getSkinFile('icons/silk/user.gif')", >> + noresults: "User not found", >> + }, >> + "groups" : { >> + script: XWiki.currentDocument.getURL('get', >> 'xpage=uorgsuggest&classname=XWiki.XWikiGroups&wiki=local&uorg=group&'), >> + varname: "input", >> + icon: "$xwiki.getSkinFile('icons/silk/group.gif')", >> + noresults: "Group not found", >> + } >> + }; >> + if (typeof(XWiki.widgets.Suggest) != "undefined") { >> + var keys = Object.keys(suggestionsMapping); >> + for (var i=0;i<keys.length;i++) { >> + var selector = 'input.suggest' + keys[i].capitalize(); >> + $$(selector).each(function(item) { >> + if (!item.hasClassName('initialized')) { >> + var options = { >> + timeout : 30000, >> + parentContainer : item.up() >> + }; >> + Object.extend(options, suggestionsMapping[keys[i]]); >> + // Create the Suggest. >> + var suggest = new XWiki.widgets.Suggest(item, options); >> + item.addClassName('initialized'); >> + } >> + }); >> + } >> + } >> }); >> >> /** >> >> Modified: >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js >> =================================================================== >> --- >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -157,7 +157,8 @@ >> script: "${xwiki.getURL('Main.WebHome', 'view', >> 'xpage=suggest&classname=XWiki.TagClass&fieldname=tags&firCol=-&secCol=-')}&", >> varname: 'input', >> seps: >> "${xwiki.getDocument('XWiki.TagClass').xWikiClass.tags.getProperty('separators').value}", >> - shownoresults : false >> + shownoresults : false, >> + icon: "${xwiki.getSkinFile('icons/silk/tag_yellow.gif')}" >> }); >> } >> }); >> >> Added: >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js >> =================================================================== >> --- >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js >> (rev 0) >> +++ >> platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -0,0 +1,126 @@ >> +/** >> + * Usage : >> + * >> + * var xlist = new XWiki.widgets.XList( >> + * [ // array of initial list elements (or just content it works too >> + * new XWiki.widgets.XListItem( "A first element" ), >> + * new XWiki.widgets.XListItem( "A second element", {'value' : >> '10'} ), >> + * "A third item passed as string content", >> + * new Element("blink").update('An hip-hop item passed as DOM >> element') >> + * ], >> + * { // options >> + * numbered: false, >> + * icon: "$xwiki.getSkinFile('icons/silk/sport_basketball.gif')", >> + * classes : "myListExtraClass", >> + * itemClasses : "myListItemExtraClasses", >> + * eventListeners : { >> + * // Event listeners defined for each of this list items. >> + * // listeners call backs are bound to the list item object >> (XWiki.widgets.XListItem) from which they emerge >> + * 'click' : function() { console.log('clicked !', this); }, >> + * 'mouseover' : function() { console.log('mouse over !', this); >> } >> + * } >> + * }); >> + * >> + * $('insertionNode').insert( xlist.getElement() ); >> + * >> + * xlist.addItem( >> + * new XWiki.widgets.XListItem('A fifth element added later', { >> + * icon : "$xwiki.getSkinFile('icons/silk/bomb.gif')", // this >> overrides the one defined for the whole list >> + * eventListeners: { >> + * // Event listeners defined just for this specific list item >> + * 'mouseout' : function() { console.log('just this list item is >> bound to this event', this); } >> + * } >> + * }) >> + * ); >> + * >> + */ >> + >> +var XWiki = function(XWiki){ >> + >> + var widgets = XWiki.widgets = XWiki.widgets || {}; >> + >> + widgets.XList = Class.create({ >> + initialize: function(items, options) { >> + this.items = items || []; >> + this.options = options || {} >> + this.listElement = new Element(this.options.ordered ? "ol" : >> "ul", { >> + 'class' : 'xlist' + (this.options.classes ? (' ' + >> this.options.classes) : ''), >> + }); >> + if (this.items && this.items.length > 0) { >> + for (var i=0;i<this.items.length;i++) { >> + this.addItem(this.items[i]); >> + } >> + } >> + }, >> + addItem: function(item){ /* future: position (top, N) */ >> + if (!item || !(item instanceof XWiki.widgets.XListItem)) { >> + item = new XWiki.widgets.XListItem(item); >> + } >> + var listItemElement = item.getElement(); >> + if (this.options.itemClasses && >> !this.options.itemClasses.blank()) { >> + listItemElement.addClassName(this.options.itemClasses); >> + } >> + this.listElement.insert(listItemElement); >> + if (typeof this.options.eventListeners == 'object') { >> + item.bindEventListeners(this.options.eventListeners); >> + } >> + if (this.options.icon && !this.options.icon.blank()) { >> + item.setIcon(this.options.icon, >> this.options.overrideItemIcon); >> + } >> + item.list = this; // associate list item to this XList >> + }, >> + getElement: function() { >> + return this.listElement; >> + } >> + }); >> + >> + widgets.XListItem = Class.create({ >> + initialize: function(content, options) { >> + this.options = options || {}; >> + var classes = 'xitem' + (this.options.noHighlight ? '' : ' >> xhighlight'); >> + classes += this.options.classes ? this.options.classes: ''; >> + this.containerElement = new Element("div", {'class': >> 'xitemcontainer'}).insert(content || ''); >> + this.containerElement.addClassName(this.options.containerClasses >> || ''); >> + this.containerElement.setStyle({textIndent: '0px'}); >> + if (this.options.value) { >> + this.containerElement.insert(new Element('div', >> {'class':'hidden value'}).insert(this.options.value)); >> + } >> + this.listItemElement = new Element("li", {'class' : >> classes}).update( this.containerElement ); >> + if (this.options.icon && !this.options.icon.blank()) { >> + this.setIcon(this.options.icon); >> + this.hasIcon = true; >> + } >> + if (typeof this.options.eventListeners == 'object') { >> + this.bindEventListeners(this.options.eventListeners); >> + } >> + }, >> + getElement: function() { >> + return this.listItemElement; >> + }, >> + setIcon: function(icon, override) { >> + if (!this.hasIcon || override) { >> + this.iconImage = new Image(); >> + this.iconImage.onload = function(){ >> + this.listItemElement.setStyle({ >> + backgroundImage: "url(" + this.iconImage.src + ")", >> + backgroundRepeat: 'no-repeat', >> + }); >> + this.listItemElement.down(".xitemcontainer").setStyle({ >> + textIndent:(this.iconImage.width + 5) + 'px', >> + height: this.iconImage.height + 'px' >> + }); >> > > We need to make some standard classes for those types of icons: page, tags, > groups, etc and use those classes instead (search, suggest, activity, trees, > etc) > Not so nice that the image is put in style, is gonna break the wcag. Also, > for this type of images (like the one in action menu) we have a > background-position: 0 3px. We already have a class option for xitem, that we could use for suggestGroups, suggestUsers, etc. classes, but still this "icon" is valid in my opinion, not all developers will want to define classes for everything (for example your icon name could be retrieved dynamically, etc.) Does the WCAG validate dynamic DOM changes like suggest ? Jerome. > > Thanks, > Caty > > > >> + }.bind(this) >> + this.iconImage.src = icon; >> + } >> + }, >> + bindEventListeners: function(eventListeners) { >> + var events = Object.keys(eventListeners); >> + for (var i=0;i<events.length;i++) { >> + this.listItemElement.observe(events[i], >> eventListeners[events[i]].bind(this)); >> + } >> + }, >> + }); >> + >> + return XWiki; >> + >> +}(XWiki || {}); >> \ No newline at end of file >> >> Modified: >> platform/web/trunk/standard/src/main/webapp/templates/javascript.vm >> =================================================================== >> --- platform/web/trunk/standard/src/main/webapp/templates/javascript.vm >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ platform/web/trunk/standard/src/main/webapp/templates/javascript.vm >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -1,7 +1,7 @@ >> ## >> ## CSS files related to JS libraries. >> ## >> -<link href="$xwiki.getSkinFile("js/xwiki/suggest/ajaxSuggest.css")" >> rel="stylesheet" type="text/css" /> >> +<link href="$xwiki.getSkinFile("js/xwiki/suggest/ajaxSuggest.css", true)" >> rel="stylesheet" type="text/css" /> >> <link href="$xwiki.getSkinFile("js/xwiki/lightbox/lightbox.css", true)" >> rel="stylesheet" type="text/css" /> >> <!--[if IE]> >> <link href="$xwiki.getSkinFile("js/xwiki/lightbox/lightboxIE.css", true)" >> rel="stylesheet" type="text/css" /> >> @@ -19,9 +19,10 @@ >> $xwiki.jsfx.use('uicomponents/widgets/confirmedAjaxRequest.js', true) >> $xwiki.jsfx.use('uicomponents/widgets/notification.js', true) >> $xwiki.ssfx.use('uicomponents/widgets/notification.css', true) >> +$xwiki.jsfx.use('uicomponents/widgets/list/xlist.js') >> +$xwiki.jsfx.use('js/xwiki/suggest/ajaxSuggest.js') >> <script type="text/javascript" >> src="$xwiki.getSkinFile("js/prototype/prototype.js")"></script> >> <script type="text/javascript" >> src="$xwiki.getSkinFile("js/xwiki/xwiki.js", true)"></script> >> -<script type="text/javascript" >> src="$xwiki.getSkinFile("js/xwiki/suggest/ajaxSuggest.js")"></script> >> <script type="text/javascript"> >> // <![CDATA[ >> XWiki.webapppath = "${xwiki.webAppPath}"; >> >> Modified: platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm >> =================================================================== >> --- platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -93,7 +93,7 @@ >> #set($seps = >> $xwiki.getDocument("XWiki.TagClass").xWikiClass.tags.getProperty('separators').value) >> <dl> >> <dt><label for="tags">$msg.get("core.tagedit.title")</label></dt> >> - <dd><input type="text" id="tags" name="tags" onfocus="new >> XWiki.widgets.Suggest(this, {script:'$script', varname: 'input', >> seps:'$seps', offsety: 13} );" value="$!tdoc.tags"/></dd> >> + <dd><input type="text" id="tags" name="tags" onfocus="new >> XWiki.widgets.Suggest(this, {script:'$script', varname: 'input', >> seps:'$seps', offsety: 13, >> icon:'${xwiki.getSkinFile('icons/silk/tag_yellow.gif')}'"} );" >> value="$!tdoc.tags"/></dd> >> </dl> >> #end >> #end >> >> Modified: >> platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml >> =================================================================== >> --- >> platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ >> platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -11,15 +11,15 @@ >> <customClass></customClass> >> <contentAuthor>XWiki.Admin</contentAuthor> >> <creationDate>1242173909000</creationDate> >> -<date>1242173909000</date> >> -<contentUpdateDate>1242173909000</contentUpdateDate> >> +<date>1288812724000</date> >> +<contentUpdateDate>1288812724000</contentUpdateDate> >> <version>1.1</version> >> <title></title> >> <template></template> >> <defaultTemplate></defaultTemplate> >> <validationScript></validationScript> >> <comment></comment> >> -<minorEdit>false</minorEdit> >> +<minorEdit>true</minorEdit> >> <syntaxId>xwiki/2.0</syntaxId> >> <hidden>false</hidden> >> <object> >> @@ -159,10 +159,12 @@ >> >> if (uorg == "user") { >> suggesturl += "&uorg=user&"; >> + icon = "$xwiki.getSkinFile('icons/silk/user.gif')"; >> } else { >> suggesturl += "&uorg=group&"; >> + icon = "$xwiki.getSkinFile('icons/silk/group.gif')"; >> } >> - return new XWiki.widgets.Suggest(input, { script: suggesturl, >> varname:'input' }); >> + return new XWiki.widgets.Suggest(input, { script: suggesturl, >> varname:'input', icon:icon }); >> }, >> addNewMember: function(uorg, input) { >> if (input) { >> >> Modified: >> platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml >> =================================================================== >> --- >> platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml >> 2010-11-04 15:22:54 UTC (rev 32478) >> +++ >> platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml >> 2010-11-04 16:34:35 UTC (rev 32479) >> @@ -338,7 +338,8 @@ >> if (typeof(XWiki.widgets.Suggest) != "undefined") { >> new XWiki.widgets.Suggest(field, { >> script: "$suggestDoc.URL?xpage=plain&type=" + type + >> "&number=" + number + "&", >> - }); >> + icon: "$xwiki.getSkinFile('icons/silk/folder.gif')" >> + }); >> } >> } >> >> XWiki.officeImporter.addAutoSuggest(document.getElementById("targetSpaceInputId"), >> "spaces", 5); >> >> _______________________________________________ >> notifications mailing list >> notifications(a)xwiki.org >> http://lists.xwiki.org/mailman/listinfo/notifications >> > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs >

14 years, 10 months

2
2
0 0

Re: [xwiki-devs] [xwiki-notifications] r32479 - in platform: web/trunk/standard/src/main/webapp/resources/js/xwiki web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets web/trunk/standard/src/m

by Ecaterina Moraru (Valica)

On Thu, Nov 4, 2010 at 18:34, jvelociter <platform-notifications(a)xwiki.org>wrote: > Author: jvelociter > Date: 2010-11-04 17:34:35 +0100 (Thu, 04 Nov 2010) > New Revision: 32479 > > Added: > > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/ > > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js > Modified: > > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css > > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js > > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js > > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js > platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm > > platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml > > platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml > Log: > XWIKI-5648 New visual design for the AJAX suggest module > XWIKI-5649 CSS classes to support automatic users and groups suggestions on > field input > XWIKI-3655 Clean the JS code of the ajax suggest - Continued work > XWIKI-5105 When several suggest are used on the same page, suggests results > interfer from one field to another - Fixed > > + some formatting on xwiki.js > > > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css > =================================================================== > --- > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css > 2010-11-04 15:22:54 UTC (rev 32478) > +++ > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.css > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -1,167 +1,60 @@ > -body > -{ > - position: relative; > -} > +#template('colorThemeInit.vm') > > -div.ajaxsuggest > -{ > - position: absolute; > - background-image: url(suggest_img/as_pointer.gif); > - background-position: top; > - background-repeat: no-repeat; > - padding: 10px 0 0 0; > -z-index: 100013; > +.xhover { > + background:red; > } > > -div.ajaxsuggest div.as_header, > -div.ajaxsuggest div.as_footer > -{ > - position: relative; > - height: 6px; > - padding: 0 6px; > - background-image: url(suggest_img/ul_corner_tr.gif); > - background-position: top right; > - background-repeat: no-repeat; > - overflow: hidden; > +input[type="text"].suggest { > + border-width: 1px; > } > -div.ajaxsuggest div.as_footer > -{ > - background-image: url(suggest_img/ul_corner_br.gif); > -} > > -div.ajaxsuggest div.as_header div.as_corner, > -div.ajaxsuggest div.as_footer div.as_corner > -{ > - position: absolute; > - top: 0; > - left: 0; > - height: 6px; > - width: 6px; > - background-image: url(suggest_img/ul_corner_tl.gif); > - background-position: top left; > - background-repeat: no-repeat; > -} > -div.ajaxsuggest div.as_footer div.as_corner > -{ > - background-image: url(suggest_img/ul_corner_bl.gif); > -} > -div.ajaxsuggest div.as_header div.as_bar, > -div.ajaxsuggest div.as_footer div.as_bar > -{ > - height: 6px; > - overflow: hidden; > - background-color: #333; > -} > - > - > -div.ajaxsuggest ul > -{ > - list-style: none; > - margin: 0 0 -4px 0; > - padding: 0; > - overflow: hidden; > - background-color: #333; > -} > - > -div.ajaxsuggest ul li > -{ > - color: #ccc; > - padding: 0; > - margin: 0 4px 4px; > - text-align: left; > -} > - > -div.ajaxsuggest ul li a > -{ > - color: #ccc; > - display: block; > - text-decoration: none; > - background-color: transparent; > +body { > position: relative; > - padding: 0; > - width: 100%; > } > -div.ajaxsuggest ul li a:hover > -{ > - background-color: #444; > -} > -div.ajaxsuggest ul li.as_highlight a:hover > -{ > - background-color: #1B5CCD; > -} > > -div.ajaxsuggest ul li a span > -{ > - display: block; > - padding: 3px 6px; > - font-weight: bold; > +div.suggestItems { > + position:absolute; > + border: 1px solid $theme.borderColor; > + border-top: none; > + background: white; /* theme color ? */ > + z-index: 100013; > + text-align:left; > } > > -div.ajaxsuggest ul li a span small > -{ > - font-weight: normal; > - color: #fff; > +div.suggestItems ul { > + margin: 0px; > } > > -div.ajaxsuggest ul li.as_highlight a span small > -{ > - color: #ccc; > +ul.suggestList { > + margin:0px !important; > + text-transform:none; > + color:$theme.textColor; > + font-weight:normal; > } > > -div.ajaxsuggest ul li.as_highlight a > -{ > - color: #fff; > - background-color: #1B5CCD; > - background-image: url(suggest_img/hl_corner_br.gif); > - background-position: bottom right; > - background-repeat: no-repeat; > +ul.suggestList .xhighlight { > + background-color: $theme.highlightColor; > } > > -div.ajaxsuggest ul li.as_highlight a span > -{ > - background-image: url(suggest_img/hl_corner_bl.gif); > - background-position: bottom left; > - background-repeat: no-repeat; > +div.suggestItemName { > + text-indent: 0; > } > > -div.ajaxsuggest ul li a .tl, > -div.ajaxsuggest ul li a .tr > -{ > - background-repeat: no-repeat; > - width: 6px; > - height: 6px; > - position: absolute; > - top: 0; > - padding: 0; > - margin: 0; > +div.suggestItemInfo { > + color: #556677; > + font-size: 0.8em; > + padding-left: 20px; > + text-indent: 0; > } > -div.ajaxsuggest ul li a .tr > -{ > - right: 0; > -} > > -div.ajaxsuggest ul li.as_highlight a .tl > -{ > - left: 0; > - background-image: url(suggest_img/hl_corner_tl.gif); > - background-position: bottom left; > +div.suggestItemName, > +div.suggestItemInfo { > + text-decoration: inherit; > } > > -div.ajaxsuggest ul li.as_highlight a .tr > -{ > - right: 0; > - background-image: url(suggest_img/hl_corner_tr.gif); > - background-position: bottom right; > +.highlight { > + background-color: $theme.highlightColor; > + font-weight:bold; > + text-decoration: inherit; > } > > -div.ajaxsuggest ul em > -{ > - font-style: normal; > - color: #6EADE7; > -} > - > -div.ajaxsuggest ul li.as_warning > -{ > - font-weight: bold; > - text-align: center; > -} > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js > =================================================================== > --- > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js > 2010-11-04 15:22:54 UTC (rev 32478) > +++ > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -2,6 +2,12 @@ > > var widgets = XWiki.widgets = XWiki.widgets || {}; > > + if (typeof widgets.XList == 'undefined') { > + if (typeof console != "undefined" && typeof console.warn == "function") > { > + console.warn("[Suggest widget] Required class missing: > XWiki.widgets.XList"); > + } > + } else { > + > /** > * Suggest class. > * Provide value suggestions to users when starting to type in a text > input. > @@ -18,7 +24,7 @@ > className : "ajaxsuggest", > timeout : 2500, > delay : 500, > - offsety : -5, > + offsety : 0, > // Display a "no results" message, or simply hide the suggest box when > no suggestions are available > shownoresults : true, > // The message to display as the "no results" message > @@ -26,6 +32,7 @@ > maxheight : 250, > cache : false, > seps : "", > + icon : null, > // The name of the JSON variable or XML element holding the results. > // "results" for the old suggest, "searchResults" for the REST search. > resultsParameter : "results", > @@ -59,8 +66,8 @@ > return false; > } > > - // parameters object > - Object.extend(this.options, param || { }); > + // Clone default options from the prototype so that they are not > shared and extend options with passed parameters > + this.options = Object.extend(Object.clone(this.options), param || { > }); > > // Reset the container if the configured parameter is not valid > if (!$(this.options.parentContainer)) { > @@ -127,7 +134,7 @@ > * value inside the target field, Escape closes the suggest dropdown, Up > and Down move the current selection. > */ > onKeyPress: function(event) { > - if(!$(this.idAs)) { > + if(!$(this.suggest)) { > // Let the key events pass through if the UI is not displayed > return; > } > @@ -136,7 +143,7 @@ > switch(key) { > case Event.KEY_RETURN: > if(this.aSuggestions.length == 1) { > - this.setHighlight(1); > + this.highlightFirst(); > } > this.setHighlightedValue(); > Event.stop(event); > @@ -234,7 +241,7 @@ > requestHeaders: headers, > onSuccess: this.setSuggestions.bindAsEventListener(this), > onFailure: function (response) { > - alert("AJAX error: " + response.statusText); > + new XWiki.widgets.Notification("Failed to retrieve suggestions : > ')" + response.statusText, "error", {timeout: 5}); > } > }); > }, > @@ -281,8 +288,6 @@ > } > > } > - > - this.idAs = "as_"+this.fld.id; > this.createList(this.aSuggestions); > }, > > @@ -298,8 +303,8 @@ > // get rid of old list > // and clear the list removal timeout > // > - if ($(this.idAs)) { > - $(this.idAs).remove(); > + if (this.suggest && this.suggest.parentNode) { > + this.suggest.remove(); > } > this.killTimeout(); > > @@ -309,69 +314,46 @@ > > // create holding div > // > - var div = new Element("div", { > - id: this.idAs, > - className: this.options.className > + var div = new Element("div", { 'class': "suggestItems "+ > this.options.className }); > + > + // create and populate list > + var list = new XWiki.widgets.XList([], { > + icon: this.options.icon, > + classes: 'suggestList', > + eventListeners: { > + 'click' : function () { pointer.setHighlightedValue(); return > false; }, > + 'mouseover' : function () { pointer.setHighlight( > this.getElement() ); } > + } > }); > > - var hcorner = new Element("div", {className: "as_corner"}); > - var hbar = new Element("div", {className: "as_bar"}); > - var header = new Element("div", {className: "as_header"}); > - header.appendChild(hcorner); > - header.appendChild(hbar); > - div.appendChild(header); > - > - // create and populate ul > - var ul = new Element("ul", {id: "as_ul"}); > - > // loop throught arr of suggestions > - // creating an LI element for each suggestion > + // creating an XlistItem for each suggestion > // > for (var i=0;i<arr.length;i++) > { > // format output with the input enclosed in a EM element > // (as HTML, not DOM) > // > - var val = arr[i].value; > - var st = val.toLowerCase().indexOf( this.sInput.toLowerCase() ); > - var output = val.substring(0,st) + "<em>" + val.substring(st, > st+this.sInput.length) + "</em>" + val.substring(st+this.sInput.length); > - > + var val = arr[i].value, st = val.toLowerCase().indexOf( > this.sInput.toLowerCase() ); > + var output = val.substring(0,st) + "<span class='highlight'>" + > val.substring(st, st+this.sInput.length) + "</span>" + > val.substring(st+this.sInput.length); > var span = new Element("span").update(output); > > - var a = new Element("a", {href: "#"}); > + var item = new XWiki.widgets.XListItem( span , { > + containerClasses: 'suggestItem', > + value: arr[i].value, > + noHighlight: true // we do the highlighting ourselves > + }); > > - var tl = new Element("span", {className:"tl"}).update(" "); > - var tr = new Element("span", {className:"tr"}).update(" "); > - a.appendChild(tl); > - a.appendChild(tr); > - > - a.appendChild(span); > - > - a.name = i+1; > - a.onclick = function () { pointer.setHighlightedValue(); return > false; } > - a.onmouseover = function () { pointer.setHighlight(this.name); } > - > - var li = new Element("li").update(a); > - > - ul.appendChild( li ); > + list.addItem(item); > } > > // no results > if (arr.length == 0) > { > - var li = new Element("li", > {className:"as_warning"}).update(this.options.noresults); > - > - ul.appendChild( li ); > + list.addItem( new XWiki.widgets.XListItem(this.options.noresults, > {'classes' : 'noSuggestion'})) > } > - div.appendChild( ul ); > + div.appendChild( list.getElement() ); > > - var fcorner = new Element("div", {className: "as_corner"}); > - var fbar = new Element("div", {className: "as_bar"}); > - var footer = new Element("div", {className: "as_footer"}); > - footer.appendChild(fcorner); > - footer.appendChild(fbar); > - div.appendChild(footer); > - > // get position of target textfield > // position holding div below it > // set width of holding div to width of field > @@ -388,7 +370,8 @@ > div.onmouseout = function(){ pointer.resetTimeout() } > > // add DIV to document > - $(this.options.parentContainer).appendChild(div); > + $(this.options.parentContainer).insert(div); > + this.suggest = div; > > // currently no item is highlighted > this.iHighlighted = 0; > @@ -405,23 +388,30 @@ > */ > changeHighlight: function(key) > { > - var list = $("as_ul"); > + var list = this.suggest.down('ul'); > if (!list) > return false; > > var n; > > - if (key == 40) > - n = this.iHighlighted + 1; > - else if (key == 38) > - n = this.iHighlighted - 1; > + if (this.iHighlighted) { > + if (key == 40) > + elem = this.iHighlighted.next(); > + else if (key == 38) > + elem = this.iHighlighted.previous(); > + } > + else { > + if (key == 40) > + elem = list.down('li'); > + else if (key == 38) > + if (list.select('li') > 0) { > + elem = list.select('li')[list.select('li').length]; > + } > + } > > - if (n > list.childNodes.length) > - n = list.childNodes.length; > - if (n < 1) > - n = 1; > - > - this.setHighlight(n); > + if (typeof elem != 'undefined') { > + this.setHighlight(elem); > + } > }, > > /** > @@ -429,18 +419,14 @@ > * > * @param {Object} n > */ > - setHighlight: function(n) > + setHighlight: function(highlightedItem) > { > - var list = $("as_ul"); > - if (!list) > - return false; > - > - if (this.iHighlighted > 0) > + if (this.iHighlighted) > this.clearHighlight(); > > - this.iHighlighted = Number(n); > + highlightedItem.addClassName("xhighlight"); > > - list.childNodes[this.iHighlighted-1].className = "as_highlight"; > + this.iHighlighted = highlightedItem; > > this.killTimeout(); > }, > @@ -450,14 +436,19 @@ > */ > clearHighlight: function() > { > - var list = $("as_ul"); > - if (!list) > - return false; > + if (this.iHighlighted) { > + this.iHighlighted.removeClassName("xhighlight"); > + delete this.iHighlighted; > + } > + }, > > - if (this.iHighlighted > 0) > - { > - list.childNodes[this.iHighlighted-1].className = ""; > - this.iHighlighted = 0; > + highlightFirst: function() > + { > + if (this.suggest && this.suggest.down('ul')) { > + var first = this.suggest.down('ul').down('li'); > + if (first) { > + this.setHighlight(first); > + } > } > }, > > @@ -466,7 +457,7 @@ > if (this.iHighlighted) > { > if(this.sInput == "" && this.fld.value == "") > - this.sInput = this.fld.value = this.aSuggestions[ > this.iHighlighted-1 ].value; > + this.sInput = this.fld.value = > this.iHighlighted.down(".value").innerHTML; > else { > if(this.seps) { > var lastIndx = -1; > @@ -474,15 +465,15 @@ > if(this.fld.value.lastIndexOf(this.seps.charAt(i)) > lastIndx) > lastIndx = this.fld.value.lastIndexOf(this.seps.charAt(i)); > if(lastIndx == -1) > - this.sInput = this.fld.value = this.aSuggestions[ > this.iHighlighted-1 ].value; > + this.sInput = this.fld.value = > this.iHighlighted.down(".value").innerHTML; > else > { > - this.fld.value = this.fld.value.substring(0, lastIndx+1) + > this.aSuggestions[ this.iHighlighted-1 ].value; > + this.fld.value = this.fld.value.substring(0, lastIndx+1) + > this.iHighlighted.down(".value").innerHTML; > this.sInput = this.fld.value.substring(lastIndx+1); > } > } > else > - this.sInput = this.fld.value = this.aSuggestions[ > this.iHighlighted-1 ].value; > + this.sInput = this.fld.value = > this.iHighlighted.down(".value").innerHTML; > } > > Event.fire(this.fld, "xwiki:suggest:selected"); > @@ -537,12 +528,13 @@ > */ > clearSuggestions: function() { > this.killTimeout(); > - var ele = $(this.idAs); > + var ele = $(this.suggest); > var pointer = this; > if (ele) { > var fade = new Effect.Fade(ele, {duration: "0.25", afterFinish : > function() { > - if($(pointer.idAs)) { > - $(pointer.idAs).remove(); > + if($(pointer.suggest)) { > + $(pointer.suggest).remove(); > + delete pointer.suggest; > } > }}); > } > @@ -550,6 +542,8 @@ > > }); > > + } > + > return XWiki; > > })(XWiki || {}); > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js > =================================================================== > --- > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js > 2010-11-04 15:22:54 UTC (rev 32478) > +++ > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/widgets/jumpToPage.js > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -57,6 +57,7 @@ > // Prefixed with & since the current (as of 1.7) Suggest code does > not automatically append it. > varname: "q", > noresults: "Document not found", > + icon: "${xwiki.getSkinFile('icons/silk/page_white_text.gif')}", > json: true, > resultsParameter : "searchResults", > resultId : "id", > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js > 2010-11-04 15:22:54 UTC (rev 32478) > +++ platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/xwiki.js > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -537,55 +537,55 @@ > }, > > cookies: { > - /** > - * Create a cookie, with or without expiration date. > - * > - * @param name Name of the cookie. > - * @param value Value of the cookie. > - * @param days Days to keep the cookie (can be null). > - * @return > - */ > - create: function(name,value,days) { > - if (days) { > - var date = new Date(); > - date.setTime(date.getTime()+(days*24*60*60*1000)); > - var expires = "; expires="+date.toGMTString(); > - } > - else var expires = ""; > - document.cookie = name+"="+value+expires+"; path=/"; > - }, > + /** > + * Create a cookie, with or without expiration date. > + * > + * @param name Name of the cookie. > + * @param value Value of the cookie. > + * @param days Days to keep the cookie (can be null). > + * @return > + */ > + create: function(name,value,days) { > + if (days) { > + var date = new Date(); > + date.setTime(date.getTime()+(days*24*60*60*1000)); > + var expires = "; expires="+date.toGMTString(); > + } > + else var expires = ""; > + document.cookie = name+"="+value+expires+"; path=/"; > + }, > > - /** > - * Read a cookie. > - * > - * @param name Name of the cookie. > - * @return Value for the given cookie. > - */ > - read:function(name) { > - var nameEQ = name + "="; > - var ca = document.cookie.split(';'); > - for(var i=0;i < ca.length;i++) { > - var c = ca[i]; > - while (c.charAt(0)==' ') { > - c = c.substring(1,c.length); > - } > - if (c.indexOf(nameEQ) == 0) { > - return c.substring(nameEQ.length,c.length); > - } > - } > - return null; > - }, > + /** > + * Read a cookie. > + * > + * @param name Name of the cookie. > + * @return Value for the given cookie. > + */ > + read:function(name) { > + var nameEQ = name + "="; > + var ca = document.cookie.split(';'); > + for(var i=0;i < ca.length;i++) { > + var c = ca[i]; > + while (c.charAt(0)==' ') { > + c = c.substring(1,c.length); > + } > + if (c.indexOf(nameEQ) == 0) { > + return c.substring(nameEQ.length,c.length); > + } > + } > + return null; > + }, > > - /** > - * Erase a cookie. > - * > - * @param name Name of the cookie to erase. > - * @return > - */ > - erase:function(name) { > - XWiki.cookies.create(name,"",-1); > - } > - > + /** > + * Erase a cookie. > + * > + * @param name Name of the cookie to erase. > + * @return > + */ > + erase:function(name) { > + XWiki.cookies.create(name,"",-1); > + } > + > }, > > /** > @@ -1337,27 +1337,57 @@ > /** > * Small JS improvement, which suggests document names (doc.fullName) when > typing in an input. > * > - * To activate this behavior on an input elements, add the > "suggestDocuments" classname to it. > + * To activate this behavior on an input elements, add one of the > following classname to it : > + * <ul> > + * <li><tt>suggestDocuments</tt> to suggest from any available > document</li> > + * <li><tt>suggestUsers</tt> to suggest from documents that contains user > objects</li> > + * <li><tt>suggestGroups</tt> to suggest from documents that contains > group objects</li> > + * </ul> > */ > document.observe('xwiki:dom:loaded', function() { > - if (typeof(XWiki.widgets.Suggest) != "undefined") { > - $$("input.suggestDocuments").each(function(item) { > - // Create the Suggest. > - new XWiki.widgets.Suggest(item, { > - // This document also provides the suggestions. > - script: > XWiki.Document.getRestSearchURL("scope=name&number=10&media=json&"), > - varname: "q", > - noresults: "Document not found", > - json: true, > - resultsParameter : "searchResults", > - resultId : "id", > - resultValue : "pageFullName", > - resultInfo : "pageFullName", > - timeout : 30000, > - parentContainer : item.up() > - }); > - }); > - } > + var suggestionsMapping = { > + "documents" : { > + script: > XWiki.Document.getRestSearchURL("scope=name&number=10&media=json&"), > + varname: "q", > + icon: "$xwiki.getSkinFile('icons/silk/page_white_text.gif')", > + noresults: "Document not found", > + json: true, > + resultsParameter : "searchResults", > + resultId : "id", > + resultValue : "pageFullName", > + resultInfo : "pageFullName" > + }, > + "users" : { > + script: XWiki.currentDocument.getURL('get', > 'xpage=uorgsuggest&classname=XWiki.XWikiUsers&wiki=local&uorg=user&'), > + varname: "input", > + icon: "$xwiki.getSkinFile('icons/silk/user.gif')", > + noresults: "User not found", > + }, > + "groups" : { > + script: XWiki.currentDocument.getURL('get', > 'xpage=uorgsuggest&classname=XWiki.XWikiGroups&wiki=local&uorg=group&'), > + varname: "input", > + icon: "$xwiki.getSkinFile('icons/silk/group.gif')", > + noresults: "Group not found", > + } > + }; > + if (typeof(XWiki.widgets.Suggest) != "undefined") { > + var keys = Object.keys(suggestionsMapping); > + for (var i=0;i<keys.length;i++) { > + var selector = 'input.suggest' + keys[i].capitalize(); > + $$(selector).each(function(item) { > + if (!item.hasClassName('initialized')) { > + var options = { > + timeout : 30000, > + parentContainer : item.up() > + }; > + Object.extend(options, suggestionsMapping[keys[i]]); > + // Create the Suggest. > + var suggest = new XWiki.widgets.Suggest(item, options); > + item.addClassName('initialized'); > + } > + }); > + } > + } > }); > > /** > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js > =================================================================== > --- > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js > 2010-11-04 15:22:54 UTC (rev 32478) > +++ > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/viewers/tags.js > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -157,7 +157,8 @@ > script: "${xwiki.getURL('Main.WebHome', 'view', > 'xpage=suggest&classname=XWiki.TagClass&fieldname=tags&firCol=-&secCol=-')}&", > varname: 'input', > seps: > "${xwiki.getDocument('XWiki.TagClass').xWikiClass.tags.getProperty('separators').value}", > - shownoresults : false > + shownoresults : false, > + icon: "${xwiki.getSkinFile('icons/silk/tag_yellow.gif')}" > }); > } > }); > > Added: > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js > =================================================================== > --- > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js > (rev 0) > +++ > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/widgets/list/xlist.js > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -0,0 +1,126 @@ > +/** > + * Usage : > + * > + * var xlist = new XWiki.widgets.XList( > + * [ // array of initial list elements (or just content it works too > + * new XWiki.widgets.XListItem( "A first element" ), > + * new XWiki.widgets.XListItem( "A second element", {'value' : > '10'} ), > + * "A third item passed as string content", > + * new Element("blink").update('An hip-hop item passed as DOM > element') > + * ], > + * { // options > + * numbered: false, > + * icon: "$xwiki.getSkinFile('icons/silk/sport_basketball.gif')", > + * classes : "myListExtraClass", > + * itemClasses : "myListItemExtraClasses", > + * eventListeners : { > + * // Event listeners defined for each of this list items. > + * // listeners call backs are bound to the list item object > (XWiki.widgets.XListItem) from which they emerge > + * 'click' : function() { console.log('clicked !', this); }, > + * 'mouseover' : function() { console.log('mouse over !', this); > } > + * } > + * }); > + * > + * $('insertionNode').insert( xlist.getElement() ); > + * > + * xlist.addItem( > + * new XWiki.widgets.XListItem('A fifth element added later', { > + * icon : "$xwiki.getSkinFile('icons/silk/bomb.gif')", // this > overrides the one defined for the whole list > + * eventListeners: { > + * // Event listeners defined just for this specific list item > + * 'mouseout' : function() { console.log('just this list item is > bound to this event', this); } > + * } > + * }) > + * ); > + * > + */ > + > +var XWiki = function(XWiki){ > + > + var widgets = XWiki.widgets = XWiki.widgets || {}; > + > + widgets.XList = Class.create({ > + initialize: function(items, options) { > + this.items = items || []; > + this.options = options || {} > + this.listElement = new Element(this.options.ordered ? "ol" : > "ul", { > + 'class' : 'xlist' + (this.options.classes ? (' ' + > this.options.classes) : ''), > + }); > + if (this.items && this.items.length > 0) { > + for (var i=0;i<this.items.length;i++) { > + this.addItem(this.items[i]); > + } > + } > + }, > + addItem: function(item){ /* future: position (top, N) */ > + if (!item || !(item instanceof XWiki.widgets.XListItem)) { > + item = new XWiki.widgets.XListItem(item); > + } > + var listItemElement = item.getElement(); > + if (this.options.itemClasses && > !this.options.itemClasses.blank()) { > + listItemElement.addClassName(this.options.itemClasses); > + } > + this.listElement.insert(listItemElement); > + if (typeof this.options.eventListeners == 'object') { > + item.bindEventListeners(this.options.eventListeners); > + } > + if (this.options.icon && !this.options.icon.blank()) { > + item.setIcon(this.options.icon, > this.options.overrideItemIcon); > + } > + item.list = this; // associate list item to this XList > + }, > + getElement: function() { > + return this.listElement; > + } > + }); > + > + widgets.XListItem = Class.create({ > + initialize: function(content, options) { > + this.options = options || {}; > + var classes = 'xitem' + (this.options.noHighlight ? '' : ' > xhighlight'); > + classes += this.options.classes ? this.options.classes: ''; > + this.containerElement = new Element("div", {'class': > 'xitemcontainer'}).insert(content || ''); > + this.containerElement.addClassName(this.options.containerClasses > || ''); > + this.containerElement.setStyle({textIndent: '0px'}); > + if (this.options.value) { > + this.containerElement.insert(new Element('div', > {'class':'hidden value'}).insert(this.options.value)); > + } > + this.listItemElement = new Element("li", {'class' : > classes}).update( this.containerElement ); > + if (this.options.icon && !this.options.icon.blank()) { > + this.setIcon(this.options.icon); > + this.hasIcon = true; > + } > + if (typeof this.options.eventListeners == 'object') { > + this.bindEventListeners(this.options.eventListeners); > + } > + }, > + getElement: function() { > + return this.listItemElement; > + }, > + setIcon: function(icon, override) { > + if (!this.hasIcon || override) { > + this.iconImage = new Image(); > + this.iconImage.onload = function(){ > + this.listItemElement.setStyle({ > + backgroundImage: "url(" + this.iconImage.src + ")", > + backgroundRepeat: 'no-repeat', > + }); > + this.listItemElement.down(".xitemcontainer").setStyle({ > + textIndent:(this.iconImage.width + 5) + 'px', > + height: this.iconImage.height + 'px' > + }); > We need to make some standard classes for those types of icons: page, tags, groups, etc and use those classes instead (search, suggest, activity, trees, etc) Not so nice that the image is put in style, is gonna break the wcag. Also, for this type of images (like the one in action menu) we have a background-position: 0 3px. Thanks, Caty > + }.bind(this) > + this.iconImage.src = icon; > + } > + }, > + bindEventListeners: function(eventListeners) { > + var events = Object.keys(eventListeners); > + for (var i=0;i<events.length;i++) { > + this.listItemElement.observe(events[i], > eventListeners[events[i]].bind(this)); > + } > + }, > + }); > + > + return XWiki; > + > +}(XWiki || {}); > \ No newline at end of file > > Modified: > platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > 2010-11-04 15:22:54 UTC (rev 32478) > +++ platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -1,7 +1,7 @@ > ## > ## CSS files related to JS libraries. > ## > -<link href="$xwiki.getSkinFile("js/xwiki/suggest/ajaxSuggest.css")" > rel="stylesheet" type="text/css" /> > +<link href="$xwiki.getSkinFile("js/xwiki/suggest/ajaxSuggest.css", true)" > rel="stylesheet" type="text/css" /> > <link href="$xwiki.getSkinFile("js/xwiki/lightbox/lightbox.css", true)" > rel="stylesheet" type="text/css" /> > <!--[if IE]> > <link href="$xwiki.getSkinFile("js/xwiki/lightbox/lightboxIE.css", true)" > rel="stylesheet" type="text/css" /> > @@ -19,9 +19,10 @@ > $xwiki.jsfx.use('uicomponents/widgets/confirmedAjaxRequest.js', true) > $xwiki.jsfx.use('uicomponents/widgets/notification.js', true) > $xwiki.ssfx.use('uicomponents/widgets/notification.css', true) > +$xwiki.jsfx.use('uicomponents/widgets/list/xlist.js') > +$xwiki.jsfx.use('js/xwiki/suggest/ajaxSuggest.js') > <script type="text/javascript" > src="$xwiki.getSkinFile("js/prototype/prototype.js")"></script> > <script type="text/javascript" > src="$xwiki.getSkinFile("js/xwiki/xwiki.js", true)"></script> > -<script type="text/javascript" > src="$xwiki.getSkinFile("js/xwiki/suggest/ajaxSuggest.js")"></script> > <script type="text/javascript"> > // <![CDATA[ > XWiki.webapppath = "${xwiki.webAppPath}"; > > Modified: platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm > 2010-11-04 15:22:54 UTC (rev 32478) > +++ platform/web/trunk/standard/src/main/webapp/templates/tagedit.vm > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -93,7 +93,7 @@ > #set($seps = > $xwiki.getDocument("XWiki.TagClass").xWikiClass.tags.getProperty('separators').value) > <dl> > <dt><label for="tags">$msg.get("core.tagedit.title")</label></dt> > - <dd><input type="text" id="tags" name="tags" onfocus="new > XWiki.widgets.Suggest(this, {script:'$script', varname: 'input', > seps:'$seps', offsety: 13} );" value="$!tdoc.tags"/></dd> > + <dd><input type="text" id="tags" name="tags" onfocus="new > XWiki.widgets.Suggest(this, {script:'$script', varname: 'input', > seps:'$seps', offsety: 13, > icon:'${xwiki.getSkinFile('icons/silk/tag_yellow.gif')}'"} );" > value="$!tdoc.tags"/></dd> > </dl> > #end > #end > > Modified: > platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml > =================================================================== > --- > platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml > 2010-11-04 15:22:54 UTC (rev 32478) > +++ > platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiGroupSheet.xml > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -11,15 +11,15 @@ > <customClass></customClass> > <contentAuthor>XWiki.Admin</contentAuthor> > <creationDate>1242173909000</creationDate> > -<date>1242173909000</date> > -<contentUpdateDate>1242173909000</contentUpdateDate> > +<date>1288812724000</date> > +<contentUpdateDate>1288812724000</contentUpdateDate> > <version>1.1</version> > <title></title> > <template></template> > <defaultTemplate></defaultTemplate> > <validationScript></validationScript> > <comment></comment> > -<minorEdit>false</minorEdit> > +<minorEdit>true</minorEdit> > <syntaxId>xwiki/2.0</syntaxId> > <hidden>false</hidden> > <object> > @@ -159,10 +159,12 @@ > > if (uorg == "user") { > suggesturl += "&uorg=user&"; > + icon = "$xwiki.getSkinFile('icons/silk/user.gif')"; > } else { > suggesturl += "&uorg=group&"; > + icon = "$xwiki.getSkinFile('icons/silk/group.gif')"; > } > - return new XWiki.widgets.Suggest(input, { script: suggesturl, > varname:'input' }); > + return new XWiki.widgets.Suggest(input, { script: suggesturl, > varname:'input', icon:icon }); > }, > addNewMember: function(uorg, input) { > if (input) { > > Modified: > platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml > =================================================================== > --- > platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml > 2010-11-04 15:22:54 UTC (rev 32478) > +++ > platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml > 2010-11-04 16:34:35 UTC (rev 32479) > @@ -338,7 +338,8 @@ > if (typeof(XWiki.widgets.Suggest) != "undefined") { > new XWiki.widgets.Suggest(field, { > script: "$suggestDoc.URL?xpage=plain&type=" + type + > "&number=" + number + "&", > - }); > + icon: "$xwiki.getSkinFile('icons/silk/folder.gif')" > + }); > } > } > > XWiki.officeImporter.addAutoSuggest(document.getElementById("targetSpaceInputId"), > "spaces", 5); > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

14 years, 10 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r32739 - platform/web/trunk/standard/src/main/webapp/templates

by Vincent Massol

Hi Sergiu, Why is the feature done as template (just wondering)? IMO the share this page feature should be an extension of the platform, not part of the platform. Thanks -Vincent On Nov 12, 2010, at 2:14 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2010-11-12 02:14:03 +0100 (Fri, 12 Nov 2010) > New Revision: 32739 > > Added: > platform/web/trunk/standard/src/main/webapp/templates/share.vm > platform/web/trunk/standard/src/main/webapp/templates/shareinline.vm > Log: > XE-750: Ability to send a link to a page by email > Done (templates) > > Added: platform/web/trunk/standard/src/main/webapp/templates/share.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/share.vm (rev 0) > +++ platform/web/trunk/standard/src/main/webapp/templates/share.vm 2010-11-12 01:14:03 UTC (rev 32739) > @@ -0,0 +1,6 @@ > +### > +### Share page by email > +### > +### > +<div id="document-title"><h1>$msg.get('core.viewers.share.title', [$escapetool.xml($doc.displayTitle), $doc.getURL()])</h1></div> > +#template("shareinline.vm") > \ No newline at end of file > > > Property changes on: platform/web/trunk/standard/src/main/webapp/templates/share.vm > ___________________________________________________________________ > Added: svn:keywords > + Id > Added: svn:eol-style > + native > > Added: platform/web/trunk/standard/src/main/webapp/templates/shareinline.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/shareinline.vm (rev 0) > +++ platform/web/trunk/standard/src/main/webapp/templates/shareinline.vm 2010-11-12 01:14:03 UTC (rev 32739) > @@ -0,0 +1,96 @@ > +#template('xwikivars.vm') > +#if ($isGuest) > +## $response.setStatus(401) > + #error ($msg.get('core.viewers.share.error.mustLogin')) > +#elseif ("$!{request.send}" != '') > + #set ($message = "$!{request.message.trim()}") > + #set ($sender = $xwiki.getUserName($context.user, false)) > + #set ($display = "$!{request.includeDocument}") > +## #if ("$!{xwiki.getXWikiPreference('admin_email')}" != '') > +## #set ($sender = "$sender <$!{xwiki.getXWikiPreference('admin_email')}>") > +## #else > + #set ($sender = "$sender <noreply(a)$!{request.localName}>") > +## #end > + > + #set ($recipients = []) > + #set ($errors = {}) > + #set ($successes = []) > + > + #foreach ($recipientValue in $request.getParameterValues('target')) > + #foreach ($recipient in $recipientValue.split(',')) > + #set ($recipient = $recipient.trim()) > + #if ($recipient != '') > + #if ($recipient.indexOf('@') > 0) > + #if ($recipient.indexOf('<') > 0) > + #set ($recipientName = $recipient.substring(0, $recipient.indexOf('<')).trim()) > + #else > + #set ($recipientName = $recipient.substring(0, $recipient.indexOf('@')).trim()) > + #end > + #set ($fullRecipientName = $recipientName) > + #else ## No @ > + #set ($recipientName = $xwiki.getDocument($recipient).getObject('XWiki.XWikiUsers').getProperty('first_name').value) > + #set ($fullRecipientName = $xwiki.getUserName($recipient, false)) > + #set ($recipient = $xwiki.getDocument($recipient).getObject('XWiki.XWikiUsers').getProperty('email').value) > + #end ## @ > + #if (!$recipients.contains($recipient) && "$!recipient" != '') > + #set ($discard = $recipients.add($recipient)) > + #set ($result = $xwiki.mailsender.sendMessageFromTemplate($sender, $recipient, ${util.null}, ${util.null}, $context.language, 'XWiki.SharePage', $context.vcontext)) > + #if ($result != 0) > + #set ($discard = $errors.put($fullRecipientName, $msg.get('core.viewers.share.error.serverError'))) > + #else > + #set ($discard = $successes.add($fullRecipientName)) > + #end > + #elseif ("$!recipient" == '') > + #set($discard = $errors.put($fullRecipientName, $msg.get('core.viewers.share.error.unknownEmail'))) > + #end ## Non empty/handled recipient > + #end ## Non empty recipient > + #end ## Foreach recipient > + #end ## Foreach parameter value > + #if ($successes.size() > 0) > + #info($msg.get('core.viewers.share.send.success', [$successes.toString().replaceAll('^\[', '').replaceAll('\]$', '')])) > + #end > + #if ($errors.size() > 0) > + #foreach ($recipient in $errors.keySet()) > + #error($msg.get('core.viewers.share.send.error', [${recipient}, ${errors.get($recipient)}])) > + #end > + #end > + <a href='$doc.getURL()' class='share-backlink'>$msg.get('core.viewers.share.send.back', ["<em>${doc.displayTitle}</em>"])</a> > +#else ## Form not sent, display the UI > +$xwiki.jsx.use('XWiki.SharePage') > +<form class="xform" action="$doc.getURL('view', 'viewer=share')" method="post"> > + <div class="hidden"> > + <input type="hidden" name="form_token" value="$services.csrf.token" /> > + <input type="hidden" name="send" value="1" /> > + </div> > + <dl> > + <dt> > + <label for="target">$msg.get('core.viewers.share.target')</label> > + <span class="xHint">$msg.get('core.viewers.share.target.hint')</span> > + </dt> > + <dd><input type="text" name="target" id="target" value="" class="suggestUsers"/></dd> > + #set ($ownEmail = "$!{xwiki.getDocument($context.user).getObject('XWiki.XWikiUsers').getProperty('email').value}") > + #if ($ownEmail != '') > + <dd><label for="includeSender"><input type="checkbox" id="includeSender" name="target" value="${xwiki.getUserName($context.user, false)} $escapetool.xml("<${ownEmail}>")" /> $msg.get('core.viewers.share.target.ccMe')</label></dd> > + #end > + <dt><label>$msg.get('core.viewers.share.includeMethod')</label></dt> > + <dd><label><input type="radio" name="includeDocument" value="link" checked="checked"/> $msg.get('core.viewers.share.includeMethod.link')</label></dd> > + <dd><label><input type="radio" name="includeDocument" value="inline"/> $msg.get('core.viewers.share.includeMethod.inline')</label></dd> > + ## <dd><label><input type="radio" name="includeDocument" value="attachment"/> $msg.get('core.viewers.share.includeMethod.attachment')</label></dd> > + ## <dd><label><input type="checkbox" name="includeComments"/> $msg.get('core.viewers.share.includeComments')</label></dd> > + > + #set ($message = "<textarea name='message' rows='3' cols='80'>${msg.get('core.viewers.share.defaultMessage')}</textarea>") > + #set ($fullMessage = $xwiki.getDocument('XWiki.SharePage').getObject('XWiki.Mail', 'language', $context.language, true).getProperty('html').value) > + #set ($fullMessage = $fullMessage.replace('${recipientName}', $msg.get('core.viewers.share.recipientPlaceholder'))) > + #set ($fullMessage = $fullMessage.replaceAll('<pre[^>]*+>[^<]*+</pre>', $message)) > + #set ($fullMessage = $xwiki.parseContent($fullMessage)) > + > + <dt><label for="message">$msg.get('core.viewers.share.messagePreviewLabel')</label></dt> > + <dd class='mail-preview'>$fullMessage</dd> > + > + </dl> > + <div class="buttons"> > + <span class="buttonwrapper"><input type="submit" class="button" value="$msg.get('core.viewers.share.submit')" /></span> > + <span class="buttonwrapper"><a class="secondary button" href="$doc.getURL()">$msg.get('core.viewers.share.cancel')</a></span> > + </div> > +</form> > +#end > \ No newline at end of file > > > Property changes on: platform/web/trunk/standard/src/main/webapp/templates/shareinline.vm > ___________________________________________________________________ > Added: svn:keywords > + Id > Added: svn:eol-style > + native

14 years, 10 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r32741 - platform/web/trunk/standard/src/main/webapp/templates

by Vincent Massol

Hi, On Nov 12, 2010, at 2:19 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2010-11-12 02:19:09 +0100 (Fri, 12 Nov 2010) > New Revision: 32741 > > Modified: > platform/web/trunk/standard/src/main/webapp/templates/menuview.vm > Log: > XE-750: Ability to send a link to a page by email > Enabled the Share menu entry in non-Colibri skins > > Modified: platform/web/trunk/standard/src/main/webapp/templates/menuview.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/menuview.vm 2010-11-12 01:14:31 UTC (rev 32740) > +++ platform/web/trunk/standard/src/main/webapp/templates/menuview.vm 2010-11-12 01:19:09 UTC (rev 32741) > @@ -136,6 +136,10 @@ > #if($canImport) > #submenuitem($xwiki.getURL('XWiki.OfficeImporter', 'view') $msg.get('core.menu.create.pageFromOffice') 'tmActionImport') > #end > + #if (!$isGuest) > + #submenuitem($doc.getURL('view', 'viewer=share') $msg.get('core.menu.share') 'tmActionShare', '') > + $xwiki.jsx.use('XWiki.SharePage') > + #end Again the share this page should be an extension of the platform and thus the menu entry should be there only if the share application (or whatever app it's included with) is available. WDYT? Thanks -Vincent > #xwikitopmenuentryend() > #if($canDelete && $keyboardShortcutsEnabled) > <script type="text/javascript">

14 years, 10 months

1
0
0 0

[xwiki-devs] LiveTable Macro + LiveTable Generator

by Ludovic Dubost

Hi, I've worked on a livetable generator and livetable macro which allows to generate the livetable configuration directly from the XWiki class. http://code.xwiki.org/xwiki/bin/view/Macros/LiveTableMacro20Macro It would be great if some devs could look at it, as it could be a good candidate for inclusion in the platform as it would ease creating livetables. The current problematic parts are: 1/ A hack was made for translations as changes to the livetable macros were necessary to allow to use the Pretty Names automatically instead of translations 2/ It would be great to not even have to give the fields to use in the LiveTable and use the information from the class where a checkbox could be added for each field saying "include in default livetable" This would be a good step towards full CRUD in XWiki. Now that we have Templates, we could add a place in the Wiki where all documents can be browser per class (using this livetable). We would just need a slightly simpler Class Editor which hide the more difficult configurations from classes. The more important work is to support Class Sheets that don't need the include macro to be used for documents that have an object of this class, and a modification of the inline mode which could disappear. Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

14 years, 10 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r32725 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web

by Vincent Massol

On Nov 11, 2010, at 8:25 PM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2010-11-11 20:25:14 +0100 (Thu, 11 Nov 2010) > New Revision: 32725 > > Added: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ExternalServletURLFactory.java > Log: > XWIKI-5681: New URLFactory that always generates external URLs > Done. > > Added: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ExternalServletURLFactory.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ExternalServletURLFactory.java (rev 0) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/ExternalServletURLFactory.java 2010-11-11 19:25:14 UTC (rev 32725) > @@ -0,0 +1,55 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software 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 > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + * > + */ > +package com.xpn.xwiki.web; > + > +import java.net.URL; > + > +import com.xpn.xwiki.XWikiContext; > + > +/** > + * URL Factory which always prints the absolute (external) form of URLs. > + * > + * @version $Id$ Missing @since tags. Thanks -Vincent [snip]

14 years, 10 months

1
0
0 0

[xwiki-devs] [Proposal] Turn comments into major events

by Guillaume Lerouge

Hi XWiki Devs, I've been performing some XWiki demos recently and it came to my attention that when adding a comment to a page and then going back to the homepage, my comments didn't show up in the recent activity section of the dashboard. This is due to the fact that adding a comment is considered a minor event. This behavior is still taking place in the most recent versions of XWiki Enterprise (I tested a XE 2.7 snapshot this morning). I believe that comments should be treated as major events, the same way that adding an object or an annotation to a page is. Therefore I propose making adding a comment a major event instead of a minor one. Here's my +1 for this. Thanks, Guillaume

14 years, 10 months

10
13
0 0

[xwiki-devs] where to extend XWiki link syntax?

by mwallace＠modusoperandi.com

Apology for cross posting. Can someone point me to where in the XWiki code I could implement an extended XWiki link syntax? E.g. if I'd like to handle something like this: Berlin is a city in [[locatedIn::Germany>>Germany]] where I'm adding the double-colon syntax before the usual link info. -- Mark Wallace Principal Engineer, Semantic Applications Modus Operandi, Melbourne, FL, USA

14 years, 10 months

7
12
0 0

[xwiki-devs] [proposal] Add an xwiki-store module with a UUID user defined type.

by Caleb James DeLisle

Hi all, In order to allow XWikiAttachment to reference data in multiple places, we need XWikiAttachment to know the location of it's content. XWikiAttachmentContent uses an id which is identical to the XWikiAttachment id meaning XWikiAttachmentContent has no id of it's own, only a foreign key which points to the content. To remedy this I propose the addition of a UUID hibernate UserType. This type will store a UUID as a 16 byte VARBINARY entry (little endian encoding) in order to minimize the size and database load. Note: I discovered that a UUID type was added in a later version of hibernate so when we upgrade we can decide whether to begin using their implementation. I would like to add the UUID type as the first class in a new module xwiki-store (in a submodule called xwiki-store-hibernate). I think the best approach is to add new database code to xwiki-store slowly until eventually the storage drivers in the core are no longer used thus "moving a mountain one shovel full at a time". The UUID implementation: http://svn.xwiki.org/svnroot/xwiki/contrib/sandbox/xwiki-store/xwiki-store-… How it works: Add this to the xwiki.hbm.xml where you want to add a UUID: <property name="contentUUID" type="org.xwiki.store.hibernate.types.UUIDToBinaryType"> <column name="contentuuid" /> </property> (type can be mapped to a shorter name such as "UUID") Add this to the bean class: public UUID getContentUUID() public void setContentUUID(final UUID contentUUID) Hibernate takes care of the rest. WDYT? Caleb

14 years, 10 months

3
6
0 0

[xwiki-devs] Email this page feature

by Ludovic Dubost

Sergiu, You are in charge of the email this page feature for 2.6. Is there a design page for it ? I wanted to suggest some additional functionnality to that feature if you have time for it. When sending the page or when saving (the email this page feature could be just under the save button), the user would have the ability to ask for an automatic email this page on every change (content and comments). The user would be able to say: [ ] All Contributors Additional users or groups: [ ] Additional manual emails: [ ] [ ] email all changes Then automatically the email this page would be activated on each change. A required feature would be an exclude list and a way for the user to unsubscribe. Finally we could add an email box so that we can load comments sent as a reply to an email sent by the wiki. The rationale for this feature is that when working on a document that requires some discussion and validation, the email discussion is not captured and the changes in the wiki are not triggering a fast enough reaction thus slowing down the discussion around the document (I know the Watch List exists, but since it requires manual subscription, most participants won't do it and the speed of notification of the watch list is not fast enough for discussion). WDYT ? Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

14 years, 10 months

5
10
0 0

[xwiki-devs] [VOTE] Release XE 2.6 RC2 on the 11th instead of 8th

by Vincent Massol

Hi devs, We planned the mail to page feature for XE 2.6 and Sergiu won't be able to commit it before Monday 8th. We also need to fix several critical issues found in RC1: - import wiki macros in XAR when wiki is empty - XWikiGuest in recent activity - security issue re XWikiGuest - first time display which shows the user as logged out Thus I'm proposing to postpone the release to the 11th. We'll need to start the release on the 11th morning sharp or we won't have time to do any more work before the final release in case we find some blockers. Here's my +1 Thanks -Vincent

14 years, 10 months

6
6
0 0

[xwiki-devs] What should contain our hudson emails (was Re: [xwiki-notifications] Aggregated test reports on trunk.)

by Vincent Massol

Hi Caleb, Nice start. Some questions/feedback: * Is this replacing the standard hudson emails or does it come as an additional report? When is it sent? * I'd like to see an email whenever someone commits something that makes one of the modules fail to build and in that mail the title should be short and explicit about whom has made the build fail + the mail should contain the log of the failure (in order to understand why it fails directly from the email). IMO in general we need: * less emails from hudson (only mails when builds are failing IMO, not needed when they're not) * separate flickering from non flickering * shorter email titles * know how broke the build in the email and very visible * console logs in the mail (not the full log, just the module that fails to build and only the part around the failure: let's say the last 100 lines) Thanks -Vincent On Nov 9, 2010, at 4:02 AM, Caleb James DeLisle wrote: > Trying out a new test reporter, tell me what you think. > > Statistics Report: > 22 tests failed out of a total of 3026 > The total time taken to run the tests was 1853.3518 seconds, > and the average time taken by a test was 0.6124758 seconds. > The fastest test ran in 0.0 seconds,a record held by > http://hudson.xwiki.org/job/concerto/org.xwiki.contrib.concerto$xwoot-conte… > The slowest test ran in 120.414 seconds,and that one was > http://hudson.xwiki.org/job/concerto/org.xwiki.contrib.concerto$jxta/5/test… > and the average speed of a webstandards test (a good indication of page load speed) was 0.0 seconds. > ------------------------------------------------------------------------------- > Detailed Failure Report: > 0 Regressions, > 0 Tests are Probably Flickering, > 22 Failures > ------------------------------------------------------------------------------- > > Failures: > These tests have failed multiple times in a row. > > Failing for the past 164 builds. > Name: Blog/Archive.xml [month, year, comment, space, language] testParametersInColibri > Details: Escaping test failed. * Parameter: "year" Tested file: Blog/Archive.xml URL: > http://127.0.0.1:8080/xwiki/bin/view/Blog/Archive?skin=colibri&year=aaa%22b… > List of validation errors: line 305 column 133 WARNING: Macro execution exception in the > response. line 531 column 0 WARNING: Possible SQL error trace. line 563 column 0 > WARNING: Possible SQL error trace. > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: Blog/CreatePost.xml [category, comment, entrySpace, form_token, language, entryTitle] > testParametersInColibri > Details: Escaping test failed. * Parameter: "entrySpace" Tested file: Blog/CreatePost.xml URL: > http://127.0.0.1:8080/xwiki/bin/view/Blog/CreatePost?skin=colibri&entrySpac… > List of validation errors: line 308 column 62 ERROR: Unescaped < character line 308 > column 58 ERROR: Unescaped > character * Parameter: "entryTitle" Tested file: > Blog/CreatePost.xml URL: > http://127.0.0.1:8080/xwiki/bin/view/Blog/CreatePost?skin=colibri&entryTitl… > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: Panels/PanelWizard.xml [forceLeftPanels, section, queryString, place, forceRightPanels, > comment, space, language] testParametersInColibri > Details: Escaping test failed. * Parameter: "place" Tested file: Panels/PanelWizard.xml URL: > http://127.0.0.1:8080/xwiki/bin/view/Panels/PanelWizard?skin=colibri&place=… > List of validation errors: line 341 column 95 ERROR: Unescaped < character line 341 > column 91 ERROR: Unescaped > character > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: XWiki/ExtensionManager.xml [extensionid, actioninstall, actionresolve, confirm, > extensionversion, comment, actionuninstall, language, editor] testParametersInColibri > Details: Escaping test failed. * Parameter: "actioninstall" Tested file: > XWiki/ExtensionManager.xml URL: > http://127.0.0.1:8080/xwiki/bin/view/XWiki/ExtensionManager?skin=colibri&ac… > List of validation errors: line 321 column 140 WARNING: Macro execution exception in the > response. * Parameter: "actionresolve" Tested file: XWiki/ExtensionManager.xml URL: > http://127.0.0.1:8080/xwiki/bin/view/XWiki/ExtensionManager?skin=colibri&ac… > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: XWiki/LiveTableResults.xml [classname, orphaned, collist, comment, space, language] > testParametersInColibri > Details: Escaping test failed. * Parameter: "classname" Tested file: XWiki/LiveTableResults.xml > URL: > http://127.0.0.1:8080/xwiki/bin/view/XWiki/LiveTableResults?classname=aaa%2… > List of validation errors: line 304 column 133 WARNING: Macro execution exception in the > response. line 408 column 0 WARNING: Possible SQL error trace. line 423 column 0 > WARNING: Possible SQL error trace. * Parameter: "space" Tested file: XWiki/LiveTab > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: testClassEditor > Details: Escaping test for XWIKI-5404 failed. Tested file: templates/editclass.vm URL: > http://127.0.0.1:8080/xwiki/bin/edit/aaa%22bbb%27ccc%3Eddd%3Ceee/aaa%22bbb%… > List of validation errors: line 332 column 71 WARNING: Unescaped ' character line 336 > column 77 WARNING: Unescaped ' character line 338 column 78 WARNING: Unescaped ' character > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: templates/editattachments.vm [] testPageEscaping > Details: Escaping test for page name failed. Tested file: templates/editattachments.vm URL: > http://127.0.0.1:8080/xwiki/bin/view/Main/aaa%22bbb%27ccc%3Eddd%3Ceee?skin=… > List of validation errors: line 1 column 42 ERROR: Unescaped < character line 1 > column 38 ERROR: Unescaped > character > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: templates/editgroup.vm [classname] testPageEscaping > Details: Escaping test for page name failed. Tested file: templates/editgroup.vm URL: > http://127.0.0.1:8080/xwiki/bin/view/Main/aaa%22bbb%27ccc%3Eddd%3Ceee?skin=… > List of validation errors: line 0 column 0 WARNING: Unexpected empty response > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: templates/editgroup.vm [classname] testParameterEscaping > Details: Escaping test failed. * Parameter: "classname" Tested file: templates/editgroup.vm URL: > http://127.0.0.1:8080/xwiki/bin/view/Main/WebHome?classname=aaa%22bbb%27ccc… > List of validation errors: line 0 column 0 WARNING: Unexpected empty response > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 164 builds. > Name: templates/editgroup.vm [classname] testSpaceEscaping > Details: Escaping test for space name failed. Tested file: templates/editgroup.vm URL: > http://127.0.0.1:8080/xwiki/bin/view/aaa%22bbb%27ccc%3Eddd%3Ceee/WebHome?sk… > List of validation errors: line 0 column 0 WARNING: Unexpected empty response > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 177 builds. > Name: testDocumentCacheSync > Details: null expected:<[modified ]content> but was:<[]content> > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 177 builds. > Name: testDocumentCacheSyncForAttachments > Details: Name: PUT URI: > http://localhost:8081/xwiki/rest/wikis/xwiki/spaces/Test/pages/AttachementC… > Status code: 404 Status text: Not Found Response: <html> <head> <title>Status page</title> > </head> <body> <h3>The server has not found anything matching the request URI</h3><p>You can get > technical details <a > href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.5">here</a>.<br> Please > continue your visit at our <a href="/">home page</a>. </p> </body> </html> > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 177 builds. > Name: org.xwiki.test.ui.AllTests > Details: Failed to connect to binary FirefoxBinary(/home/hudsonagent/firefox/firefox) on port 7055; > process output follows: Error: cannot open display: :1.0 System info: os.name: 'Linux', os.arch: > 'i386', os.version: '2.6.27.10-grsec-xxxx-grs-ipv4-64', java.version: '1.5.0_15' Driver info: > driver.version: firefox > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 177 builds. > Name: org.xwiki.test.ui.AllTests > Details: Failed to connect to binary FirefoxBinary(/home/hudsonagent/firefox/firefox) on port 7055; > process output follows: Error: cannot open display: :1.0 System info: os.name: 'Linux', os.arch: > 'i386', os.version: '2.6.27.10-grsec-xxxx-grs-ipv4-64', java.version: '1.5.0_15' Driver info: > driver.version: firefox > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 177 builds. > Name: WYSIWYG Selenium Tests > Details: Could not start Selenium session: Failed to start new browser session: Error while > launching browser > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 180 builds. > Name: junit.framework.TestSuite@6b3fc7 > Details: Could not start Selenium session: Failed to start new browser session: Error while > launching browser > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 180 builds. > Name: junit.framework.TestSuite@1d85f79 > Details: Could not start Selenium session: Failed to start new browser session: Error while > launching browser > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-tests/org.xwiki.enterp… > > Failing for the past 828 builds. > Name: Validating Dutch Web Guidelines validity for: space=Main, page=WebHome executed with > credentials Admin:admin > Details: Validation errors in space=Main, page=WebHome ERROR: At least one style attribute has been > found on the page. > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-manager-tests/org.xwik… > > Failing for the past 828 builds. > Name: Validating Dutch Web Guidelines validity for: space=WikiManager, page=CreateNewWiki executed > with credentials Admin:admin > Details: Validation errors in space=WikiManager, page=CreateNewWiki ERROR: An input field has been > found with no label association. > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-manager-tests/org.xwik… > > Failing for the past 828 builds. > Name: Validating Dutch Web Guidelines validity for: space=Main, page=WebHome executed with > credentials Admin:admin > Details: Validation errors in space=Main, page=WebHome ERROR: At least one style attribute has been > found on the page. > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-manager-tests/org.xwik… > > Failing for the past 828 builds. > Name: Validating Dutch Web Guidelines validity for: space=Main, page=WebHome executed with > credentials Admin:admin > Details: Validation errors in space=Main, page=WebHome ERROR: At least one style attribute has been > found on the page. > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-manager-tests/org.xwik… > > Failing for the past 839 builds. > Name: junit.framework.TestSuite@2a4983 > Details: Could not start Selenium session: Failed to start new browser session: Error while > launching browser > Link: > http://hudson.xwiki.org/job/xwiki-product-enterprise-manager-tests/org.xwik… > -------------------------------------------------------------------------------

14 years, 10 months

2
3
0 0

Re: [xwiki-devs] [Discussion] Recent Changes macro name and parameters

by Raluca Stavro

Hello, I am working on http://jira.xwiki.org/jira/browse/XE-741 and I would need a final list of macro and parameter names. These would be the current namings: Macro name: * recentactivity -> to be replaced with 'activity' Parameter names: * 'showRss' (boolean: false by default) - Whether to show activity rss links or not. -> to be replaced with 'rss' * 'showMinor' (boolean: false by default): - Whether to show modifications that create minor versions or not. -> to be replaced with 'minor' * 'tag' (comma separated list): - Comma separated list of tags to display activity for. -> to be replaced with 'tags' * 'space' (comma separated list): - Comma separated list of spaces to display the recent activity for. -> to be replaced with 'spaces' -> also remove 'recent' from the macro description * 'space' (comma separated list): - Comma separated list of spaces to display the recent activity for. -> to be replaced with 'spaces' -> also remove 'recent' from the macro description * 'author' (comma separated list): - Comma separated list of authors whose modifications to show. -> to be replaced with 'authors' * 'changesNb' (number: 30 by default): - Number of activity to show. -> to replace the description with 'Number of pages to display the activity of.' -> to be replaced with 'pages' or 'entries' or some other name that would fit better; you are welcome to add naming proposals. -> to replace '30' with '20', now that each entry (page) contains a number of sub-entries (activity events) and there will be a way to 'show more' entries (Facebook style) New macro parameters to be added: * 'events' (number: 10 by default): - Number of events to show for each page entry. -> you are welcome to add naming proposals. * 'modifications' (boolean: false by default) - Whether to show 'see modifications' link on 'edited the page' events. -> other naming proposals: 'diff', 'differences', 'actions' Raluca. >On Oct 20, 2010, at 4:05 PM, Anca Luca wrote: > >>Hi devs, >> >>I've been working on http://jira.xwiki.org/jira/browse/XE-721 and it's done on my local. This is the recent changes macro based on the current implementation (not the activity stream one), but the idea is that we'll rewrite it to display recent activity in the future. I will commit it for the moment, in the 2.6 trunk, as is, but I would like to discuss here the name of the macro and its parameters: >>Macro name: >>recentchanges, changes, activity, recentactivity >+1 for "activity" to be in line with the upcoming recent activity feature planned for 2.6. > >No need for "recent", "activity" is enough. It's about the activity of the wiki. >>Parameters: >>* rss link should be shown at the bottom of the changes table (boolean): showRss, rss >+1 rss (default true) > >>* minor changes are shown or not (boolean, default false): showMinor, minor >+1 minor > >>* shows "see modifications" link next to entries (boolean, default true): showDiff, showDifferences, diff, differences >I don't like too much diff* >What about "actions"? It's more than just the difference link, there could be other actions, as in the {{spaces/}} macro for example. >>* number of changes to show (number, 0 means "all", defaults to 30): changesNb, changesCount, number, count, limit > +1 count > >>* tags of documents to show chages for (comma separated list): tag, tags >+1 tags > >>* spaces of documents to show changes for (comma separated list): space, spaces > +1 spaces > >>* authors of documents to show changes for (comma separated list): author, authors >+1 authors > >Note that the types cannot be enforced since it's a wiki macro, I put them there just for orientation. >I'd go for activity rss minor diff count tags spaces authors . > > Thanks -Vincent

14 years, 10 months

8
21
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs