jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r1736809 - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/java/org/apache/wiki/plugin/ jspwiki-war/src/main/java/org/apache/wiki/preferences/ jspwiki-war/src/main/scripts/wiki-edit/ jspwiki-war/src/mai...
Date Sun, 27 Mar 2016 19:24:42 GMT
Author: brushed
Date: Sun Mar 27 19:24:42 2016
New Revision: 1736809

URL: http://svn.apache.org/viewvc?rev=1736809&view=rev
Log:
* 2.10.3-svn-7  Small fixes on the HADDOCK template 
       * [JSPWIKI-918] HADDOCK:  "view" menu button
       * [JSPWIKI-901] : Undo/Redo doesn't work in HADDOCK editor
       * [WeblogPlugin] : fix filtering weblog entries based on date 
       * [JSPWIKI-897] : Fixing printing issues with long page names. 
       * Replace the attachment info icon, for not-inlined attachments 
       * [JSPWIKI-904]: HADDOCK – retain LeftMeny open/close status

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/plugin/WeblogPlugin.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Nav.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less
    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/PageTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.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=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Mar 27 19:24:42 2016
@@ -1,3 +1,27 @@
+2016-03-27  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.3-svn-7  Few more small fixes on the HADDOCK template 
+
+       * [JSPWIKI-918] HADDOCK: the "view" menu is back as a better way
+         to navigate back to the main page from "Attach" or "Info" views.
+         (also removed the ugly "Back to Parent Page" button)
+       
+       * [JSPWIKI-901] : Undo/Redo doesn't work in HADDOCK editor
+
+       * [WeblogPlugin] : added support for filtering weblog entries according to weblog
+            start-date and number of days. Now you can select weblog entries
+            from a link from the WeblogArchive plugin. 
+       
+       * [JSPWIKI-897] : Long page names in Haddock don't wrap gracefully
+            Fixing printing issues with long page names. 
+
+       * Replace the attachment info icon, for not-inlined attachments 
+
+       * [JSPWIKI-904]: HADDOCK – the display status of the LeftMenu is retained,
+         also after a page refresh.  (by means of a new "Sidebar" user-pref cookie)
+         The "Hide-Sidebar" option is obsolete and thus removed from the UserPreferences.
+
+ 
 2016-03-15  Harry Metske (metskem@apache.org)
 
        * 2.10.3-svn-6

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=1736809&r1=1736808&r2=1736809&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 Mar 27 19:24:42
2016
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "6";
+    public static final String     BUILD         = "7";
 
     /**
      *  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/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java Sun Mar
27 19:24:42 2016
@@ -456,7 +456,13 @@ public class WeblogPlugin
                 try
                 {
                     WikiPage firstVersion = mgr.getPageInfo( pageName, 1 );
-                    result.add( firstVersion );
+
+                    Date d = firstVersion.getLastModified();
+
+                    if( d.after(start) && d.before(end) )
+                    {
+                        result.add( firstVersion );
+                    }
                 }
                 catch( Exception e )
                 {

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/preferences/Preferences.java Sun
Mar 27 19:24:42 2016
@@ -77,12 +77,12 @@ public class Preferences
      */
     public static void setupPreferences( PageContext pageContext )
     {
-        HttpSession session = pageContext.getSession();
+       // HttpSession session = pageContext.getSession();
 
-        if( session.getAttribute( SESSIONPREFS ) == null )
-        {
+        //if( session.getAttribute( SESSIONPREFS ) == null )
+        //{
             reloadPreferences( pageContext );
-        }
+        //}
     }
 
     /**
@@ -151,7 +151,7 @@ public class Preferences
             Gson gson=new Gson();
             Map<String,String> map = new HashMap<String,String>();
             // Convert prefVal JSON to a generic hashmap
-            map= (Map<String,String>) gson.fromJson(prefVal, map.getClass());
+            map = (Map<String,String>) gson.fromJson(prefVal, map.getClass());
 
             for (String key : map.keySet()) {
                 key = TextUtil.replaceEntities( key );

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js Sun Mar 27 19:24:42
2016
@@ -46,8 +46,8 @@ Wiki.Snips = {
 
         // Snipe predefined commands
         find: { key: "f" },
-        undo: { key: "z", event: "undo" },
-        redo: { key: "y", event: "redo" },
+        undo: { event: "undo" },
+        redo: { event: "redo" },
 
         // Configuration commands
         wysiwyg: { event: 'config' },

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=1736809&r1=1736808&r2=1736809&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 27 19:24:42 2016
@@ -60,7 +60,7 @@ Class: Wiki
 */
 var Wiki = {
 
-    version: "haddock02",  //used to validate compatible preference cookies
+    version: "haddock03",  //used to validate compatible preference cookies
 
     initialize: function(){
 
@@ -82,7 +82,14 @@ var Wiki = {
             //toggle effect:  toggle .active class on this element when clicking toggle element
             //.add("[data-toggle]", "onToggle", {attr:"data-toggle"})
             .add( "[data-toggle]", function(element){
-                element.onToggle( element.get("data-toggle") );
+
+                element.onToggle( element.get("data-toggle"), function(isActive){
+                    var pref = element.get("data-toggle-pref");
+                    if( pref ){
+                        //console.log(pref, isActive);
+                        wiki.prefs.set(pref, isActive ? "active" : "");
+                    }
+                });
             })
 
             //generate modal confirmation boxes, eg prompting to execute

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less Sun Mar 27
19:24:42 2016
@@ -44,6 +44,14 @@ textarea { white-space: pre-wrap; }
     z-index: 2;  //appear on top of the button group
     width: 480px;
 }
+
+
+.editform .commentsignature {
+    position: absolute;
+    z-index: 2;  //appear on top of the button group
+}
+
+
 .editform .open + .editor-tools  {
     opacity:0;
 }
@@ -59,15 +67,19 @@ textarea { white-space: pre-wrap; }
 
 //base styling similar to .page-content in Template.Content.less;
 .ajaxpreview {
+
+    &:empty:before {
+        content:"PREVIEW";
+    }
+
     .hide;
     background: @wiki-preview-bg;
     padding: 0 0 .5em @grid-gutter-width/2; //cannot use margin here, as width=50%
-    overflow: scroll;
-    -ms-overflow-style: -ms-autohiding-scrollbar;
+    overflow: auto;
+    //-ms-overflow-style: -ms-autohiding-scrollbar;
     border: 2px dashed transparent;
 
     &.loading {
-        //FFS: walking ant animation ?
         border: 2px dashed red;
     }
 }

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=1736809&r1=1736808&r2=1736809&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 Mar 27
19:24:42 2016
@@ -64,6 +64,7 @@ Note: avoid page-bump when sticky become
     + .sticky-spacer { .hide; }
 
     .pagename {
+        font-family:@font-family-sans-serif;
         font-size: @wiki-logo-font-size;
         line-height: 1;
         .opacity(0);

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less Sun Mar 27
19:24:42 2016
@@ -222,7 +222,6 @@ even when there’s not enough conten
 Credits: https://philipwalton.github.io/solved-by-flexbox/demos/sticky-footer/
 */
 
-
 body.can-flex > .container-fluid,
 body.can-flex > .container {
   display: -webkit-box;

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less Sun Mar
27 19:24:42 2016
@@ -49,27 +49,18 @@ DOM Structure:
     background: transparent;
     -webkit-appearance: none;
     border:0;
+
 }
 .slimbox-link:after,
 .slimbox-btn:before {
-    // copied from   font/jspwiki/core.less
-    // fixme:  better use .icon-slimbox ?
-    font-family: 'FontJspwiki';
-	font-style: normal;
-	font-weight: normal;
 
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+   .icon--all;
 
     color:@link-color;
     margin-left:.25em;
 
-	content: "\e617";
-    &:hover { text-decoration:none; }
+	content: "\e617"; //.icon-slimbox
     overflow:hidden;
-
-    position:relative;
-    top:.1em;
 }
 
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less Sun Mar 27
19:24:42 2016
@@ -48,6 +48,7 @@ a[href*="NewBlogEntry.jsp"] { .btn; .btn
     margin:(@line-height-computed / 2) 0;
 }
 .weblogentryheading {
+    margin-top: @line-height-computed/2;
     padding:@padding-base-vertical @padding-base-horizontal;
     .small;
     float:right;

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less Sun Mar 27 19:24:42
2016
@@ -180,10 +180,9 @@ body > .container {
     flex-flow: initial;
 }
 
-.userbox, .titlebox, .searchbox, .breadcrumb, .row.sticky,
+.header .logo, .userbox, .titlebox, .searchbox, .breadcrumb, .row.sticky,
 a.feed[href], .editsection, .hashlink, .filter-input, .slmbx,
-.index .header,
-a[href='#top'] {
+.index .header, a[href='#top'] {
     display:none;
 }
 .header, .footer {

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=1736809&r1=1736808&r2=1736809&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 Mar 27 19:24:42
2016
@@ -93,9 +93,9 @@ br { clear: both; }
 /* Inspired by: VM UI Framework */
 /* horizontal connecting lines */
 .tree ul li::before {
-    background: #222;
+    background: @table-border-color;
     content: '';
-    height: 0.2em;
+    height: 1px;
     left: -1.5em;
     position: absolute;
     top: 0.9em;
@@ -103,13 +103,13 @@ br { clear: both; }
 }
 /* vertical connecting lines */
 .tree ul li::after {
-    background: #222;
+    background: @table-border-color;
     content: '';
     height: 100%;
     left: -1.5em;
     position: absolute;
     top: 0;
-    width: 0.2em;
+    width: 1px;
 }
 /* closing vertical connecting corner */
 .tree ul li:last-child::after {
@@ -203,11 +203,6 @@ a:hover { cursor:pointer; }
     }
 }
 
-.infolink {
-    display:inline-block;
-    width:16px; height:16px;
-    vertical-align:text-bottom;
-}
 
 //TODO: Overrule standard small red arrow; replace by ...  FIXME
 img.outlink { display:none; }
@@ -216,6 +211,15 @@ a.external:after {
     //content: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=");
     //content:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAMAAADXEh96AAAAB3RJTUUH0wMUEC8DV5a0ngAAAAlwSFlzAAAK8AAACvABQqw0mAAAAwBQTFRFAAAAgAAAAIAAgIAAAACAgACAAICAwMDAwNzApsrw/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////vwoKCkgICA/wAAAP8A//8AAAD//wD/AP//////9ptMMgAAAAt0Uk5T/////////////wBKTwHyAAAAG0lEQVR42mPg4voJBAxcYJoBxgMSXGAKKA6lALPeEyZVnxeBAAAAAElFTkSuQmCC);
 }
+a.attachment + a.infolink,
+a.attachment + button + a.infolink {
+   .icon--all;
+   &:after {
+        margin-left:.1em;
+        content:"\e614"; //.icon-paper-clip
+    }
+    > img { display:none; }
+}
 
 
 /*
@@ -253,6 +257,7 @@ img {
 //img.outlink
 //img.attlink
 
+
 // Utility class to support un-scaled, scrollable images,
 .scrollable-image {
 
@@ -397,6 +402,7 @@ Style: CAPTCHA tables and images
     display:block;
     width:100%;
     text-align:center;
+    padding:0 1em;
     .progress;
     .progress-bar-variant(@yellow);
     .progress-striped .progress-bar;

Modified: 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=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less Sun Mar 27 19:24:42
2016
@@ -18,6 +18,7 @@
 }
 */
 
+.icon--all,
 [class^="icon-"], [class*=" icon-"] {
 	font-family: 'FontJspwiki';
 	speak: none;

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=1736809&r1=1736808&r2=1736809&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 Mar 27
19:24:42 2016
@@ -302,13 +302,14 @@
               id="deleteForm"
           method="post" accept-charset="<wiki:ContentEncoding />" >
 
+<%-- See Nav.jsp  "view" menu item
   <c:set var="parentPage"><wiki:ParentPageName/></c:set>
   <a class="btn btn-primary" href="<wiki:Link page='${parentPage}' format='url' />"
>
     <fmt:message key="info.backtoparentpage" >
       <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"

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=1736809&r1=1736808&r2=1736809&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 27 19:24:42
2016
@@ -45,27 +45,23 @@
 
 <ul class="nav nav-pills pull-right">
 
-  <%-- view
+    <c:set var="page">
+      <wiki:PageType type="page"><wiki:PageName/></wiki:PageType>
+      <wiki:PageType type="attachment"><wiki:ParentPageName/></wiki:PageType>
+    </c:set>
+
+  <%-- view --%>
   <wiki:CheckRequestContext context='info|diff|upload|rename|edit'>
   <li id="view">
-    <wiki:PageType type="page">
-      <wiki:Link>
-        <fmt:message key="view.tab"/>
-      </wiki:Link>
-    </wiki:PageType>
+    <wiki:Link page="${page}" ><fmt:message key="view.tab"/></wiki:Link>
   </li>
   </wiki:CheckRequestContext>
-  --%>
 
   <%-- attachment --%>
-  <wiki:CheckRequestContext context='view|info|upload|rename|diff|rename|edit'>
+  <wiki:CheckRequestContext context='view|info|rename|diff|rename|edit'>
   <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>
-    </c:set>
     <wiki:Link page="${page}" context="upload" accessKey="a" >
       <fmt:message key='attach.tab'/>
       <c:if test="${attachments > 0}"><span class="badge">${attachments}</span></c:if>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp?rev=1736809&r1=1736808&r2=1736809&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp Sun Mar 27 19:24:42
2016
@@ -80,10 +80,10 @@ ISWEBLOG= <%= WikiContext.findContext( p
 --%>
 <%--  IF BLOCOMMENT PAGE:  insert back buttons to mainblog and blogentry permalink --%>
 <c:set var="mainblogpage" value="${fn:substringBefore(param.page,'_comments_')}" />
-<c:set var="blogentrypage" value="${fn:replace(param.page,'_comments_','_blogentry_')}"
/>
 <c:if test="${not empty mainblogpage}">
 <wiki:PageExists page="${mainblogpage}">
   <p></p>
+  <c:set var="blogentrypage" value="${fn:replace(param.page,'_comments_','_blogentry_')}"
/>
   <div class="pull-right">
       <wiki:Link cssClass="btn btn-xs btn-default"  page="${mainblogpage}" >
          <fmt:message key="blog.backtomain"><fmt:param>${mainblogpage}</fmt:param></fmt:message>
@@ -103,10 +103,10 @@ ISWEBLOG= <%= WikiContext.findContext( p
 
 <%-- IF BLOGENTRY PAGE: insert blogcomment if appropriate. --%>
 <c:set var="mainblogpage" value="${fn:substringBefore(param.page,'_blogentry_')}" />
-<c:set var="blogcommentpage" value="${fn:replace(param.page,'_blogentry_','_comments_')}"
/>
 <c:if test="${not empty mainblogpage}">
 <wiki:PageExists page="${mainblogpage}">
   <p></p>
+  <c:set var="blogcommentpage" value="${fn:replace(param.page,'_blogentry_','_comments_')}"
/>
   <div class="pull-right">
       <wiki:Link cssClass="btn btn-xs btn-default"  page="${mainblogpage}" >
          <fmt:message key="blog.backtomain"><fmt:param>${mainblogpage}</fmt:param></fmt:message>

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=1736809&r1=1736808&r2=1736809&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
27 19:24:42 2016
@@ -159,7 +159,7 @@
     <select class="" id="prefOrientation" name="prefOrientation" data-pref="Orientation">
       <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>
-      <option value='fav-hidden' ${prefs.Orientation=='fav-hidden' ? 'selected="selected"'
: ''} ><fmt:message key="prefs.user.orientation.hidden"/></option>
+      <%-- <option value='fav-hidden' ${prefs.Orientation=='fav-hidden' ? 'selected="selected"'
: ''} ><fmt:message key="prefs.user.orientation.hidden"/></option>  --%>
     </select>
   </div>
 

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=1736809&r1=1736808&r2=1736809&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 27
19:24:42 2016
@@ -51,16 +51,12 @@
   <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' }" />
+  <c:set var="sidebar"><wiki:Variable var='sidebar' /></c:set><%-- page
variable setting--%>
+  <c:set var="sidebar" value="${not sidebar ? prefs.Sidebar : sidebar }" />
   <wiki:CheckRequestContext context='login|prefs|createGroup|viewGroup'>
-    <c:set var="sidebar">off</c:set>
+    <c:set var="sidebar" value="" />
   </wiki:CheckRequestContext>
-
-  <%--<div class="content <c:if test='${sidebar != "off"}'>active</c:if>"
 --%>
-  <div class="content ${sidebar != 'off' ? 'active' : '' } SIDEBAR_${prefs.Sidebar}"
-        data-toggle="li#menu,.sidebar>.close"
-        data-toggle-cookie="Sidebar">
+  <div class="content ${sidebar}" data-toggle="li#menu,.sidebar>.close" data-toggle-pref="Sidebar"
>
     <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=1736809&r1=1736808&r2=1736809&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
27 19:24:42 2016
@@ -104,12 +104,28 @@
     <input class="btn btn-success" type="submit" name="ok" accesskey="s"
            value="<fmt:message key='editor.plain.save.submit'/>" />
 
-      <wiki:CheckRequestContext context="edit">
+    <wiki:CheckRequestContext context="edit">
       <input class="form-control" data-hover-parent="span" type="text" size="80" maxlength="80"
              name="changenote" id="changenote"
              placeholder="<fmt:message key='editor.plain.changenote'/>"
              value="${changenote}" />
-      </wiki:CheckRequestContext>
+    </wiki:CheckRequestContext>
+    <wiki:CheckRequestContext context="comment">
+      <div class="commentsignature form-inline form-group" data-hover-parent="span">
+        <label><fmt:message key="editor.commentsignature"/></label>
+        <input class="form-control" type="text" name="author" id="authorname"
+             placeholder="<fmt:message key='editor.plain.name'/>"
+             value="${author}" />
+        <label class="btn btn-default btn-xs" 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" type="text" name="link" id="link" size="24"
+               placeholder="<fmt:message key='editor.plain.email'/>"
+               value="${link}" />
+      </div>
+    </wiki:CheckRequestContext>
   </span>
 
   <div class="btn-group editor-tools">
@@ -277,25 +293,6 @@
 
   </div>
 
-  <wiki:CheckRequestContext context="comment">
-    <div class="info">
-    <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 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}" />
-    </div>
-  </wiki:CheckRequestContext>
-
-
-
     <div class="row edit-area"><%-- .livepreview  .previewcolumn--%>
       <div class="col-50">
         <textarea class="editor form-control" id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>"



Mime
View raw message