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 2014/03/02 19:27:51 UTC

svn commit: r1573337 [4/5] - in /jspwiki/trunk: ./ jspwiki-war/src/main/config/wro/ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/resources/templates/ jspwiki-war/src/main/scripts/dialog/ jspwiki-war/src/main/scripts/dynamic-styles/ j...

Added: 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=1573337&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js (added)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js Sun Mar  2 18:27:50 2014
@@ -0,0 +1,457 @@
+/*
+
+
+
+*/
+
+/*
+DirectSnippet definitions for JSPWiki, aka ''smartpairs''.
+These snippets are directly expanded on keypress.
+*/
+Wiki.DirectSnips = {
+
+    '"' : '"',
+    '(' : ')',
+    '[' : ']',
+    '{' : '}',
+    '%%' : ' /%',
+    "'" : {
+        snippet:"'",
+        scope:{
+            "[{":"}]"  //plugin parameters
+          }
+    }
+};
+
+/*
+    Function: tabSnippets
+    
+        Definitions for the JSPWiki editor commands.
+
+        Following commands are predefined by the snipe editor:
+        - find : toggles the find and replace dialog
+        - sections : toggle sections dropdown dialog, which allows to switch
+            between certain sections of the document or the whole document
+        - undo : undo last command, set the editor to the previous stable state
+        - redo : revert last undo command
+
+        A command consists of triggers, attributes, snippets, events and dialogs.
+
+        Triggers : 
+        ========
+        click events, suggestion dialogs, TAB-completion and Ctrl-keys.
+
+        Click events are attached to DOM elements with a .cmd css-class.
+        If the DOM element also contains a .pop css-class, a dialog will be opened.
+
+        TAB-completion can be turned on/off via the 'tabcompletion' flag.
+
+        The 'keyup' event can trigger a suggestion dialog:
+        - the suggest(txta,caret) function validates the suggestion context
+          It returns true/false and can modify the snippet with
+             - snip.start : begin offset of the matched prefix
+             - snip.match : matched prefix (string)
+             - snip.tail: (optional) replaceable tail
+
+        Attributes :
+        ==========
+        - initialize: function(cmd, snip) called once at initialization
+        - key: shortcut key  (ctrl-key)
+        - scope: set to TRUE when the cmd is valid
+        - nscope: set to TRUE when the cmd is not valid
+        - cmdId: wysiwyg mode only (commandIdentifier)
+        
+        Snippet :
+        =======
+        The snippet contains the inserted or replaced text.
+        - static snippet: "some string"
+        - snippet with parameters in {} brackets: "some {dialog1} string"
+          A {.} will be replaced by the selected text.
+          A {dialog-1} opens a dialog, and inserts the returned info (eg color, selection...)
+        - dynamic snippet: javascript function.
+          Example:
+              snippet: function(){
+                  this.dialogs.exec( dialog-name, ...
+                      onChange: function(value){  }
+                  )
+              }
+
+        Event :
+        =====
+        Fires an event back to the invoking Object (Wiki.Edit in our case)
+        Example:
+            smartpairs: { event: 'config' }
+
+        Dialogs :
+        =======
+        (btw -- you do use unique names, do you?)
+        - <dialog-name>: [ Dialog.SubClass, {dialog-parameters, event-handlers} ]
+        - <dialog-name>: "dialog initialization string"
+          This is a short notation for Dialog.Selection, or..
+          [Selection, "put here your dialog initialization string"]
+
+        The Dialog Classes are subclass of Dialog. (eg. Dialog.Selection)
+
+
+    Examples:
+
+     acl: {
+         nscope: { "[{" : "}]" },
+         snippet: "[\\{ ALLOW {permission} {principal(s)}  }]"
+
+         permission: "view|edit|delete",
+         "principals(s)": [Dialog.Selection, {
+             onOpen: function(){ this.setBody( AJAX-request list of principals ); }
+         ]
+     }
+
+     link: {
+         suggest: function(){
+             //match [, but not [[ or [{
+             //defines .start, .selection, .trail ??
+         }
+         snippet: "{wikiLink}",
+         //or snippet: function(){ this.dialogs.exec('wikiLink'); },
+         wikiLink: [Dialog.Link, {
+            onOpen: function(){
+                AJAX-retrieval of link suggestions
+            }
+         }]
+     }
+
+     color: {
+        nscope: {"%%(":")"},
+        action: "%%(color:#000000; background:#ffffff;) {.} \%",
+     }
+     colorsuggestion: {
+        scope: {"%%(":")"},
+        suggest: function(){
+            //match #cccccc
+        }
+        snippet: "{color}",
+        color: [ dialog.Color, {
+            //parms
+        }]
+     }
+
+
+*/
+
+Wiki.Snips = {
+
+        find: {
+            key: "f"
+            //predefined find dialog triggered via Ctrl-f or a toolbar 'find' button
+        },
+
+        //sections:
+        //predefined section dialog triggered via a toolbar 'sections' button
+        //TODO: turn it into a suggestion menu for header lines
+
+        undo: {
+            //event: "undo", //predefined snipe event
+            action: function(){ this.undoredo.onUndo(); },
+            key: "z"
+        },
+
+        redo: {
+            //event: "redo", //predefined snipe event
+            action: function(){ this.undoredo.onRedo(); },
+            key: "y"
+        },
+
+        smartpairs: { event: 'config' },
+        livepreview: { event: 'config' },
+        autosuggest: { event: 'config' },
+        tabcompletion: { event: 'config' },
+        previewcolumn: { event: 'config' },
+
+        br: {
+            key: "shift+enter",
+            snippet: "\\\\\n"
+        },
+
+        hr: "\n----\n",
+
+
+        h: {
+            xxxsuggest: function(txta,caret){
+                var c,result=txta.slice(0,caret.start).match( /(?:^|[\n\r])(!{1,3}[^\n\r]*)$/ );
+
+                if( result ){
+                    c = result[1];
+                    result = {
+                        start: caret.start - c.length,
+                        match: c + txta.slice(caret.start).match( /[^\n\r]*/ )||''  //entire line
+                    };
+                }
+                return result;
+            },
+            h: [Dialog.Selection, {
+                onOpen: function(){
+                    var value = (this.getValue().replace(/^!+\s?/,'')||'Title'), //remove !markup
+                        val = value.trim().trunc(20),
+                        k = ['!!! '+value,'!! '+value,'! '+value],
+                        v = ['<h2>'+val+'</h2>','<h3>'+val+'</h3>','<h4>'+val+'</h4>'];
+
+                    this.setBody( v.associate( k ) );
+                }
+            }]
+        },
+    
+        font: {
+            nScope: {
+                "%%(":")",
+                "font-family:":";"
+            },
+            /*
+            suggest: function(txta,caret){
+                //match /%%(:?.*)font-family:([^;\)]+)/
+
+            },*/
+            snippet: "%%(font-family:{font};) {.}/% ",
+            font: [Dialog.Font, {}]
+        },
+
+        color: {
+            nscope: { '%%(': ')' },
+            snippet: "%%(color:{#000000}; background:{#ffffff};) {.} ",
+            suggest: function(txta, caret){
+                //match "#cccccc;" pattern
+                var c,d, result = txta.slice(0,caret.end).match( /#[0-9a-f]{0,6}$/i );
+
+                if( result ){
+                    c = result[0];
+                    d = txta.slice( caret.end ).match( /^[0-9a-f]+/i )||'';
+                    result = {
+                        start: caret.end - c.length, //position of # char
+                        match: (c+d).slice(0,7)
+                    };
+                }
+                return result;
+            },
+            color: [ Dialog.Color, {
+                //colorImage:'./test-dialog-assets/circle-256.png'
+            }]
+         },
+
+        symbol: { synonym:"chars" },
+        chars: {
+            nScope: { "%%(":")" },
+            snippet: "{&entity;}",
+            suggest: function(txta, caret){
+                //match &xxx;
+                var c,result = txta.slice(0,caret.end).match( /&[\da-zA-Z]*;?$/ );
+
+                if( result ){
+                    c = result[0];
+                    result = {
+                        start: caret.end - c.length,
+                        match: c,
+                        tail: txta.slice( caret.end ).match( /^[\da-zA-Z]*;?/ )||''
+                    }
+                }
+                return result;
+
+            },
+            chars: [Dialog.Chars, {caption:"Special Chars".localize()}]
+        },
+
+        style: { synonym:"css"},
+        css: {
+            nScope: { "%%(":")" },
+            snippet: "%%{css} {.} /% ",
+            suggest: function(txta, caret){
+                //match %%(.w+)
+                var c, result = txta.slice(0,caret.end).match(/%%[\da-zA-Z(\-\_:#;)]*$/);
+
+                if(result){
+                    c = result[0].slice(2); //drop the %% prefix
+                    result = {
+                        start: caret.end - c.length,
+                        match: c + txta.slice( caret.end ).match( /^[\da-zA-Z(:#;)]*/ )||''
+                    };
+                }
+                return result;
+            },
+            css: {
+                "(css:value;)":"any css definitions",
+                "text-success":"text-success",
+                "text-information":"text-information",
+                "text-warning":"text-warning",
+                "text-error":"text-error",
+                success:"success",
+                information:"information",
+                warning:"warning",
+                error:"error",
+                commentbox:"commentbox",
+                quote:"quoted paragraph",
+                sub:"sub-script<span class='sub'>2</span>",
+                sup:"super-script<span class='sup'>2</span>",
+                strike:"<span class='strike'>strikethrough</span>",
+                pretify:"prettify code block",
+                reflection:"image reflection"
+                //xflow:"wide content with scroll bars"
+            }
+        },
+
+        //simple tab completion commands
+        sub: "%%sub {subscript text}/% ",
+        sup: "%%sup {superscript text}/% ",
+        strike: "%%strike {strikethrough text}/% ",
+        xflow: "\n%%xflow\n{wide content}\n/%\n ",
+        quote: "\n%%quote \n{quoted text}\n/%\n",
+        dl: "\n;{term}:{definition-text} ",
+        pre: "\n\\{\\{\\{\n{some preformatted block}\n}}}\n",
+        code: "\n%%prettify \n\\{\\{\\{\n{/* some code block */}\n}}}\n/%\n",
+        mono: "\\{\\{{monospaced text}}} ",
+
+        link: {
+            key:'l',
+            commandIdentifier:'createlink',
+            suggest: function(txta, caret){
+
+                //match [link] or [link,  do not match [{, [[
+                //match '[' + 'any char except \n, [, { or ]' at end of the string
+                var result = txta.getFromStart().match( /\[([^\[\{\]\n\r]*)$/ ),
+                    link;
+
+                if( result ){
+                    link = result[1].split('|').getLast(); //exclude "text|" prefix
+                    result = {
+                        start: caret.start - link.length ,
+                        //if no input yet, then get list attachments of this wikipage
+                        match: link,
+                        tail: txta.slice( caret.start ).search( /[\n\r\]]/ )
+                    };
+                }
+                return result;
+            },
+
+            //snippet: "[{display text}|{pagename or url}|{attributes}] ",
+            snippet: "[{link}] ",
+            //attributes: "accesskey='X'|title='description'|target='_blank'
+            //    'accesskey', 'charset', 'class', 'hreflang', 'id', 'lang', 'dir',
+            //  'rel', 'rev', 'style', 'tabindex', 'target', 'title', 'type'
+            //    display-text
+            //    wiki-page or url -- allow to validate the url ; preview the page/url
+            //    title: descriptive text
+            //- target: _blank --new-- window yes or no
+
+            //link: [ Dialog.Link, { ...
+            link: [ Dialog.Selection, {
+
+                onOpen: function(dialog){
+
+
+//console.log("****"+dialog.getValue()+"****", Wiki.PageName)
+                    var dialog = this, 
+                        key = dialog.getValue();
+                        
+                    if( !key || (key.trim()=='')) key = Wiki.PageName + '/';
+
+                    //console.log('json lookup for '+key);
+                    Wiki.jsonrpc('search.getSuggestions', [key,30], function(result,exception){
+
+                      if( result.list && result.list[0] /*length!=0*/ ){
+                          dialog.setBody( result.list );
+                      } else {
+                          dialog.hide();
+                      }
+
+                    });
+                }
+
+            }]
+
+
+        },
+
+        bold: {
+            key:'b',
+            snippet:"__{bold text}__ "
+        },
+
+        italic: {
+            key:'i',
+            snippet: "''{italic text}'' "
+        },
+
+        allow: { synonym: "acl" },
+        acl: {
+            snippet: "\n[\\{ALLOW {permission} {principal(,principal)} \\}]\n",
+            permission: "view|edit|modify|comment|rename|upload|delete",
+            //permission:[Dialog.Selection, {body:"view|edit|modify|comment|rename|upload|delete"}]
+            "principal(,principal)": function(){
+                return "Anonymous|Asserted|Authenticated|All";
+                //FIXME: retrieve list of available wiki user groups through ajax call
+            }
+        },
+
+        img: {
+            snippet:"\n[\\{Image src='{img.jpg}' width='{400px}' height='{300px}' align='{text-align}' style='{css-style}' class='{css-class}' }]\n ",
+            'text-align':'left|center|right'
+        },
+
+        plugin: {
+            snippet: "\n[\\{{plugin}}]\n",
+            suggest: function(txta, xcaret){
+                //match [{
+            },
+            plugin: {
+                "TableOfContents title='Page contents' numbered='true' prefix='Chap. '":"Table Of Contents (toc)",
+                "If name='value' page='pagename' exists='true' contains='regexp'\n\nbody\n":"Test a page variable",
+                "SET alias='{pagename}'":"Make a Page Alias",
+                "SET name='value'":"Set a page variable",
+                "$varname":"Get a page variable",
+                "InsertPage page='pagename'":"Insert Page",
+                "CurrentTimePlugin format='yyyy mmm-dd'":"Current Time",
+                "Search query='Janne' max='10'":"Search query",
+                "ReferredPagesPlugin page='pagename' type='local|external|attachment' depth='1..8' include='regexp' exclude='regexp'":"Incoming Links (aka referred pages)",
+                "ReferringPagesPlugin page='pagename' separator=',' include='regexp' exclude='regexp'":"Outgoing Links (aka referring pages)",
+                "WeblogPlugin page='pagename' startDate='300604' days='30' maxEntries='30' allowComments='false'":"Display weblog posts",
+                "WeblogEntryPlugin":"New weblog entry"
+            }
+        },
+
+        tab: {
+            nScope: {
+                "%%(":")",
+                "%%tabbedSection":"/%"
+            },
+            snippet:"%%tabbedSection \n%%tab-{tabTitle1}\n{tab content 1}\n/%\n%%tab-{tabTitle2}\n{tab content 2}\n/%\n/%\n "
+        },
+
+        toc: {
+            nScope: { "[{":"}]" },
+            snippet:"\n[\\{TableOfContents }]\n"
+        },
+
+        table: "\n||heading-1||heading-2\n| cell11   | cell12\n| cell21   | cell22\n",
+
+        me: { alias: 'sign'},
+        sign: function(){
+            var name = Wiki.UserName || 'UserName';
+            return "\\\\\n--" + name + ", "+ new Date().toISOString() + "\\\\\n";
+        },
+
+        date: function(k) {
+            return new Date().toISOString()+' ';
+            //return "[{Date value='" + d.toISOString() + "' }]"
+            //return "[{Date " + d.toISOString() + " }]"
+        },
+
+        abra: {
+            suggest:"abra",
+            snippet:"cadabra"
+        },
+        abrar: {
+            suggest:"abrar",
+            snippet:"acurix"
+        },
+        lorem: "This is is just some sample. Don’t even bother reading it; you will just waste your time. Why do you keep reading? Do I have to use Lorem Ipsum to stop you? OK, here goes: Lorem ipsum dolor sit amet, consectetur adipi sicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Still reading? Gosh, you’re impossible. I’ll stop here to spare you.",
+        Lorem: { synonym: "lorem" }
+
+
+}
+

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Dynamic-styles.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Dynamic-styles.js?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Dynamic-styles.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Dynamic-styles.js Sun Mar  2 18:27:50 2014
@@ -55,9 +55,11 @@ BOOTSTRAP Style: %%alert .. /%
     .add('.alert', function(element){
 
         element.addClass('alert-warning alert-dismissable').grab(
+
             'button.close[type="button"][html="&times;"]'.slick()
                 .addEvent('click',function(){ element.dispose(); }),
             'top'
+
         );
 
     })
@@ -157,16 +159,13 @@ function filterJSPWikiLinks(element){
 wiki.once('body', function( elements ){
 
         //create singleton TheSlimbox
-        TheSlimbox = new Viewer.Slimbox();
-        /*TheSlimbox = new Viewer.Slimbox({ 
+        TheSlimbox = new Viewer.Slimbox({ 
             hints: {
                 //use defaults as much as possible
-                //btn: 'Click to view {0}', 
-                //caption: ' Direct link to {0}',    
                 btn: 'slimbox.btn'.localize(),
                 caption: 'slimbox.caption'.localize()
             }
-        });*/
+        });
     })
 
     // [ link-description | link-url | class='slimbox-link' ]
@@ -317,11 +316,11 @@ Example:
 Style: Reflection for images
 >    %%reflection-30-50    //size of reflection images is 30% height by 50% wide
 */
-    .add('div[class*=reflection]', function(element){
+    .add('[class^=reflection]', function(element){
 
         var args = "reflection".sliceArgs( element );
         
-        if(args) element.getElements('img').reflect({
+        if( args ) element.getElements('img').reflect({
             height:args[0]/100,
             width:args[1]/100
         });
@@ -406,16 +405,35 @@ FFS %%table-scrollable  (keep head fixed
 
 /*
 Add BOOTSTRAP Styles
-    Scrollable pre area's
+    Scrollable area's
+    - pre   (%%scrollable {{{ ... }}})
 */
     .add('div.scrollable > pre', function(element){ 
 
-        element.addClass('pre-scrollable');  //bootstrap class
+        element.addClass('pre-scrollable');  //decorate pre elements with bootstrap class
+
+    })
+
+/*
+Add BOOTSTRAP Font Icon style
+    Convert .icon-<icon-name> into appropriate class-name depending on the font family
+
+    Glyphicon :  .glyphicon.glyphicon-<icon-name>
+    Font-Awesome: .fa.fa-<icon-name>
+    FontJspwiki (via icomoon) : .icon-<icon-name>
+*/
+    .add('[class^=icon-]', function(element){
+
+        //element.className='glyphicon glyph'+element.className;
+        //element.className = 'fa fa-'+element.className.slice(5);
 
     })
 
+/*
+Add BOOTSTRAP 
 
-    .add('*[class^=list]', function(element){ 
+*/
+    .add('[class^=list]', function(element){ 
     
         var args = "list".sliceArgs(element),
             lists = element.getElements("ul|ol");

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=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js Sun Mar  2 18:27:50 2014
@@ -9,32 +9,37 @@ Javascript routines to support JSPWiki U
     *  prefOrientation:'Orientation',
     *  editor:'editor',
     *  prefLanguage:'Language',
-    *  prefSectionEditing:'SectionEditing' =>checkbox 'on', T/F ???fixme
+    *  prefSectionEditing:'SectionEditing' =>checkbox 'on'
 */
-Wiki.once('.context-prefs form', function(forms){
+Wiki.once('#setCookie', function(form){
 
+        window.onbeforeunload = function(){
 
-    window.onbeforeunload = function(){
+            if( form.getElements('[data-pref]').some(function(el){
 
-        //a checkbox get('value') returns 'on' when checked; getDefaultValue() should also return 'on'
-        if( forms[1].getElements('[data-pref]').some(function(el){
-            //console.log(el.get('data-pref'),el.checked,el.get('name'), el.get('value') , el.getDefaultValue());
-            return (el.get('value') != el.getDefaultValue());
-        }) ) return 'prefs.areyousure'.localize();
-        
-        //return 'always popup dialog for testing';
+                //a checkbox.get('value') returns 'on' when checked; 
+                //so getDefaultValue() should also return 'on'
+                return (el.get('value') != el.getDefaultValue());
 
-    };
+            }) ) return 'prefs.areyousure'.localize();      
+        };
 
-    forms[1].addEvent('submit', function(){
+        form.addEvent('submit', function(e){
     
-        this.getElements('[data-pref]').each( function(el){
-            Wiki.set( el.get('data-pref'), el.get('value') ); 
+            this.getElements('[data-pref]').each( function(el){
+                Wiki.set( el.get('data-pref'), el.get('value') ); 
+            });
+            window.onbeforeunload = function(){};
+
         });
-        //alert("stop");
+    })
+
+    .once('#clearCookie', function(form){
 
-    });
+        form.addEvent('submit', function(){ 
 
-    forms[2].addEvent('submit', function(){ Wiki.erase(); });
+            window.onbeforeunload = function(){}; 
+            Wiki.erase(); 
 
-});
+        });
+});
\ No newline at end of file

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=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js Sun Mar  2 18:27:50 2014
@@ -140,11 +140,15 @@ var Wiki = {
         wiki.add( '*[accesskey]', Accesskey )
 
             .add('*[data-toggle]', function(element){
+
                 element.onToggle( element.get('data-toggle') /*, 'active'*/ );
+
             })
 
             .add('*[data-hover-parent]', function(element){
+
                 element.onHover( element.get('data-hover-parent') /*, 'active'*/ );
+
             })
 
             .add('.searchbox .dropdown-menu', function(element){
@@ -214,9 +218,9 @@ var Wiki = {
 
         wiki.url = null;  //??check why this is needed
 
-        if ( wiki.Context!='preview' && wiki.EditPermission && (wiki.get('SectionEditing:checked')) ){
+        if ( wiki.Context!='preview' && wiki.EditPermission && (wiki.get('SectionEditing')) ){
 
-            wiki.addEditLinks( wiki.EditUrl );
+            wiki.addEditLinks( wiki.toUrl(wiki.PageName,true) );
 
         }
 
@@ -232,6 +236,13 @@ var Wiki = {
         //todo -- check bootstrap router concept
         //wiki.parseHash.periodical(500);
 
+        /*
+        wiki.jsonrpc("system.listMethods",[],function(result){
+            wiki.rpcRegister = result;
+            console.log("rpcRegister",result);
+        });
+        */
+
     },
 
     /*

Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Dialog.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Dialog.less?rev=1573337&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Dialog.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Dialog.less Sun Mar  2 18:27:50 2014
@@ -0,0 +1,168 @@
+/*
+Section: dialog
+	CSSdefs for the Mootools dialog plugin
+
+DOM structure:
+(start code)
+	div.dialog
+		a.close
+		div.caption ...  //optional, + drag handle
+		div.body ... 
+		div.buttons      //optional
+			div.btn ... 
+		div.resize 
+(end)
+*/
+
+/* Dialog main container */
+.dialog {
+
+	position:absolute;
+	.hide;
+	z-index: 10;
+
+    color:@white;
+    background:@tooltip-bg;
+    border-radius:@border-radius-base;
+    //.box-shadow( 2px 2px 4px @tooltip-bg );
+    .box-shadow(0 6px 12px rgba(0,0,0,.175)); 
+    
+    min-width: 160px;
+    padding:.5em 0;
+
+    //overwrite some bootstrap/close.less settings
+    .close {
+        position:absolute;
+        top:0; 
+        right:0.25em;
+        color:@white;
+        .opacity(1);
+    }
+
+    .caption {
+        margin-top:-.5em; //put flat with the top border, jump back over the padding
+    	text-align: center;
+	    padding: .25em 24px .25em .5em; /* leave space for the close button */
+    	//font-weight: bold;
+	    white-space: nowrap;
+    	overflow: hidden;
+       	border-radius:@border-radius-base;
+    	background:rgba(0,0,0,.2);	//black half transparent
+    }
+
+    .body {
+    	padding:.25em;
+	    .user-select(none);
+    }  
+
+}
+ 
+/*
+Style: Dialog.Selection, Dialog.Font, Dialog.Chars
+*/
+.dialog.selection {
+
+    .body { 
+        overflow:scroll; max-height:400px;
+        ul { 
+            .list-unstyled; 
+            margin:0;
+        }
+        li { 
+            cursor:pointer; 
+            white-space:nowrap; 
+            padding:0 1em; 
+            border-radius:@border-radius-base;
+        }
+        .hover { background-color: rgba(0,0,0,.2); }
+        .selected { 
+            background:@black;
+        }        
+    }
+
+}
+
+.dialog.chars {
+    td {
+	    
+    	text-align:center;
+	    cursor:pointer;
+    	padding:0.25em 0.5em;
+        border-radius: @border-radius-base;
+	    
+        &.hover { font-weight:bold; border-color:@black; }
+	}
+}
+
+
+/*
+Style: .dialog.color
+*/
+@dialog-color-size: 256px;
+
+.dialog.color {
+
+    .caption span {
+    	padding:0 1.5em;
+	    border-radius: 1em;
+	    color:#000;
+	    background-color:#fff;
+	    cursor:text;
+	    font-family:@font-family-monospace;
+    }
+    .body {
+	    position:relative; /*restrict cursor movement*/
+    	margin:1em;
+    	width: @dialog-color-size;
+	    height: @dialog-color-size;
+	    cursor: crosshair;
+	    background:url('@{imagePath}/circle-256.png') no-repeat center center;
+        //background-size: cover;
+
+    }
+    .cursor {
+    	position:absolute;
+	    background:url('@{imagePath}/cursor.gif') no-repeat;
+    	margin:-4px; /*half of height x weight */
+	    height:9px;
+    	left:@dialog-color-size/2; /* init at middle of img - mandatory for Drag */
+	    top:@dialog-color-size/2; /* init at middle of img - mandatory for Drag */
+	    width:9px;
+	    z-index:901;
+    }
+    .zone, {
+	    height:100%;
+    	width:100%;
+    }
+    /*
+    .resize {
+    	position:absolute;
+     	bottom:2px;
+	    right:2px;
+    	height: 0;
+	    width: 0;
+    	cursor: se-resize;
+	    opacity:0.5;
+        border-style: solid;
+        border-width: 0 0 16px 16px;
+        border-color: transparent transparent rgba(0,0,0,.2) transparent;
+    }
+    */
+    .btn-group { margin-top:-1em;}
+}
+
+ 
+.dialog.find {
+
+    padding:1em;
+    background-color: fade(@dropdown-bg,80%); //white background
+
+    .caption { margin:0 0 1em 0; }
+
+    .tbHITS {
+    	position:absolute;
+	    right:1.5em;
+	    color:#999;
+    }
+
+}

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/TableX.Filter.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/TableX.Filter.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/TableX.Filter.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/TableX.Filter.less Sun Mar  2 18:27:50 2014
@@ -18,10 +18,9 @@ DOM structure:
 */
 .filter-input {
 
-    background:url("@{imagePath}/icon-filter.gif") no-repeat 8px @line-height-computed*1.5;
-
-    padding:@line-height-computed 32px 0 32px;
+    //background:url("@{imagePath}/icon-filter.gif") no-repeat 8px @line-height-computed*1.5;
+    //padding:@line-height-computed 32px 0 32px;    
     
-    input { width:25%; display:inline; }
+    input { margin-left:.5em; width:40%; display:inline; }
     
 }

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Edit.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Edit.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Edit.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Edit.less Sun Mar  2 18:27:50 2014
@@ -1,210 +1,100 @@
-/* +++ 425 Edit/EditContent and CommentContent +++ */
-/*body.edit {
-}
-body.comment {
-}
-#edithelp {
-}*/
+/* 
+Edit.jsp, EditContent.jsp, CommentContent.jsp, plain.jsp
+
+*/
 
 input[name=changenote] {
     display:inline-block; 
     width:50%;
 }
 
-/* +++ 430 Edit/EditContent +++ */
-.textarea-resizer {
-    background:#eee url("@{imagePath}/resize-horizontal.gif") top center;
-    cursor:s-resize; /* css3 row-resize */
-    font-size:1px;
-    height:6px;
-    line-height:6px;
-    overflow:hidden;
-}
-
-#toolbuttons, #toolextra, #searchbar {
-    margin-left:1em;
-    clear:both;
-}
-#tools span {
-    float:left;
-    display:block;
-    padding:0.25em 0;
-    margin-right:1em;
-}
-#toolbuttons span {
-    border:1px solid #ddd /*#BORDER#*/;
-}
-
-.tool {
-    float:left;
-    margin:2px;
-    display:block;
-    background:transparent;
-    text-decoration: none;
-}
-.tool:hover {
-    background-color:#ddd !important;
-}
-#tools a.tool {
-    border:none;
-    background-repeat:no-repeat;
-    background-image:url("@{imagePath}/editor-strip.gif");
-    background-color:transparent;
-    height:16px;
-    width:16px;
-    text-indent:20px;
-    overflow:hidden;
-}
-
-#tbREDO        { background-position:0 0; width:auto !important;}
-#tbUNDO        { background-position:0 -16px; width:auto !important;}
-
-/*#tbOUTLINE    { background-position:0 0; width:auto !important;}
-#tbOUTLINE    {
-    width:auto !important;
-    background-image:url("images/book_open.png") !important;
+.editor {
+    font-family:@font-family-monospace;
+    padding:.5em;
+    
+	resize: none !important; // disable resizable textareas in Webkit 
+	//outline: 0 !important; // disable focus ring in Safari 
+	//-moz-appearance: none; // CHECKME: remove focus ring on FF
+
 }
-*/
-/*
-label[for="edittoc"] {
-    background-repeat:no-repeat;
-    background-position:center left;
-    xxbackground-image:url("images/editor-strip.gif");
-    background-image:url("images/book_open.png") !important;
-    background-color:transparent;
-    padding:2px 0 2px 20px;
+
+.ajaxpreview {
+    .hide;
+    background:@wiki-preview;
+    border-radius:@border-radius-base;
+    padding:.5em;
+    overflow:scroll;
+    
+    &.loading {
+        .progress-striped .progress-bar;
+        .progress.active .progress-bar;
+    }
 }
-*/
-#tbH1         { background-position:0 -192px; }
-#tbH2         { background-position:0 -208px; }
-#tbH3         { background-position:0 -224px; }
-#tbB          { background-position:0 -176px; }
-#tbI          { background-position:0 -256px; }
-#tbLink       { background-position:0 -48px; }
-#tbMONO       { background-position:0 -160px; }
-/*
-#tbColor      { background-image:url("images/paintbrush.png");  }
-#tbBackground { background-image:url("images/paintcan.png");  }
-*/
-#tbPRE       { background-position:0 -64px; }
-#tbCODE       { background-position:0 -80px; }
-#tbHR         { background-position:0 -240px; }
-#tbBR         { background-position:0 -112px; }
-#tbDL         { background-position:0 -272px; }
-#tbSUP        { background-position:0 -336px; }
-#tbSUB        { background-position:0 -320px; }
-#tbSTRIKE     { background-position:0 -304px; }
-#tbUL         { background-position:0 -256px; }
-#tbOL         { background-position:0 -272px; }
-#tbLEFT       { background-position:0 -288px; }
-#tbCENTER     { background-position:0 -304px; }
-#tbRIGHT      { background-position:0 -320px; }
-#tbJUST       { background-position:0 -336px; }
-#tbQUOTE      { background-position:0 -272px; }
-#tbIMG        { background-position:0 -96px; }
-#tbTABLE      { background-position:0 -144px; }
-#tbTOC        { background-position:0 -32px; }
-#tbTAB        { background-position:0 -128px; }
-#tbSIGN        { background-position:0 -288px; }
 
-#tbDOREPLACE { background-image:url("@{imagePath}/doreplace.png") !important;  }
+//Layout of editor and preview area 
 
-.editor {
-    font:110% Monaco, "Courier New", Courier, monospace;
-    padding:4px;
-    width:99%;
-}
-#toctoc {
-    position:relative;
-    margin:0.5em 0;
-}
-#toctoc label {
-    display:block;
-    margin:0;
-    padding:0.5em;
-}
-#toctoc ul {
-    border:3px solid #eee;
-    width:auto;
-    overflow:auto;
-    height:150px;
-    list-style:none;
-    margin:0;
-    padding:0;
-}
-#toctoc a {
-    display:block;
-    padding:0 0.5em;
-    overflow:hidden;
-    white-space:nowrap;
-}
-
-/* ie6 hack ensure moremenu remains properly aligned */
-* html #editorarea {
-    padding:4px 0;
-}
-/*ie7 hack */
-*:first-child+html #editorarea {
-    padding:4px 0;
-}
-#commentcontent, #editcontent {
+//always show the editor (and preview) areas at 100%
+.edit-area  .col-50,
+.edit-area + .resizer + .ajaxpreview.col-50 { width:100%; }
+
+//when livepreview is on, show the ajaxpreview area
+.edit-area.livepreview .ajaxpreview { .show; }
+.edit-area.livepreview  + .resizer + .ajaxpreview { .show; height:auto !important; }
+
+//when livepreview is on AND previewcolumn (side by side) is on, set width to 50%
+.edit-area.livepreview.previewcolumn .col-50 { width:50%; float:left; }
+
+
+.resizer {
+    background: @wiki-resizer; 
+	cursor:row-resize;
     width:100%;
+	height:8px;
+    line-height:8px;
+    margin-top:4px;
+    margin-bottom:.5em;
+    border-radius:4px;
+    z-index:3;
+
+    &.dragging {
+        .progress-striped .progress-bar;
+        .progress.active .progress-bar;
+    }
+}
+
+
+/*******************/
+
+//reset bootstrap/form.less style on labels inside dropdown menu-s
+.dropdown-menu {
+    max-height:400px;
+    overflow:scroll;
+    label { font-weight:normal; }
 }
 
-#searchbar {
-    display:block !important;
+.toolbar{
+
+    padding-bottom:1em;
+    .btn-group { 
+        border:1px solid @link-color;
+	    border-radius:@border-radius-base;
+    }
+    .btn-link:hover { text-decoration:none; }
+
 }
-#searchbar span {
-    white-space:nowrap;
+
+// icons only, or text labels ?
+// [data-cmd] { &:after { content: " " attr(data-cmd);  } }
+
+[data-cmd='color'] { 
+    background:url("@{imagePath}/color-wheel.png") no-repeat center;  
 }
-/*#searchbarhelp {
-}*/
-#findSuggestionMenu {
-    position:absolute;
-    color:white;
-    background-color:#000;
-    background-color:rgba(0,0,0,0.7);
-    -moz-border-radius:10px;
-    -webkit-border-radius:5px;
-    border-radius:10px;
-    -webkit-box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
-    box-shadow:0 0 5px rgba(0, 0, 0, 0.5);
-    z-index:10;
-    font-size:85%;
-    overflow:hidden;
-}
-/* ie6 hack */
-* html #findSuggestionMenu {
-    background:url("@{imagePath}/tip.png") top left;
-}
-/* ie7 hack */
-*:first-child+html #findSuggestionMenu {
-    background:url("@{imagePath}/tip.png") top left;
-}
-
-#findSuggestionMenu ul {
-    list-style:none;
-    margin:0;
-    padding:0;
-}
-#findSuggestionMenu li {
-    padding:0.25em 0.5em;
-    cursor:pointer;
-}
-#findSuggestionMenu .hover {
-    background-color:#000;
-    background-color:rgba(0,0,0,0.5);
-    -moz-border-radius:5px;
-    -webkit-border-radius:5px;
-    border-radius:5px;
-}
-/* ie6 hack */
-* html #findSuggestionMenu .hover {
-    background-color:black;
-}
-/* ie7 hack */
-*:first-child+html #findSuggestionMenu .hover {
-    background-color:black;
+[data-sections] {
+    .indent-0 {  }
+    .indent-1 { text-indent:.5em; }
+    .indent-2 { text-indent:1em; }    
 }
 
+//change the color of the section button (bookmark) when a section is selected
+.section-selected > .btn { color:@red; }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.SearchBox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.SearchBox.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.SearchBox.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.SearchBox.less Sun Mar  2 18:27:50 2014
@@ -34,18 +34,18 @@ DOM structure:
     z-index:5;
     
     // ensure the searchbox submit button appears on the same horizontal line as the input field
-    input { width: 164px; }
+    
+    input { width: 0px;  .transition( all 1s ease ); padding-right:2em;}
+    
+    &:hover input { width:164px; }
 
 	// search icon button
+	// todo : use btn-group style iso absolute positioning
     button[type=submit] {
-        position:absolute;
-        top:12px;
-        right:3px;
-        width:16px;
-        height:16px;
-        border:none;
-        background: url("@{imagePath}/icon-search.png") no-repeat center;
-        overflow:hidden;
+        position:absolute;    
+        top:0;
+        right:0;
+        background:transparent;
     }
 }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less Sun Mar  2 18:27:50 2014
@@ -136,21 +136,25 @@ DOM structure:
 
 .copyright, .wiki-version { .small; }
 
+
 .feed {
-    background:url("@{imagePath}/jspwiki-strip.gif") no-repeat 0 0;
-    //background-repeat:no-repeat;
-    //background-position:0 0;
-    width:16px;
-    height:16px;
 
-	/*icon*/    
+	//.@{fa-css-prefix};
+    display:inline-block;
+    font-family:FontJspwiki;
+	font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;	
+	&:before { content: "\e610"; } //fixme -- re-use .icon-search
+	
     text-decoration:none;
+    &:hover { text-decoration:none; }
     overflow:hidden;
-    text-indent:16px;
-    display:inline-block;
-    margin:0 .25em;
     vertical-align:middle;
-}
+} 
+
 
 
 // CHECKME

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Viewer.Slimbox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Viewer.Slimbox.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Viewer.Slimbox.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Viewer.Slimbox.less Sun Mar  2 18:27:50 2014
@@ -21,6 +21,7 @@ DOM Structure:
 
 */
 
+/*
 //slimbox button icon (right pointing triangle), added next to a slimbox activated link
 .slimbox-link:after { content:" "; }
 .slimbox-link:after,
@@ -38,6 +39,34 @@ DOM Structure:
     padding: 0;
     background: transparent;
     -webkit-appearance: none;
+    
+}
+*/
+//slimbox button icon-slimbox
+.slimbox-btn {
+    //overwrite button defaults
+    padding: 0;
+    background: transparent;
+    -webkit-appearance: none;
+    border:0;
+}
+.slimbox-link:after,
+.slimbox-btn:before {
+    font-family: 'FontJspwiki';
+	font-style: normal;
+	font-weight: normal;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	
+    color:@link-color;
+    margin-left:.25em;
+
+	content: "\e617";
+    text-decoration:none;
+    &:hover { text-decoration:none; }
+    overflow:hidden;
+    vertical-align:middle;
 }
 
  

Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki.zip
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki.zip?rev=1573337&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/FontJspwiki.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less?rev=1573337&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less Sun Mar  2 18:27:50 2014
@@ -0,0 +1,35 @@
+// Base Class Definition
+// -------------------------
+
+/*
+.@{fa-css-prefix} {
+  display: inline-block;
+  font-family: FontJspwiki;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  //adopted .fa-fw (fixed width) style
+  width: (18em / 14);
+  text-align: center;
+ 
+}
+*/
+
+[class^="icon-"], [class*=" icon-"] {
+	font-family: 'FontJspwiki';
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+
+	/* Better Font Rendering =========== */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	
+	&:hover { text-decoration:none; }
+}

Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less?rev=1573337&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less Sun Mar  2 18:27:50 2014
@@ -0,0 +1,17 @@
+/*!
+ *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "../fontawesome/variables";
+@import "../fontawesome/mixins";
+@import "path";
+@import "core";
+//@import "../fontawesome/larger";
+//@import "../fontawesome/fixed-width";
+//@import "../fontawesome/list";
+//@import "../fontawesome/bordered-pulled";
+//@import "../fontawesome/spinning";
+//@import "../fontawesome/rotated-flipped";
+//@import "../fontawesome/stacked";
+@import "icons";

Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less?rev=1573337&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less Sun Mar  2 18:27:50 2014
@@ -0,0 +1,119 @@
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+
+/* JSPWiki: font subset */
+/*
+.@{fa-css-prefix}-search:before { content: @fa-var-search; }
+.@{fa-css-prefix}-user:before { content: @fa-var-user; }
+.@{fa-css-prefix}-home:before { content: @fa-var-home; }
+.@{fa-css-prefix}-repeat:before { content: @fa-var-repeat; }
+.@{fa-css-prefix}-refresh:before { content: @fa-var-refresh; }
+.@{fa-css-prefix}-bookmark:before { content: @fa-var-bookmark; }
+
+.@{fa-css-prefix}-font:before { content: @fa-var-font; }
+.@{fa-css-prefix}-bold:before { content: @fa-var-bold; }
+.@{fa-css-prefix}-italic:before { content: @fa-var-italic; }
+.@{fa-css-prefix}-tint:before { content: @fa-var-tint; }
+.@{fa-css-prefix}-plus:before { content: @fa-var-plus; }
+.@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; }
+.@{fa-css-prefix}-external-link:before { content: @fa-var-external-link; }
+.@{fa-css-prefix}-sign-in:before { content: @fa-var-sign-in; }
+.@{fa-css-prefix}-rss:before { content: @fa-var-rss; }
+.@{fa-css-prefix}-wrench:before { content: @fa-var-wrench; }
+.@{fa-css-prefix}-filter:before { content: @fa-var-filter; }
+.@{fa-css-prefix}-link:before { content: @fa-var-link; }
+.@{fa-css-prefix}-paperclip:before { content: @fa-var-paperclip; }
+.@{fa-css-prefix}-undo:before { content: @fa-var-undo; }
+.@{fa-css-prefix}-euro:before,
+.@{fa-css-prefix}-eur:before { content: @fa-var-eur; }
+
+//jspwiki specific naming
+.@{fa-css-prefix}-picture:before { content: @fa-var-picture-o; }
+.@{fa-css-prefix}-slimbox:before { content: @fa-var-play-circle-o; }
+
+//ffs
+.@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; }
+.@{fa-css-prefix}-users:before { content: @fa-var-users; }
+.@{fa-css-prefix}-table:before { content: @fa-var-table; }
+.@{fa-css-prefix}-columns:before { content: @fa-var-columns; }
+.@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; }
+
+.@{fa-css-prefix}-file:before { content: @fa-var-file; }
+*/
+
+.icon-none:before {
+    content: "\a0";
+}
+.icon-search:before {
+	content: "\e601";
+}
+.icon-user:before {
+	content: "\e602";
+}
+.icon-home:before {
+	content: "\e603";
+}
+.icon-refresh:before {
+	content: "\e604";
+}
+.icon-bookmark:before {
+	content: "\e605";
+}
+.icon-repeat:before {
+	content: "\e606";
+}
+.icon-picture:before {
+	content: "\e607";
+}
+.icon-font:before {
+	content: "\e608";
+}
+.icon-bold:before {
+	content: "\e609";
+}
+.icon-italic:before {
+	content: "\e60a";
+}
+.icon-tint:before {
+	content: "\e60b";
+}
+.icon-plus:before {
+	content: "\e60c";
+}
+.icon-external-link:before {
+	content: "\e60d";
+}
+.icon-sign-out:before {
+	content: "\e60e";
+}
+.icon-sign-in:before {
+	content: "\e60f";
+}
+.icon-rss:before {
+	content: "\e610";
+}
+.icon-wrench:before {
+	content: "\e611";
+}
+.icon-filter:before {
+	content: "\e612";
+}
+.icon-link:before {
+	content: "\e613";
+}
+.icon-paperclip:before {
+	content: "\e614";
+}
+.icon-undo:before {
+	content: "\e615";
+}
+.icon-euro:before {
+	content: "\e616";
+}
+.icon-slimbox:before {
+	content: "\e617";
+}
+.icon-columns:before {
+	content: "\e600";
+}
+

Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less?rev=1573337&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less Sun Mar  2 18:27:50 2014
@@ -0,0 +1,28 @@
+/* FONT PATH */
+
+/*
+@font-face {
+  font-family: 'FontJspwiki';
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontjspwikiregular') format('svg');
+//  src: url('@{fa-font-path}/fontjspwiki.otf') format('opentype'); // used when developing fonts
+  font-weight: normal;
+  font-style: normal;
+}
+*/
+
+
+@font-face {
+	font-family: 'FontJspwiki';
+	src:url('fonts/FontJspwiki.eot');
+	src:url('fonts/FontJspwiki.eot?#iefix') format('embedded-opentype'),
+		url('fonts/FontJspwiki.woff') format('woff'),
+		url('fonts/FontJspwiki.ttf') format('truetype'),
+		url('fonts/FontJspwiki.svg?#FontJspwiki') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less Sun Mar  2 18:27:50 2014
@@ -81,6 +81,13 @@ Stylesheet: JSPWiki
 @import "bootstrap/buttons.less";
  
 // Components: common
+//@import "bootstrap/glyphicons.less";
+//@import "fontawesome/font-awesome.less";
+//@import "fontjspwiki/font-jspwiki.less"; 
+@import "fontjspwiki/path.less";
+@import "fontjspwiki/core.less";
+@import "fontjspwiki/icons.less";
+
 //@import "bootstrap/component-animations.less";
 @import "bootstrap/input-groups.less";
 @import "bootstrap/dropdowns.less";
@@ -128,7 +135,10 @@ Stylesheet: JSPWiki
 @import "Template.Attach.less";
 @import "Template.Diff.less";
 @import "Template.Search.less";
+
+//todo:move to separate jspwiki-edit.less
 @import "Template.Edit.less";
+@import "Dialog.less";
 @import "Template.Preview.less";
  
 // JSPWiki: Plugins

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less Sun Mar  2 18:27:50 2014
@@ -307,9 +307,11 @@ Section: Reusable Styles
 .text-right { text-align:right; }
 
 
-//CHECKME
-//Note: error => danger from bootstrap
-.success, .information, .info,  .warning, .error { .alert; clear:both; display:block;}
+.success, .information, .info,  .warning, .error { 
+    .alert; 
+    clear:both; 
+    display:block;
+}
 .success            { .alert-success; }
 .info, .information { .alert-info; }
 .warning            { .alert-warning; }

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/variables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/variables.less?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/variables.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/variables.less Sun Mar  2 18:27:50 2014
@@ -34,7 +34,8 @@
 @black:  #111;
 
 
-@imagePath: "images";
+@imagePath: "./images";
+@icon-font-path: "./fonts/";
 
 
 // wiki color scheme
@@ -78,7 +79,7 @@
 @wiki-mark:   @orange; //mark search results, searchbars (amber), default graphbar
 
 // Misc.
-@wiki-link-createpage: red;
+@wiki-link-createpage: @red;
 @wiki-diff-add:        #9f9; //diff inserted lines
 @wiki-diff-delete:     #f93; //diff deleted lines
 @wiki-captcha-bg:      @light-grey;
@@ -110,3 +111,6 @@
 // Category
 @wiki-category-link-color: #545454;
 
+//Editor
+@wiki-preview : fade( @wiki-header-bg, 25%);
+@wiki-resizer:  @btn-primary-bg;

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp Sun Mar  2 18:27:50 2014
@@ -45,7 +45,7 @@
 
 <body class="<wiki:Variable var='requestcontext' />" >
 
-<div class="container ${prefs.Orientation}">
+<div class="container${prefs.Layout=='fluid' ? '-fluid' : ''} ${prefs.Orientation}">
  
   <wiki:Include page="Header.jsp" />
   <wiki:Include page="Nav.jsp" />

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=1573337&r1=1573336&r2=1573337&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 Mar  2 18:27:50 2014
@@ -84,10 +84,28 @@
   <wiki:CheckRequestContext context='view|upload|rename|edit'>
   <li id="info">
     <wiki:Link context="info" accessKey="i">
-      <fmt:message key='info.tab'/>
+      <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>
+    <wiki:CheckVersion mode="latest">
+      <li><wiki:DiffLink version="latest" newVersion="previous"><wiki:PageDate format='${prefs["DateFormat"]}'/></wiki:DiffLink></li>
+    </wiki:CheckVersion>
+    <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 class="divider"></li> 
+    <li><wiki:RSSImageLink mode="wiki" /></li> 
+  </ul>
+  </wiki:PageExists>
   </li>
-  </wiki:CheckRequestContext>
+  </wiki:CheckRequestContext>  
+  
 
   <%-- edit --%>
   <wiki:CheckRequestContext context='view|info|diff|upload|rename'>
@@ -159,7 +177,7 @@
 
       <%-- VIEW RAW PAGE SOURCE --%>
       <wiki:PageExists>  
-      <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview' >
+      <wiki:CheckRequestContext context='view|info|diff|upload|preview' >
         <li>
           <wiki:CheckVersion mode="latest">
           <%--FIXME: wiki:Link doesnt support class=".." yet ; should be changed to className=".." --%>
@@ -226,7 +244,7 @@
       <%-- divider --%>
       <wiki:PageExists page="MoreMenu">
 
-        <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|prefs'>
+        <wiki:CheckRequestContext context='view|info|diff|upload|prefs'>
         <li class="divider "></li>
         </wiki:CheckRequestContext>
 

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp Sun Mar  2 18:27:50 2014
@@ -31,7 +31,7 @@
 <%-- 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:Include page="PageTab.jsp"/>
   
   <wiki:PageType type="attachment">
@@ -41,17 +41,8 @@
       </fmt:message>
     </div>
     <div><%-- insert the actual attachement, image, etc... --%>
-      <wiki:Translate>[<%= c.getPage().getName()%>]</wiki:Translate>
+      <wiki:Translate>[<%= WikiContext.findContext( pageContext ).getPage().getName() %>]</wiki:Translate>
     </div>
   </wiki:PageType>  
     
 </div> 
-<%--
-  <wiki:PageExists>
-  <wiki:PageType type="page">
-  <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
-    <wiki:Include page="AttachmentTab.jsp"/>
-  </wiki:Tab>
-  </wiki:PageType>
-  </wiki:PageExists>
---%>
\ 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=1573337&r1=1573336&r2=1573337&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 Mar  2 18:27:50 2014
@@ -100,7 +100,7 @@
   <div class="form-group">
   <label class="btn btn-default form-col-offset-20" for="prefSectionEditing">
     <input class="" id="prefSectionEditing" name="prefSectionEditing"  data-pref="SectionEditing"
-         type="checkbox" <c:if test='${"on" == prefs.SectionEditing}'>checked="checked"</c:if> >
+         type="checkbox" ${prefs.SectionEditing=='on' ? 'checked="checked"' : ''} >
       <fmt:message key="prefs.user.sectionediting"/>
   </label>
   <fmt:message key="prefs.user.sectionediting.text"/>
@@ -113,7 +113,7 @@
   
   <select class="" id="prefSkin" name="prefSkin" data-pref="SkinName">
     <c:forEach items="${skins}" var="i">
-      <option value='<c:out value='${i}'/>' <c:if test='${i == prefs.SkinName}'>selected="selected"</c:if> ><c:out value="${i}"/></option>
+      <option value='${i}' ${prefs.SkinName==i ? 'selected="selected"' : ''} >${i}</option>
     </c:forEach>
   </select>
   
@@ -128,7 +128,7 @@
   
   <select class="" id="prefLanguage" name="prefLanguage" data-pref="Language">
     <c:forEach items='${languages}' var='lg'>
-      <option value="<c:out value='${lg.key}'/>" <c:if test='${fn:startsWith(prefLanguage,lg.key)}'>selected="selected"</c:if> ><c:out value="${lg.value}"/></option>
+      <option value="<c:out value='${lg.key}'/>" ${fn:startsWith(prefLanguage,lg.key) ? 'selected="selected"' : ''} >${lg.value}</option>
     </c:forEach>
   </select>
   
@@ -139,19 +139,26 @@
   <label class="control-label form-col-20" for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label>
   
   <select class="" id="prefOrientation" name="prefOrientation" data-pref="Orientation">
-      <option value='fav-left' <c:if test='${"fav-left" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.left"/></option>
-      <option value='fav-right' <c:if test='${"fav-right" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.right"/></option>
+      <option value='fav-left' ${prefs.Orientation=='fav-left' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.orientation.left"/></option>
+      <option value='fav-right' ${prefs.Orientation=='fav-right' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.orientation.right"/></option>
   </select>
   
   </div>
 
+  <div class="form-group">
+  <label class="control-label form-col-20" for="prefLayout"><fmt:message key="prefs.user.layout"/></label>  
+  <select class="" id="prefLayout" name="prefLayout" data-pref="Layout">
+      <option value='fluid' ${prefs.Layout=='fluid' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.layout.fluid"/></option>
+      <option value='fixed' ${prefs.Layout=='fixed' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.layout.fixed"/></option>
+  </select>
+  </div>
 
   <div class="form-group">
   <label class="control-label form-col-20" for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label>
   
   <select class="" id="prefTimeFormat" name="prefTimeFormat"  data-pref="DateFormat">
     <c:forEach items='${timeformats}' var='tf' >
-      <option value='<c:out value="${tf.key}"/>' <c:if test='${tf.key == prefs.DateFormat}'>selected="selected"</c:if> ><c:out value="${tf.value}"/></option>
+      <option value='<c:out value="${tf.key}"/>' ${prefs.DateFormat==tf.key ? 'selected="selected"' : ''} >${tf.value}</option>
     </c:forEach>
   </select>
   
@@ -162,7 +169,7 @@
   
   <select class="" id='prefTimeZone' name='prefTimeZone'  data-pref="TimeZone">
     <c:forEach items='${timezones}' var='tz'>
-      <option value='<c:out value="${tz.key}"/>' <c:if test='${tz.key == prefs.TimeZone}'>selected="selected"</c:if> ><c:out value="${tz.value}"/></option>
+      <option value='<c:out value="${tz.key}"/>' ${prefs.TimeZone==tz.key ? 'selected="selected"' : ''} >${tz.value}</option>
     </c:forEach>
   </select>
   

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp?rev=1573337&r1=1573336&r2=1573337&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/SearchBox.jsp Sun Mar  2 18:27:50 2014
@@ -40,7 +40,7 @@
   <button type="submit" 
     class="btn" name="searchSubmit" id="searchSubmit" 
   	value="<fmt:message key='find.submit.go'/>"
-  	title="<fmt:message key='find.submit.go'/>"></button>
+  	title="<fmt:message key='find.submit.go'/>"><span class="icon-search"></span></button>
 
   <ul class="dropdown-menu pull-right" data-hover-parent="span">
    <li class="dropdown-header">Quick Search results (type ahead)</li>

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=1573337&r1=1573336&r2=1573337&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 Mar  2 18:27:50 2014
@@ -45,6 +45,7 @@
 </wiki:UserCheck>
 
 <%-- login button --%>
+<div class="btn-group">
 <wiki:UserCheck status="notAuthenticated">
   <wiki:CheckRequestContext context='!login'>
     <wiki:Permission permission="login">
@@ -75,3 +76,4 @@
     </a>
   </wiki:CheckRequestContext>
 </wiki:CheckRequestContext>
+</div>
\ No newline at end of file

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=1573337&r1=1573336&r2=1573337&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 Mar  2 18:27:50 2014
@@ -45,11 +45,11 @@
 
 <body class="context-<wiki:Variable var='requestcontext' />">
 
-<div class="container-fluid ${prefs.Orientation}">
+<div class="container${prefs.Layout=='fluid' ? '-fluid' : ''} ${prefs.Orientation}">
  
   <wiki:Include page="Header.jsp" />
   <wiki:Include page="Nav.jsp" />
-  <div class="content active" data-toggle="li#menu,.sidebar>.close" >
+  <div class="content active" data-toggle="li#menu,.sidebar>.close">
     <div class="page">
       <wiki:Content/>
       <wiki:Include page="PageInfo.jsp"/>

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=1573337&r1=1573336&r2=1573337&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 Mar  2 18:27:50 2014
@@ -40,11 +40,7 @@
    WikiEngine engine = context.getEngine();
 
    TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT,
-   		context.getURL( WikiContext.NONE, "scripts/jspwiki-edit.js" ) );
-   /*merged by wro4j into one jspwiki-edit.js
-   TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT,
-   		context.getURL( WikiContext.NONE, "scripts/posteditor.js" ) );
-   */
+           context.getURL( WikiContext.NONE, "scripts/haddock-edit.js" ) );
    String usertext = EditorManager.getEditedText( pageContext );
 %>
 <wiki:CheckRequestContext context="edit">
@@ -80,14 +76,13 @@
 </wiki:CheckRequestContext>
 <% if( usertext == null ) usertext = "";  %>
 
-<div style="width:100%"> <%-- Required for IE6 on Windows --%>
+<%-- <div style="width:100%"> <%-- Required for IE6 on Windows --%>
 
 <form action="<wiki:CheckRequestContext
      context='edit'><wiki:EditLink format='url'/></wiki:CheckRequestContext><wiki:CheckRequestContext
      context='comment'><wiki:CommentLink format='url'/></wiki:CheckRequestContext>"
        class=""
           id="editform"
-    onsubmit="return Wiki.submitOnce(this);"
       method="post" accept-charset="<wiki:ContentEncoding/>"
      enctype="application/x-www-form-urlencoded" >
 
@@ -98,150 +93,175 @@
   <%=SpamFilter.insertInputFields( pageContext )%>
   <input type="hidden" name="<%=SpamFilter.getHashFieldName(request)%>" value="<c:out value='${lastchange}' />" />
   
-  <input class="btn btn-primary" type="submit" name="ok" value="<fmt:message key='editor.plain.save.submit'/>"
-    accesskey="s"
-        title="<fmt:message key='editor.plain.save.title'/>" />
-  <input class="btn btn-primary" type="submit" name="preview" value="<fmt:message key='editor.plain.preview.submit'/>"
-    accesskey="v"
-        title="<fmt:message key='editor.plain.preview.title'/>" />
-  <input class="btn btn-danger pull-right" type="submit" name="cancel" value="<fmt:message key='editor.plain.cancel.submit'/>"
-    accesskey="q"
-        title="<fmt:message key='editor.plain.cancel.title'/>" />
+  <input class="btn btn-primary" type="submit" name="ok" accesskey="s"
+         value="<fmt:message key='editor.plain.save.submit'/>"
+         title="<fmt:message key='editor.plain.save.title'/>" />
+<%--
+  <input class="btn btn-primary" type="submit" name="preview" accesskey="v"
+         value="<fmt:message key='editor.plain.preview.submit'/>"
+         title="<fmt:message key='editor.plain.preview.title'/>" />
+--%>
+  <input class="btn btn-danger pull-right" type="submit" name="cancel" accesskey="q"
+         value="<fmt:message key='editor.plain.cancel.submit'/>"
+         title="<fmt:message key='editor.plain.cancel.title'/>" />
 
   <%-- This following field is only for the SpamFilter to catch bots which are just randomly filling all fields and submitting.
        Normal user should never see this field, nor type anything in it. --%>
   <input class="hidden" type="text" name="<%=SpamFilter.getBotFieldName()%>" id="<%=SpamFilter.getBotFieldName()%>" value="" />
+
   <%--TODO
     <wiki:Permission permission="rename">
-    <tr>
-    <td><label for="renameto"><fmt:message key='editor.renameto'/></label></td>
-    <td><input type="text" name="renameto" value="<wiki:Variable var='pagename' />" size="40" />
-    &nbsp;&nbsp;
+    <div class="form-group form-inline">
+    <label for="renameto"><fmt:message key='editor.renameto'/></label>
+    <input type="text" name="renameto" value="<wiki:Variable var='pagename' />" size="40" />
     <input type="checkbox" name="references" checked="checked" />
     <fmt:message key="info.updatereferrers"/>
-    FIXME</td>
-    </tr>
+    </div>
     </wiki:Permission>
   --%>
 
   <wiki:CheckRequestContext context="edit">
-  <input type="text" size="80" maxlength="80" 
-      class="form-control form-col-50"
-      name="changenote" id="changenote" 
-      placeholder="<fmt:message key='editor.plain.changenote'/>"
-      value="${changenote}"/>
+  <input class="form-control form-col-50" type="text" size="80" maxlength="80"
+         name="changenote" id="changenote" 
+         placeholder="<fmt:message key='editor.plain.changenote'/>"
+         value="${changenote}"/>
   </wiki:CheckRequestContext>
-
   <wiki:CheckRequestContext context="comment">
-	<label><fmt:message key="editor.commentsignature"/></label>
-
+    <label><fmt:message key="editor.commentsignature"/></label>
     <input class="form-control form-col-20" type="text" name="author" id="authorname" 
-        placeholder="<fmt:message key='editor.plain.name'/>"
-        value="${author}" />
-        
-    <label for="rememberme">
-        <input type="checkbox" name="remember" id="rememberme" <%=TextUtil.isPositive((String)session.getAttribute("remember")) ? "checked='checked'" : ""%> />
-        <fmt:message key="editor.plain.remember"/>
+           placeholder="<fmt:message key='editor.plain.name'/>"
+           value="${author}" />
+    <label class="btn btn-default btn-sm" for="rememberme">
+      <input type="checkbox" name="remember" id="rememberme" 
+             <%=TextUtil.isPositive((String)session.getAttribute("remember")) ? "checked='checked'" : ""%> />
+      <fmt:message key="editor.plain.remember"/>
     </label>
-
     <input class="form-control form-col-20" type="text" name="link" id="link" size="24" 
-        placeholder="<fmt:message key='editor.plain.email'/>"
-        value="${link}" />
-
+           placeholder="<fmt:message key='editor.plain.email'/>"
+           value="${link}" />
   </wiki:CheckRequestContext>
 
   </div>  
   
+<div class="snipe">
 
-  <div id="tools" class="warning">
-      <%--<h4><fmt:message key='editor.plain.toolbar'/></h4>--%>
-      <div id="toolbuttons" class="form-group">
-      <span>
-	  <a href="#" class="tool" rel="" id="tbLink" title="<fmt:message key='editor.plain.tbLink.title'/>">link</a>
-	  <a href="#" class="tool" rel="break" id="tbH1" title="<fmt:message key='editor.plain.tbH1.title'/>">h1</a>
-	  <a href="#" class="tool" rel="break" id="tbH2" title="<fmt:message key='editor.plain.tbH2.title'/>">h2</a>
-	  <a href="#" class="tool" rel="break" id="tbH3" title="<fmt:message key='editor.plain.tbH3.title'/>">h3</a>
-      </span>
-      <span>
-	  <a href="#" class="tool" rel="" id="tbB" title="<fmt:message key='editor.plain.tbB.title'/>">bold</a>
-	  <a href="#" class="tool" rel="" id="tbI" title="<fmt:message key='editor.plain.tbI.title'/>">italic</a>
-	  <a href="#" class="tool" rel="" id="tbMONO" title="<fmt:message key='editor.plain.tbMONO.title'/>">mono</a>
-	  <a href="#" class="tool" rel="" id="tbSUP" title="<fmt:message key='editor.plain.tbSUP.title'/>">sup</a>
-	  <a href="#" class="tool" rel="" id="tbSUB" title="<fmt:message key='editor.plain.tbSUB.title'/>">sub</a>
-	  <a href="#" class="tool" rel="" id="tbSTRIKE" title="<fmt:message key='editor.plain.tbSTRIKE.title'/>">strike</a>
-      </span>
-      <span>
-	  <a href="#" class="tool" rel="" id="tbBR" title="<fmt:message key='editor.plain.tbBR.title'/>">br</a>
-	  <a href="#" class="tool" rel="break" id="tbHR" title="<fmt:message key='editor.plain.tbHR.title'/>">hr</a>
-	  <a href="#" class="tool" rel="break" id="tbPRE" title="<fmt:message key='editor.plain.tbPRE.title'/>">pre</a>
-	  <a href="#" class="tool" rel="break" id="tbCODE" title="<fmt:message key='editor.plain.tbCODE.title'/>">code</a>
-	  <a href="#" class="tool" rel="break" id="tbDL" title="<fmt:message key='editor.plain.tbDL.title'/>">dl</a>
-      </span>
-      <span>
-	  <a href="#" class="tool" rel="break" id="tbTOC" title="<fmt:message key='editor.plain.tbTOC.title'/>">toc</a>
-	  <a href="#" class="tool" rel="break" id="tbTAB" title="<fmt:message key='editor.plain.tbTAB.title'/>">tab</a>
-	  <a href="#" class="tool" rel="break" id="tbTABLE" title="<fmt:message key='editor.plain.tbTABLE.title'/>">table</a>
-	  <a href="#" class="tool" rel="" id="tbIMG" title="<fmt:message key='editor.plain.tbIMG.title'/>">img</a>
-	  <a href="#" class="tool" rel="break" id="tbQUOTE" title="<fmt:message key='editor.plain.tbQUOTE.title'/>">quote</a>
-	  <a href="#" class="tool" rel="break" id="tbSIGN" title="<fmt:message key='editor.plain.tbSIGN.title'/>">sign</a>
-      </span>
-      <span>
-      <a href="#" class="tool" rel="break" id="tbUNDO" title="<fmt:message key='editor.plain.undo.title'/>"><fmt:message key='editor.plain.undo.submit'/></a>
-      </span>
-      <span>
-	  <a href="#" class="tool" rel="break" id="tbREDO" title="<fmt:message key='editor.plain.redo.title'/>"><fmt:message key='editor.plain.redo.submit'/></a>
-      </span>
-	  </div>
-
-	  <div id="toolextra" class="form-group hidden" >
-      <span>
-      <input type="checkbox" name="tabcompletion" id="tabcompletion" <%=TextUtil.isPositive((String)session.getAttribute("tabcompletion")) ? "checked='checked'" : ""%>/>
-      <label for="tabcompletion" title="<fmt:message key='editor.plain.tabcompletion.title'/>"><fmt:message key="editor.plain.tabcompletion"/></label>
-      </span>
-      <span>
-      <input type="checkbox" name="smartpairs" id="smartpairs" <%=TextUtil.isPositive((String)session.getAttribute("smartpairs")) ? "checked='checked'" : ""%>/>
-      <label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title'/>"><fmt:message key="editor.plain.smartpairs"/></label>
-      </span>
-	  </div>
-
-	  <div class="form-inline form-group" style="margin-bottom:0;" id="searchbar">
-  		
-        <%--<label for="tbFIND" ><fmt:message key="editor.plain.find"/></label>--%>
-  		<input class="form-control form-col-25" type="text"   name="tbFIND" id="tbFIND" size="16" placeholder="<fmt:message key='editor.plain.find'/>"/>
-		<%--<label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/></label>--%>
-		<input class="form-control form-col-25" type="text"   name="tbREPLACE" id="tbREPLACE" size="16" placeholder="<fmt:message key='editor.plain.replace'/>"/>
-        <input class="btn btn-primary" type="button" name="doreplace" id="doreplace" value="<fmt:message key='editor.plain.find.submit' />" />
-        
-        <div class="btn-group">
-  		<label class="btn btn-default btn-xs" for="tbMatchCASE">
-  		  <input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
-  		  <fmt:message key="editor.plain.matchcase"/>
-  		</label>
-  		<label class="btn btn-default btn-xs" for="tbREGEXP" >
-  		  <input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
-  		  <fmt:message key="editor.plain.regexp"/>
-  		</label>
-  		<label  class="btn btn-default btn-xs" for="tbGLOBAL">
-  		  <input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
-  		  <fmt:message key="editor.plain.global"/>
-  		</label>
-  		</div>
-	  </div>
-	  
-  </div>
-
-  <textarea class="editor form-group form-control" id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>"         
-            autofocus="autofocus"
-            rows="20" cols="80"><%=TextUtil.replaceEntities(usertext)%></textarea>
+<div class="toolbar row">
 
-</form>
+  <div class="btn-group">
+
+  <div class="cage" style="float:left">
+    <div class="btn btn-link"><span class="icon-bookmark"><span class="caret"></span></div>
+    <ul class="dropdown-menu" data-sections="div">
+      <li><a>first</a></li>
+      <li><a>..</a></li>
+      <li><a class="dropdown-divider">..</a></li>
+      <li><a>..</a></li>
+    </ul>
+  </div>
+
+  <div class="btn btn-link" data-cmd="undo" title="<fmt:message key='editor.plain.undo.title'/>"><span class="icon-undo"></span></div>
+  <div class="btn btn-link" data-cmd="redo" title="<fmt:message key='editor.plain.redo.title'/>"><span class="icon-repeat"></span></div>
+  <div class="btn btn-link" data-cmd="find" title="<fmt:message key='editor.plain.find.title'/>"><span class="icon-search"></span></div>  
+
+  <div class="cage" style="float:left">
+    <div class="btn btn-link"><span class="icon-wrench"></span><span class="caret"></span></div>
+    <ul class="dropdown-menu" data-hover-parent=".cage">
+    <li><a><label for="autosuggest">
+        <input type="checkbox" data-cmd="autosuggest" id="autosuggest" />
+        <fmt:message key='editor.plain.autosuggest'/>
+    </label></a></li>
+    <li><a><label for="tabcompletion">
+        <input type="checkbox" data-cmd="tabcompletion" id="tabcompletion" />
+        <fmt:message key='editor.plain.tabcompletion'/>
+    </label></a></li>
+    <li><a><label for="smartpairs">
+        <input type="checkbox" data-cmd="smartpairs" id="smartpairs" />
+        <fmt:message key='editor.plain.smartpairs'/>
+    </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" />
+        Preview Side by Side <span class="icon-columns">
+    </label></a></li>
+    </ul>
+    </div>
+  </div>
 
-<div class="form-control btn btn-primary" id="sneakpreviewheader">
-  <input type="checkbox" name="autopreview" id="autopreview" <%=TextUtil.isPositive((String)session.getAttribute("autopreview")) ? "checked='checked'" : ""%> />
-  <label for="autopreview" title="<fmt:message key='editor.plain.sneakpreview.title'/>"><fmt:message key="editor.plain.sneakpreview"/></label>
-  <span id="previewSpin" class="spin" style="position:absolute;display:none;"></span>
+  <div class="btn-group">
+    <%--<div class="btn btn-link" data-cmd="h" title="<fmt:message key='editor.plain.tbH1.title'/>"><span class="icon-header"></span></div>--%>
+    <div class="btn btn-link" data-cmd="bold" title="<fmt:message key='editor.plain.tbB.title'/>"><span class="icon-bold"></span></div>
+    <div class="btn btn-link" data-cmd="italic" title="<fmt:message key='editor.plain.tbI.title'/>"><span class="icon-italic"></span></div>
+    <%--<div class="btn btn-link  tMONO" title="<fmt:message key='editor.plain.tbMONO.title'/>"><i>mono</i></div>--%>
+    <div class="btn btn-link" data-cmd="css" title="<fmt:message key='editor.plain.tbCSS.title'/>"><span class="icon-tint"></span></div>
+    <div class="btn btn-link" data-cmd="font" title="<fmt:message key='editor.plain.tbFONT.title'/>"><span class="icon-font"></span></div>
+    <div class="btn btn-link" data-cmd="color" title="<fmt:message key='editor.plain.tbCOLOR.title'/>"><span class="icon-none"></span></div>
+    <%--<div class="btn btn-link  tPRE" title="<fmt:message key='editor.plain.tbPRE.title'/>"><i>pre</i></div>--%>
+    <%--<div class="btn btn-link  tCODE" title="<fmt:message key='editor.plain.tbCODE.title'/>"><i>code</i></div>--%>
+    <%--<div class="btn btn-link  tHR" title="<fmt:message key='editor.plain.tbHR.title'/>"><i>hr</i></div>--%>
+  </div>
+
+  <div class="btn-group">
+    <div class="btn btn-link" data-cmd="link" title="<fmt:message key='editor.plain.tbLink.title'/>"><span class="icon-link"></span></div>
+    <div class="btn btn-link" data-cmd="img" title="<fmt:message key='editor.plain.tbIMG.title'/>"><span class="icon-picture"></span></div>
+    <%--<div class="cmd btn btn-link" data-cmd="table" title="<fmt:message key='editor.plain.tbTABLE.title'/>"><i>table</i></div>--%>
+    <div class="btn btn-link" data-cmd="char" title="<fmt:message key='editor.plain.tbCHAR.title'/>"><span class="icon-euro"></div>
+    <div class="btn btn-link" data-cmd="plugin" title="<fmt:message key='editor.plain.tbPLUGIN.title'/>"><span class="icon-plus"></div>
+    <%--<div class="btn btn-link  tBR" title="<fmt:message key='editor.plain.tbBR.title'/>"><i>br</i></div>--%>
+    <%--<div class="cmd btn btn-link" data-cmd="sign" title="<fmt:message key='editor.plain.tbSIGN.title'/>"><span class="icon-user"></span></div>--%>
+    <%--<div class="cmd btn btn-link" data-cmd="acl" title="<fmt:message key='editor.plain.tbACL.title'/>"><span class="icon-lock"></span></div>--%>
+    <%--<div class="cmd tDL" title="<fmt:message key='editor.plain.tbDL.title'/>"><i>dl</i></div>--%>
+  </div>
+
+  <div class="dialog float find">
+    <div class="caption"><fmt:message key='editor.plain.find'/> &amp; <fmt:message key='editor.plain.replace'/> </div>
+      <div class="form-group">
+        <span class="tbHITS"></span>
+        <input class="form-control" type="text" name="tbFIND" size="16" 
+               placeholder="<fmt:message key='editor.plain.find'/>" />
+      </div>
+      <div class="form-group">      
+      <input class="form-control" type="text" name="tbREPLACE" size="16" 
+             placeholder="<fmt:message key='editor.plain.replace'/>" />
+      </div>
+      <div class="btn-group">      
+        <button class="btn btn-primary" type="button" name="replace">  
+          <fmt:message key='editor.plain.find.submit' /> first
+        </button>
+        <button class="btn btn-primary" type="button" name="replaceall">
+          <fmt:message key='editor.plain.global'/>
+        </button>
+        <label class="btn btn-default" for="tbMatchCASE">
+          <input type="checkbox" name="tbMatchCASE" id="tbMatchCASE"/>
+          <fmt:message key="editor.plain.matchcase"/>
+        </label>
+        <label class="btn btn-default" for="tbREGEXP">
+          <input type="checkbox" name="tbREGEXP" id="tbREGEXP"/>
+          <fmt:message key="editor.plain.regexp"/>
+        </label>
+      </div>
+       
+  </div>
+      
+</div><%-- end of .toolbar --%>
+
+  
+<div class="row edit-area">
+  <div class="col-50" >
+    <textarea class="editor form-control" id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>"         
+                autofocus="autofocus"
+                rows="20" cols="80"><%=TextUtil.replaceEntities(usertext)%></textarea>
+  </div>
+  <div class="ajaxpreview col-50" ></div>
 </div>
+<div class="resizer" title="<fmt:message key='editor.plain.edit.resize'/>"></div>
+
+</div><%-- end of .snipe --%>
+
+</form>
 
-<div id="sneakpreview" class="preview-content"></div>
 
-</div>
\ No newline at end of file
+<%-- </div>   ??CHECK: needed of IEx--%>
\ No newline at end of file

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/fonts/FontJspwiki.eot
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/fonts/FontJspwiki.eot?rev=1573337&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/fonts/FontJspwiki.eot
------------------------------------------------------------------------------
    svn:executable = *

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/fonts/FontJspwiki.eot
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream