Author: brushed
Date: Wed Apr 9 12:26:51 2008
New Revision: 646490
URL: http://svn.apache.org/viewvc?rev=646490&view=rev
Log:
2.7.0-svn-9: [JSPWIKI-233] Bugfix PreferencesTab.jsp, [JSPWIKI-232] Edit
Section localization, [JSPWIKI-234] Added IS8601 date/time pattern, resolved IE
js crash
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/templates/default.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=646490&r1=646489&r2=646490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Apr 9 12:26:51 2008
@@ -1,3 +1,16 @@
+2007-04-09 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.7.0-svn-9
+
+ * [JSPWIKI-233] Bugfix PreferencesTab.jsp
+
+ * [JSPWIKI-232] Localization of (All) in the Edit Section dropdown.
+ Also added localization to the language dropdown
+
+ * [JSPWIKI-234] Added IS8601 date/time pattern to default prefs in
JSPWiki.properties
+
+ * Bugfix IE javascript crash on mouse-over handler
+
2008-04-09 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.7.0-svn-8
Modified: incubator/jspwiki/trunk/etc/i18n/templates/default.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default.properties?rev=646490&r1=646489&r2=646490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default.properties Wed Apr 9
12:26:51 2008
@@ -607,7 +607,8 @@
#
javascript.sbox.clone.suffix=-New
-javascript.edit.startOfPage=( start of page )
+javascript.edit.allsections=( All )
+javascript.edit.startOfPage=( Start of page )
javascript.edit.findandreplace.nomatch=No match found!
javascript.edit.toolbar.makeSelection=Please make first a selection.
javascript.edit.resize=Drag to resize the text area
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=646490&r1=646489&r2=646490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Wed Apr 9
12:26:51 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "8";
+ public static final String BUILD = "9";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java?rev=646490&r1=646489&r2=646490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java Wed
Apr 9 12:26:51 2008
@@ -447,7 +447,7 @@
defaultLanguage =
LocaleSupport.getLocalizedMessage(pageContext, I18NDEFAULT_LOCALE);
}
- resultMap.put(name, locale.getDisplayName() + " " +
defaultLanguage);
+ resultMap.put(name, locale.getDisplayName(locale) + " " +
defaultLanguage);
}
}
}
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=646490&r1=646489&r2=646490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Wed Apr 9
12:26:51 2008
@@ -47,7 +47,6 @@
** 270 WikiColumns
** 280 ZebraTable: color odd/even row of a table
** 290 HighlightWord: refactored
- ** 295 Typography
** 300 Prettify
**/
@@ -368,7 +367,6 @@
/** 105 WikiSlidingFavs
** Support sliding favorites menu
- ** Dirk Frederickx, Feb 2008
*/
var WikiSlidingFavs =
{
@@ -411,7 +409,7 @@
'mouseenter': function(e){
this.addClass('hover');
var ppx = toggler.getPosition().x+"px";
- pointer.setStyles({ left: ppx, top:
(e.pageY || e.clientY)+"px" }).show();
+ pointer.setStyles({ left: ppx, top:
e.client.y+"px" }).show();
if( body.hasClass('fav-slide') ){
favsWrapper.inject(toggler).show();
favsFx.start(favsShow);
@@ -419,7 +417,7 @@
},
'mousemove': function(e){
var ppx = toggler.getPosition().x+"px";
- pointer.setStyles({ left: ppx, top:
(e.pageY || e.clientY)+"px" });
+ pointer.setStyles({ left: ppx, top:
e.client.y+"px" });
},
'mouseleave': function(){
this.removeClass('hover');
@@ -460,7 +458,6 @@
/** 110 WikiSlimbox
** Inspired http://www.digitalia.be/software/slimbox by Christophe Bleys
- ** Dirk Frederickx, Mar 2007
** %%slimbox [...] %%
** %%slimbox-img [some-image.jpg] %%
** %%slimbox-ajax [some-page links] %%
@@ -837,11 +834,12 @@
url = url + (url.contains('?') ? '&' : '?') + 'section=';
$$('#pagecontent *[id^=section]').each(function(el,i){
+
new Element('span',{
'class':'editsection'
}).adopt( new Element('a', {
- 'href' : url+i,
- 'title' :
'quick.edit.title'.localize(el.getText())
+ 'href' : url+i /*,
+ 'title' :
'quick.edit.title'.localize(el.getText()) */
}).setHTML('quick.edit'.localize())
).inject(el);
});
@@ -1330,11 +1328,6 @@
/** 200 Collapsible list and boxes
- ** See also David Lindquist <first name><at><last name><dot><net>
- ** See: http://www.gazingus.org/html/DOM-Scripted_Lists_Revisited.html
- **
- ** Add support for collabsable boxes, Nov 05, D.Frederickx
- ** Refactored on mootools, including effects, May 07, D.Frederickx
**/
var Collapsible =
{
@@ -2001,7 +1994,7 @@
** Modified 21006 to fix query string parsing and add case insensitivity
** Modified 20030227 by [EMAIL PROTECTED] to skip words
** with "-" and cut %2B (+) preceding pages
- ** Refactored for JSPWiki -- now based on regexp, by D.Frederickx. Nov 2005
+ ** Refactored for JSPWiki -- now based on regexp
**/
var HighlightWord =
{
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=646490&r1=646489&r2=646490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js Wed Apr 9
12:26:51 2008
@@ -484,7 +484,7 @@
newSelector: function(){
this.selector.empty();
this.selector.offsets = [];
- this.addSelector("( all )",-1);
+ this.addSelector("edit.allsections".localize(),-1);
},
addSelector: function(text,offset,indent){
text = text.replace(/~([^~])/g, '$1'); /*remove wiki-markup
escape char ~ */
