jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r1693819 [1/3] - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/ jspwiki-war/src/main/java/org/apache/wiki/render/ jspwiki-war/src/main/java/org/apache/wiki/tags/ jspwik...
Date Sun, 02 Aug 2015 18:05:56 GMT
Author: brushed
Date: Sun Aug  2 18:05:54 2015
New Revision: 1693819

URL: http://svn.apache.org/r1693819
Log:
* 2.10.2-svn-29  HADDOCK template improvements & WYSIWYG improvements
       * [JSPWIKI-430] confirmation dialogs build with regular DOM elements 
       * Added support for the WYSIWYG editor TinyMCE.jsp
       * [JSPWIKI-622] Added an editor selection switch to the editor toolbar. 

Added:
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Workflow.less
    jspwiki/trunk/jspwiki-wikipages/ru/target/
    jspwiki/trunk/jspwiki-wikipages/ru/target/.plxarc
    jspwiki/trunk/jspwiki-wikipages/ru/target/archive-tmp/
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/About.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForPageChanges.txt   (with props)
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForUserProfiles.txt   (with props)
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/Community.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/CopyrightNotice.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/EditFindAndReplaceHelp.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/EditPageHelp.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/FullRecentChanges.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/InstallationTips.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/LeftMenu.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/LeftMenuFooter.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/LoginHelp.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/META-INF/
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/META-INF/DEPENDENCIES
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/META-INF/LICENSE
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/META-INF/NOTICE
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/Main.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/MoreMenu.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/OneMinuteWiki.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/PageAlias.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/PageIndex.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/RecentChanges.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/RejectedMessage.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/SandBox.txt   (with props)
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/SearchPageHelp.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/SystemInfo.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/TextFormattingRules.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/TitleBox.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/UndefinedPages.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/UnusedPages.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/WikiEtiquette.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/WikiName.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/classes/WikiWiki.txt
    jspwiki/trunk/jspwiki-wikipages/ru/target/jspwiki-wikipages-ru-2.10.2-SNAPSHOT.jar   (with props)
    jspwiki/trunk/jspwiki-wikipages/ru/target/jspwiki-wikipages-ru-2.10.2-SNAPSHOT.zip   (with props)
    jspwiki/trunk/jspwiki-wikipages/ru/target/maven-archiver/
    jspwiki/trunk/jspwiki-wikipages/ru/target/maven-archiver/pom.properties
    jspwiki/trunk/jspwiki-wikipages/ru/target/maven-shared-archive-resources/
    jspwiki/trunk/jspwiki-wikipages/ru/target/maven-shared-archive-resources/META-INF/
    jspwiki/trunk/jspwiki-wikipages/ru/target/maven-shared-archive-resources/META-INF/DEPENDENCIES
    jspwiki/trunk/jspwiki-wikipages/ru/target/maven-shared-archive-resources/META-INF/LICENSE
    jspwiki/trunk/jspwiki-wikipages/ru/target/maven-shared-archive-resources/META-INF/NOTICE
Removed:
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Group.js
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/htmltowiki/XHtmlElementToWikiTranslator.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java
    jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
    jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/IndexPlugin.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Nav.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less
    jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/CKeditor.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Aug  2 18:05:54 2015
@@ -1,3 +1,72 @@
+2015-08-02  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.2-svn-29
+
+       Some more Haddock template "tweaks":
+
+       * Hide the attach & info navigation menu's for non-existing page
+
+       * Improved the Info dropdown when no Author page exists.
+
+       * Section titles remain visible, even with a sticky navigation menu.
+         Eg. when clicking a table of contents entry, you should end up
+         with a visible section header just below the sticky menu line.
+
+       * Fixed: the top border of a TABLE was gone.
+
+       * Added a version check on the user-preference cookie to be more robust ico changes.
+         (hopefully no more cookie clean-up is needed when upgrading JSPWiki)
+
+       * Sidebar:
+         - The sidebar height now extends till the bottom of the page
+         - 3 Sidebar modes are now working: left(default), right and hidden
+
+       * Fixed the <wiki:Link> tag to support "cssClass" as attribute. 
+
+       * [JSPWIKI-430] All confirmation dialogs are now build with regular DOM elements. 
+         (check out the Log-out or Delete confirmation dialogs to see the improvement) 
+  
+  
+       WYSIWYG editors:
+
+       * Added support for the WYSIWYG editor TinyMCE.jsp
+
+       * Improved server side handling of HtmlStringToWiki translation
+
+       * [JSPWIKI-622] Added an editor selection switch to the editor toolbar. 
+         It is now possible to switch between editors (plain, or other installed 
+         wysiwyg editors) while in Edit. (no need to go first via the Preferences screen)
+
+
+
+2015-07-26  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.2-svn-28
+
+       Haddock Template commit of the remaining JSP's: UI for handling groups,
+       workflow UI, and refactored JSP's for Login/Lostpw/Register.
+       This concludes the re-design of all the haddock template JSP's.
+       
+       Other changes:
+
+       * Fixed page redirections and improved the back button handling.
+         Eg. Attachment DELETE will get you now back to the ATTACH view, 
+         not the INFO view.  See also [JSPWIKI-867]
+
+       * Tabs & Accordion toggles can now include other markup, rather than only text. 
+
+       * Added CSS3-based automatic text hyphenation for browsers who support this.
+         (also works with none justified text)
+
+       * Attachment Upload UI improved: attachment types are represented by icons 
+         from the icon-font.
+
+       * Attachment Info page to access version information on attachments
+         should now be more user-friendly, with an extra INFO action button.
+         (iso a hidden link via the version number)
+
+
+
 2015-07-16  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.2-svn-27

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "28";
+    public static final String     BUILD         = "29";
 
     /**
      *  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/htmltowiki/XHtmlElementToWikiTranslator.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java Sun Aug  2 18:05:54 2015
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
  */
 package org.apache.wiki.htmltowiki;
 
@@ -55,7 +55,7 @@ public class XHtmlElementToWikiTranslato
 
     /**
      *  Create a new translator using the default config.
-     *  
+     *
      *  @param base The base element from which to start translating.
      *  @throws IOException If reading of the DOM tree fails.
      *  @throws JDOMException If the DOM tree is faulty.
@@ -67,7 +67,7 @@ public class XHtmlElementToWikiTranslato
 
     /**
      *  Create a new translator using the specified config.
-     *  
+     *
      *  @param base The base element from which to start translating.
      *  @param config The config to use.
      *  @throws IOException If reading of the DOM tree fails.
@@ -83,7 +83,7 @@ public class XHtmlElementToWikiTranslato
 
     /**
      *  FIXME: I have no idea what this does...
-     * 
+     *
      *  @return Something.
      */
     public String getWikiString()
@@ -215,11 +215,11 @@ public class XHtmlElementToWikiTranslato
                 {
                     if( n.equals( "div" ) )
                     {
-                        m_out.print( "\n%%\n" );
+                        m_out.print( "\n/%\n" );
                     }
                     else
                     {
-                        m_out.print( "%%" );
+                        m_out.print( "/%" );
                     }
                 }
                 if( monospace )
@@ -239,11 +239,11 @@ public class XHtmlElementToWikiTranslato
                 {
                     if( n.equals( "div" ) )
                     {
-                        m_out.print( "\n%%\n" );
+                        m_out.print( "\n/%\n" );
                     }
                     else if( n.equals( "span" ) )
                     {
-                        m_out.print( "%%" );
+                        m_out.print( "/%" );
                     }
                 }
             }
@@ -308,7 +308,7 @@ public class XHtmlElementToWikiTranslato
                         // element is a table cell or list item, a newline character would break the markup.
                         // We also check that this isn't being done inside a plugin body.
                         //
-                        if( parentElementName.matches( "p|div" ) 
+                        if( parentElementName.matches( "p|div" )
                             && !base.getText().matches( "(?s).*\\[\\{.*\\}\\].*" ) )
                         {
                             m_out.print( " \\\\\n" );
@@ -391,13 +391,13 @@ public class XHtmlElementToWikiTranslato
                                     {
                                         // convert "#ref-PageName-1" to just "1"
                                         String href = ref.replaceFirst( "#ref-.+-(\\d+)", "$1" );
-                                        
+
                                         // remove the brackets around "[1]"
                                         String textValue = e.getValue().substring( 1, (e.getValue().length() - 1) );
-                                        
+
                                         if( href.equals( textValue ) ){ // handles the simplest case. Example: [1]
                                             print( e );
-                                        }                                        
+                                        }
                                         else{ // handles the case where the link text is different from the href. Example: [something|1]
                                             m_out.print( "[" + textValue + "|" + href + "]" );
                                         }

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java Sun Aug  2 18:05:54 2015
@@ -1,4 +1,4 @@
-/* 
+/*
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
  */
 package org.apache.wiki.render;
 
@@ -67,7 +67,7 @@ public class RenderingManager implements
     private static final int    DEFAULT_CACHESIZE = 1000;
     private static final String VERSION_DELIMITER = "::";
     private static final String PROP_RENDERER     = "jspwiki.renderingManager.renderer";
-    
+
     /** The name of the default renderer. */
     public  static final String DEFAULT_RENDERER  = XHTMLRenderer.class.getName();
 
@@ -150,9 +150,7 @@ public class RenderingManager implements
     }
 
     /**
-     *  Returns the default Parser for this context.
-     *
-     *  @param context the wiki context
+     *  Returns the default Paxt
      *  @param pagedata the page data
      *  @return A MarkupParser instance.
      */
@@ -232,7 +230,7 @@ public class RenderingManager implements
      * Returns a WikiRenderer instance, initialized with the given
      * context and doc. The object is an XHTMLRenderer, unless overridden
      * in jspwiki.properties with PROP_RENDERER.
-     * 
+     *
      * @param context The WikiContext
      * @param doc The document to render
      * @return A WikiRenderer for this document, or null, if no such renderer could be instantiated.

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java Sun Aug  2 18:05:54 2015
@@ -55,7 +55,7 @@ public class LinkTag extends WikiLinkTag
     private static final Logger log = Logger.getLogger( LinkTag.class );
 
     private String m_version = null;
-    private String m_class   = null;
+    private String m_cssClass= null;
     private String m_style   = null;
     private String m_title   = null;
     private String m_target  = null;
@@ -77,7 +77,7 @@ public class LinkTag extends WikiLinkTag
     public void initTag()
     {
         super.initTag();
-        m_version = m_class = m_style = m_title = m_target = m_compareToVersion = m_rel = m_jsp = m_ref = m_accesskey = m_templatefile = null;
+        m_version = m_cssClass = m_style = m_title = m_target = m_compareToVersion = m_rel = m_jsp = m_ref = m_accesskey = m_templatefile = null;
         m_context = WikiContext.VIEW;
         m_containedParams = new HashMap<String, String>();
         m_absolute = false;
@@ -109,9 +109,9 @@ public class LinkTag extends WikiLinkTag
         m_version = arg;
     }
 
-    public void setClass( String arg )
+    public void setCssClass( String arg )
     {
-        m_class = arg;
+        m_cssClass = arg;
     }
 
     public void setStyle( String style )
@@ -425,7 +425,7 @@ public class LinkTag extends WikiLinkTag
 
             StringBuilder sb = new StringBuilder( 20 );
 
-            sb.append( (m_class != null)   ? "class=\""+m_class+"\" " : "" );
+            sb.append( (m_cssClass != null)   ? "class=\""+m_cssClass+"\" " : "" );
             sb.append( (m_style != null)   ? "style=\""+m_style+"\" " : "" );
             sb.append( (m_target != null ) ? "target=\""+m_target+"\" " : "" );
             sb.append( (m_title != null )  ? "title=\""+m_title+"\" " : "" );

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld Sun Aug  2 18:05:54 2015
@@ -342,7 +342,7 @@
        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
-       <name>class</name>
+       <name>cssClass</name>
        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js Sun Aug  2 18:05:54 2015
@@ -141,7 +141,6 @@ var Tab = new Class({
         var name = pane.get("data-pane") || pane.className.slice(4).deCamelize();
 
         if( !pane.id ){
-            console.log("red alert", name)
             //pane.id = name;
         }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js Sun Aug  2 18:05:54 2015
@@ -218,36 +218,60 @@ Element.implement({
     Function onModal
         Open a modal dialog with ""message"".
 
-        Used on forms (submit) or form-elements (click) to get a
-        confirmation prior to executing the default behaviour of the event.
-        TODO: use DOM based modal dialog rather then JS confirm(..)
+        Used on clickable elements (input, button, a.href) to get a
+        confirmation prior to executing the default behaviour of the CLICK.
 
     Example:
     (start code)
-        <form data-modal="Are your really sure?" ... > .. </form>
+        <a href="..." data-modal=".modal">
+             <div class=".modal">Are your really sure?</div>
+        </a>
 
         behavior.add("[data-modal]", function(element){
             element.onModal( element.get("data-modal") );
         });
-
     (end)
 
     */
-    onModal: function( message ){
+    onModal: function( selector ){
 
-        this.addEvent( this.match("form") ? "submit" : "click", function( /*event*/ ){
+        var self = this,
+            modal = self.getElement(selector);
 
-console.log(message);
+        function doSelfEvent(event){
 
-            return window.confirm(message);
-            /*
-            TODO
-            build modal dialog
-            modalbody.set("html",message);
-            return modaldialog.show();
-            */
+            modal.addClass( "active" );
+            document.body.addClass( "show-modal" );
+            event.preventDefault(); //postpone the click event
+        }
 
-        });
+        function doModalEvent(){
+
+            modal.removeClass( "active" );
+            document.body.removeClass( "show-modal" );
+
+            if( this.hasClass("btn-primary") ){
+                self.removeEvent( "click", doSelfEvent ).click();
+            }
+        }
+
+        if( modal ){
+
+            //build a pretty modal dialog
+            if( !modal.getElement("> modal-footer") ){
+                modal.grab([
+                    "div.modal-footer", [
+                        "button.btn.btn-primary", { text: "Confirm" },
+                        "button.btn.btn-danger", { text: "Cancel" },
+                    ]
+                ].slick());
+            }
+            //move it at the top of the document for easy css styling
+            modal.inject( document.getBackdrop(), "before" )
+                 .addEvent( "click:relay(.btn)",  doModalEvent );
+
+            self.addEvent( "click" , doSelfEvent );
+        }
     },
 
     /*
@@ -454,4 +478,16 @@ console.log(message);
 
     }
 
+});
+
+
+Document.implement({
+
+    getBackdrop : function(){
+
+        var body = document.body;
+        return body.getElement(".backdrop") || "div.backdrop".slick().inject(body);
+
+    }
+
 });

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -78,7 +78,7 @@ wiki.add("#editform", function( element
 
     }
 
-    resizer( snipe.toElement(), getFormElement(".resizer"), "EditorCookie" );
+    resizer( snipe.toElement(), getFormElement(".resizer"), "editorHeight" );
 
     //Initialize the configuration checkboxes
     //Read the wiki-prefs cookie values.
@@ -119,13 +119,16 @@ wiki.add("#editform", function( element
         Install an onbeforeunload handler, which is called ""before"" the page unloads.
         The user gets a warning in case the textarea was changed, without saving.
 
-        The onbeforeunload handler is automatically removed on regular exit of the page.
+        The onbeforeunload handler then gets removed on regular exit of the page.
     */
     function onbeforeunload( ){
 
-        window.onbeforeunload = function(){
+        window.onbeforeunload = function(event){
+
             if( textarea.value != textarea.defaultValue ){
+
                 return "edit.areyousure".localize();
+
             }
         };
 

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=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js Sun Aug  2 18:05:54 2015
@@ -60,6 +60,8 @@ Class: Wiki
 */
 var Wiki = {
 
+    version: "haddock01",  //used to validate compatible preference cookies
+
     initialize: function(){
 
         var wiki = this,
@@ -188,6 +190,12 @@ var Wiki = {
             duration: 20
         });
 
+        if( wiki.version != wiki.prefs.get('version') ){
+            wiki.prefs.empty();
+            wiki.prefs.set("version", wiki.version);
+        }
+
+
         //wiki.url = null;  //CHECK:  why this is needed?
         if( wiki.prefs.get("SectionEditing") && wiki.EditPermission && (wiki.Context != "preview") ){
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/IndexPlugin.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/IndexPlugin.less?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/IndexPlugin.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/IndexPlugin.less Sun Aug  2 18:05:54 2015
@@ -41,16 +41,20 @@ DOM structure:
 
     .header {
         .btn; .btn-primary;
-        font-size:125%;
-        a { color:inherit; }
-        .box-shadow(1px 1px 8px @brand-primary);
+        border: none;
+        font-size: 0; /*hide the " - " separators of the plugin! */
+        overflow: scroll;
+        a {
+            color: inherit;
+            font-size: @font-size-large;
+            padding: @padding-base-vertical/2 @padding-base-horizontal/2;
+        }
     }
 
     > .section {
         .h1;
-        display:block;
+        display: block;
         margin-top: @line-height-computed;
         margin-bottom: (@line-height-computed / 2);
     }
-
 }
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less Sun Aug  2 18:05:54 2015
@@ -40,12 +40,12 @@ DOM Structure:
 */
 
 .content {
-    //position:relative;  => dont, otherwise suggestion dialogs are clipped
+    /* position:relative;  => dont, otherwise suggestion dialogs are clipped */
     padding:0;
     overflow:hidden;
     clear:both;
     .hyphens(auto);
-    //.clearfix();
+    .transition(all .3s);
 }
 .page {
     float:right;
@@ -62,37 +62,58 @@ DOM Structure:
 }
 .page, .sidebar {
     //box-sizing: border-box;  //width% now includes border & padding : already default in bootstrap
-   .transition(all 300ms);
-
-    /*Solution to make .sidebar and .page of equal height
-      using the "One True Layout Method" -- See https://css-tricks.com/fluid-width-equal-height-columns/
-      NOK: when jumping to in-page anchors
-    */
-    // margin-bottom: -99998em;
-    //padding-bottom: 99999em;
+   .transition(all .3s);
     //& > *:last-child { padding-bottom:1em; }
 }
 
 
-/* FIXME
-.fav-right {
-    .page    { float:left; }
-    .sidebar { float:right; margin-left:0; margin-right:-@wiki-sidebar-width;}
-}
-.fav-hidden {
-    .sidebar { .hide();  }
-}
-*/
-
-.sidebar { background:@wiki-sidebar-bg; }
-.content {
-    background: @wiki-page-bg;
-}
 .content.active {
     .page { width:100%-@wiki-sidebar-width; }
     .sidebar { margin-left:0; }
 }
+.content {
+    background: @wiki-page-bg;  //page background color
+    position: relative;  //prepare for the :after element to give the sidebar another color
+}
+.content:after {
+    content: " ";
+    position: absolute; top: 0; left: 0; bottom: 0;
+    background: @wiki-sidebar-bg;
+    .transition (all .3s);
+    width: @wiki-sidebar-width;
+}
+.content:not(.active):after {
+    width: 0;
+}
+.sidebar {
+    z-index:1;  //ontop of the content:after element !
+}
 
+/*
+Put sidebar at the right side
+- FFS: also move toggle buttons to other side ?
+*/
+.fav-right {
+    .content:after {
+        right:0; left:auto;
+    }
+    .page    {
+        float:left;
+    }
+    .sidebar {
+        float: right;
+        margin-left: 0;
+        margin-right: -@wiki-sidebar-width;
+    }
+    .content.active {
+        .sidebar { margin-right:0; }
+    }
+}
+/*
+Main logic to hide the sidebar is in ViewTemplate.jsp.
+We may just hide the on/off toggle in css
+*/
+//.fav-hidden #menu {  .hide; }
 
 .page-content, .sidebar, .ajaxpreview {
 	.clearfix;

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Nav.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Nav.less?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Nav.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Nav.less Sun Aug  2 18:05:54 2015
@@ -84,6 +84,11 @@ Note: avoid page-bump when sticky become
     .pagename { .opacity(1); }
 }
 
-//More-menu - add padding to unstyled lists, for proper menu look&feel
-.more-menu ul.list-unstyled { padding: 3px 20px;}
-
+/* make sure the anchors remains visible, even below the fixed header elements */
+.page-content > [id^="section-"]:not(#section-TOC):before {
+  display: block;
+  content: " ";
+  margin-top: -50px; //approximate size of the fixed navigation block
+  height: 50px;
+  visibility: hidden;
+}

Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Workflow.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Workflow.less?rev=1693819&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Workflow.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Workflow.less Sun Aug  2 18:05:54 2015
@@ -0,0 +1,30 @@
+/*
+    JSPWiki - a JSP-based WikiWiki clone.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); fyou may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+/*
+Style: WorkflowContent.jsp
+
+*/
+.context-workflow .workflow-details pre {
+    border-style:dashed;
+    .small;
+    max-height:8em;
+    overflow:scroll;
+}

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less Sun Aug  2 18:05:54 2015
@@ -80,7 +80,7 @@ Stylesheet: JSPWiki
 //@import "../bootstrap/pager.less";
 
 // Components: Popovers
-@import "../bootstrap/modals.less";
+//@import "../bootstrap/modals.less";
 @import "../bootstrap/tooltip.less";
 @import "../bootstrap/popovers.less";
 
@@ -108,6 +108,7 @@ Stylesheet: JSPWiki
 @import "TableX.Sort.less";
 @import "TableX.Filter.less";
 @import "forms.less";
+@import "modals.less";
 //JSPWiki Components: common
 @import "../fontjspwiki/font-jspwiki.less";
 //@import "dropdown.less";

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less Sun Aug  2 18:05:54 2015
@@ -48,27 +48,23 @@ table[border="1"] td { border:0; }
 
 }
 
-.table-condensed .wikitable {
+.wikitable.table-condensed  {
 
     th, td { padding: @table-condensed-cell-padding; }
 
 }
 
-.table-bordered {
-    border:none;
-
-    .wikitable {
+.wikitable.table-bordered {
         border: 1px solid @table-border-color;
 
         tr:first-child {
             th, td { border-top: 1px solid @table-border-color; }
         }
-    }
 }
 
 .table-fit .wikitable {  width:auto; }
 
-.table-striped .wikitable {
+.table-striped.wikitable {
   > tbody > tr:nth-child(odd) {
     > td,
     > th {

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less Sun Aug  2 18:05:54 2015
@@ -248,12 +248,11 @@ img {
 //img.attlink
 
 // Utility class to support un-scaled, scrollable images,
-.scroll, .scrollable-image {
-    overflow:scroll;
+.scrollable-image {
 
-    pre, img.inline { width:auto; max-width:none; }
+    overflow:scroll;
+    img.inline { width:auto; max-width:none; }
 
-    pre { white-space: nowrap; }
 }
 
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less Sun Aug  2 18:05:54 2015
@@ -57,6 +57,8 @@
 @panel-default-border:        @pre-border-color;
 @panel-default-heading-bg:    @pre-bg;
 
+@modal-backdrop-bg: #ca8E78; //copper blush
+
 // JPSWiki variables
 // Main color scheme
 @wiki-header-bg:    @brand-primary; //#1976D2;

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=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Edit.jsp Sun Aug  2 18:05:54 2015
@@ -263,6 +263,23 @@
 
     log.info("Editing page "+pagereq+". User="+user+", host="+HttpUtil.getRemoteAddress(request) );
 
+
+    //
+    // 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

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp Sun Aug  2 18:05:54 2015
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
 --%>
 
 <%@ page import="org.apache.log4j.*" %>
@@ -27,8 +27,8 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 
-<%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+<%!
+    Logger log = Logger.getLogger("JSPWiki");
 %>
 <%
     String bean = request.getParameter("bean");
@@ -36,7 +36,7 @@
     // Create wiki context and check for authorization
     WikiContext wikiContext = wiki.createContext( request, WikiContext.ADMIN );
     if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response )) return;
-    
+
     //
     //  This is an experimental feature, so we will turn it off unless the
     //  user really wants to.
@@ -70,14 +70,14 @@
     String contentPage = wiki.getTemplateManager().findJSP( pageContext,
                                                             wikiContext.getTemplate(),
                                                             "admin/AdminTemplate.jsp" );
-    
+
     pageContext.setAttribute( "engine", wiki, PageContext.REQUEST_SCOPE );
     pageContext.setAttribute( "context", wikiContext, PageContext.REQUEST_SCOPE );
 
     if( request.getMethod().equalsIgnoreCase("post") && bean != null )
     {
         AdminBean ab = wiki.getAdminBeanManager().findBean( bean );
-        
+
         if( ab != null )
         {
             ab.doPost( wikiContext );
@@ -87,5 +87,5 @@
             wikiContext.getWikiSession().addMessage( "No such bean "+bean+" was found!" );
         }
     }
-    
+
 %><wiki:Include page="<%=contentPage%>" />
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp Sun Aug  2 18:05:54 2015
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
 --%>
 
 <%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -25,12 +25,12 @@
 <%@ page import="org.apache.wiki.preferences.Preferences" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page errorPage="/Error.jsp" %>
-<%! 
+<%!
   public void jspInit()
   {
     wiki = WikiEngine.getInstance( getServletConfig() );
   }
-  Logger log = Logger.getLogger("JSPWiki"); 
+  Logger log = Logger.getLogger("JSPWiki");
   WikiEngine wiki;
   SecurityVerifier verifier;
 %>
@@ -53,7 +53,7 @@
         <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
         <wiki:IncludeResources type="stylesheet"/>
       </head>
-      <body><div id="wikibody container">
+      <body class="container">
          <h1>Disabled</h1>
          <p>JSPWiki SecurityConfig UI has been disabled.  This page could reveal important security
          details about your configuration to a potential attacker, so it has been turned off by
@@ -65,14 +65,14 @@
          <p>Once you are done with debugging your security configuration, please turn this page
          off again by removing the preceding line, so that your system is safe again.</p>
          <p>Have a nice day.  May the Force be with you.</p>
-      </div></body>
+      </body>
       </html>
       <%
       return;
   }
 
 %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -82,7 +82,7 @@
   <wiki:IncludeResources type="stylesheet"/>
 </head>
 <body>
-<div id="wikibody" class="container">
+<div id="wikibody" class="container-fixed">
 <div id="page">
 <div id="pagecontent">
 
@@ -93,7 +93,7 @@
 <p>This page is dynamically generated by JSPWiki. It examines the authentication, authorization and security policy settings. When we think something looks funny, we'll try to communicate what the issue might be, and will make recommendations on how to fix the problem.</p>
 
 <blockquote>
-<p >Please delete this JSP when you are finished troubleshooting your system. 
+<p >Please delete this JSP when you are finished troubleshooting your system.
 This diagnostic data presented on this page do not represent a security risk
 to your system <em>per se</em>, but they do provide a significant amount of
 contextual information that could be useful to an attacker. This page is
@@ -106,13 +106,13 @@ and everyone in between. You have been w
 </p>
 </blockquote>
 
-<!-- 
+<!--
   *********************************************
   **** A U T H E N T I C A T I O N         ****
   *********************************************
 -->
 <h2>Authentication Configuration</h2>
-<!-- 
+<!--
   *********************************************
   **** Container Authentication Verifier   ****
   *********************************************
@@ -137,8 +137,8 @@ and everyone in between. You have been w
   }
 %>
 
-    
-<!-- 
+
+<!--
   *********************************************
   **** JAAS Authentication Config Verifier ****
   *********************************************
@@ -160,14 +160,14 @@ a class we can find on the classpath. Th
 <wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_JAAS%>" prefix="We found some potential problems with your configuration: "/>
 <wiki:Messages div="error" topic="<%=SecurityVerifier.ERROR_JAAS%>" prefix="We found some errors with your configuration: " />
 
-<!-- 
+<!--
   *********************************************
   **** A U T H O R I Z A T I O N           ****
   *********************************************
 -->
 <h2>Authorization Configuration</h2>
 
-<!-- 
+<!--
   *********************************************
   **** Container Authorization Verifier    ****
   *********************************************
@@ -216,7 +216,7 @@ a class we can find on the classpath. Th
   }
 %>
 
-<!-- 
+<!--
   *********************************************
   **** Java Security Policy Verifier       ****
   *********************************************
@@ -244,7 +244,7 @@ And as an additional check, we will try
     principal principal_class_name "principal_name",
     principal principal_class_name "principal_name",
     ... {
-    
+
     permission permission_class_name "target_name", "action";
     permission permission_class_name "target_name", "action";
 };</pre>
@@ -301,7 +301,7 @@ In addition, because you are using conta
     }
 %>
     If your container's realm returns other role names, users won't be able to access the pages they should be allowed to see -- because the role names don't match. In that case, You should adjust the <code>&lt;role-name&gt;</code> entries in <code>web.xml</code> appropriately to match the role names returned by your container's authorization realm.</p>
-    
+
     <p>Now we are going to compare the roles listed in your security policy with those from your <code>web.xml</code> file. The ones we care about are those that aren't built-in roles like "All", "Anonymous", "Authenticated" or "Asserted". If your policy shows roles other than these, we need to make sure your container knows about them, too. Container roles are defined in <code>web.xml</code> in blocks such as these:</p>
     <blockquote><pre>&lt;security-role&gt;
   &lt;description&gt;

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -88,13 +88,15 @@
     <form action="tbd"
            class="hidden"
             name="deleteForm" id="deleteForm"
-          method="post" accept-charset="<wiki:ContentEncoding />"
-      data-modal="<fmt:message key='attach.deleteconfirm'/>" >
+          method="post" accept-charset="<wiki:ContentEncoding />" >
 
       <%--TODO: "nextpage" is not yet implemented in Delete.jsp
       --%>
       <input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
-      <input class="btn btn-danger btn-xs" id="delete-all" name="delete-all" type="submit" value="Delete" />
+      <input id="delete-all" name="delete-all" type="submit"
+        data-modal="+ .modal"
+             value="Delete" />
+      <div class="modal"><fmt:message key='attach.deleteconfirm'/></div>
 
     </form>
   </wiki:Permission>
@@ -108,7 +110,7 @@
       <th><fmt:message key="info.size"/></th>
       <th><fmt:message key="info.date"/></th>
       <th><fmt:message key="info.author"/></th>
-      <wiki:Permission permission="delete"><th><fmt:message key="info.actions"/></th></wiki:Permission>
+      <th><fmt:message key="info.actions"/></th>
       <th><fmt:message key="info.changenote"/></th>
     </tr>
 

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditContent.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditContent.jsp Sun Aug  2 18:05:54 2015
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
 --%>
 
 <%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki"  %>
@@ -28,29 +28,29 @@
 <%--
   WikiContext c = WikiContext.findContext( pageContext );
 --%>
-  
+
 <%-- Main Content Section --%>
 <%-- This has been source ordered to come first in the markup (and on small devices)
      but to be to the right of the nav on larger screens --%>
 <div class="page-content">
-  
+
   <wiki:CheckLock mode="locked" id="lock">
-    <div class="error">
+    <div class="alert alert-danger">
       <fmt:message key="edit.locked">
         <fmt:param><c:out value="${lock.locker}"/></fmt:param>
         <fmt:param><c:out value="${lock.timeLeft}"/></fmt:param>
       </fmt:message>
     </div>
   </wiki:CheckLock>
-  
+
   <wiki:CheckVersion mode="notlatest">
-    <div class="warning">
+    <div class="alert alert-danger">
       <fmt:message key="edit.restoring">
         <fmt:param><wiki:PageVersion/></fmt:param>
       </fmt:message>
     </div>
   </wiki:CheckVersion>
-    
+
   <wiki:Editor />
-        
-</div> 
+
+</div>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp Sun Aug  2 18:05:54 2015
@@ -99,10 +99,12 @@
 <form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
       class="hidden"
         name="deleteGroupForm" id="deleteGroupForm"
-  data-modal="<fmt:message key='grp.deletegroup.confirm'/>"
       method="POST" accept-charset="UTF-8">
   <input type="hidden" name="group" value="${group.name}" />
-  <input type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
+  <input type="submit" name="ok"
+   data-modal="+ .modal"
+        value="<fmt:message key="actions.deletegroup"/>" />
+  <div class="modal"><fmt:message key='grp.deletegroup.confirm'/></div>
 </form>
 
 <div class="table-filter-sort-condensed-striped">

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -148,10 +148,11 @@ defaul template,  let's fix this here
     <form action="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />"
            class="form-group"
               id="deleteForm"
-          method="post" accept-charset="<wiki:ContentEncoding />"
-      data-modal="<fmt:message key='info.confirmdelete'/>" >
+          method="post" accept-charset="<wiki:ContentEncoding />" >
       <input class="btn btn-danger" type="submit" name="delete-all" id="delete-all"
+        data-modal="+ .modal"
             value="<fmt:message key='info.delete.submit'/>" />
+      <div class="modal"><fmt:message key='info.confirmdelete'/></div>
     </form>
   </wiki:Permission>
   <wiki:Permission permission="!delete">
@@ -307,19 +308,20 @@ defaul template,  let's fix this here
 <form action="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />"
            class="form-group"
               id="deleteForm"
-          method="post" accept-charset="<wiki:ContentEncoding />"
-          data-modal="<fmt:message key='info.confirmdelete'/>" >
+          method="post" accept-charset="<wiki:ContentEncoding />" >
 
   <c:set var="parentPage"><wiki:ParentPageName/></c:set>
-  <a class="btn btn-default" href="<wiki:Link page='${parentPage}' format='url' />" >
+  <a class="btn btn-primary" href="<wiki:Link page='${parentPage}' format='url' />" >
     <fmt:message key="info.backtoparentpage" >
-      <fmt:param>${parentPage}</fmt:param>
+      <fmt:param><span class="badge">${parentPage}</span></fmt:param>
     </fmt:message>
   </a>
 
   <wiki:Permission permission="delete">
     <input class="btn btn-danger" type="submit" name="delete-all" id="delete-all"
+      data-modal="+ .modal"
            value="<fmt:message key='info.deleteattachment.submit' />" />
+    <div class="modal"><fmt:message key='info.confirmdelete'/></div>
   </wiki:Permission>
 </form>
 
@@ -388,9 +390,11 @@ defaul template,  let's fix this here
 </wiki:PageExists>
 
 <wiki:NoSuchPage>
+  <div class="danger">
   <fmt:message key="common.nopage">
-    <fmt:param><wiki:EditLink><fmt:message key="common.createit"/></wiki:EditLink></fmt:param>
+    <fmt:param><a class="createpage" href="<wiki:EditLink format='url'/>"><fmt:message key="common.createit"/></a></fmt:param>
   </fmt:message>
+  </div>
 </wiki:NoSuchPage>
 
 </div>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp Sun Aug  2 18:05:54 2015
@@ -17,11 +17,12 @@
     under the License.
 --%>
 
-<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.attachment.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
@@ -59,7 +60,9 @@
 
   <%-- attachment --%>
   <wiki:CheckRequestContext context='view|info|diff|rename|edit'>
-  <li id="attach">
+  <wiki:PageExists>
+  <li id="attach"
+   class="<wiki:Permission permission='!upload'>disabled</wiki:Permission>">
     <c:set var="page">
       <wiki:PageType type="page"><wiki:PageName/></wiki:PageType>
       <wiki:PageType type="attachment"><wiki:ParentPageName/></wiki:PageType>
@@ -69,15 +72,16 @@
       <c:if test="${attachments > 0}"><span class="badge">${attachments}</span></c:if>
     </wiki:Link>
   </li>
+  </wiki:PageExists>
   </wiki:CheckRequestContext>
 
   <%-- info --%>
   <wiki:CheckRequestContext context='view|upload|rename|edit'>
+  <wiki:PageExists>
   <li id="info">
     <wiki:Link context="info" accessKey="i">
       <fmt:message key='info.tab'/><wiki:PageExists><span class="caret"></span></wiki:PageExists>
     </wiki:Link>
-  <wiki:PageExists>
   <ul class="dropdown-menu pull-right" data-hover-parent="li">
       <li class="dropdown-header">This is version <span class="badge"><wiki:PageVersion /></span></li>
       <li class="dropdown-header">Last Changed on:</span></li>
@@ -87,15 +91,21 @@
     <wiki:CheckVersion mode="notlatest">
       <li><wiki:DiffLink version="current" newVersion="latest"><wiki:PageDate format='${prefs["DateFormat"]}'/></wiki:DiffLink></li>
     </wiki:CheckVersion>
-    <%--fixme: Author sometimes returns a link(ok) or a plain text(bad formatting) --%>
     <li class="dropdown-header">By:</span></li>
-    <li><wiki:Author /></li>
+    <li>
+      <%-- wiki:Author sometimes returns a link(ok) or a plain text, we always need a link! --%>
+      <c:set var="author"><wiki:Author/></c:set>
+      <c:choose>
+        <c:when test="${ fn:contains(author,'href=')}">${author}</c:when>
+        <c:otherwise><a href="#">${author}</a></c:otherwise>
+      </c:choose>
+    </li>
     <li class="divider"></li>
     <li><wiki:RSSImageLink mode="wiki" /></li>
 
   </ul>
-  </wiki:PageExists>
   </li>
+  </wiki:PageExists>
   </wiki:CheckRequestContext>
 
 
@@ -166,39 +176,38 @@
   <li id="more">
     <a href="#"><fmt:message key="actions.more"/><span class="caret"></span></a>
     <ul class="dropdown-menu pull-right" data-hover-parent="li">
-
       <wiki:PageExists>
       <wiki:CheckRequestContext context='view|info|diff|upload|preview' >
 
         <%-- VIEW RAW PAGE SOURCE --%>
         <li>
           <wiki:CheckVersion mode="latest">
-          <%--FIXME: wiki:Link doesnt support class=".." yet ; should be changed to className=".." --%>
-          <a class="slimbox-link"
-             href="<wiki:Link format='url'><wiki:Param name='skin' value='raw'/></wiki:Link>"><fmt:message key='actions.rawpage' />
-          </a>
+            <wiki:Link cssClass="slimbox-link">
+              <wiki:Param name='skin' value='raw'/>
+              <fmt:message key='actions.rawpage' />
+            </wiki:Link>
           </wiki:CheckVersion>
           <wiki:CheckVersion mode="notlatest">
-          <a class="slimbox-link"
-             href="<wiki:Link format='url' version='${param.version}'><wiki:Param name='skin' value='raw'/></wiki:Link>"><fmt:message key='actions.rawpage' />
-          </a>
+            <wiki:Link cssClass="slimbox-link" version='${param.version}'>
+              <wiki:Param name='skin' value='raw'/>
+              <fmt:message key='actions.rawpage' />
+            </wiki:Link>
           </wiki:CheckVersion>
         </li>
 
         <%-- Show Reader View --%>
         <li>
           <wiki:CheckVersion mode="latest">
-          <%--FIXME: wiki:Link doesnt support class=".." yet ; should be changed to className=".." --%>
-          <a class="reader-view"
-             href="<wiki:Link format='url'><wiki:Param name='skin' value='reader'/></wiki:Link>"><fmt:message key='actions.showreaderview' />
-             <span class="icon-leanpub" />
-          </a>
+            <wiki:Link cssClass="reader-view">
+              <wiki:Param name='skin' value='reader'/>
+              <fmt:message key='actions.showreaderview' /><span class="icon-leanpub" />
+            </wiki:Link>
           </wiki:CheckVersion>
           <wiki:CheckVersion mode="notlatest">
-          <a class="reader-view"
-             href="<wiki:Link format='url' version='${param.version}'><wiki:Param name='skin' value='reader'/></wiki:Link>"><fmt:message key='actions.showreaderview' />
-             <span class="icon-leanpub" />
-          </a>
+            <wiki:Link cssClass="reader-view" version="${param.version}">
+              <wiki:Param name='skin' value='reader'/>
+              <fmt:message key='actions.showreaderview' /><span class="icon-leanpub" />
+            </wiki:Link>
           </wiki:CheckVersion>
         </li>
 
@@ -276,7 +285,8 @@
 </ul>
 
 </div>
-  <%--
+
+<%--
   <wiki:PageExists>
   <wiki:PageType type="page">
   <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
@@ -285,4 +295,4 @@
   </wiki:PageType>
 
   </wiki:PageExists>
-  --%>
+--%>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp Sun Aug  2 18:05:54 2015
@@ -27,6 +27,12 @@
 <fmt:setBundle basename="templates.default"/>
 
 <div class="page-content">
+
+<wiki:UserCheck status="notAuthenticated">
+  <wiki:Include page="PreferencesTab.jsp" />
+</wiki:UserCheck>
+
+<wiki:UserCheck status="authenticated">
 <div class="tabs">
 
   <h3 id="section-prefs">
@@ -34,7 +40,6 @@
   </h3>
   <wiki:Include page="PreferencesTab.jsp" />
 
-  <%-- <wiki:UserCheck status="authenticated"> --%>
   <wiki:Permission permission="editProfile">
   <wiki:UserProfile property="exists">
     <c:set var="profileTab" value="${param.tab == 'profile' ? 'data-activePane' : ''}"/>
@@ -43,7 +48,6 @@
     <%-- <%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.profile")%> --%>
   </wiki:UserProfile>
   </wiki:Permission>
-  <%-- </wiki:UserCheck> --%>
 
   <wiki:Permission permission="createGroups"><%-- use WikiPermission --%>
     <c:set var="groupTab" value="${param.tab == 'groups' ? 'data-activePane' : ''}"/>
@@ -52,8 +56,9 @@
     </wiki:CheckRequestContext>
     <h3 ${groupTab} id="section-groups"><fmt:message key="group.tab" /></h3>
     <wiki:Include page="GroupTab.jsp" />
-
   </wiki:Permission>
 
 </div>
+</wiki:UserCheck>
+
 </div>
\ No newline at end of file

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -33,18 +33,17 @@
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
 <%
-  //FIXME: this should better move to UserPreferences.jsp but that doesn't seem to work. Ugh ?
   WikiContext c = WikiContext.findContext( pageContext );
   TemplateManager t = c.getEngine().getTemplateManager();
-  pageContext.setAttribute( "skins", t.listSkins(pageContext, c.getTemplate() ) );
-  pageContext.setAttribute( "languages", t.listLanguages(pageContext) );
-  pageContext.setAttribute( "timezones", t.listTimeZones(pageContext) );
-  pageContext.setAttribute( "timeformats", t.listTimeFormats(pageContext) );
-  pageContext.setAttribute( "hasMultipleEditors", c.getEngine().getEditorManager().getEditorList().length > 1 );
-
 %>
+<c:set var="skins"       value="<%= t.listSkins(pageContext, c.getTemplate() ) %>" />
+<c:set var="languages"   value="<%= t.listLanguages(pageContext) %>" />
+<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() %>" />
+
 <form action="<wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab' value='prefs'/></wiki:Link>"
-          id="preferences"  <%-- see Prefs.js; setCookie --%>
+          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='' />" />
@@ -85,8 +84,8 @@
     <label class="control-label form-col-20" for="assertedName"><fmt:message key="prefs.assertedname"/></label>
     <span class="dropdown form-col-50">
     <input class="form-control" type="text" id="assertedName" name="assertedName" size="20"
-          autofocus="autofocus"
-         value="<wiki:UserProfile property='wikiname' />" />
+       autofocus="autofocus"
+           value="<wiki:UserProfile property='wikiname' />" />
     <%-- CHECK THIS
     <input type="text" id="assertedName" name="assertedName" size="20" value="<wiki:UserProfile property='loginname'/>" />
     --%>
@@ -107,13 +106,14 @@
     </span>
   </div>
 
-  <c:if test='${hasMultipleEditors}'>
+  <c:if test='${fn.length(editors)>1}'>
   <div class="form-group">
     <label class="control-label form-col-20" for="editor"><fmt:message key="edit.chooseeditor"/></label>
     <select class="" id="editor" name="editor" data-pref="editor">
-      <wiki:EditorIterator id="edt">
-        <option <%=edt.isSelected()%> value="<%=edt.getName()%>"><%=edt.getName()%></option>
-      </wiki:EditorIterator>
+      <%-- no need to use EditorIterator tags--%>
+      <c:forEach items="${editors}" var="edt">
+        <option value='${edt}' ${prefs.editor==edt ? 'selected="selected"' : ''} >${edt}</option>
+      </c:forEach>
     </select>
   </div>
   </c:if>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UploadTemplate.jsp Sun Aug  2 18:05:54 2015
@@ -40,12 +40,25 @@
   <wiki:Include page="Header.jsp" />
   <wiki:Include page="Nav.jsp" />
   <c:set var="sidebar"><wiki:Variable var='sidebar' /></c:set>
+  <c:set var="sidebar" value="${ (sidebar!='off') and (prefs.Orientation!='fav-hidden') ? 'on' : 'off' }" />
+  <wiki:CheckRequestContext context='login|prefs|createGroup|viewGroup'>
+    <c:set var="sidebar">off</c:set>
+  </wiki:CheckRequestContext>
+
   <div class="content <c:if test='${sidebar != "off"}'>active</c:if>" data-toggle="li#menu,.sidebar>.close">
     <div class="page">
       <wiki:PageExists>
         <wiki:Include page="AttachmentTab.jsp"/>
       </wiki:PageExists>
 
+      <wiki:NoSuchPage>
+        <div class="danger">
+        <fmt:message key="common.nopage">
+          <fmt:param><a class="createpage" href="<wiki:EditLink format='url'/>"><fmt:message key="common.createit"/></a></fmt:param>
+        </fmt:message>
+        </div>
+      </wiki:NoSuchPage>
+
       <wiki:Include page="PageInfo.jsp"/>
     </div>
     <wiki:Include page="Sidebar.jsp"/>

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -65,15 +65,16 @@
       --%>
       <wiki:CheckRequestContext context='!prefs'>
         <wiki:CheckRequestContext context='!preview'>
-          <a href="<wiki:Link jsp='UserPreferences.jsp' format='url' ><wiki:Param name='redirect' value='${redirect}'/></wiki:Link>"
-            class="btn btn-default btn-block">
+          <wiki:Link cssClass="btn btn-default btn-block" jsp="UserPreferences.jsp">
+            <wiki:Param name='redirect' value='${redirect}'/>
            <fmt:message key="actions.prefs" />
-          </a>
+          </wiki:Link>
           <wiki:Permission permission="createGroups">
-          <a href="<wiki:Link jsp='UserPreferences.jsp' format='url' ><wiki:Param name='redirect' value='${redirect}'/><wiki:Param name='tab' value='groups'/></wiki:Link>"
-            class="btn btn-default btn-block icon-group" >
+          <wiki:Link cssClass="btn btn-default btn-block icon-group" jsp="UserPreferences.jsp">
+            <wiki:Param name='redirect' value='${redirect}'/>
+            <wiki:Param name='tab' value='groups'/>
             <fmt:message key="actions.groups" />
-          </a>
+          </wiki:Link>
           </wiki:Permission>
          </wiki:CheckRequestContext>
       </wiki:CheckRequestContext>
@@ -83,16 +84,17 @@
       <wiki:UserCheck status="notAuthenticated">
         <wiki:CheckRequestContext context='!login'>
         <wiki:Permission permission="login">
-        <a href="<wiki:Link jsp='Login.jsp' format='url' ><wiki:Param name='redirect' value='${redirect}'/></wiki:Link>"
-           class="btn btn-primary btn-block login icon-signin">
+          <wiki:Link cssClass="btn btn-primary btn-block login icon-signin" jsp="Login.jsp">
+            <wiki:Param name='redirect' value='${redirect}'/>
           <fmt:message key="actions.login" />
-        </a>
+        </wiki:Link>
         </wiki:Permission>
         <wiki:Permission permission='editProfile'>
-        <a href="<wiki:Link jsp='Login.jsp' format='url' ><wiki:Param name='redirect' value='${redirect}'/><wiki:Param name='tab' value='register'/></wiki:Link>"
-           class="btn btn-link btn-block register">
+        <wiki:Link cssClass="btn btn-link btn-block register" jsp="Login.jsp">
+          <wiki:Param name='redirect' value='${redirect}'/>
+          <wiki:Param name='tab' value='register'/>
           <fmt:message key="actions.registernow" />
-        </a>
+        </wiki:Link>
         </wiki:Permission>
         </wiki:CheckRequestContext>
       </wiki:UserCheck>
@@ -102,8 +104,9 @@
       <wiki:UserCheck status="authenticated">
         <a href="<wiki:Link jsp='Logout.jsp' format='url' />"
           class="btn btn-default btn-block logout icon-signout"
-     data-modal="<fmt:message key='actions.confirmlogout'/>">
+     data-modal=".modal">
           <fmt:message key="actions.logout"/>
+          <div class="modal"><fmt:message key='actions.confirmlogout'/></div>
         </a>
       </wiki:UserCheck>
     </li>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp Sun Aug  2 18:05:54 2015
@@ -50,9 +50,11 @@
 
   <wiki:Include page="Header.jsp" />
   <wiki:Include page="Nav.jsp" />
+
   <c:set var="sidebar"><wiki:Variable var='sidebar' /></c:set>
+  <c:set var="sidebar" value="${ (sidebar!='off') and (prefs.Orientation!='fav-hidden') ? 'on' : 'off' }" />
   <wiki:CheckRequestContext context='login|prefs|createGroup|viewGroup'>
-      <c:set var="sidebar">off</c:set>
+    <c:set var="sidebar">off</c:set>
   </wiki:CheckRequestContext>
 
   <div class="content <c:if test='${sidebar != "off"}'>active</c:if>" data-toggle="li#menu,.sidebar>.close">

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/admin/UserManagement.jsp Sun Aug  2 18:05:54 2015
@@ -137,8 +137,8 @@ function addNew()
 
      </table>
    <div id="useractions">
-     <input type="submit" name="action" value="Remove"
-      data-modal="Are you sure you wish to remove this user?" />
+     <input type="submit" name="action" value="Remove" data-modal="+ .modal" />
+     <div class="modal">"Are you sure you wish to remove this user?</div>
      <input type="button" value="Add" onclick="javascript:addNew()"/>
    </div>
    </form>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp?rev=1693819&r1=1693818&r2=1693819&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/commonheader.jsp Sun Aug  2 18:05:54 2015
@@ -39,28 +39,23 @@
 --%>
 <%-- CSS stylesheet --%>
 
-<link rel="stylesheet" type="text/css" media="screen, projection, print"
-     href="<wiki:Link format='url' templatefile='haddock.css'/>" />
-
-<wiki:IncludeResources type="stylesheet"/>
-<wiki:IncludeResources type="inlinecss" />
-
-<%-- JAVASCRIPT --%>
-
+<%-- Localized JS; must come before any css, to avoid blocking immediate execution --%>
+<%-- var LocalizedStrings= { "javascript.<xx>":"...", etc. } --%>
 <script type="text/javascript">//<![CDATA[
-/* Localized javascript strings: LocalizedStrings[] */
 <wiki:IncludeResources type="jslocalizedstrings"/>
 String.I18N = LocalizedStrings;
 String.I18N.PREFIX = "javascript.";
+//]]></script>
 
-//TODO: Load JS resources parallel with other resources.
-
-
+<link rel="stylesheet" type="text/css" media="screen, projection, print"
+     href="<wiki:Link format='url' templatefile='haddock.css'/>" />
 
-//]]></script>
+<wiki:IncludeResources type="stylesheet"/>
+<wiki:IncludeResources type="inlinecss" />
 
-<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/haddock.js'/>"></script>
+<%-- JAVASCRIPT --%>
 
+<script async src="<wiki:Link format='url' jsp='scripts/haddock.js'/>"></script>
 
 <wiki:IncludeResources type="script"/>
 
@@ -110,8 +105,8 @@ String.I18N.PREFIX = "javascript.";
   WikiContext c = WikiContext.findContext( pageContext );
   String frontpage = c.getEngine().getFrontPage();
 %>
-<link rel="start"  href="<wiki:LinkTo format='url' page='<%=frontpage%>' />" title="Front page" />
-
+<link rel="start"  href="<wiki:LinkTo format='url' page='<%=frontpage%>' />"
+    title="Front page" />
 <link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='haddock.css'/>"
     title="Standard" />
 <link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>" />
@@ -122,8 +117,8 @@ String.I18N.PREFIX = "javascript.";
 <wiki:CheckRequestContext context='view|info|diff|upload'>
   <wiki:Permission permission="edit">
     <wiki:PageType type="page">
-    <link rel="alternate" type="application/x-wiki"
-          href="<wiki:EditLink format='url' />"
+      <link rel="alternate" type="application/x-wiki"
+           href="<wiki:EditLink format='url' />"
           title="<fmt:message key='actions.edit.title'/>" />
     </wiki:PageType>
   </wiki:Permission>

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -17,7 +17,6 @@
     under the License.
 --%>
 <%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 <%@ page import="java.util.Properties"%>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
@@ -30,8 +29,10 @@
 
 <%@ page import="org.apache.wiki.filters.*" %>
 <%@ page import="org.apache.commons.lang.*" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
 <%--
@@ -164,41 +165,31 @@
   </span>
 
 
-  <div class="btn-group editor-tools">
-  <%--
-      <!-- note: 'dropdown-toggle' is only here to style the last button properly! -->
-      <button class="btn btn-default dropdown-toggle"><span class="icon-wrench"></span><span class="caret"></span></button>
-      <ul class="dropdown-menu" data-hover-parent="div">
-            <li>
-              <a>
-                <label for="autosuggest">
-                  <input type="checkbox" data-cmd="autosuggest" id="autosuggest" />
-                  <fmt:message key='editor.plain.autosuggest'/>
-                </label>
-              </a>
-            </li>
-
-            <li class="divider"></li>
-            <li>
-              <a>
-                <label for="livepreview">
-                  <input type="checkbox" data-cmd="livepreview" id="livepreview"/>
-                  <fmt:message key='editor.plain.livepreview'/> <span class="icon-refresh"/>
-                </label>
-              </a>
-            </li>
-            <li>
-              <a>
-                <label for="previewcolumn">
-                  <input type="checkbox" data-cmd="previewcolumn" id="previewcolumn" />
-                  <fmt:message key='editor.plain.sidebysidepreview'/> <span class="icon-columns"/>
-                </label>
-              </a>
-            </li>
+  <%--<div class="btn-group editor-tools">--%>
 
+    <c:set var="editors" value="<%= engine.getEditorManager().getEditorList() %>" />
+    <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 dropdown-toggle"><span class="icon-pencil"></span><span class="caret"></span></button>
+      <ul class="dropdown-menu" data-hover-parent="div">
+        <c:forEach items="${editors}" var="edt">
+          <c:choose>
+            <c:when test="${edt != prefs.editor}">
+              <li>
+                <wiki:Link context="edit"><wiki:Param name="editor" value="${edt}" />${edt}</wiki:Link>
+              </li>
+            </c:when>
+            <c:otherwise>
+              <li class="dropdown-header">${edt}</li>
+            </c:otherwise>
+          </c:choose>
+      </c:forEach>
       </ul>
---%>
-  </div>
+    </div>
+    </c:if>
+
+  <%--</div>--%>
 
 
   <%-- is PREVIEW functionality still needed - with livepreview ?

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=1693819&r1=1693818&r2=1693819&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 Aug  2 18:05:54 2015
@@ -18,7 +18,6 @@
 --%>
 
 <%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.auth.permissions.*" %>
@@ -26,8 +25,10 @@
 <%@ page import="org.apache.wiki.filters.SpamFilter" %>
 <%@ page import="org.apache.wiki.ui.*" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
 <%--
@@ -79,6 +80,9 @@
       action="<wiki:CheckRequestContext
      context='edit'><wiki:EditLink format='url'/></wiki:CheckRequestContext><wiki:CheckRequestContext
      context='comment'><wiki:CommentLink format='url'/></wiki:CheckRequestContext>"
+
+     <%--action="<wiki:Link context=${context} format='url'/>"--%>
+
        class="editform"
           id="editform"
      enctype="application/x-www-form-urlencoded" >
@@ -134,7 +138,8 @@
       </label>
     </div>
     --%>
-    <div class="btn-group config">
+
+`    <div class="btn-group config">
       <%-- note: 'dropdown-toggle' is only here to style the last button properly! --%>
       <button class="btn btn-default dropdown-toggle"><span class="icon-wrench"></span><span class="caret"></span></button>
       <ul class="dropdown-menu" data-hover-parent="div">
@@ -182,6 +187,30 @@
 
       </ul>
     </div>
+
+    <%-- --%>
+    <c:set var="editors" value="<%= context.getEngine().getEditorManager().getEditorList() %>" />
+    <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 dropdown-toggle"><span class="icon-pencil"></span><span class="caret"></span></button>
+      <ul class="dropdown-menu" data-hover-parent="div">
+        <c:forEach items="${editors}" var="edt">
+          <c:choose>
+            <c:when test="${edt != prefs.editor}">
+              <li>
+                <wiki:Link context="edit"><wiki:Param name="editor" value="${edt}" />${edt}</wiki:Link>
+              </li>
+            </c:when>
+            <c:otherwise>
+              <li class="dropdown-header">${edt}</li>
+            </c:otherwise>
+          </c:choose>
+      </c:forEach>
+      </ul>
+    </div>
+    </c:if>
+
   </div>
 
       <div class="dialog float find">

Added: jspwiki/trunk/jspwiki-wikipages/ru/target/.plxarc
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/ru/target/.plxarc?rev=1693819&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/ru/target/.plxarc (added)
+++ jspwiki/trunk/jspwiki-wikipages/ru/target/.plxarc Sun Aug  2 18:05:54 2015
@@ -0,0 +1 @@
+maven-shared-archive-resources
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-wikipages/ru/target/classes/About.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/ru/target/classes/About.txt?rev=1693819&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/ru/target/classes/About.txt (added)
+++ jspwiki/trunk/jspwiki-wikipages/ru/target/classes/About.txt Sun Aug  2 18:05:54 2015
@@ -0,0 +1,18 @@
+Эта Wiki выполнена с использованием технологии [JSP|http://java.sun.com/products/jsp], 
+что, как мы надеемся, делает очень легким усовершенствование и выглядит лучше чем большинство Wiki,
+основанных на [оригинальной wiki|http://c2.com/cgi/wiki].
+Настраиваемый узел обрабатывает преобразование текста в HTML.
+
+Большинство [маркеров редактирования|TextFormattingRules] было разработано согласно [Библиотеке Sensei|http://senseis.xmp.net], лучшие Go сайты в Интернете. Я считаю их разметку очень легкой, тем не менее очевидной.
+
+Эта wiki доступна под [Лицензией Apache, Версии 2.0|http://www.apache.org/licenses/LICENSE-2.0]. Пожалуйста,
+см. [http://jspwiki.apache.org] для дополнительной информации.
+
+Если Вы интересуетесь разработкой JSPWiki, домашняя страница для JSPWiki в [http://jspwiki.apache.org]. Некоторые быстрые ссылки:
+
+* [Протокол Багов|JSPWiki:SubmitBugReport] - или [взгляните на список открытых багов|JSPWiki:OpenBugs].
+* [Внесение новых идей|JSPWiki:SubmitNewIdea].
+* Рассмотрите наиболее актуальные [JSPWiki FAQ|JSPWiki:JSPWikiFAQ]
+* Ищите дополнительные [плагины|JSPWiki:ContributedPlugins], [шаблоны|JSPWiki:ContributedTemplates], [фильтры|JSPWiki:ContributedFilters], [провайдеры|JSPWiki:ContributedProviders], или [другой современный материал|JSPWiki:ContributedCode].
+
+Удачи в исследовании, и спасибо за выбор JSPWiki!

Added: jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForPageChanges.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForPageChanges.txt?rev=1693819&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForPageChanges.txt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForUserProfiles.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForUserProfiles.txt?rev=1693819&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-wikipages/ru/target/classes/ApprovalRequiredForUserProfiles.txt
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message