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 7b18ed6 Added interwiki link for location links; Added plain editor
configs as regular properties. Smaller js / css tweaks.
7b18ed6 is described below
commit 7b18ed6a5bcdec90f14433e2ecada53b5a90c716
Author: brushed <[email protected]>
AuthorDate: Fri Apr 5 20:04:24 2019 +0200
Added interwiki link for location links; Added plain editor configs as
regular properties. Smaller js / css tweaks.
Various small JS & CSS updates
Add visualization for Location and MailTo: link.
---
ChangeLog | 12 ++++++++++
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../org/apache/wiki/preferences/Preferences.java | 8 +++++++
.../src/main/resources/ini/jspwiki.properties | 26 ++++++++++++++++++++++
jspwiki-war/src/main/config/wro/wro.xml | 8 -------
jspwiki-war/src/main/scripts/behaviors/Tabs.js | 2 +-
.../src/main/scripts/behaviors/Viewer.Carousel.js | 2 +-
.../src/main/scripts/behaviors/Viewer.Slimbox.js | 4 ++--
.../src/main/scripts/moo-extend/Array.Extend.js | 2 +-
.../main/scripts/moo-extend/Array.NaturalSort.js | 2 +-
.../src/main/scripts/moo-extend/String.Extend.js | 2 +-
.../src/main/scripts/wiki-edit/Wiki.Edit.js | 5 ++---
jspwiki-war/src/main/scripts/wiki/Recents.js | 2 +-
jspwiki-war/src/main/scripts/wiki/Search.js | 8 ++++---
.../src/main/scripts/wiki/Wiki.Behaviors.js | 4 ++--
jspwiki-war/src/main/scripts/wiki/Wiki.js | 2 +-
.../main/styles/haddock/default/Collapsible.less | 8 +++----
.../styles/haddock/default/Viewer.Slimbox.less | 5 ++++-
.../src/main/styles/haddock/default/modals.less | 4 ++--
.../src/main/styles/haddock/default/tables.less | 7 ++++--
.../src/main/styles/haddock/default/type.less | 21 +++++++++++++++++
.../src/main/styles/haddock/default/variables.less | 6 ++---
22 files changed, 103 insertions(+), 39 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2e638c5..e1e48ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-03-17 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.11.0-M4-git-01
+
+ * Added interwiki link for location links (google maps)
+
+ * Added plain editor configs as regular properties.
+ By default, the editor preview, autosuggestion and tabcompletion are
set.
+
+ * Various small js / css tweaks.
+
+
2019-03-22 Juan Pablo Santos (juanpablo AT apache DOT org)
* prepare release for 2.11.0.M3
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 2d7eebb..9d16518 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 = "";
+ public static final String BUILD = "01";
/**
* 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/preferences/Preferences.java
b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
index f8c3da3..39b7491 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
@@ -114,6 +114,14 @@ public class Preferences
prefs.put("SectionEditing", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.sectionediting", "true" ) );
prefs.put("Appearance", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.appearance", "true" ) );
+ //editor cookies
+ prefs.put("autosuggest", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.autosuggest", "true" ) );
+ prefs.put("tabcompletion", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.tabcompletion", "true" ) );
+ prefs.put("smartpairs", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.smartpairs", "false" ) );
+ prefs.put("livepreview", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.livepreview", "true" ) );
+ prefs.put("previewcolumn", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.previewcolumn", "true" ) );
+
+
// FIXME: editormanager reads jspwiki.editor -- which of both
properties should continue
prefs.put("editor", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.editor", "plain" ) );
diff --git a/jspwiki-main/src/main/resources/ini/jspwiki.properties
b/jspwiki-main/src/main/resources/ini/jspwiki.properties
index ac36959..fe5de90 100644
--- a/jspwiki-main/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-main/src/main/resources/ini/jspwiki.properties
@@ -665,6 +665,12 @@ jspwiki.interWikiRef.Raw = Wiki.jsp?page=%s&skin=raw
# A link to the reader view of the page (no leftmenu, fit for printing) :
[Reader:MainPage]
jspwiki.interWikiRef.Reader = Wiki.jsp?page=%s&skin=reader
+# A link to a Wiki Group, defined in the Group database.
+jspwiki.interWikiRef.Group = Group.jsp?group=%s
+
+# A link to the RSS feed for a page
+jspwiki.interWikiRef.RSS = rss.jsp?page=%s&mode=wiki
+
# This is the original WikiWikiWeb
jspwiki.interWikiRef.WikiWikiWeb = http://c2.com/cgi/wiki?%s
@@ -680,6 +686,9 @@ jspwiki.interWikiRef.Wikipedia =
http://www.wikipedia.com/wiki/%s
# Google, the ubiquitous search engine.
jspwiki.interWikiRef.Google = http://www.google.com/search?q=%s
+# Google Maps, the ubiquitous internet map
+jspwiki.interWikiRef.Location = https://maps.google.com/maps?q=%s
+
# JSPWiki documentation (for this release)
jspwiki.interWikiRef.Doc = http://jspwiki-wiki.apache.org/Wiki.jsp?page=%s
@@ -1000,6 +1009,23 @@ jspwiki.defaultprefs.template.sectionediting =true
# Set Appearance light/dark
jspwiki.defaultprefs.template.appearance =false
+# Editor properties
+# Show AutoSuggest popups in the plain editor
+jspwiki.defaultprefs.template.autosuggest =true
+
+# Set the Auto-completion of commands when pressing the Tab key
+jspwiki.defaultprefs.template.tabcompletion =true
+
+# Provide automatic completion of (, { and [
+jspwiki.defaultprefs.template.smartpairs =false
+
+# Set live-preview mode of the plain and wysiwyg editor
+jspwiki.defaultprefs.template.livepreview =true
+
+# Show the preview section in 2 horizontal columns
+jspwiki.defaultprefs.template.previewcolumn =true
+
+
# Set the language
# By default, the language is read from the client browser http request
# jspwiki.defaultprefs.template.language =en
diff --git a/jspwiki-war/src/main/config/wro/wro.xml
b/jspwiki-war/src/main/config/wro/wro.xml
index bf2ce34..dd2eefd 100644
--- a/jspwiki-war/src/main/config/wro/wro.xml
+++ b/jspwiki-war/src/main/config/wro/wro.xml
@@ -53,12 +53,4 @@
<css>/styles/jspwiki_print.css</css>
</group>
- <!-- FIXME : revise the way skins are handles with wro4j
- For now, keep the skin css & js uncompressed/unmerged. (small files
anyway)
- <group name="skins">
- <css>/templates/defaults/skins/**/skin.css</css>
- <js>/templates/defaults/skins/**/skin.js</js>
- </group>
- -->
-
</groups>
\ No newline at end of file
diff --git a/jspwiki-war/src/main/scripts/behaviors/Tabs.js
b/jspwiki-war/src/main/scripts/behaviors/Tabs.js
index d21f16b..6b0b32a 100644
--- a/jspwiki-war/src/main/scripts/behaviors/Tabs.js
+++ b/jspwiki-war/src/main/scripts/behaviors/Tabs.js
@@ -180,7 +180,7 @@ var Tab = new Class({
//then create div.tab-<pane-title> groups
container.groupChildren(header, "div", function(pane, caption){
- pane.addClass( "tab-" +
caption.get("text").trim().replace(/\s+/g, "-").camelCase() );
+ pane.addClass( "tab-" +
caption.textContent.trim().replace(/\s+/g, "-").camelCase() );
pane.set("data-pane", caption.get("html").stripScripts());
if( caption.match("[data-activePane]") ){
pane.addClass("active"); }
pane.id = caption.id;
diff --git a/jspwiki-war/src/main/scripts/behaviors/Viewer.Carousel.js
b/jspwiki-war/src/main/scripts/behaviors/Viewer.Carousel.js
index 73e8376..cecf671 100644
--- a/jspwiki-war/src/main/scripts/behaviors/Viewer.Carousel.js
+++ b/jspwiki-war/src/main/scripts/behaviors/Viewer.Carousel.js
@@ -108,7 +108,7 @@ Viewer.Carousel = new Class({
Number(width - el.width).limit(0, width) / 2 +
"px"
}},
"div.carousel-caption", {
- html: (el.title || el.alt || el.get("text"))
+ html: (el.title || el.alt || el.textContent)
}
]);
indicators.push("li");
diff --git a/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js
b/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js
index 58c497f..2b28396 100644
--- a/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js
+++ b/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js
@@ -140,7 +140,7 @@ Viewer.Slimbox = new Class({
return elements.each( function(el, idx){
- caption = el.get("text") || el.title || el.alt;
+ caption = el.textContent || el.title || el.alt;
if( btn ){
el = btn.slick({
@@ -261,7 +261,7 @@ Viewer.Slimbox = new Class({
self.get(".caption").set({
href: url,
html: ( many ? hints.nofm.xsubs( cursor + 1, max) : "" ) +
- (el.title || el.alt || el.get("text") || "" )
+ (el.title || el.alt || el.textContent || "" )
});
diff --git a/jspwiki-war/src/main/scripts/moo-extend/Array.Extend.js
b/jspwiki-war/src/main/scripts/moo-extend/Array.Extend.js
index c4cb8fc..4516146 100644
--- a/jspwiki-war/src/main/scripts/moo-extend/Array.Extend.js
+++ b/jspwiki-war/src/main/scripts/moo-extend/Array.Extend.js
@@ -71,7 +71,7 @@ Array.implement({
else if ( item instanceof Element ){ elements.push(item); }
else if ( ""+item === item /*isString*/ ){
elements.push(item.slick()); }
else if ( type == "object" ){ elements.getLast().set(item); }
- else if ( item.pop /*isArray*/ ){
elements.getLast().adopt(item.slick()); }
+ else if ( Array.isArray(item) ){
elements.getLast().adopt(item.slick()); }
}
});
diff --git a/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
b/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
index a50ce64..f5d96c8 100644
--- a/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
+++ b/jspwiki-war/src/main/scripts/moo-extend/Array.NaturalSort.js
@@ -118,7 +118,7 @@ Array.implement({
if( !isNaN(column) ){ val = ( isNode ? val.getChildren() : val
)[column]; }
//retrieve the value and convert to string
- val = ("" + (isNode ? val.getAttribute("data-sortvalue") ||
val.get("text") || val.get("title") : val)).trim();
+ val = ("" + (isNode ? val.getAttribute("data-sortvalue") ||
val.textContent || val.get("title") : val)).trim();
//2. Convert and store in type specific arrays (num, dmy, kmgt,
nat)
diff --git a/jspwiki-war/src/main/scripts/moo-extend/String.Extend.js
b/jspwiki-war/src/main/scripts/moo-extend/String.Extend.js
index aefd1ea..a990bdd 100644
--- a/jspwiki-war/src/main/scripts/moo-extend/String.Extend.js
+++ b/jspwiki-war/src/main/scripts/moo-extend/String.Extend.js
@@ -242,7 +242,7 @@ String.implement({
var name = element.grab /*isElement*/ ? element.className : element;
- name = (name.match(
/\b(default|primary|success|info|warning|danger)(\b|$)/ )||[,'default'])[1];
+ name = (name.match(
/\b(default|primary|success|info|warning|danger)(\b|$)/ )||[0,'default'])[1];
return this + " " + this + "-" + name ;
diff --git a/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
b/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
index f5a8730..c8088a5 100644
--- a/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
+++ b/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
@@ -281,10 +281,9 @@ function jspwikiSectionParser( text ){
}
/*
-Function
+Function: processDragAndDropData
Call back handler, invoked when data is dragged or copied into the editor
textarea.
- Call Html2Wiki.js to process the incoming data & convert to wiki markup
-
+ Convert url links or html to convert to wiki markup
*/
function processDragAndDropData( dataTransfer ){
diff --git a/jspwiki-war/src/main/scripts/wiki/Recents.js
b/jspwiki-war/src/main/scripts/wiki/Recents.js
index a9624c6..593494a 100644
--- a/jspwiki-war/src/main/scripts/wiki/Recents.js
+++ b/jspwiki-war/src/main/scripts/wiki/Recents.js
@@ -93,7 +93,7 @@ Wiki.Recents = new Class({
} else {
- form.query.value = element.get("text");
+ form.query.value = element.textContent;
form.submit();
}
diff --git a/jspwiki-war/src/main/scripts/wiki/Search.js
b/jspwiki-war/src/main/scripts/wiki/Search.js
index 32ec30d..35ebe94 100644
--- a/jspwiki-war/src/main/scripts/wiki/Search.js
+++ b/jspwiki-war/src/main/scripts/wiki/Search.js
@@ -123,9 +123,11 @@ Wiki.Search = new Class({
update: result,
onComplete: function(){
- new GraphBar( result.getElement( ".graphBars" ));
- self.fireEvent( "onComplete" );
-
+ var g = result.getElement( ".graphBars" );
+ if(g){
+ new GraphBar( result.getElement( ".graphBars" ));
+ self.fireEvent( "onComplete" );
+ }
}
}).send();
diff --git a/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
b/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
index d48c3f4..992569e 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
@@ -245,7 +245,7 @@ Behavior: Viewer
})
.add(".maps", function( map ){
- var address = map.get("text").trim(),
+ var address = map.textContent.trim(),
mapSvc =
map.className.replace("-maps","").replace("maps","google"),
url = "https://maps.{0}.com/maps?q=".xsubs(mapSvc) +
encodeURIComponent( address );
@@ -457,7 +457,7 @@ Behavior:Columns
Dynamic Style: Code-Prettifier
JSPWiki wrapper around
http://google-code-prettify.googlecode.com/svn/trunk/README.html
- TODO: add option to overrule the choice of language:
+ TODO: add option to set the choice of language:
> "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
> "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
> "xhtml", "xml", "xsl"
diff --git a/jspwiki-war/src/main/scripts/wiki/Wiki.js
b/jspwiki-war/src/main/scripts/wiki/Wiki.js
index fc34542..b172855 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.js
@@ -594,7 +594,7 @@ var Wiki = {
//????form.getElements(".dropdown-menu
a[data-cmd=editor]").addEvent("click", ...
form.getElements("a.editor-type").addEvent("click", function () {
- wiki.prefs.set("editor", this.get("text"));
+ wiki.prefs.set("editor", this.textContent);
});
diff --git a/jspwiki-war/src/main/styles/haddock/default/Collapsible.less
b/jspwiki-war/src/main/styles/haddock/default/Collapsible.less
index 0c7a1dd..7577a72 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Collapsible.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Collapsible.less
@@ -131,11 +131,9 @@ div[class^=collapsebox] {
> .panel-heading { padding-left:0; } //remove some left space next to the
bullet
- //coloured collapseboxes get white bullets
+ //bullets get color ot text
&:not(.panel-default) .bullet {
- &.xpand, &.xpand:hover { border-top-color: @white; }
- &.clpse, &.clpse:hover { border-left-color: @white; }
+ &.xpand, &.xpand:hover { border-top-color: currentColor; }
+ &.clpse, &.clpse:hover { border-left-color: currentColor; }
}
}
-
-
diff --git a/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
b/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
index a3ec5b0..3d9c2a5 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
@@ -62,7 +62,10 @@ DOM Structure:
content: @icon-expand;
overflow:hidden;
}
-
+/*hide default jspwiki paperclip icon*/
+.slimbox-link > img {
+ display:none;
+}
.slmbx {
diff --git a/jspwiki-war/src/main/styles/haddock/default/modals.less
b/jspwiki-war/src/main/styles/haddock/default/modals.less
index 8bde01b..f88c4b8 100755
--- a/jspwiki-war/src/main/styles/haddock/default/modals.less
+++ b/jspwiki-war/src/main/styles/haddock/default/modals.less
@@ -36,8 +36,8 @@ body[.show-modal]
*/
.modal {
- //position: fixed;
- position: absolute;
+ position: fixed;
+ //position: absolute;
max-width: unit(@wiki-modal-max-width, vw);
max-height: unit(@wiki-modal-max-height,vh);
top: unit( (100 - @wiki-modal-max-height)/2,vh);
diff --git a/jspwiki-war/src/main/styles/haddock/default/tables.less
b/jspwiki-war/src/main/styles/haddock/default/tables.less
index 2ac0d1c..84f47a6 100644
--- a/jspwiki-war/src/main/styles/haddock/default/tables.less
+++ b/jspwiki-war/src/main/styles/haddock/default/tables.less
@@ -55,6 +55,9 @@ table[border="1"] td { border:0; }
}
.table-bordered {
+ border:none;
+}
+.table-bordered table {
border: 1px solid @table-border-color;
tr:first-child {
@@ -62,8 +65,8 @@ table[border="1"] td { border:0; }
}
}
-.table-noborder,
-.table-borderless {
+.table-noborder table.wikitable ,
+.table-borderless table.wikitable {
td, tr:first-child th {
border: 0;
}
diff --git a/jspwiki-war/src/main/styles/haddock/default/type.less
b/jspwiki-war/src/main/styles/haddock/default/type.less
index 0c83ac8..136d47e 100644
--- a/jspwiki-war/src/main/styles/haddock/default/type.less
+++ b/jspwiki-war/src/main/styles/haddock/default/type.less
@@ -531,6 +531,20 @@ a.interwiki[href*="Group.jsp?group="] {
background-color:@link-hover-color;
}
}
+a[href^="https://maps.google.com/maps?q=";],
+a[href^="https://maps.apple.com/maps?q=";],
+a[href^="https://www.bing.com/maps/default.aspx?rtp=";] {
+ &::before {
+ margin-right:.15em;
+ color:@link-color;
+ .icon--all;
+ content:@icon-map-marker;
+ }
+ &:hover::before {
+ text-decoration:none;
+ //background-color:@link-hover-color;
+ }
+}
a.interwiki[href^="rss.jsp"],
.feed {
&:after {
@@ -539,6 +553,13 @@ a.interwiki[href^="rss.jsp"],
}
&:hover { text-decoration:none; }
}
+
+a[href^="mailto:"]::after {
+ .icon--text;
+ content:"mail-to";
+ margin-left:.15em;
+}
+
.dropdown-menu > li > a.feed { padding-left:0; }
/*
diff --git a/jspwiki-war/src/main/styles/haddock/default/variables.less
b/jspwiki-war/src/main/styles/haddock/default/variables.less
index 695f54c..326edea 100644
--- a/jspwiki-war/src/main/styles/haddock/default/variables.less
+++ b/jspwiki-war/src/main/styles/haddock/default/variables.less
@@ -72,8 +72,6 @@ images/feather-small.png wxh 162x286
@panel-default-border: @pre-border-color;
@panel-default-heading-bg: @pre-bg;
-@modal-backdrop-bg: hsl(16, 44%, 63%); //copper blush
-
// JPSWiki variables
// Main color scheme
@wiki-header-bg: hsla(214, 68%, 58%, 0.9); //@brand-primary;
@@ -104,8 +102,10 @@ images/feather-small.png wxh 162x286
@wiki-commentbox-ratio: percentage( 1 / (1 + @golden-square) ); //27.6373%
@wiki-commentbox-width: @wiki-commentbox-ratio * 100% / (100% -
@wiki-sidebar-width);
@wiki-commentbox-width-inverse: (100% - @wiki-commentbox-width);
+
+@modal-backdrop-bg: hsl(16, 44%, 63%); //copper blush
@wiki-modal-max-width: 100 * (1-@sidebar-ratio);
-@wiki-modal-max-height: 90;
+@wiki-modal-max-height: 40;
//Nav bar
@wiki-logo-font-family: 'HelveticaNeue-UltraLight', 'Helvetica Neue
UltraLight', 'Helvetica Neue', Arial, Helvetica, sans-serif;
