Author: brushed
Date: Sat Jul 7 05:32:46 2012
New Revision: 1358507
URL: http://svn.apache.org/viewvc?rev=1358507&view=rev
Log:
2.9.0-incubating-6
* [JSPWIKI-733] Add unprefixed border-radius and box-shadow to
jspwiki.css.
* [JSPWIKI-734] ShortURLConstructor causes Syntax Error when loading
jspwiki-edit.js
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1358507&r1=1358506&r2=1358507&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Jul 7 05:32:46 2012
@@ -1,3 +1,13 @@
+2012-07-07 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.9.0-incubating-6
+
+ * Fixing JSPWIKI-733 Box rounded corners missing in Firefox 13 for
PlainVanilla skin elements etc.
+ Add unprefixed border-radius and box-shadow to jspwiki.css.
+ (ref. https://bugzilla.mozilla.org/show_bug.cgi?id=693510 Gecko 2.0
dropped support for -moz-prefix.)
+
+ * Fixing JSPWIKI-734 ShortURLConstructor causes Syntax Error when
loading jspwiki-edit.js
+
2012-06-05 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.9.0-incubating-5, fixed JSPWIKI-737 IfPlugin negation doesn't work
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1358507&r1=1358506&r2=1358507&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Sat Jul 7
05:32:46 2012
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "5";
+ public static final String BUILD = "6";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp?rev=1358507&r1=1358506&r2=1358507&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp Sat
Jul 7 05:32:46 2012
@@ -26,8 +26,9 @@
wikiPage.setAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS, "false" );
String usertext = EditorManager.getEditedText(pageContext);
- TemplateManager.addResourceRequest( context,
TemplateManager.RESOURCE_SCRIPT,"scripts/fckeditor/fckeditor.js" );
- %>
+ TemplateManager.addResourceRequest( context,
TemplateManager.RESOURCE_SCRIPT,
+ context.getURL( WikiContext.NONE,
"scripts/fckeditor/fckeditor.js" ) ); %>
+
<wiki:CheckRequestContext context="edit">
<wiki:NoSuchPage> <%-- this is a new page, check if we're cloning --%>
<%
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp?rev=1358507&r1=1358506&r2=1358507&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Sat
Jul 7 05:32:46 2012
@@ -19,9 +19,11 @@
WikiContext context = WikiContext.findContext( pageContext );
WikiEngine engine = context.getEngine();
- TemplateManager.addResourceRequest( context,
TemplateManager.RESOURCE_SCRIPT, "scripts/jspwiki-edit.js" );
- TemplateManager.addResourceRequest( context,
TemplateManager.RESOURCE_SCRIPT, "scripts/posteditor.js" );
-
+ TemplateManager.addResourceRequest( context,
TemplateManager.RESOURCE_SCRIPT,
+ context.getURL( WikiContext.NONE, "scripts/jspwiki-edit.js" ) );
+ TemplateManager.addResourceRequest( context,
TemplateManager.RESOURCE_SCRIPT,
+ context.getURL( WikiContext.NONE, "scripts/posteditor.js" ) );
+
String usertext = EditorManager.getEditedText( pageContext );
%>
<wiki:CheckRequestContext context="edit">
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css?rev=1358507&r1=1358506&r2=1358507&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css Sat Jul
7 05:32:46 2012
@@ -782,7 +782,9 @@ label[for="edittoc"] {
background-color:rgba(0,0,0,0.7);
-moz-border-radius:10px;
-webkit-border-radius:5px;
+ border-radius:10px;
-webkit-box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
+ box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
z-index:10;
font-size:85%;
overflow:hidden;
@@ -809,6 +811,7 @@ label[for="edittoc"] {
background-color:rgba(0,0,0,0.5);
-moz-border-radius:10px;
-webkit-border-radius:5px;
+ border-radius:10px;
}
/* ie6 hack */
* html #findSuggestionMenu .hover {
@@ -1586,7 +1589,9 @@ table.calendar tr.weekdays {
background-color:rgba(0,0,0,0.7);
-moz-border-radius:10px;
-webkit-border-radius:5px;
+ border-radius:10px;
-webkit-box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
+ -box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
}
.tip-title {
font-weight:bold;
@@ -1817,7 +1822,9 @@ a.slimbox:hover {
background-color:rgba(0,0,0,0.7);
-moz-border-radius:10px;
-webkit-border-radius:5px;
+ border-radius:10px;
-webkit-box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
+ box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
}
/* ie6 hack */
* html .categoryPopup {
@@ -1867,6 +1874,7 @@ a.slimbox:hover {
background-color:rgba(0,0,0,0.5);
-moz-border-radius:10px;
-webkit-border-radius:5px;
+ border-radius:10px;
}
/* ie6 hack */
* html .categoryPopup .hover {
