This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 925c1ae 2.11.0-M2-git-08: wysiwyg editor not loading the css
stylesheet
925c1ae is described below
commit 925c1aebd8ed1235caa750c95200e7c6150c29a7
Author: brushed <dirk.frederi...@gmail.com>
AuthorDate: Fri Feb 15 10:29:22 2019 +0100
2.11.0-M2-git-08: wysiwyg editor not loading the css stylesheet
---
ChangeLog | 23 ++++++++++++++--------
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 2 +-
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 61df3e3..05321e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
+2019-02-15 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.11.0-M2-git-08
+
+ * WYSIWYG editor was still pointing to the Haddock template.
+
+
2019-02-15 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.11.0-M2-git-07
-
- * JSPWIKI-1088: Fallback to default template if jspwiki.templateDir if
the requested template folder is
+
+ * JSPWIKI-1088: Fallback to default template if jspwiki.templateDir if
the requested template folder is
not found
-
+
* JSPWIKI-1092: Upgrade bundled dependencies
* flexmark to 0.40.16
* gson to 2.8.5
@@ -12,19 +19,19 @@
* nekohtml to 1.9.22
* stripes to 1.7.0-async (needed to test JSPWIKI-1088)
* tomcat to 8.5.38
-
+
* fixed css path and packaging of webresources
-
+
* updated both new and missing es resources
2019-02-14 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.11.0-M2-git-06
-
- * lots of internal refactorings, mostly around a) Task's
implementations extracted to their own package
+
+ * lots of internal refactorings, mostly around a) Task's
implementations extracted to their own package
and b) PageManager and PageLock moved to o.a.w.pages package, in
order to untangle some class/package
circular dependencies
-
+
* JUnit updated to 5.4.0
2019-02-13 Dirk Frederickx (brushed AT apache DOT org)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index 1c83bf1..2ba1814 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "07";
+ public static final String BUILD = "08";
/**
* This is the generic version string you should use when printing out
the version. It is of
diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp
b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp
index 4ddad49..cfc0b64 100644
--- a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp
@@ -52,7 +52,7 @@
String usertext = EditorManager.getEditedText(pageContext);
%>
-<wiki:RequestResource type="stylesheet"
resource="templates/haddock/haddock-wysiwyg.css" />
+<wiki:RequestResource type="stylesheet"
resource="templates/default/haddock-wysiwyg.css" />
<wiki:RequestResource type="script" resource="scripts/haddock-wysiwyg.js" />
<c:set var='context'><wiki:Variable var='requestcontext' /></c:set>
<wiki:CheckRequestContext context="edit">
