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 2016/04/03 21:47:58 UTC
svn commit: r1737605 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/preferences/
jspwiki-war/src/main/resources/ini/ jspwiki-war/src/main/resources/templates/
jspwiki-war/src/main/scripts/mo...
Author: brushed
Date: Sun Apr 3 19:47:57 2016
New Revision: 1737605
URL: http://svn.apache.org/viewvc?rev=1737605&view=rev
Log:
2.10.3-svn-8 Few more fixes on the HADDOCK template
* Reorganize the attachment detail view
* Improve the rendering of the RecentChanges page
* Fix the font for text in buttons with an icon
* Fix the suggestion dialog position in the plain editor
* Hide the section-editlinks for weblog comments.
* Fix the handling of the editor-type switch in the editor.
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties
jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/CKeditor.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/TinyMCE.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/wysiwyg.jsp
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Apr 3 19:47:57 2016
@@ -1,3 +1,22 @@
+2016-04-03 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-svn-8 Few more fixes on the HADDOCK template
+
+ * Reorganize the attachment detail view, changing the
+ order of columns to a more logical format.
+
+ * Improve the rendering of the RecentChanges page
+
+ * Fix the font for text in buttons with an icon
+
+ * Fix the popup dialog position in the plain editor
+ in case the textarea contains '<', '>' or '&' characters.
+
+ * Hide the section-editlinks for weblog comments.
+
+ * Fix the handling of the editor-type switch in the editor.
+
+
2016-03-27 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-7 Few more small fixes on the HADDOCK template
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun Apr 3 19:47:57 2016
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "7";
+ public static final String BUILD = "8";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java Sun Apr 3 19:47:57 2016
@@ -77,7 +77,7 @@ public class Preferences
*/
public static void setupPreferences( PageContext pageContext )
{
- // HttpSession session = pageContext.getSession();
+ //HttpSession session = pageContext.getSession();
//if( session.getAttribute( SESSIONPREFS ) == null )
//{
@@ -113,6 +113,7 @@ public class Preferences
java.util.TimeZone.getDefault().getID() ) );
prefs.put("Orientation", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.orientation", "fav-left" ) );
+ prefs.put("Sidebar", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.sidebar", "active" ) );
prefs.put("Layout", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.layout", "fluid" ) );
@@ -120,7 +121,7 @@ public class Preferences
getLocale( ctx ).toString() ) );
prefs.put("SectionEditing", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.sectionediting",
- "" ) );
+ "true" ) );
// FIXME: "editor" property does not get registered, may be related with http://bugs.jspwiki.org/show_bug.cgi?id=117
// disabling it until knowing why it's happening
Modified: jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/ini/jspwiki.properties Sun Apr 3 19:47:57 2016
@@ -965,11 +965,17 @@ jspwiki.defaultprefs.template.dateformat
# By default, the timezone is read from the server
# jspwiki.defaultprefs.template.timezone =GMT+01:00
-# Set position of the favorites menu (aka left menu)
+# Set position of the favorites menu (aka left menu, sidebar)
# The value determines the css-class used to change the position of the #favorites block
-# Possible values: fav-left, fav-right or fav-hidden
+# Possible values: fav-left or fav-right
# Default value is fav-left
jspwiki.defaultprefs.template.orientation =fav-left
+
+# Hide/Display the favorites menu (aka left menu, sidebar)
+jspwiki.defaultprefs.template.sidebar =active
+
+# Set layout of the template
+# Possible values: fluid (use full screen-estate) or fixed (fixed max-width)
jspwiki.defaultprefs.template.layout =fluid
# Set editor type : plain, WikiWizard, FCK
Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties Sun Apr 3 19:47:57 2016
@@ -424,6 +424,7 @@ prefs.save.description=Click “save
prefs.save.submit=Save profile
prefs.create.submit=Create New User Profile
+prefs.cancel.submit=Cancel
prefs.roles=Roles
prefs.groups=Groups
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Textarea.js Sun Apr 3 19:47:57 2016
@@ -341,7 +341,7 @@ var Textarea = new Class({
var ta = this.ta,
//make sure the shadow element is always just before of the textarea
taShadow = this.taShadow.inject(ta, "before"),
- value = ta.value,
+ value = ta.value.replace(/[<>&]/g,"X"),
el, t, l, w, h;
//default character offset is the position of the caret (cursor or begin of the selection)
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.js Sun Apr 3 19:47:57 2016
@@ -226,7 +226,7 @@ var Snipe = new Class({
if( /snippets|directsnips|autosuggest|tabcompletion|smartpairs/.test(item) ){
this.options[item] = value;
}
- return this;
+ return this.fireEvent("change");
},
/*
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js Sun Apr 3 19:47:57 2016
@@ -36,6 +36,7 @@ var editform,
snipe,
preview,
previewcache,
+ isLivePreview,
sectionsDropDown;
wiki.add("#editform", function( element ){
@@ -43,6 +44,7 @@ wiki.add("#editform", function( element
editform = element;
textarea = getFormElement(".editor");
preview = getFormElement(".ajaxpreview");
+ isLivePreview = getFormElement("[data-cmd=livepreview]") || {};
onbeforeunload( );
@@ -57,10 +59,7 @@ wiki.add("#editform", function( element
},
snippets: wiki.Snips,
directsnips: wiki.DirectSnips,
-
- onChange: livepreview.debounce(500),
-
- onConfig: config //configuration callbacks
+ onChange: livepreview.debounce(500)
});
@@ -68,37 +67,15 @@ wiki.add("#editform", function( element
new Snipe.Sections( sectionsDropDown, {
snipe: snipe,
- parser: jspwikiSectionParser //jspwiki section parser callback
+ parser: jspwikiSectionParser //callback
});
-
}
- wiki.resizer( snipe.toElement(), function(h){ preview.setStyle("height", h); });
-
- /*
- $$("config[data-cmd]:checked").addEvent("configured", function(){
- snipe.set(this.getAttribute("data-cmd"), this.checked).fireEvent("change") );
- });
- wiki.configuration( form );
- */
-
- //Initialize the configuration checkboxes
- //Read the wiki-prefs cookie values.
- //EG: tabcompletion, smartpairs, autosuggest, livepreview, previewcolumn..
- editform.getElements(".config [data-cmd]").each( function( configElement ){
-
- var cmd = configElement.getAttribute("data-cmd");
-
- configElement.checked = !!wiki.prefs.get(cmd); //read wiki preferences cookie
-
- configElement.getParent().ifClass(configElement.checked, 'active');
-
- //wiki.Snips[ cmd ] = { event: 'config' };
- //console.log(cmd, configElement.checked);
- config(cmd);
-
+ wiki.configPrefs( editform, function(cmd, isChecked){
+ snipe.set(cmd, isChecked); //and snipe will fire the change event
});
+ wiki.resizer( snipe.toElement(), function(h){ preview.setStyle("height", h); });
});
@@ -134,7 +111,9 @@ wiki.add("#editform", function( element
}
};
- editform.addEvent("submit", function(){ window.onbeforeunload = null; });
+ editform.addEvent("submit", function(){
+ window.onbeforeunload = null;
+ });
}
@@ -153,7 +132,7 @@ wiki.add("#editform", function( element
console.log("**** change event", new Date().getSeconds() );
- if( !(getFormElement("[data-cmd=livepreview]") || {}).checked ){
+ if( !isLivePreview.checked ){
//cleanup the preview area
console.log("cleanup");
@@ -188,75 +167,6 @@ wiki.add("#editform", function( element
}
/*
- Function: config
- Change the configuration of the snip-editor, and store it
- in the wiki-prefs. (cookie)
- The configuration is read from DOM checkbox elements.
- The name of the DOM checkboxes correponds with the cookie names,
- and the cookienames correspond with the snip-editor state attribute, if applicable.
-
- - invoked by initconfig, to initialize checkboxes with cookie values.
- - invoked when the config cmd checkboxes are clicked (ref. snippet commands)
-
- Argument:
- cmd - which configuration command has been triggered or needs to be initialized.
- */
- function config( cmd ){
-
- var el = getFormElement("[data-cmd=" + cmd + "]"),
- state,
- previewcontainer;
-
- //console.log("CONFIG EVENT", cmd, arguments);
-
- if( el ){
-
- state = el.checked;
- wiki.prefs.set(cmd, state); //persist in the pref cookie
-
- if( cmd.test( /livepreview|previewcolumn/ ) ){
-
- previewcontainer = getFormElement(".edit-area").ifClass(state, cmd);
-
- if( cmd == "livepreview" ){
-
- //disable the previewcolumn toolbar cmd
- getFormElement("[data-cmd=previewcolumn]").disabled = !state;
-
- } else {
-
- /* Toggle the position of the preview-area in the dom
-
- 1. HORIZONTAL SIDE BY SIDE VIEW
- div.snip
- div.toolbar
- div.edit-area.livepreview.previewcolumn
- div.col-50
- div.col-50.ajaxpreview
- div.resizer
-
- 2. VERTICAL VIEW
- div.snip
- div.toolbar
- div.edit-area.livepreview
- div.col-50
- div.resizer
- div.col-50.ajaxpreview
- */
-
- if( !state ){ previewcontainer = previewcontainer.getParent(); }
- previewcontainer.grab(preview);
-
- }
- }
-
- snipe.set(cmd, state).fireEvent("change");
-
- }
- }
-
-
- /*
Function: jspwikiSectionParser
Convert a jspwiki-markup page into an array of page sections.
Sections are marked by jspwiki headers: !, !! or !!!
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js Sun Apr 3 19:47:57 2016
@@ -469,19 +469,20 @@ Wiki.Snips = {
"SET {name}='value'":"Set a Wiki variable",
"${varname}":"Get a Wiki variable",
"If name='{value}' page='pagename' exists='true' contains='regexp'\n\nbody\n":"IF plugin",
- "SET alias='${pagename}'":"Page Alias",
- "SET sidebar='off'":"Collapse Sidebar",
+ "SET alias='${pagename}'":"Set Page Alias",
+ "SET page-styles='prettify-nonum table-condensed-fit'":"Set Page Styles",
+ "SET sidebar='off'":"Hide Sidebar",
//"Table":"Advanced Tables",
//"Groups":"View all Wiki Groups",
"":"",
"Counter":"Insert a simple counter",
+ "PageViewPlugin":"Count Views of this page",
"CurrentTimePlugin format='yyyy mmm-dd'":"Insert Current Time",
"Denounce":"Denounce a link",
"Image src='${image.jpg}'":"Insert an Image <span class='icon-picture'></span>",
"IndexPlugin":"Index of all pages",
"InsertPage page='${pagename}'":"Insert another Page",
- "SET page-styles='prettify-nonum table-condensed-fit'":"Insert Page Styles",
"ListLocksPlugin":"List page locks",
"RecentChangesPlugin":"Displays the recent changed pages",
"ReferredPagesPlugin page='{pagename}' type='local|external|attachment' depth='1..8' include='regexp' exclude='regexp'":"Incoming Links (referred pages)",
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js Sun Apr 3 19:47:57 2016
@@ -58,7 +58,7 @@ Javascript routines to support JSPWiki U
});
//save & clear button handlers
- //form.getElements("[name=action]").addEvent( function(event){..});
+ //form.getElements("[name=action]").addEvent( function(event){
form.action[0].onclick = form.action[1].onclick = function(event){
switch( event.target.value ){
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js Sun Apr 3 19:47:57 2016
@@ -209,6 +209,8 @@ var Wiki = {
duration: 20
});
+ //Object.each(wiki.prefs.hash, function(item,key){ console.log("PREFS ",key,"=>",item); });
+
if( wiki.version != wiki.prefs.get("version") ){
wiki.prefs.empty();
wiki.prefs.set("version", wiki.version);
@@ -464,52 +466,85 @@ var Wiki = {
},
/*
- Function: configuration
+ Function: configPrefs (sofar only used in edit mode)
+ Initialize the configuration checkboxes from the wiki prefs cookie.
+ Save any change to the checkboxes back into the wiki prefs cookie.
+ Also take care of switching between different editor types, saving the
+ new editor type into the wiki prefs cookie.
+
+ EG: tabcompletion, smartpairs, autosuggest, livepreview, previewcolumn. editor-type
*/
- configuration: function( form ){
+ configPrefs: function( form, onChangeFn ){
- var wiki = this,
- editarea = form.getElement(".edit-area"),
- preview = form.getElement(".ajaxpreview");
+ var wiki = this;
- function onConfig(){ config(this, this.getAttribute("data-cmd")); }
+ function onCheck(){
- function config( el, cmd ){
+ var cmd = this.getAttribute("data-cmd"),
+ isChecked = this.checked;
- var checked = el.checked, previewcontainer;
+ wiki.toggleLivePreview(form, cmd, isChecked);
+ wiki.prefs.set(cmd, isChecked); //persist in the pref cookie
+ if( onChangeFn ){ onChangeFn(cmd, isChecked); }
- //console.log("CONFIG EVENT", el, cmd );
+ }
- //editor DOM manipulation, to toggle row/column live-preview layout
- //FFS: should be do-able via css only
- if( cmd.test( /livepreview|previewcolumn/ ) ){
+ //Handle all configuration checkboxes
+ form.getElements("[type=checkbox][data-cmd]").each( function( el ){
- previewcontainer = editarea.ifClass(checked, cmd);
+ el.checked = !!wiki.prefs.get(el.getAttribute("data-cmd"));
+ el.addEvent("click", onCheck );
+ onCheck.apply(el);
- if( cmd == "livepreview" ){
+ });
- //disable the previewcolumn toolbar cmd
- form.getElement("[data-cmd=previewcolumn]").disabled = !checked;
+ //Persist the selected editor type in the pref cookie
+ form.getElements("a.editor-type").addEvent("click", function(){
+ wiki.prefs.set("editor", this.get("text"));
+ });
- } else {
+ },
- if( !checked ){ previewcontainer = previewcontainer.getParent(); }
- previewcontainer.grab( preview );
- }
- }
- wiki.prefs.set(cmd, checked); //persist in the pref cookie
- el.fireEvent("configured");
- }
+ toggleLivePreview: function( container, cmd, state ){
- form.getElements(".config [data-cmd]").each( function( element ){
+ if( cmd.test( /livepreview|previewcolumn/ ) ){
- var cmd = element.getAttribute("data-cmd");
- element.checked = !!wiki.prefs.get(cmd); //read wiki preferences cookie
- element.addEvent("click", onConfig );
- config( element, cmd );
+ var previewcontainer = container.getElement(".edit-area").ifClass(state, cmd),
+ ajaxpreview = container.getElement(".ajaxpreview");
+
+ if( cmd == "livepreview" ){
+
+ //disable the previewcolumn toolbar cmd checkbox
+ container.getElement("[data-cmd=previewcolumn]").disabled = !state;
+
+ } else {
+
+ /* Toggle the position of the preview-area in the dom
+
+ 1. HORIZONTAL SIDE BY SIDE VIEW
+ div.snip
+ div.toolbar
+ div.edit-area.livepreview.previewcolumn
+ div.col-50
+ div.col-50.ajaxpreview
+ div.resizer
+
+ 2. VERTICAL VIEW
+ div.snip
+ div.toolbar
+ div.edit-area.livepreview
+ div.col-50
+ div.resizer
+ div.col-50.ajaxpreview
+ */
+
+ if( !state ){ previewcontainer = previewcontainer.getParent(); }
+ previewcontainer.grab(ajaxpreview);
+
+ }
+ }
- });
},
getXHRPreview: function( getContent, previewElement ){
@@ -559,7 +594,7 @@ var Wiki = {
var prefs = this.prefs,
handle = document.getElement(".resizer"),
- pref = handle.getAttribute("data-resize-cookie"),
+ pref = handle.getAttribute("data-pref"),
h;
function helpdragging(add){ handle.ifClass(add, "dragging"); }
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less Sun Apr 3 19:47:57 2016
@@ -30,13 +30,17 @@ DOM structure:
.table-hover;
td {
- vertical-align:top;
- }
- td.date {
- vertical-align:bottom;
- background-color:@wiki-recentchanges-date-bg;
- border-radius: @border-radius-base;
- border:none;
+ &:first-child:not(.date) {
+ padding-left:2em;
+ }
+ &.date {
+ border-bottom:2px solid @wiki-recentchanges-date-bg;
+ padding-top:1em;
+ }
+ &.changenote {
+ .small;
+ font-style:normal;
+ }
}
tr.odd td {
background-color:transparent;
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less Sun Apr 3 19:47:57 2016
@@ -111,6 +111,11 @@ div.weblogcomments
}
.weblogcomments {
padding-left: 2em;
+ /*
+ Hide the incorrect section-edit links because the comments are actually stored
+ in another page with name "<blog-name>_comments_<timestamp>-SEQ#"
+ */
+ .editsection { .hide; }
}
.signature {
margin:(@line-height-computed/2) 0;
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Comment.jsp Sun Apr 3 19:47:57 2016
@@ -210,10 +210,8 @@
Calendar cal = Calendar.getInstance();
SimpleDateFormat fmt = Preferences.getDateFormat( wikiContext , TimeFormat.DATETIME);
- pageText.append("\n\n--"+signature+", "+fmt.format(cal.getTime()));
+ pageText.append("\n\n%%signature\n"+signature+", "+fmt.format(cal.getTime())+"\n/%");
- //SimpleDateFormat fmt = new SimpleDateFormat( "YYYY-MM-DDThh:mm" ); //ISO-8601 format
- //pageText.append("\n\n--"+signature+", [{Date value='"+fmt.format(cal.getTime())+"' }]");
}
if( TextUtil.isPositive(remember) )
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp Sun Apr 3 19:47:57 2016
@@ -265,22 +265,6 @@
//
- // switch the target editor type (plain, wysiwyg-editor...) when opening the editor
- // by means of an optional url parameter &editor=plain
- //
- String editor = request.getParameter(EditorManager.PARA_EDITOR);
- if( editor != null )
- {
- log.info("Switching Editor type to: " + editor );
-
- Preferences prefs = (Preferences)session.getAttribute( Preferences.SESSIONPREFS );
- if( prefs != null )
- {
- prefs.put( EditorManager.PARA_EDITOR, editor );
- }
- }
-
- //
// Determine and store the date the latest version was changed. Since
// the newest version is the one that is changed, we need to track
// that instead of the edited version.
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp Sun Apr 3 19:47:57 2016
@@ -104,11 +104,11 @@
<div class="slimbox-attachments table-filter-striped-sort-condensed">
<table class="table">
<tr>
- <th><fmt:message key="info.attachment.type"/></th>
<th><fmt:message key="info.attachment.name"/></th>
<th><fmt:message key="info.version"/></th>
- <th><fmt:message key="info.size"/></th>
<th><fmt:message key="info.date"/></th>
+ <th><fmt:message key="info.size"/></th>
+ <th><fmt:message key="info.attachment.type"/></th>
<th><fmt:message key="info.author"/></th>
<th><fmt:message key="info.actions"/></th>
<th><fmt:message key="info.changenote"/></th>
@@ -121,20 +121,20 @@
<c:set var="parts" value="${fn:split(att.fileName, '.')}" />
<c:set var="type" value="${ fn:length(parts)>1 ? parts[fn:length(parts)-1] : ''}" />
- <td class="attach-type"><span class="icon-file-${type}-o">${type}</span></td>
+ <td class="attach-name" title="${att.fileName}"><wiki:LinkTo>${att.fileName}</wiki:LinkTo></td>
- <td class="attach-name" title="${att.fileName}">${att.fileName}</td>
+ <td><wiki:PageVersion /></td>
- <td><wiki:LinkTo><wiki:PageVersion /></wiki:LinkTo></td>
+ <td class="nowrap" jspwiki:sortvalue="${att.lastModified.time}">
+ <fmt:formatDate value="${att.lastModified}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+ </td>
<td class="nowrap" title="${att.size} bytes">
<%-- <fmt:formatNumber value='${att.size/1024.0}' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/> --%>
<%= org.apache.commons.io.FileUtils.byteCountToDisplaySize( att.getSize() ) %>
</td>
- <td class="nowrap" jspwiki:sortvalue="${att.lastModified.time}">
- <fmt:formatDate value="${att.lastModified}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
- </td>
+ <td class="attach-type"><span class="icon-file-${fn:toLowerCase(type)}-o"></span>${type}</td>
<td><wiki:Author /></td>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp Sun Apr 3 19:47:57 2016
@@ -323,11 +323,11 @@
<div class="slimbox-attachments table-filter-sort-condensed-striped">
<table class="table">
<tr>
- <th><fmt:message key="info.version"/></th>
- <th><fmt:message key="info.attachment.type"/></th>
<th><fmt:message key="info.attachment.name"/></th>
- <th><fmt:message key="info.size"/></th>
+ <th><fmt:message key="info.version"/></th>
<th><fmt:message key="info.date"/></th>
+ <th><fmt:message key="info.size"/></th>
+ <th><fmt:message key="info.attachment.type"/></th>
<th><fmt:message key="info.author"/></th>
<%--
<wiki:Permission permission="upload">
@@ -340,23 +340,23 @@
<wiki:HistoryIterator id="att"><%-- <wiki:AttachmentsIterator id="att"> --%>
<tr>
- <td><wiki:LinkTo version="${att.version}"><wiki:PageVersion /></wiki:LinkTo></td>
+ <td class="attach-name"><wiki:LinkTo version="${att.version}">${att.fileName}</wiki:LinkTo></td>
- <%-- see styles/fontjspwiki/icon.less : icon-file-<....>-o --%>
- <c:set var="parts" value="${fn:split(att.fileName, '.')}" />
- <c:set var="type" value="${ fn:length(parts)>1 ? parts[fn:length(parts)-1] : ''}" />
- <td class="attach-type"><span class="icon-file-${type}-o">${type}</span></td>
+ <td><wiki:PageVersion /></td>
- <td class="attach-name">${att.fileName}</td>
+ <td class="nowrap" jspwiki:sortvalue="${att.lastModified.time}">
+ <fmt:formatDate value="${att.lastModified}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+ </td>
<td class="nowrap" title="${att.size} bytes">
<%-- <fmt:formatNumber value='${att.size/1024.0}' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/> --%>
<%= org.apache.commons.io.FileUtils.byteCountToDisplaySize( att.getSize() ) %>
</td>
- <td class="nowrap" jspwiki:sortvalue="${att.lastModified.time}">
- <fmt:formatDate value="${att.lastModified}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
- </td>
+ <%-- see styles/fontjspwiki/icon.less : icon-file-<....>-o --%>
+ <c:set var="parts" value="${fn:split(att.fileName, '.')}" />
+ <c:set var="type" value="${ fn:length(parts)>1 ? parts[fn:length(parts)-1] : ''}" />
+ <td class="attach-type"><span class="icon-file-${fn:toLowerCase(type)}-o"></span>${type}</td>
<td><wiki:Author /></td>
<%--
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp Sun Apr 3 19:47:57 2016
@@ -41,12 +41,13 @@
<c:set var="timezones" value="<%= t.listTimeZones(pageContext) %>" />
<c:set var="timeformats" value="<%= t.listTimeFormats(pageContext) %>" />
<c:set var="editors" value="<%= c.getEngine().getEditorManager().getEditorList() %>" />
+<c:set var="redirect"><wiki:Variable var='redirect' default='<%=c.getEngine().getFrontPage() %>' /></c:set>
<form action="<wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab' value='prefs'/></wiki:Link>"
id="preferences" <%-- used by Prefs.js to set/reset the userpreferences cookie --%>
method="post" accept-charset="<wiki:ContentEncoding />" >
- <input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
+ <input type="hidden" name="redirect" value="${redirect}" />
<div class="form-group ">
@@ -62,9 +63,9 @@
</span>
<span class="dropdown" style="display:inline-block" >
- <button class="btn btn-danger" type="submit" name="action" value="clearAssertedName"
+ <button class="btn btn-default" type="submit" name="action" value="clearAssertedName"
<%--<wiki:UserCheck status="anonymous">disabled</wiki:UserCheck>--%>
- ><fmt:message key='prefs.clear.submit'/></button>
+ ><span class="icon-trash-o"></span> <fmt:message key='prefs.clear.submit'/></button>
<ul class="dropdown-menu" data-hover-parent=".dropdown">
<li class="dropdown-header"><fmt:message key="prefs.clear.description" /></li>
</ul>
@@ -73,7 +74,7 @@
</div>
<c:if test="${param.tab eq 'prefs'}" >
- <div class="">
+ <div>
<span class="form-col-20 control-label"></span>
<fmt:message key="prefs.errorprefix.prefs" var="msg"/>
<wiki:Messages div="alert alert-danger form-col-50" topic="prefs" prefix="${msg}" />
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp Sun Apr 3 19:47:57 2016
@@ -70,9 +70,10 @@
<fmt:message key="actions.prefs" />
</wiki:Link>
<wiki:Permission permission="createGroups">
- <wiki:Link cssClass="btn btn-default btn-block icon-group" jsp="UserPreferences.jsp">
+ <wiki:Link cssClass="btn btn-default btn-block" jsp="UserPreferences.jsp">
<wiki:Param name='redirect' value='${redirect}'/>
<wiki:Param name='tab' value='groups'/>
+ <span class="icon-group"></span>
<fmt:message key="actions.groups" />
</wiki:Link>
</wiki:Permission>
@@ -84,7 +85,8 @@
<wiki:UserCheck status="notAuthenticated">
<wiki:CheckRequestContext context='!login'>
<wiki:Permission permission="login">
- <wiki:Link cssClass="btn btn-primary btn-block login icon-signin" jsp="Login.jsp">
+ <wiki:Link cssClass="btn btn-primary btn-block login" jsp="Login.jsp">
+ <span class="icon-signin"></span>
<wiki:Param name='redirect' value='${redirect}'/>
<fmt:message key="actions.login" />
</wiki:Link>
@@ -103,8 +105,8 @@
--%>
<wiki:UserCheck status="authenticated">
<a href="<wiki:Link jsp='Logout.jsp' format='url' />"
- class="btn btn-default btn-block logout icon-signout"
- data-modal=".modal">
+ class="btn btn-default btn-block logout" data-modal=".modal">
+ <span class="icon-signout"></span>
<fmt:message key="actions.logout"/>
<div class="modal"><fmt:message key='actions.confirmlogout'/></div>
</a>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/CKeditor.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/CKeditor.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/CKeditor.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/CKeditor.jsp Sun Apr 3 19:47:57 2016
@@ -158,7 +158,7 @@
<div class="form-inline form-group">
<span class="cage">
- <input class="btn btn-primary" type="submit" name="ok" accesskey="s"
+ <input class="btn btn-success" type="submit" name="ok" accesskey="s"
value="<fmt:message key='editor.plain.save.submit'/>"
title="<fmt:message key='editor.plain.save.title'/>" />
@@ -207,7 +207,7 @@
<c:choose>
<c:when test="${edt != prefs.editor}">
<li>
- <wiki:Link context="edit"><wiki:Param name="editor" value="${edt}" />${edt}</wiki:Link>
+ <wiki:Link context="edit" cssClass="editor-type">${edt}</wiki:Link>
</li>
</c:when>
<c:otherwise>
@@ -288,8 +288,9 @@ Wiki.add("[name=htmlPageText]", function
html2markup = Wiki.getXHRPreview( editorContent, preview );
- $$("[data-cmd^=live]:checked").addEvent("configured", html2markup);
- Wiki.configuration( form );
+ Wiki.configPrefs( form, function(cmd, isChecked){
+ if(isChecked && (cmd=="livepreview")){ html2markup(); }
+ });
CKEDITOR.replace(element,{
//uiColor: "#e5e8ed",
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/TinyMCE.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/TinyMCE.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/TinyMCE.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/TinyMCE.jsp Sun Apr 3 19:47:57 2016
@@ -163,7 +163,7 @@
<div class="form-inline form-group">
<span class="cage">
- <input class="btn btn-primary" type="submit" name="ok" accesskey="s"
+ <input class="btn btn-success" type="submit" name="ok" accesskey="s"
value="<fmt:message key='editor.plain.save.submit'/>"
title="<fmt:message key='editor.plain.save.title'/>" />
@@ -211,7 +211,7 @@
<c:choose>
<c:when test="${edt != prefs.editor}">
<li>
- <wiki:Link context="edit"><wiki:Param name="editor" value="${edt}" />${edt}</wiki:Link>
+ <wiki:Link context="edit" cssClass="editor-type">${edt}</wiki:Link>
</li>
</c:when>
<c:otherwise>
@@ -295,9 +295,9 @@ Wiki.add("[name=htmlPageText]", function
html2markup = Wiki.getXHRPreview( editorContent, preview );
- $$("[data-cmd^=live]:checked").addEvent("configured", html2markup);
- Wiki.configuration( form );
-
+ Wiki.configPrefs( form, function(cmd, isChecked){
+ if(isChecked && (cmd=="livepreview")){ html2markup(); }
+ });
tinymce.init({
selector: "textarea[name=htmlPageText]",
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp Sun Apr 3 19:47:57 2016
@@ -215,8 +215,8 @@
</div>
<c:set var="editors" value="<%= context.getEngine().getEditorManager().getEditorList() %>" />
- <c:if test='${fn:length(editors)>1}'>
- <div class="btn-group config">
+ <c:if test='${fn:length(editors) > 1}'>
+ <div class="btn-group config">
<%-- note: 'dropdown-toggle' is only here to style the last button properly! --%>
<button class="btn btn-default"><span class="icon-pencil"></span><span class="caret"></span></button>
<ul class="dropdown-menu" data-hover-parent="div">
@@ -224,7 +224,7 @@
<c:choose>
<c:when test="${edt != prefs.editor}">
<li>
- <wiki:Link context="edit"><wiki:Param name="editor" value="${edt}" />${edt}</wiki:Link>
+ <wiki:Link context="edit" cssClass="editor-type">${edt}</wiki:Link>
</li>
</c:when>
<c:otherwise>
@@ -303,7 +303,7 @@
</div>
<div class="resizer"
- data-resize-cookie="editorHeight"
+ data-pref="editorHeight"
title="<fmt:message key='editor.plain.edit.resize'/>"></div>
</div><%-- end of .snipe --%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/wysiwyg.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/wysiwyg.jsp?rev=1737605&r1=1737604&r2=1737605&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/wysiwyg.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/wysiwyg.jsp Sun Apr 3 19:47:57 2016
@@ -152,7 +152,7 @@
<div class="form-inline form-group">
<span class="cage">
- <input class="btn btn-primary" type="submit" name="ok" accesskey="s"
+ <input class="btn btn-success" type="submit" name="ok" accesskey="s"
value="<fmt:message key='editor.plain.save.submit'/>"
title="<fmt:message key='editor.plain.save.title'/>" />
@@ -201,7 +201,7 @@
<c:choose>
<c:when test="${edt != prefs.editor}">
<li>
- <wiki:Link context="edit"><wiki:Param name="editor" value="${edt}" />${edt}</wiki:Link>
+ <wiki:Link context="edit" cssClass="editor-type">${edt}</wiki:Link>
</li>
</c:when>
<c:otherwise>
@@ -267,7 +267,7 @@
</div>
<div class="resizer"
- data-resize-cookie="editorHeight"
+ data-pref="editorHeight"
title="<fmt:message key='editor.plain.edit.resize'/>"></div>
</form>
@@ -289,8 +289,9 @@ Wiki.add("[name=htmlPageText]", function
html2markup = Wiki.getXHRPreview( editorContent, preview );
- $$("[data-cmd^=live]:checked").addEvent("configured", html2markup);
- Wiki.configuration( form );
+ Wiki.configPrefs( form, function(cmd, isChecked){
+ if(isChecked && (cmd=="livepreview")){ html2markup(); }
+ });
element.mooEditable({
dimensions:{