I think this is the highest "fix rate" we have seen so far :-) Thanks Dirk !
regards, Harry 2008/8/25 <[EMAIL PROTECTED]> > Author: brushed > Date: Mon Aug 25 13:18:12 2008 > New Revision: 688861 > > URL: http://svn.apache.org/viewvc?rev=688861&view=rev > Log: > v2.7.0-alpha-30: > * [JSPWIKI-329] Pagination link for All-entries fixed. Added > comments to > InfoContent.jsp to clear-out obscure pagination counting logic. > > * [JSPWIKI-357], [JSPWIKI-358] Wrong section counting when a page > contains a TOC. > > * [JSPWIKI-359] Popup when editing page from Quick Navigation Field > should only > appear when no pagename was entered in input field. > > Modified: > incubator/jspwiki/trunk/ChangeLog > incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java > incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js > incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js > incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp > > Modified: incubator/jspwiki/trunk/ChangeLog > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=688861&r1=688860&r2=688861&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/ChangeLog (original) > +++ incubator/jspwiki/trunk/ChangeLog Mon Aug 25 13:18:12 2008 > @@ -1,3 +1,16 @@ > +2008-08-25 Dirk Frederickx <[EMAIL PROTECTED]> > + > + * 2.7.0-alpha-30 > + > + * [JSPWIKI-329] Pagination link for All-entries fixed. Added > comments to > + InfoContent.jsp to clear-out obscure pagination counting logic. > + > + * [JSPWIKI-357], [JSPWIKI-358] Wrong section counting when a page > contains a TOC. > + > + * [JSPWIKI-359] Popup when editing page from Quick Navigation > Field should only > + appear when no pagename was entered in input field. > + > + > 2008-08-24 Andrew Jaquith <ajaquith AT apache DOT org> > > * 2.7.0-alpha-29 > > Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=688861&r1=688860&r2=688861&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original) > +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Mon Aug 25 > 13:18:12 2008 > @@ -77,7 +77,7 @@ > * <p> > * If the build identifier is empty, it is not added. > */ > - public static final String BUILD = "29"; > + public static final String BUILD = "30"; > > /** > * This is the generic version string you should use > > Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js?rev=688861&r1=688860&r2=688861&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js > (original) > +++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Mon Aug > 25 13:18:12 2008 > @@ -242,6 +242,16 @@ > var p = $('page'); if(p) this.renderPage(p, Wiki.PageName); > var f = $('favorites'); if(f) this.renderPage(f, > "Favorites"); > }, > + /* show popup alert, which allows any html msg to be displayed */ > + alert: function(msg){ > + return alert(msg); //standard js > + > + }, > + /* show popup prompt, which allows any html msg to be displayed and > replied to */ > + prompt: function(msg, defaultreply, callback){ > + return callback( prompt(msg,defaultreply) ); //standard js > + > + }, > > renderPage: function(page, name){ > this.$pageHandlers.each(function(obj){ > @@ -346,16 +356,6 @@ > location = location.href; /* now jump to the #hash */ > }, > > - alert: function(msg){ > - /* TODO: create popup alert, which allowed any html msg to > be displayed */ > - alert(msg); > - }, > - > - prompt: function(title, msg){ > - /* TODO: create popup prompt */ > - return prompt(title,msg); > - }, > - > /* SubmitOnce: disable all buttons to avoid double submit */ > submitOnce: function(form){ > window.onbeforeunload = null; /* regular exit of this page > -- see jspwiki-edit.js */ > @@ -384,11 +384,12 @@ > url = url + (url.contains('?') ? '&' : '?') + 'section='; > > var aa = new Element('a').setHTML('quick.edit'.localize()), > - ee = new > Element('span',{'class':'editsection'}).adopt(aa); > + ee = new > Element('span',{'class':'editsection'}).adopt(aa), > + i = 0; > > - $$('#pagecontent *[id^=section]').each(function(el,i){ > + $$('#pagecontent *[id^=section]').each(function(el){ > if(el.id=='section-TOC') return; > - aa.set({'href':url+i}); > + aa.set({'href':url + i++ }); > el.adopt(ee.clone()); > }); > }, > @@ -921,7 +922,7 @@ > s = this.query.value; > if(s == this.query.defaultValue) s = ''; > > - var handleResult=function(s){ > + var handleResult = function(s){ > if(s == '') return; > if(!search) s = Wiki.cleanLink(s);//remove > invalid chars from the pagename > > @@ -932,24 +933,11 @@ > location.href = url.replace('__PAGEHERE__', s ); > }; > > - if(s!='') handleResult(s); //???? > - //handleResult(Wiki.prompt(promptText, (clone) ? > p+'sbox.clone.suffix'.localize() : p)); > - //return; > - > - Wiki.prompt(promptText, defaultResult, > handleResult.bind(this)); > - > - return; > -/* > - new Popup({ > - caption:'', > - body:promptText, > - promptDefault:(clone) ? > p+'sbox.clone.suffix'.localize() : p, > - buttons:({ > - 'Cancel':Class.empty, > - 'Ok':function(result){ doNavigate(result); > } > - }) > - }); > -*/ > + if(s!='') { > + handleResult(s); > + } else { > + Wiki.prompt(promptText, defaultResult, > handleResult.bind(this)); > + } > } > } > > > Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js?rev=688861&r1=688860&r2=688861&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js (original) > +++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js Mon Aug 25 > 13:18:12 2008 > @@ -183,7 +183,7 @@ > this.onPageLoadSectionToc( ); > > //this.ta = new TextArea( this.textarea ); > - //this.ta = TextArea.initialize( this.textarea ); > + this.ta = TextArea.initialize( this.textarea ); //FIXME > > this.onPageLoadResizeTextarea(); > this.onPageLoadToolbar(); > > Modified: > incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp > URL: > http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=688861&r1=688860&r2=688861&view=diff > > ============================================================================== > --- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp > (original) > +++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp > Mon Aug 25 13:18:12 2008 > @@ -33,13 +33,16 @@ > catch( Exception e ) { /* dont care */ } > > int pagesize = 20; > - int startitem = itemcount; > + int startitem = itemcount-1; /* itemcount==1-20 -> startitem=0-19 ... */ > > String parm_start = (String)request.getParameter( "start" ); > - if( parm_start != null ) startitem = Integer.parseInt( parm_start )+1 ; > - /*round to start of a pagination block 1-20: startitem=0; block 21-30: > startitem=20; ... */ > - if( startitem > -1 ) startitem = ((startitem-1)/pagesize) * pagesize; > + if( parm_start != null ) startitem = Integer.parseInt( parm_start ) ; > > + /* round to start of block: 0-19 becomes 0; 20-39 becomes 20 ... */ > + if( startitem > -1 ) startitem = ((startitem)/pagesize) * pagesize; > + > + /* startitem drives the pagination logic */ > + /* startitem=-1:show all; startitem=0:show block 1-20; > startitem=20:block 21-40 ... */ > %> > <wiki:PageExists> > > > > -- met vriendelijke groet, Harry Metske Telnr. +31-548-512395 Mobile +31-6-51898081
