jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r685337 - in /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: ./ src/com/ecyrd/jspwiki/ src/webdocs/scripts/ src/webdocs/templates/default/
Date Tue, 12 Aug 2008 22:03:38 GMT
Author: ajaquith
Date: Tue Aug 12 15:03:37 2008
New Revision: 685337

URL: http://svn.apache.org/viewvc?rev=685337&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 685311.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog?rev=685337&r1=685336&r2=685337&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog Tue Aug 12 15:03:37 2008
@@ -1,5 +1,25 @@
 2008-08-12 Dirk Frederickx <dirk.frederickx@gmail.com>
 
+        * 2.7.0-alpha-15
+
+        * [JSPWIKI-334] IE6/IE7 javascript bug causes section editor to crash.
+        JS is now running fine, but the Section Overview box still needs some CSS
+        fixes. Ongoing.
+        Note: Section Editing only works with the plain editor.
+        
+ 
+        * [JSPWIKI-337] Missing localization in WorkflowContent.jsp.
+
+2008-08-12  Harry Metske <harry.metske@gmail.com>
+
+        * 2.7.0-alpha-14
+        
+        * [JSPWIKI-231] updated de translation, thanks to Florian
+        
+        * fix for  [JSPWIKI-300] required some extra changes to the JUnit test for the TableOfContents
Plugin
+
+2008-08-12 Dirk Frederickx <dirk.frederickx@gmail.com>
+
         * 2.7.0-alpha-13
 
         * [JSPWIKI-329] Pagination link was still not correct for the block 21-40.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=685337&r1=685336&r2=685337&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
Tue Aug 12 15:03:37 2008
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "13";
+    public static final String     BUILD         = "15";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js?rev=685337&r1=685336&r2=685337&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
Tue Aug 12 15:03:37 2008
@@ -291,7 +291,7 @@
 			'prefLanguage':'Language',
 			'prefSectionEditing':'SectionEditing'
 		};
-		for(el in prefs){
+		for(var el in prefs){
 			if($(el)) this.prefs.set(prefs[el],$(el).getValue());
 		};
 	},

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js?rev=685337&r1=685336&r2=685337&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js
Tue Aug 12 15:03:37 2008
@@ -253,12 +253,13 @@
 
 	render: function(page,name){
 		/* make reverse copies for bottom definitions */
+
 		this.$Bottom = {};
-		for(item in this.$Top){
-			this.$Bottom[item] = this.$Top[item].slice(0).reverse();
+		for(var i in this.$Top){
+			this.$Bottom[i] = this.$Top[i].slice(0).reverse();
 		}
 
-		for(selector in this.$registry){  // CHECK NEEDED
+		for(var selector in this.$registry){  // CHECK NEEDED
 			var n = $$(selector), 
 				p = this.$registry[selector];
 			this.exec(n, p[0], p[1], p[2], p[3]);
@@ -310,7 +311,7 @@
 
 	getTemplate: function(template, corners){
 		var t = false;
-		if(corners != 'nn') for(item in template){
+		if(corners != 'nn') for(var item in template){
 			if(corners.contains(item)){
 				t = template[item];
 				break;

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp?rev=685337&r1=685336&r2=685337&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp
Tue Aug 12 15:03:37 2008
@@ -89,7 +89,7 @@
             <td>&nbsp;</td>
             <td colspan="4" class="split">
               <a href="#" 
-                title="Show or hide details"
+                title="<fmt:message key='workflow.details.title' />"
               onclick="$('decision.<c:out value="${decision.workflow.id}"/>').toggle();"
>
                 <fmt:message key="workflow.details" />
               </a>



Mime
View raw message