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
commit c620bd57ee473269e198dd714de6a55ca4673bd4
Author: brushed <dirk.frederi...@gmail.com>
AuthorDate: Mon Feb 26 23:26:13 2018 +0100
Typo
---
.../src/main/resources/ini/jspwiki.properties | 2 +-
.../src/main/scripts/wiki-edit/Wiki.Edit.js | 2 +-
.../src/main/scripts/wiki-edit/Wiki.Snips.js | 22 +++---
.../src/main/scripts/wiki/Wiki.Behaviors.js | 18 +++--
.../main/styles/haddock/default/Template.View.less | 78 ++++++++++++++++------
.../src/main/styles/haddock/default/Viewer.less | 2 +-
.../src/main/styles/haddock/default/forms.less | 14 ++++
.../src/main/styles/haddock/default/type.less | 30 ++++++++-
.../src/main/styles/haddock/default/variables.less | 3 +-
9 files changed, 133 insertions(+), 38 deletions(-)
diff --git a/jspwiki-war/src/main/resources/ini/jspwiki.properties
b/jspwiki-war/src/main/resources/ini/jspwiki.properties
index dadcbc3..767cc9f 100644
--- a/jspwiki-war/src/main/resources/ini/jspwiki.properties
+++ b/jspwiki-war/src/main/resources/ini/jspwiki.properties
@@ -981,7 +981,7 @@ jspwiki.defaultprefs.template.editor =plain
# Set section editing on/off : allow editing of page sections
# Note: currently this is only compatible with the plain editor
-#jspwiki.defaultprefs.template.sectionediting =on
+jspwiki.defaultprefs.template.sectionediting =on
# Set the language
# By default, the language is read from the client browser http request
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 147bff7..f4ba211 100644
--- a/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
+++ b/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
@@ -41,6 +41,7 @@ wiki.add("textarea#editorarea", function( main ){
onbeforeunload( window, main );
+
if( snipe = getFormElem("textarea.snipeable") ){
snipe = new Snipe( snipe, {
@@ -127,7 +128,6 @@ function livepreview(snipe, preview, previewToggle){
isEmpty = content == "",
name, link;
- //console.log("**** change event", new Date().getSeconds() );
function previewDone(){ PreviewSemaphore = false; } //semaphore OFF!
diff --git a/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
b/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
index b66ea8b..25a4f9a 100644
--- a/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
+++ b/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
@@ -29,11 +29,11 @@ Wiki.DirectSnips = {
'[' : ']',
'{' : '}',
"'" : {
- snippet: "'",
- scope: {
- "[{" : "}]" //plugin parameters
- }
- }
+ snippet: "'",
+ scope: {
+ "[{" : "}]" //plugin parameters
+ }
+ }
};
/*
@@ -103,12 +103,18 @@ Wiki.Snips = {
tabs: {
nScope: {
- "%%(":")",
- "%%tabs":"/%"
+ "%%(":")",
+ "%%tabs":"/%"
},
snippet:"%%tabs\n!tab-1\ntab-1 content 1\n!tab-2\ntab-2 content \n/%\n
"
},
+ insertPageDlg:{
+ scope: { "[{InsertPage":"}]" },
+ suggest: { lback:"page='([^']*)'?$", match: "^([^']*)" },
+ insertPageDlg: Wiki.pageDialog("Insert Page", "/search/suggestions")
+ },
+
img: "\n[{Image src='{img.jpg}' width='400px' height='300px' align='left'
}]\n ",
imgSrcDlg:{
@@ -333,7 +339,7 @@ Wiki.Snips = {
suggest: {lback: "table-(?:[\\w-]+-)?(\\w*)$", match: "^\\w*" },
tableDlg: [Dialog.Selection, {
cssClass:".dialog-horizontal",
- body: "sort|filter|striped|bordered|hover|condensed|fit"
+ body: "sort|filter|striped|bordered|noborder|hover|condensed|fit"
}]
},
diff --git a/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
b/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
index ba7a56f..dcc8a48 100644
--- a/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
+++ b/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
@@ -468,9 +468,7 @@ Example:
> }}} /%
*/
- .add("div.prettify:not(.prettyprint) pre, div.prettify:not(.prettyprint)
code", function(element){
-
- element.addClass("prettyprint");
+ .add("div.prettify pre:not(.prettyprint), div.prettify
code:not(.prettyprint)", function(element){
//brute-force line-number injection
"div".slick().wraps(element).grab(
@@ -482,10 +480,22 @@ Example:
}),"top");
+ element.addClass("prettyprint");
+ /*html5 expects <pre><code> */
+ if( element.match("pre") ){
+ element.innerHTML = "<code>" + element.innerHTML + "</code>";
+ element = element.getFirst();
+ }
+
})
- .add("[class~=prettify-nonum] pre, [class~=prettify-nonum] code",
function(element){
+ .add("[class~=prettify-nonum] pre:not(.prettyprint),
[class~=prettify-nonum] code:not(.prettyprint)", function(element){
element.addClass("prettyprint");
+ /*html5 expects <pre><code> */
+ if( element.match("pre") ){
+ element.innerHTML = "<code>" + element.innerHTML + "</code>";
+ element = element.getFirst();
+ }
})
diff --git a/jspwiki-war/src/main/styles/haddock/default/Template.View.less
b/jspwiki-war/src/main/styles/haddock/default/Template.View.less
index 8af14c7..4213d3c 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Template.View.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Template.View.less
@@ -271,25 +271,6 @@ body.can-flex {
clear:both;
}
-.feed {
-
- //.@{fa-css-prefix};
- display:inline-block;
- font-family:FontJspwiki;
- font-style: normal;
- font-weight: normal;
- line-height: 1;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- text-decoration:none;
-
- &:before { content: "\e610"; } //fixme -- re-use .icon-search
- &:hover { text-decoration:none; }
-
- overflow:hidden;
- vertical-align:middle;
-}
-
// CHECKME
// *** ConflictContent.jsp ***
@@ -297,3 +278,62 @@ body.can-flex {
// #conflictother
// #conflictown
+
+
+
+/* admin beans */
+/*
+div.formcontainer
+ div.block
+ label
+ input
+ div.description
+*/
+div.admin {
+ .formcontainer {
+ .default;
+ .block { margin-bottom:.5em; }
+ label { }
+ input[type=submit] {
+ .btn;
+ .btn-primary;
+ }
+ input[type=text] {
+ .form-control;
+ }
+ table {
+ .table;
+ .table-bordered;
+ .table-striped;
+ .table-condensed;
+ .wikitable;
+ width:auto; //.table-fit;
+ }
+ .description { .help-block; }
+
+ }
+
+}
+
+ .admin-user-form {
+ display: -ms-flex;
+ display: -webkit-flex;
+ display: flex;
+
+ > div#useredit {
+ width:80%;
+ }
+ > div#userlist {
+ margin-right: (@padding-base-horizontal*4);
+ width:20%;
+
+ .list-group-item.new-user{
+ color: @btn-primary-color;
+ background: @btn-primary-bg;
+ border: @btn-primary-border;
+ }
+ }
+
+ }
+
+
diff --git a/jspwiki-war/src/main/styles/haddock/default/Viewer.less
b/jspwiki-war/src/main/styles/haddock/default/Viewer.less
index 60c59e0..ac9eae5 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Viewer.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Viewer.less
@@ -54,7 +54,7 @@ DOM Structure:
body > iframe { .hidden; }
//avoid that the default background of an iframe is transparent, and contents
becomes unreadible
-//(eg needed for View Page Source
+//(eg needed for View Page Source)
.viewport iframe {
background-color:fade(@white,92%);
padding:.5em;
diff --git a/jspwiki-war/src/main/styles/haddock/default/forms.less
b/jspwiki-war/src/main/styles/haddock/default/forms.less
index f0ebd7c..236bd89 100644
--- a/jspwiki-war/src/main/styles/haddock/default/forms.less
+++ b/jspwiki-war/src/main/styles/haddock/default/forms.less
@@ -81,3 +81,17 @@ Forms:
}
/* CHECKME IEfix ?? .from-group select::-ms-expand { display: none; } */
+
+/* Wiki Form plugins*/
+.page-content .wikiform {
+ input[type=text], textarea{
+ .form-control;
+ height:auto;
+ }
+ input[type=submit]{
+ .btn; .btn-default;
+ }
+ input[type=checkbox], input[type=radio]{
+ margin:10px 1em 10px 0;
+ }
+}
diff --git a/jspwiki-war/src/main/styles/haddock/default/type.less
b/jspwiki-war/src/main/styles/haddock/default/type.less
index 1bc0844..d2ade55 100644
--- a/jspwiki-war/src/main/styles/haddock/default/type.less
+++ b/jspwiki-war/src/main/styles/haddock/default/type.less
@@ -405,6 +405,8 @@ Links:
//generic behavior -- why not part of bootstrap ??
a:hover {
cursor:pointer;
+ //text-decoration: underline;
+ -webkit-text-decoration-skip: ink;
}
//mimic :hover, for old ie cases which may not yet support :hover
@@ -413,6 +415,11 @@ a:hover {
.createpage {
color: @wiki-link-createpage;
border-bottom: 1px dashed @wiki-link-createpage;
+ &:after {
+ .icon--text();
+ content:"?";
+ background-color:@wiki-link-createpage;
+ }
&:hover {
color:darken(@wiki-link-createpage,10%);
text-decoration:none;
@@ -445,10 +452,11 @@ Interwiki links
.interwiki-reader,
a.interwiki[href$="skin=reader"] {
&::after {
- color:@link-color;
.icon--all;
.sup;
content:@icon-leanpub;
+ margin-left:.15em;
+ //color:@link-color; //needed for More-Menu style
}
&:hover::after {
//text-decoraction:none; //FIXME: doesnt work ...
@@ -459,6 +467,7 @@ a.interwiki[href$="skin=raw"] {
&::after {
.icon--text();
content:"raw";
+ margin-left:.15em;
}
&:hover::after {
//text-decoraction:none;
@@ -470,6 +479,7 @@ a.interwiki[href*="Edit.jsp?page="] {
&::after {
.icon--text;
content:"edit";
+ margin-left:.15em;
//color:@link-color;
//.icon--all;
//.sup;
@@ -485,6 +495,7 @@ a.interwiki[href*="Group.jsp?group="] {
&::after {
.icon--text;
content:"group";
+ margin-left:.15em;
//color:@link-color;
//.icon--all;
//.sup;
@@ -495,6 +506,17 @@ a.interwiki[href*="Group.jsp?group="] {
background-color:@link-hover-color;
}
}
+a.interwiki[href^="rss.jsp"],
+.feed {
+ &:after {
+ .icon--all;
+ margin-left:.15em;
+ .sup;
+ content:@icon-rss;
+ }
+ &:hover { text-decoration:none; }
+
+}
/*
Footnotes
@@ -644,6 +666,9 @@ span.default, span.success, span.information, span.info,
span.warning, span.err
display: inline;
padding: .05em .25em;
}
+span.success, span.information, span.info, span.warning, span.error,
span.danger {
+ border:none;
+}
.default {
.alert-variant(@btn-default-bg; @btn-default-border; @btn-default-color);
@@ -654,11 +679,10 @@ span.default, span.success, span.information, span.info,
span.warning, span.err
.error, .danger { .alert-danger; }
//CHECKME: make sure to fill the table cell with the background color
-td .success, td .information, td .warning, td .error { margin:0; }
+td .success, td .info, td .information, td .warning, td .error, td .danger {
margin:0; }
//BETTER: td > .alert { margin:0; }
-
/*
Style: CAPTCHA tables and images
*/
diff --git a/jspwiki-war/src/main/styles/haddock/default/variables.less
b/jspwiki-war/src/main/styles/haddock/default/variables.less
index 0da424a..d2b0596 100644
--- a/jspwiki-war/src/main/styles/haddock/default/variables.less
+++ b/jspwiki-war/src/main/styles/haddock/default/variables.less
@@ -74,7 +74,8 @@ images/feather-small.png wxh 162x286
// JPSWiki variables
// Main color scheme
-@wiki-header-bg: #4A89DC; //@brand-primary;
+@wiki-header-bg: rgba(74,137,220,0.9); //@brand-primary;
+
@wiki-header-color: @white;
@wiki-page-bg: @white;
@wiki-sidebar-bg: #e5e8ed;
--
To stop receiving notification emails like this one, please contact
brus...@apache.org.
