November 2010 - xwiki-devs@xwiki.org

Re: [xwiki-devs] [xwiki-notifications] r32790 - platform/skins/trunk/colibri
by Sergiu Dumitriu 12 Nov '10

12 Nov '10

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/

1 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 12 Nov '10

12 Nov '10

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 >

2 2

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) 12 Nov '10

12 Nov '10

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 >

1 0

Re: [xwiki-devs] [xwiki-notifications] r32739 - platform/web/trunk/standard/src/main/webapp/templates
by Vincent Massol 12 Nov '10

12 Nov '10

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

2 1

Re: [xwiki-devs] [xwiki-notifications] r32741 - platform/web/trunk/standard/src/main/webapp/templates
by Vincent Massol 12 Nov '10

12 Nov '10

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">

1 0

[xwiki-devs] LiveTable Macro + LiveTable Generator
by Ludovic Dubost 12 Nov '10

12 Nov '10

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

2 1

Re: [xwiki-devs] [xwiki-notifications] r32725 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web
by Vincent Massol 12 Nov '10

12 Nov '10

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]

1 0

[xwiki-devs] [Proposal] Turn comments into major events
by Guillaume Lerouge 11 Nov '10

11 Nov '10

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

10 13

[xwiki-devs] where to extend XWiki link syntax?
by mwallace＠modusoperandi.com 11 Nov '10

11 Nov '10

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

7 12

[xwiki-devs] [proposal] Add an xwiki-store module with a UUID user defined type.
by Caleb James DeLisle 11 Nov '10

11 Nov '10

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

3 6