You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2019/04/05 19:33:41 UTC
[jspwiki] branch master updated: [JSPWIKI-1101] Improve rendering
of {{{inline preformatted text}}}
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 cc91e3a [JSPWIKI-1101] Improve rendering of {{{inline preformatted text}}}
cc91e3a is described below
commit cc91e3a31acc1a57fe395fb9610f618fbae12fcf
Author: brushed <di...@gmail.com>
AuthorDate: Fri Apr 5 21:33:29 2019 +0200
[JSPWIKI-1101] Improve rendering of {{{inline preformatted text}}}
---
ChangeLog | 11 ++++++++++-
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../org/apache/wiki/parser/JSPWikiMarkupParser.java | 2 +-
.../htmltowiki/HtmlStringToWikiTranslatorTest.java | 6 +++---
.../apache/wiki/parser/JSPWikiMarkupParserTest.java | 14 +++++++-------
jspwiki-war/src/main/styles/haddock/default/type.less | 19 +++++++++++++------
.../main/webapp/templates/default/AttachmentTab.jsp | 2 +-
7 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7b2c168..f611c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2019-03-17 Dirk Frederickx (brushed AT apache DOT org)
+2019-04-05 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.11.0-M4-git-02
+
+ * [JSPWIKI-1101] Improve rendering of {{{inline preformatted text}}}
+
+ * Change UI for attachement upload: by default, the FILE SELECTION input should be visible
+
+
+2019-04-05 Dirk Frederickx (brushed AT apache DOT org)
* 2.11.0-M4-git-01
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 9d16518..a24f495 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 = "01";
+ public static final String BUILD = "02";
/**
* This is the generic version string you should use when printing out the version. It is of
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
index 6ad722a..739649f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
@@ -1516,7 +1516,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
return pushElement( new Element("pre") );
}
- return pushElement( new Element("span").setAttribute("style","font-family:monospace; white-space:pre;") );
+ return pushElement( new Element("span").setAttribute("class","inline-code") );
}
pushBack( ch2 );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
index a28c79a..f332581 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslatorTest.java
@@ -136,12 +136,12 @@ public class HtmlStringToWikiTranslatorTest {
Assertions.assertEquals(
"\n* Diese Karte kann von jedem editiert und um neue Links erweitert werden. \\\\Klickt einfach unten neben der Karte auf {{{[edit]}}}\n",
html2wiki.translate(
- "<ul><li> Diese Karte kann von jedem editiert und um neue Links erweitert werden.<br>Klickt einfach unten neben der Karte auf <span style=\"font-family: monospace; white-space: pre;\">[edit]</span></li></ul>" ) );
+ "<ul><li> Diese Karte kann von jedem editiert und um neue Links erweitert werden.<br>Klickt einfach unten neben der Karte auf <span class=\"inline-code\">[edit]</span></li></ul>" ) );
Assertions.assertEquals(
"\n* Diese Karte kann von jedem editiert und um neue Links erweitert werden. \\\\Klickt einfach unten neben der Karte auf {{{[edit]}}}\n",
html2wiki.translate(
- "<ul><li> Diese Karte kann von jedem editiert und um neue Links erweitert werden.<br>Klickt einfach unten neben der Karte auf <span style=\"font-family: monospace; white-space: pre;\">[edit]</span></li></ul>" ) );
+ "<ul><li> Diese Karte kann von jedem editiert und um neue Links erweitert werden.<br>Klickt einfach unten neben der Karte auf <span class=\"inline-code\">[edit]</span></li></ul>" ) );
}
@@ -160,7 +160,7 @@ public class HtmlStringToWikiTranslatorTest {
*/
Assertions.assertEquals( "Fahrt einfac{{{h mit\u00A0\u00A0 \n der \u00A0 Maus}}} drueber", html2wiki
- .translate( "Fahrt einfac<span style=\"font-family: monospace; white-space: pre;\">h mit <br> der Maus</span> drueber" ) );
+ .translate( "Fahrt einfac<span class=\"inline-code\">h mit <br> der Maus</span> drueber" ) );
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java b/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
index f6dc49b..de744cd 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
@@ -1151,7 +1151,7 @@ public class JSPWikiMarkupParserTest
{
String src = "1{{{2345}}}6";
- Assertions.assertEquals( "1<span style=\"font-family:monospace; white-space:pre;\">2345</span>6", translate(src) );
+ Assertions.assertEquals( "1<span class=\"inline-code\">2345</span>6", translate(src) );
}
@Test
@@ -1160,7 +1160,7 @@ public class JSPWikiMarkupParserTest
{
String src = "1 {{{ {{{ 2345 }}} }}} 6";
- Assertions.assertEquals( "1 <span style=\"font-family:monospace; white-space:pre;\"> {{{ 2345 </span> }}} 6", translate(src) );
+ Assertions.assertEquals( "1 <span class=\"inline-code\"> {{{ 2345 </span> }}} 6", translate(src) );
}
@Test
@@ -1169,7 +1169,7 @@ public class JSPWikiMarkupParserTest
{
String src = "foo\n\nbar{{{2345}}}6";
- Assertions.assertEquals( "<p>foo\n</p><p>bar<span style=\"font-family:monospace; white-space:pre;\">2345</span>6</p>", translate(src) );
+ Assertions.assertEquals( "<p>foo\n</p><p>bar<span class=\"inline-code\">2345</span>6</p>", translate(src) );
}
@Test
@@ -1187,7 +1187,7 @@ public class JSPWikiMarkupParserTest
{
String src = "1{{{{{{2345~}}}}}}6";
- Assertions.assertEquals( "1<span style=\"font-family:monospace; white-space:pre;\">{{{2345}}}</span>6", translate(src) );
+ Assertions.assertEquals( "1<span class=\"inline-code\">{{{2345}}}</span>6", translate(src) );
}
@Test
@@ -1196,7 +1196,7 @@ public class JSPWikiMarkupParserTest
{
String src = "1 {{{ {{{ 2345 ~}}} }}} 6";
- Assertions.assertEquals( "1 <span style=\"font-family:monospace; white-space:pre;\"> {{{ 2345 }}} </span> 6", translate(src) );
+ Assertions.assertEquals( "1 <span class=\"inline-code\"> {{{ 2345 }}} </span> 6", translate(src) );
}
@Test
@@ -1205,7 +1205,7 @@ public class JSPWikiMarkupParserTest
{
String src = "1{{{ {{{2345~}} }}}6";
- Assertions.assertEquals( "1<span style=\"font-family:monospace; white-space:pre;\"> {{{2345~}} </span>6", translate(src) );
+ Assertions.assertEquals( "1<span class=\"inline-code\"> {{{2345~}} </span>6", translate(src) );
}
@Test
@@ -1214,7 +1214,7 @@ public class JSPWikiMarkupParserTest
{
String src = "1{{{ ~ }}}6";
- Assertions.assertEquals( "1<span style=\"font-family:monospace; white-space:pre;\"> ~ </span>6", translate(src) );
+ Assertions.assertEquals( "1<span class=\"inline-code\"> ~ </span>6", translate(src) );
}
diff --git a/jspwiki-war/src/main/styles/haddock/default/type.less b/jspwiki-war/src/main/styles/haddock/default/type.less
index 136d47e..0fb031e 100644
--- a/jspwiki-war/src/main/styles/haddock/default/type.less
+++ b/jspwiki-war/src/main/styles/haddock/default/type.less
@@ -368,12 +368,18 @@ pre {
//inline code: jspwiki uses <tt> ; styles copied from bootstrap/code.less
tt {
- padding: 2px 4px;
- font-size: 90%;
- color: @code-color;
- background-color: @code-bg;
- white-space: nowrap;
- border-radius: @border-radius-base;
+ padding: 2px 4px;
+ font-size: 90%;
+ color: @code-color;
+ background-color: @code-bg;
+ white-space: nowrap;
+ border-radius: @border-radius-base;
+}
+//used for inline {{{code snippets}}}
+span.inline-code {
+ font-family:monospace;
+ white-space:pre;
+ color: @code-color;
}
//list-unstyled : bootstrap
@@ -461,6 +467,7 @@ a.external:after {
//content: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=");
//content:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAMAAADXEh96AAAAB3RJTUUH0wMUEC8DV5a0ngAAAAlwSFlzAAAK8AAACvABQqw0mAAAAwBQTFRFAAAAgAAAAIAAgIAAAACAgACAAICAwMDAwNzApsrw//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// [...]
}
+
a.infolink,
button + a.infolink {
.icon--all;
diff --git a/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp b/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
index 5228204..42ebfd1 100644
--- a/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/AttachmentTab.jsp
@@ -37,7 +37,7 @@
<wiki:Permission permission="upload">
<form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='${progressId}'/></wiki:Link>"
- class="accordion<wiki:HasAttachments>-close</wiki:HasAttachments>"
+ class="accordion<wiki:HasAttachments></wiki:HasAttachments>"
id="uploadform"
method="post"
enctype="multipart/form-data" accept-charset="<wiki:ContentEncoding/>" >