jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r1692754 [1/2] - in /jspwiki/trunk/jspwiki-war/src/main: config/wro/ java/org/apache/wiki/ java/org/apache/wiki/tags/ java/org/apache/wiki/ui/ java/org/apache/wiki/util/ resources/META-INF/ resources/templates/ scripts/behaviors/ scripts/mo...
Date Sun, 26 Jul 2015 19:50:42 GMT
Author: brushed
Date: Sun Jul 26 19:50:41 2015
New Revision: 1692754

URL: http://svn.apache.org/r1692754
Log:
* 2.10.2-svn-28 Haddock Template commit of the remaining JSP's: groups, workflows, Login/Lostpw/Register.
       * Fixed page redirections and improved the back button handling. [JSPWiki-867]
       * Tabs & Accordion toggles can now include other markup
       * Added CSS3-based automatic text hyphenation f
       * Attachment Upload UI improved
       * Attachment Info page more user-friendly

Removed:
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/images/attach-strip.png
Modified:
    jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java
    jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties
    jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Accordion.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tabs.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Diff.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.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/build.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/LoginContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/NewGroupContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/WorkflowContent.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/CKeditor.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/editors/plain.jsp

Modified: jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml Sun Jul 26 19:50:41 2015
@@ -76,6 +76,7 @@
     <js>/scripts/wiki/Findpages.js</js>
     <js>/scripts/wiki/Category.js</js>
     <js>/scripts/wiki/Wiki.Behaviors.js</js>
+    <js>/scripts/wiki/Prefs.js</js>
 
     <css>/styles/haddock/default/build.less</css>
   </group>
@@ -105,9 +106,4 @@
 
   </group>
 
-  <group name="haddock-prefs">
-    <js>/scripts/wiki/Prefs.js</js>
-    <!--<js>/scripts/wiki/group.js</js>-->
-  </group>
-
 </groups>
\ No newline at end of file

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=1692754&r1=1692753&r2=1692754&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 Jul 26 19:50:41 2015
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "27";
+    public static final String     BUILD         = "28";
 
     /**
      *  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/tags/LinkTag.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java Sun Jul 26 19:50:41 2015
@@ -1,4 +1,4 @@
-/* 
+/*
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
  */
 package org.apache.wiki.tags;
 
@@ -50,7 +50,7 @@ import org.apache.wiki.util.TextUtil;
  *  @since 2.3.50
  */
 public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
-    
+
 	static final long serialVersionUID = 0L;
     private static final Logger log = Logger.getLogger( LinkTag.class );
 
@@ -79,6 +79,7 @@ public class LinkTag extends WikiLinkTag
         super.initTag();
         m_version = m_class = m_style = m_title = m_target = m_compareToVersion = m_rel = m_jsp = m_ref = m_accesskey = m_templatefile = null;
         m_context = WikiContext.VIEW;
+        m_containedParams = new HashMap<String, String>();
         m_absolute = false;
     }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/InputValidator.java Sun Jul 26 19:50:41 2015
@@ -1,4 +1,4 @@
-/* 
+/*
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
  */
 package org.apache.wiki.ui;
 
@@ -104,7 +104,7 @@ public final class InputValidator
         if ( isBlank( input ) )
         {
             ResourceBundle rb = Preferences.getBundle( m_context, InternationalizationManager.CORE_BUNDLE );
-            
+
             m_session.addMessage( m_form, MessageFormat.format( rb.getString("validate.cantbenull"),
                                                                 label ) );
             return false;
@@ -143,7 +143,9 @@ public final class InputValidator
             valid = !matcher.find();
             if ( !valid )
             {
-                Object[] args = { label, "&quot;&#39;&lt;&gt;;&amp;[]#\\@{}%$" };
+                //MessageTag already invokes replaceEntities()
+                //Object[] args = { label, "&quot;&#39;&lt;&gt;;&amp;[]#\\@{}%$" };
+                Object[] args = { label, "\'\"<>;&[]#\\@{}%$" };
                 m_session.addMessage( m_form, MessageFormat.format( rb.getString("validate.unsafechars"), args ) );
             }
             return valid;
@@ -161,7 +163,9 @@ public final class InputValidator
             valid = !matcher.find();
             if ( !valid )
             {
-                Object[] args = { label, "&quot;&#39;&lt;&gt;;&amp;{}" };
+                //MessageTag already invokes replaceEntities()
+                //Object[] args = { label, "&quot;&#39;&lt;&gt;;&amp;{}" };
+                Object[] args = { label, "\'\"<>;&{}" };
                 m_session.addMessage( m_form, MessageFormat.format( rb.getString("validate.unsafechars"), args ) );
             }
             return valid;

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/TextUtil.java Sun Jul 26 19:50:41 2015
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.    
+    under the License.
  */
 package org.apache.wiki.util;
 
@@ -32,14 +32,14 @@ import org.apache.wiki.api.exceptions.No
  *  Contains a number of static utility methods.
  */
 public final class TextUtil {
-	
+
     static final String   HEX_DIGITS = "0123456789ABCDEF";
 
     /**
      *  Private constructor prevents instantiation.
      */
     private TextUtil() {}
-    
+
     /**
      *  java.net.URLEncoder.encode() method in JDK < 1.4 is buggy.  This duplicates
      *  its functionality.
@@ -91,11 +91,11 @@ public final class TextUtil {
      *  Bug parade, bug #4257115</A> for more information.
      *  <P>
      *  Thanks to CJB for this fix.
-     *  
+     *
      *  @param bytes The byte array containing the bytes of the string
      *  @param encoding The encoding in which the string should be interpreted
      *  @return A decoded String
-     *  
+     *
      *  @throws UnsupportedEncodingException If the encoding is unknown.
      *  @throws IllegalArgumentException If the byte array is not a valid string.
      */
@@ -142,7 +142,7 @@ public final class TextUtil {
 
     /**
      *  As java.net.URLEncoder class, but this does it in UTF8 character set.
-     *  
+     *
      *  @param text The text to decode
      *  @return An URLEncoded string.
      */
@@ -164,7 +164,7 @@ public final class TextUtil {
 
     /**
      *  As java.net.URLDecoder class, but for UTF-8 strings.  null is a safe value and returns null.
-     *  
+     *
      *  @param utf8 The UTF-8 encoded string
      *  @return A plain, normal string.
      */
@@ -186,7 +186,7 @@ public final class TextUtil {
      * Provides encoded version of string depending on encoding. Encoding may be UTF-8 or ISO-8859-1 (default).
      *
      * <p>This implementation is the same as in FileSystemProvider.mangleName().
-     * 
+     *
      * @param data A string to encode
      * @param encoding The encoding in which to encode
      * @return An URL encoded string.
@@ -209,7 +209,7 @@ public final class TextUtil {
      * Provides decoded version of string depending on encoding. Encoding may be UTF-8 or ISO-8859-1 (default).
      *
      * <p>This implementation is the same as in FileSystemProvider.unmangleName().
-     * 
+     *
      * @param data The URL-encoded string to decode
      * @param encoding The encoding to use
      * @return A decoded string.
@@ -295,7 +295,7 @@ public final class TextUtil {
         buf.replace( start, end, text );
         return buf.toString();
     }
-    
+
     /**
      *  Replaces a string with an other string. Case insensitive matching is used
      *
@@ -311,7 +311,7 @@ public final class TextUtil {
         int start        = 0;
         int end          = 0;
         int last         = 0;
-        
+
         String origCaseUnsn = orig.toLowerCase();
         String srcCaseUnsn = src.toLowerCase();
 
@@ -329,7 +329,7 @@ public final class TextUtil {
 
     /**
      *  Parses an integer parameter, returning a default value if the value is null or a non-number.
-     *  
+     *
      *  @param value The value to parse
      *  @param defvalue A default value in case the value is not a number
      *  @return The parsed value (or defvalue).
@@ -345,7 +345,7 @@ public final class TextUtil {
     }
 
     /**
-     *  Gets an integer-valued property from a standard Properties list.  If the value does not exist, or is a 
+     *  Gets an integer-valued property from a standard Properties list.  If the value does not exist, or is a
      *  non-integer, returns defVal.
      *
      *  @since 2.1.48.
@@ -363,10 +363,10 @@ public final class TextUtil {
     }
 
     /**
-     *  Gets a boolean property from a standard Properties list. Returns the default value, in case the key has not 
+     *  Gets a boolean property from a standard Properties list. Returns the default value, in case the key has not
      *  been set.
      *  <P>
-     *  The possible values for the property are "true"/"false", "yes"/"no", or "on"/"off".  Any value not 
+     *  The possible values for the property are "true"/"false", "yes"/"no", or "on"/"off".  Any value not
      *  recognized is always defined as "false".
      *
      *  @param props   A list of properties to search.
@@ -390,8 +390,8 @@ public final class TextUtil {
     }
 
     /**
-     *  Fetches a String property from the set of Properties.  This differs from Properties.getProperty() in a 
-     *  couple of key respects: First, property value is trim()med (so no extra whitespace back and front), and 
+     *  Fetches a String property from the set of Properties.  This differs from Properties.getProperty() in a
+     *  couple of key respects: First, property value is trim()med (so no extra whitespace back and front), and
      *  well, that's it.
      *
      *  @param props The Properties to search through
@@ -461,7 +461,7 @@ public final class TextUtil {
     }
 
     /**
-     *  Returns true, if the string "val" denotes a positive string.  Allowed values are "yes", "on", and "true".  
+     *  Returns true, if the string "val" denotes a positive string.  Allowed values are "yes", "on", and "true".
      *  Comparison is case-insignificant. Null values are safe.
      *
      *  @param val Value to check.
@@ -480,14 +480,14 @@ public final class TextUtil {
     /**
      *  Makes sure that the POSTed data is conforms to certain rules.  These rules are:
      *  <UL>
-     *  <LI>The data always ends with a newline (some browsers, such as NS4.x series, does not send a newline at 
+     *  <LI>The data always ends with a newline (some browsers, such as NS4.x series, does not send a newline at
      *      the end, which makes the diffs a bit strange sometimes.
      *  <LI>The CR/LF/CRLF mess is normalized to plain CRLF.
      *  </UL>
      *
-     *  The reason why we're using CRLF is that most browser already return CRLF since that is the closest thing to 
+     *  The reason why we're using CRLF is that most browser already return CRLF since that is the closest thing to
      *  a HTTP standard.
-     *  
+     *
      *  @param postData The data to normalize
      *  @return Normalized data
      */
@@ -547,7 +547,7 @@ public final class TextUtil {
     }
 
     /**
-     *  Adds spaces in suitable locations of the input string.  This is used to transform a WikiName into a more 
+     *  Adds spaces in suitable locations of the input string.  This is used to transform a WikiName into a more
      *  readable format.
      *
      *  @param s String to be beautified.
@@ -558,7 +558,7 @@ public final class TextUtil {
     }
 
     /**
-     *  Adds spaces in suitable locations of the input string.  This is used to transform a WikiName into a more 
+     *  Adds spaces in suitable locations of the input string.  This is used to transform a WikiName into a more
      *  readable format.
      *
      *  @param s String to be beautified.
@@ -606,7 +606,7 @@ public final class TextUtil {
     }
 
     /**
-     *  Creates a Properties object based on an array which contains alternatively a key and a value.  It is useful 
+     *  Creates a Properties object based on an array which contains alternatively a key and a value.  It is useful
      *  for generating default mappings. For example:
      *  <pre>
      *     String[] properties = { "jspwiki.property1", "value1",
@@ -697,7 +697,7 @@ public final class TextUtil {
     }
 
     /**
-     *  A simple routine which just repeates the arguments.  This is useful for creating something like a line or 
+     *  A simple routine which just repeates the arguments.  This is useful for creating something like a line or
      *  something.
      *
      *  @param what String to repeat
@@ -715,7 +715,7 @@ public final class TextUtil {
     }
 
     /**
-     *  Converts a string from the Unicode representation into something that can be embedded in a java 
+     *  Converts a string from the Unicode representation into something that can be embedded in a java
      *  properties file.  All references outside the ASCII range are replaced with \\uXXXX.
      *
      *  @param s The string to convert
@@ -747,7 +747,7 @@ public final class TextUtil {
     }
 
     /**
-     *  Generates a hexadecimal string from an array of bytes.  For example, if the array contains 
+     *  Generates a hexadecimal string from an array of bytes.  For example, if the array contains
      *  { 0x01, 0x02, 0x3E }, the resulting string will be "01023E".
      *
      * @param bytes A Byte array
@@ -765,8 +765,8 @@ public final class TextUtil {
     }
 
     /**
-     *  Returns true, if the argument contains a number, otherwise false. In a quick test this is roughly the same 
-     *  speed as Integer.parseInt() if the argument is a number, and roughly ten times the speed, if the argument 
+     *  Returns true, if the argument contains a number, otherwise false. In a quick test this is roughly the same
+     *  speed as Integer.parseInt() if the argument is a number, and roughly ten times the speed, if the argument
      *  is NOT a number.
      *
      *  @since 2.4
@@ -793,7 +793,7 @@ public final class TextUtil {
 
     /** Length of password. @see #generateRandomPassword() */
     public static final int PASSWORD_LENGTH = 8;
-    
+
     /**
      * Generate a random String suitable for use as a temporary password.
      *

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/META-INF/jspwiki.tld Sun Jul 26 19:50:41 2015
@@ -15,7 +15,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
 -->
 <taglib xmlns="http://java.sun.com/xml/ns/javaee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -842,7 +842,7 @@
           <required>false</required>
           <rtexprvalue>false</rtexprvalue>
       </attribute>
-            <attribute>
+      <attribute>
           <name>clear</name>
           <required>false</required>
           <rtexprvalue>true</rtexprvalue>

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties Sun Jul 26 19:50:41 2015
@@ -43,6 +43,7 @@ attach.add.drop=or drop them here
 attach.preview=Image preview
 attach.deleteconfirm=Please confirm that you want to delete this attachment permanently!
 attach.delete=Delete
+attach.moreinfo=Info
 attach.moreinfo.title=Attachment info and version history
 
 # CommentContent.jsp
@@ -96,6 +97,7 @@ editgroup.saveerror=Could not save group
 editgroup.memberlist=The membership for this group. Enter each user&\#8217;s name or wiki name, separated by carriage returns.
 editgroup.savehelp=When you click &\#8220;Save group,&\#8221; this group will be saved as a group called <strong>{0}</strong>. You can specify this name in page access control lists (ACLs).
 editgroup.submit.save=Save group
+editgroup.cancel.submit=Cancel
 
 # Favorites.jsp
 
@@ -139,7 +141,7 @@ group.tab=View Group
 group.doesnotexist=This group does not exist.
 group.createsuggestion=Why don&#8217;t you go and {0}
 group.createit=create it?
-group.errorprefix=Error&nbsp;
+group.errorprefix=Error:&nbsp;
 group.groupintro=This is the wiki group called {0}. Only members of this group can edit it.
 
 group.name=Group Name
@@ -147,6 +149,12 @@ group.members=Group Members
 group.membership=The group&#8217;s membership.
 group.modifier={0} saved this group on {1}
 group.creator={0} created it on {1}.
+group.created=Created on
+group.thecreator=Created by
+group.modified=Date Modified
+group.themodifier=Modified by
+group.actions=Actions
+
 
 # GroupTab.jsp
 grp.createdon=Created on {0} by {1}
@@ -244,7 +252,7 @@ login.title=Login
 login.heading.login=Sign in to {0}
 
 login.help=Please sign in with your login name and password.
-login.errorprefix=Error:&nbsp;
+login.errorprefix=Could not login:&nbsp;
 login.login=Login
 login.password=Password
 login.remember=Remember me?
@@ -273,7 +281,7 @@ login.loginhelpmissing=Ho hum, it seems
 
 # NewGroupContent.jsp
 newgroup.heading.create=Create New Group
-newgroup.errorprefix=Error:&nbsp;
+newgroup.errorprefix=Could not create new group:&nbsp;
 newgroup.instructions.start=This page allows you to create a new wiki group.
 newgroup.name=Name
 newgroup.name.description=The name of the new group.
@@ -311,6 +319,7 @@ actions.info=Info
 actions.info.title=Additonal Page Info and Version history [ i ]
 actions.prefs=User Preferences
 actions.prefs.title=Manage your preferences [ p ]
+actions.groups=Groups
 actions.editgroup=Edit group
 actions.deletegroup=Delete group
 actions.viewgroup=View group
@@ -320,6 +329,7 @@ actions.login=Log in
 actions.login.title=Log in or Register as new user
 actions.logout=Log out
 actions.logout.title=Log out
+actions.registernow=Register a new user!
 actions.confirmlogout=Please confirm that you want to logout!
 actions.publishedon=This particular version was published on {0} by {1}.
 actions.notcreated=Page not created yet.
@@ -355,7 +365,7 @@ prefs.user.skin=Skin
 prefs.user.orientation=Favorites style
 prefs.user.orientation.left=Sidebar / Content
 prefs.user.orientation.right=Content / Sidebar
-prefs.user.orientation.hidden=No Sidebar
+prefs.user.orientation.hidden=Closed Sidebar
 prefs.user.layout=Page Layout
 prefs.user.layout.fluid=Full Width
 prefs.user.layout.fixed=Fixed Width
@@ -423,6 +433,7 @@ prefs.profile.lastmodified=Last modified
 # Workflow generic messages
 workflow.tab=Workflow
 workflow.heading=Your Workflow Items
+workflow.beforelogin=You must log in before you can access your Workflows
 workflow.decisions.heading=Inbox
 workflow.workflows.heading=Outbox
 workflow.instructions=This page contains information \

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Accordion.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Accordion.js?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Accordion.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Accordion.js Sun Jul 26 19:50:41 2015
@@ -119,15 +119,14 @@ var Accordion = new Class({
         while( pane = panes[i++] ){
 
             name = this.getName(pane);
-
             if( nav ){ //tabs or pills style accordion
 
-                nav.grab( toggle = ["li", [ "a", {text: name} ]].slick() );
+                nav.grab( toggle = ["li", [ "a", {text: name, id: String.uniqueID()} ]].slick() );
                 if( type == "pills" ) { pane.addClass( panelCSS ); }
 
             } else {  //standard accordion
 
-                toggle = "div.panel-heading".slick({ text: name });
+                toggle = "div.panel-heading".slick({ html: name, id: String.uniqueID() });
                 "div".slick({"class": panelCSS}).wraps( pane ).grab( toggle, "top" );
 
             }
@@ -142,19 +141,25 @@ var Accordion = new Class({
 
             //height: true,
             display: this.options.closed ? -1 : 0, // initial display status
-            alwaysHide: !nav,   //allow closing all panes
-            initialDisplayFx: false,   //do not show effect on initial display
+            alwaysHide: !nav, //allow closing all panes
+            initialDisplayFx: false, //do not show effect on initial display
+
             onComplete: function(){
                 var el = $(this.elements[this.current]);
                 if(el.offsetHeight > 0){ el.setStyle("height", "auto"); }
             },
+
             onActive: function(toggle, content){
+
                 toggle.addClass(active);
                 content.addClass(active);
+
             },
             onBackground: function(toggle, content){
+
                 toggle.removeClass(active);
                 content.removeClass(active);
+
             }
 
         });

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js Sun Jul 26 19:50:41 2015
@@ -87,43 +87,65 @@ var Tab = new Class({
 
         this.setOptions( options );
 
-        var panes = this.getPanes( container ),
-            pane,
+        var panes = this.getPanes( container ), pane,
+            navs = [], //collection of li for the tab navigation section
             i = 0,
-            items = []; //collection of li for the tab navigation section
+            activePos = 0;
 
-        while( pane = panes[i++] ){
+        function activate( index ){
+            var active = "active";
+            navs.removeClass( active )[ index ].addClass( active );
+            panes.removeClass( active )[ index ].addClass( active );
+        }
+
+        //handle th click events on the nav element
+        function show(){
+            var index = navs.indexOf( this.getParent('li') );
+            activate( index );
+            panes[ index ].id.setHash();
+        }
 
-            items.push("li", [
-                "a", {
-                    //id: String.uniqueID(),
-                    text: this.getName( pane )
-                    //events: { click: this.show }
-                }
-            ]);
+        //handling of popstate event on the pane element when the url#hash changes
+        function popstate(){
+            var index = this.getAllPrevious().length;
+            console.log("popstate event", this.id, index );
+            activate( index );
         }
 
-        if( items[0] ){
+        //prepare the navigation section of the tabs
+        while( pane = panes[i++] ){
+
+            if( pane.match(".active") ){ activePos = i-1; }
 
-            items[0] += ".active";
+            navs.push("li", [ "a", { html: this.getName( pane ) } ]);
+        }
+        //build the DOM
+        if( navs[0] ){
 
-            [this.options.nav, {events: {"click:relay(a)": this.show}}, items]
+            navs = [this.options.nav, { events: { "click:relay(a)": show } }, navs ]
                 .slick()
-                .inject(container, "before");
+                .inject(container, "before")
+                .getChildren();
 
-            panes.addEvent("popstate", this.popstate )
-                 .addClass("tab-pane")[0].addClass("active");
+            panes.addClass("tab-pane").addEvent("popstate", popstate );
 
             container.addClass("tab-content");
 
-        }
+            activate( activePos );
 
+        }
     },
 
     getName: function(pane){
 
-        var name = pane.className.slice(4).deCamelize();
-        if( !pane.id ){ pane.id = name; } //CHECKME : support #<tab-name> urls ; eg h1 id="section-Tabbed+Section-Usage"
+        var name = pane.get("data-pane") || pane.className.slice(4).deCamelize();
+
+        if( !pane.id ){
+            console.log("red alert", name)
+            //pane.id = name;
+        }
+
+
         return name;
 
     },
@@ -142,59 +164,28 @@ var Tab = new Class({
 
         var isPane = "[class^=tab-]",
             first = container.getFirst(),
-            header = first.get("tag"),
+            header = first && first.get("tag"),
             hasPane = first && first.match(isPane);  //predefined tab-panel containers
 
-        //avoid double runs -- obsolete, covered by behavior
+        //avoid double runs -- ok, covered by behavior
         //if( first.match("> .nav.nav-tabs") ) return null;
 
-        if( (!hasPane) && ( header.test(/h1|h2|h3|h4/) ) ){     //replace header by tab-panel containers
+        if( (!hasPane) && header && ( header.test(/h1|h2|h3|h4/) ) ){     //replace header by tab-panel containers
 
             //first remove unwanted elements from the header
-            container.getChildren(header).getElements(".hashlink,.edit-section,.labels")
+            container.getChildren(header).getElements(".hashlink,.editsection,.labels")
                 .each(function( el ){ el.destroy(); });
 
             //then create div.tab-<pane-title> groups
             container.groupChildren(header, "div", function(pane, caption){
                 pane.addClass( "tab-" + caption.get("text").trim().replace(/\s+/g, "-").camelCase() );
+                pane.set("data-pane", caption.get("html").stripScripts());
+                if( caption.match("[data-activePane]") ){ pane.addClass("active"); }
                 pane.id = caption.id;
             });
 
         }
         return container.getChildren(isPane);
-
-    },
-
-    /*
-    Click-handler to toggle the visibilities of the tab panes.
-    */
-    show: function( ){
-
-        var active = "active",
-            nav = this.getParent("ul"),
-            index = nav.getElements("a").indexOf(this),
-            panes = nav.getNext();
-
-        nav.getChildren().removeClass( active )[ index ].addClass( active );
-        panes.getChildren().removeClass( active )[ index ].addClass( active ).id.setHash();
-
-    },
-
-    /*
-    Popstate handler triggered when the #hash is changed of a tabpane
-    */
-    popstate: function( ){
-
-        var active = "active",
-            panes = this.getParent(),
-            nav = panes.getPrevious(),
-            index = this.getAllPrevious().length;
-
-        //console.log("popstate event", this.id, index );
-
-        nav.getChildren().removeClass( active )[ index ].addClass( active );
-        panes.getChildren().removeClass( active )[ index ].addClass( active );
-
     }
 
 });

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/moo-extend/Element.Extend.js Sun Jul 26 19:50:41 2015
@@ -398,7 +398,7 @@ console.log(message);
 
             while( next = group.nextSibling ){
 
-                if( ( next.nodeType != 3 ) && next.match(start) ){  //start a new group
+                if( ( next.nodeType == 1 ) && next.match(start) ){  //start a new group
 
                     if( firstGroupDone ){ group = grab.slick(); } //make a new group
                     if( replacesFn ){ replacesFn(group, next); }

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=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Prefs.js Sun Jul 26 19:50:41 2015
@@ -50,7 +50,7 @@ Javascript routines to support JSPWiki U
 
             if( form.getElements( datapref ).some( function(el){
 
-                //if(getValue(el) != el.getDefaultValue()){ console.log(getValue(el) + " " + el.get('data-pref'));}
+                //if(getValue(el) != el.getDefaultValue()){ console.log(el.get('data-pref'),getValue(el),el.getDefaultValue());}
                 return ( getValue(el) != el.getDefaultValue() );
 
             }) ){ return "prefs.areyousure".localize(); }

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js Sun Jul 26 19:50:41 2015
@@ -475,14 +475,13 @@ Behavior: Table behaviors
 
             if( arg.test("striped|bordered|hover|condensed|fit")){
 
-                element.addClass("table-"+arg);
+                tables.addClass("table-"+arg);
 
             }
 
             else if( arg == "filter" ){
 
-                tables.each( function(t){ new T.Filter(t, {hint: "filter.hint".localize()}); });
-                //new T.Filter(element,{ list:["one$","James"], hint:hints.filter});
+                tables.each( function(t){ new T.Filter(t, {hint: "filter.hint".localize() /*list:["predef1"...]*/}); });
 
             }
 

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=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js Sun Jul 26 19:50:41 2015
@@ -232,11 +232,11 @@ var Wiki = {
         //console.log( popstate, location.hash, target );
 
         //only send popstate events to targets within the main page; eg not sidebar
-        if( target && target.getParent(".page") ){
+        if( target && target.getParent(".page-content") ){
 
-            while( !target.hasClass("page") ){
+            while( !target.hasClass("page-content") ){
 
-                events = target.retrieve("events"); //mootools specific
+                events = target.retrieve("events"); //mootools specific - to read registered events on elements
 
                 if( events && events[ popstate ] ){
 
@@ -309,11 +309,9 @@ var Wiki = {
 
     /*
     Function: dropdowns
-        Adapt dropdown extensions suchs as moremenu,  logomenu, ...
-        to fit to the bootstrap .dropdown-menu class structure
+        Parse wikipages such ase MoreMenu, HomeMenu to act as bootstrap
+        compatible dropdown menu items.
     */
-    //fixthosebootstrapdropdownmenus
-    //ftbddm
     dropdowns: function(){
 
         $$( "ul.dropdown-menu > li > ul" ).each( function(ul){

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tabs.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tabs.less?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tabs.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tabs.less Sun Jul 26 19:50:41 2015
@@ -41,7 +41,7 @@ DOM structure:  ( based on Bootstrap con
 //inherit from bootstrap/navs.less
 .tab-content {
 
-    margin-bottom:@line-height-computed; //tabs could use some more bottom margin
+    //margin-bottom:@line-height-computed; //tabs could use some more bottom margin
 
     .tab-pane { .panel-body; } //inherit padding of a panel body
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Attach.less Sun Jul 26 19:50:41 2015
@@ -78,33 +78,9 @@ form#uploadform
 
 form.legacy .canDragAndDrop { .hide; }
 
-
-.attachtype {
-    line-height: 1.6;
-    font-size: 11px;
-    padding-left: 20px;
-
-    background-repeat:no-repeat;
-    background-position:0 0;
-    background-image:url("@{imagePath}/attach-strip.png");
-
+.attach-name {
+    max-width: 200px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
-
-#attach-gif  { background-position:0 -112px; }
-#attach-png  { background-position:0 -112px; }
-#attach-bmp  { background-position:0 -112px; }
-#attach-jpg  { background-position:0 -112px; }
-#attach-jpeg { background-position:0 -112px; }
-#attach-text { background-position:0 -16px;  }
-#attach-txt  { background-position:0 -16px;  }
-#attach-zip  { background-position:0 -128px; }
-#attach-jar  { background-position:0 -128px; }
-#attach-tar  { background-position:0 -128px; }
-#attach-pdf  { background-position:0 -80px;  }
-#attach-doc  { background-position:0 -32px;  }
-#attach-xls  { background-position:0 -48px;  }
-#attach-ppt  { background-position:0 -64px;  }
-#attach-swf  { background-position:0 -96px;  }
-#attach-mov  { background-position:0 -160px; }
-#attach-mp3  { background-position:0 -144px; }
-#attach-wav  { background-position:0 -144px; }

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less Sun Jul 26 19:50:41 2015
@@ -44,13 +44,9 @@ DOM Structure:
     padding:0;
     overflow:hidden;
     clear:both;
-    .clearfix();
+    .hyphens(auto);
+    //.clearfix();
 }
-.page, .sidebar {
-    //box-sizing: border-box;  // width% now includes border & padding : already default in bootstrap
-   .transition(all 300ms);
-}
-
 .page {
     float:right;
     width:100%;
@@ -59,8 +55,24 @@ DOM Structure:
     float:left;
     width:@wiki-sidebar-width;
     margin-left:-@wiki-sidebar-width;
+    padding:@padding-base-horizontal;
+    //padding-left:@padding-base-horizontal;
+    //padding-right:@padding-base-horizontal;
     overflow-x:hidden;
 }
+.page, .sidebar {
+    //box-sizing: border-box;  //width% now includes border & padding : already default in bootstrap
+   .transition(all 300ms);
+
+    /*Solution to make .sidebar and .page of equal height
+      using the "One True Layout Method" -- See https://css-tricks.com/fluid-width-equal-height-columns/
+      NOK: when jumping to in-page anchors
+    */
+    // margin-bottom: -99998em;
+    //padding-bottom: 99999em;
+    //& > *:last-child { padding-bottom:1em; }
+}
+
 
 /* FIXME
 .fav-right {
@@ -72,20 +84,24 @@ DOM Structure:
 }
 */
 
+.sidebar { background:@wiki-sidebar-bg; }
+.content {
+    background: @wiki-page-bg;
+}
 .content.active {
     .page { width:100%-@wiki-sidebar-width; }
     .sidebar { margin-left:0; }
 }
 
-.sidebar { background:@wiki-sidebar-bg; padding:@padding-base-horizontal;  }
-.content { background: @wiki-page-bg; }
 
 .page-content, .sidebar, .ajaxpreview {
 	.clearfix;
-	& > h2, & > h3, & > h4,  { margin-top:0; }
+	& > *:first-child { margin-top:0;}
+	//& > h2, & > h3, & > h4,  { margin-top:0; }
 }
 .page-content {
-    margin:0 @padding-base-horizontal  @padding-base-vertical @padding-base-horizontal;
+    //margin:0 @padding-base-horizontal  @padding-base-vertical @padding-base-horizontal;
+    margin:0 @padding-base-horizontal;
 }
 
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Diff.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Diff.less?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Diff.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Diff.less Sun Jul 26 19:50:41 2015
@@ -39,12 +39,14 @@ Traditional Diff provider
 */
 
 .diffbody {
-    margin:  (@line-height-computed/2);
-    table { width: 100%; }
+    table { margin: (@line-height-computed/2) 0; width:100%; }
+    > i { /*no difference found*/
+        .warning; margin-top:1em;
+    }
 }
 
 /* .diffnote equals .information */
-.diffadd, .diffrem { font-family:@font-family-monospace; }
+.diff { font-family:@font-family-monospace; }
 .diffadd { background:@wiki-diff-add; }
 .diffrem { background:@wiki-diff-delete; text-decoration:line-through; }
 
@@ -76,20 +78,23 @@ Contextual Diff Provider
 .diffnote { margin:  (@line-height-computed/2) 0; }
 
 .diff-wikitext {
-    font-family:@font-family-monospace;
-    overflow:auto;
-    background-color: @pre-bg;
-    white-space:pre;
+    font-family: @font-family-monospace;
+    line-height: 1;
+    overflow: auto;
+    //background-color: @wiki-diff-bg;
+    white-space: pre;
+
+    a[name^=change] { text-decoration: none; }
+    span { color: @text-color; }
+
 
-    a[name^=change] { text-decoration:none; }
-    span { color:@text-color; }
 }
 
-.diff-insertion { background:@wiki-diff-add; }
-.diff-deletion { background:@wiki-diff-delete; }
+.diff-insertion { background: @wiki-diff-add; }
+.diff-deletion { background: @wiki-diff-delete; }
 .diff-nextprev {
     .btn;
-    .btn-default;
+    .btn-primary;
     .btn-xs;  //xtra small
-    background:transparent;
+    line-height: 1;
 }

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=1692754&r1=1692753&r2=1692754&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 Jul 26 19:50:41 2015
@@ -60,7 +60,7 @@ textarea { white-space: pre-wrap; }
     .hide;
     background: @wiki-preview-bg;
     overflow: scroll;
-    padding: .5em 0 .5em @grid-gutter-width/2; //cannot use margin here, as width=50%
+    padding: 0 0 .5em @grid-gutter-width/2; //cannot use margin here, as width=50%
 
     &.loading {
         .progress-striped .progress-bar;

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less Sun Jul 26 19:50:41 2015
@@ -46,14 +46,44 @@ span.cage.pull-right.user-<loginstatus>
 
 .userbox {
 
-    //re-apply default <a.btn> style inside a dropdown-menu.
+    //re-apply default <a.btn> style inside a dropdown-menu
     .btn-primary {
         .btn-primary;
     }
 
 }
 
-
-.user-anonymous li .icon-user { .text-danger; }
+.user-authenticated li .icon-user { .text-success; }
 .user-asserted li .icon-user { .text-warning; }
-.user-authenticated li .icon-user { .text-success; }
\ No newline at end of file
+.user-anonymous li .icon-user { .text-danger; }
+
+
+/*
+Section: Login
+    LoginContent.jsp
+*/
+
+.context-login {
+  //hide the navigation TABs and only show the tab panels
+  .page-content > ul.nav { display:none; }
+}
+
+.login-form {
+    background: @wiki-login-bg;
+    max-width: @wiki-login-width;
+    padding: 2em;
+    margin: 0 auto;
+    border-radius: .5em;
+
+    hr { border-color:@gray; }
+
+    .login-header {
+        text-align:center;
+        .lead;
+    }
+
+    .login-ref {
+        text-align:right;
+    }
+
+}
\ No newline at end of file

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=1692754&r1=1692753&r2=1692754&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 Jul 26 19:50:41 2015
@@ -148,28 +148,24 @@ DOM structure:
 .dropdown-menu[data-hover-parent] { margin-top: 0; }
 
 a.logo {
-    position: relative;
-    display:block;
+    display: block;
     font-family: @wiki-logo-font-family;
-    //font-size:75%; //@font-size-base* .75
     font-weight: 200;
-    letter-spacing: 3px;
+    letter-spacing: .3em;
     text-decoration: none;
-    //padding:1px 1px @font-size-base 3px;
-    padding:1px 1px 20px 3px;
-    //border:1px solid @white;
-    //border-radius:.5em;
-    color:inherit;
+    padding: 0.15em 0.1em .25em .45em;
+    //border: 1px solid @white;
+    //border-radius: .5em;
+    color: inherit;
 
     b {
-        position: absolute;
         font-size: 150%;   //@font-size-base
-        font-weight: 200;
+        font-weight: inherit;
         line-height: 50%;
-        letter-spacing: 1px;
-        left: 0; top: 1em;
-        padding:0 3px;
+        letter-spacing: .08em;
     }
+    b:before { content:"\A"; white-space:pre ;}
+
 }
 
 

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=1692754&r1=1692753&r2=1692754&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 Jul 26 19:50:41 2015
@@ -41,27 +41,7 @@ DOM Structure:
 
 */
 
-/*
-//slimbox button icon (right pointing triangle), added next to a slimbox activated link
-.slimbox-link:after { content:" "; }
-.slimbox-link:after,
-.slimbox-btn {
-
-    .caret();
-    border-left: @slimbox-btn-size solid @link-color;
-    border-top: @slimbox-btn-size/2 solid transparent;
-    border-bottom: @slimbox-btn-size/2 solid transparent;
-    border-right:0;
-    margin-left: @slimbox-btn-size/2;
-    &:hover { border-left-color: @link-hover-color; }
 
-    //overwrite button defaults
-    padding: 0;
-    background: transparent;
-    -webkit-appearance: none;
-
-}
-*/
 //slimbox button icon-slimbox
 .slimbox-btn {
     //overwrite button defaults

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=1692754&r1=1692753&r2=1692754&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 Jul 26 19:50:41 2015
@@ -26,6 +26,10 @@ DOM structure:
 (start code)
 (end)
 */
+
+a[href*="NewBlogEntry.jsp"] { .btn; .btn-primary; }
+
+
 .weblog {
     margin:0 2em;
     clear:both;
@@ -36,15 +40,16 @@ DOM structure:
 .weblogentryheading {
     padding:0.25em 0.5em;
     font-size:90%;
-    background:#e0e0e0;
+    font-family: @wiki-logo-font-family;
     float:right;
 }
 .weblogentrytitle {
+    margin-bottom:.5em;
     padding:0.25em 0.5em;
-    font-size:120%;
-    line-height:1.2;
-    font-weight:bold;
-    background:#e0e0e0;
+    font-size:150%;
+    font-family: @wiki-logo-font-family;
+    line-height:1.5;
+    border-bottom:1px solid @wiki-sidebar-bg;
 }
 .weblogentrybody {
     margin-left:0.5em;
@@ -53,7 +58,7 @@ DOM structure:
 .weblogentryfooter {
     font-size:90%;
     padding:0.25em 0.5em;
-    border-bottom:3px solid #e0e0e0;
+    //border-bottom:3px solid @pre-bg;
     clear:both;
 }
 /*.weblogarchive {
@@ -71,11 +76,11 @@ DOM structure:
     margin-left:0 !important;
 }
 .archiveyear:after {
-    content:" AD"
+    content:" AD";
 }
 
 .weblogcommentstitle {
-    background:#e0e0e0;
+    background:@pre-bg;
     margin:1em 0.5em 0 0.5em;
     padding:0.5em;
     font-weight:bold;

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less Sun Jul 26 19:50:41 2015
@@ -131,6 +131,7 @@ Stylesheet: JSPWiki
 @import "Template.Attach.less";
 @import "Template.Diff.less";
 @import "Template.Search.less";
+@import "Template.Workflow.less";
 
 // TODO:move to separate jspwiki-edit.less ?
 @import "Template.Edit.less";

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=1692754&r1=1692753&r2=1692754&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 Jul 26 19:50:41 2015
@@ -285,20 +285,23 @@ Section: Reusable Styles
     text-align:center;
     table { text-align:left; }
 }
+.justify {
+    text-align:justify;
+}
 
 // %%dropcaps .. /%
 // CSS3:  div.dropcap:first-child:first-letter. See http://css-tricks.com/snippets/css/drop-caps/
 div.dropcaps {
     .p;
     > span.dropcaps {
-        float:left;
-        color:@dropcaps-color;
-        padding:0 @table-cell-padding;
-        font-family:@dropcaps-font-family;
-        font-size:@dropcaps-font-size;
-        font-weight:@dropcaps-font-weight;
-        line-height:80%;
-        text-shadow:2px 2px 1px rgba(0,0,0,.25);
+        float: left;
+        color: @dropcaps-color;
+        padding-right: @table-cell-padding;
+        font-family: @dropcaps-font-family;
+        font-size: @dropcaps-font-size;
+        font-weight: @dropcaps-font-weight;
+        line-height: 80%;
+        text-shadow: 2px 2px 1px rgba(0,0,0,.25);
     }
 }
 
@@ -340,11 +343,9 @@ div.dropcaps {
 //checkme: still used?
 .accesskey { text-decoration:underline; }
 
-.changenote { font-style: italic; }
+.changenote { max-width:240px; font-style: italic; }
 
-// used by info and attachment tables to display file sizes
-.nowrap-number { white-space:nowrap; }
-.text-right { text-align:right; }
+.nowrap { white-space:nowrap; }
 
 [class^=tangle-] { background: @yellow; }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less Sun Jul 26 19:50:41 2015
@@ -65,6 +65,8 @@
 @wiki-sidebar-bg:   #e5e8ed;
 @wiki-header-font-family: @font-family-sans-serif;
 
+@wiki-login-bg:     @pre-bg; //#f7f9fa;
+@wiki-login-width:  30em;
 
 //Layout ratios
 //ref. http://alistapart.com/article/content-out-layout
@@ -85,8 +87,8 @@
 
 //Nav bar
 @wiki-logo-font-family: 'HelveticaNeue-UltraLight', 'Helvetica Neue UltraLight', 'Helvetica Neue', Arial, Helvetica, sans-serif;
-@wiki-logo-font-size:20px;
-@wiki-logo-padding:5px;
+@wiki-logo-font-size: 20px;
+@wiki-logo-padding: 5px;
 @breadcrumb-color: @white;
 
 //TODO: Stacking...
@@ -104,6 +106,7 @@
 // Misc.
 @wiki-recentchanges-date-bg: @wiki-sidebar-bg;
 @wiki-link-createpage: @red;
+@wiki-diff-bg:         @pre-bg;
 @wiki-diff-add:        #9f9; //diff inserted lines
 @wiki-diff-delete:     #f93; //diff deleted lines
 @wiki-captcha-bg:      @gray-lighter;
@@ -111,7 +114,7 @@
 
 @pre-scrollable-max-height: 240px;  //bootstrap default is 340px
 
-@dropcaps-color:       @black;
+@dropcaps-color:       @text-color;
 @dropcaps-font-size:   500%;
 @dropcaps-font-weight: thin;
 @dropcaps-font-family: @wiki-logo-font-family; //Georgia

Modified: 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=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less Sun Jul 26 19:50:41 2015
@@ -115,27 +115,43 @@
 .icon-unlock-alt:before {
 	content: "\f13e";
 }
+.icon-file--o:before,
 .icon-file-o:before {
 	content: "\f016";
 }
+.icon-file-txt-o:before,
+.icon-file-htm-o:before,
+.icon-file-html-o:before,
+.icon-file-xml-o:before,
+.icon-file-csv-o:before,
+.icon-file-log-o:before,
 .icon-file-text-o:before {
 	content: "\f0f6";
 }
 .icon-file-pdf-o:before {
 	content: "\f1c1";
 }
+.icon-file-doc-o:before,
+.icon-file-docx-o:before,
 .icon-file-word-o:before {
 	content: "\f1c2";
 }
+.icon-file-xls-o:before,
+.icon-file-xlsx-o:before,
 .icon-file-excel-o:before {
 	content: "\f1c3";
 }
+.icon-file-ppt-o:before,
+.icon-file-pps-o:before,
+.icon-file-pptx-o:before,
 .icon-file-powerpoint-o:before {
 	content: "\f1c4";
 }
 .icon-file-archive-o:before {
 	content: "\f1c6";
 }
+.icon-file-jar-o:before,
+.icon-file-tar-o:before,
 .icon-file-zip-o:before {
 	content: "\f1c6";
 }
@@ -145,18 +161,34 @@
 .icon-file-photo-o:before {
 	content: "\f1c5";
 }
+.icon-file-png-o:before,
+.icon-file-bmp-o:before,
+.icon-file-gif-o:before,
+.icon-file-jpg-o:before,
+.icon-file-jpeg-o:before,
+.icon-file-tiff-o:before,
 .icon-file-picture-o:before {
 	content: "\f1c5";
 }
 .icon-file-audio-o:before {
 	content: "\f1c7";
 }
+.icon-file-mp3-o:before,
+.icon-file-wav-o:before,
+.icon-file-aif-o:before,
+.icon-file-wma-o:before,
 .icon-file-sound-o:before {
 	content: "\f1c7";
 }
 .icon-file-movie-o:before {
 	content: "\f1c8";
 }
+.icon-file-mp4-o:before,
+.icon-file-mpg-o:before,
+.icon-file-mov-o:before,
+.icon-file-avi-o:before,
+.icon-file-swf-o:before,
+.icon-file-wmv-o:before,
 .icon-file-video-o:before {
 	content: "\f1c8";
 }

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/PreferencesContent.jsp Sun Jul 26 19:50:41 2015
@@ -14,7 +14,7 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
 --%>
 
 <%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -24,8 +24,8 @@
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
-<% 
-  WikiContext context = WikiContext.findContext( pageContext ); 
+<%
+  WikiContext context = WikiContext.findContext( pageContext );
   TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT, "scripts/jspwiki-prefs.js" );
 %>
 
@@ -42,7 +42,7 @@
   </wiki:Tab>
   </wiki:Permission>
   </wiki:UserCheck>
-  
+
   <wiki:Permission permission="createGroups"> <!-- FIXME check right permissions -->
   <wiki:Tab id="group" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "group.tab")%>' accesskey="g" >
     <wiki:Include page="GroupTab.jsp" />

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp Sun Jul 26 19:50:41 2015
@@ -17,37 +17,39 @@
     under the License.
 --%>
 
-<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.ui.progress.*" %>
 <%@ page import="org.apache.wiki.auth.permissions.*" %>
 <%@ page import="java.security.Permission" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
 <%
   int MAXATTACHNAMELENGTH = 30;
   WikiContext c = WikiContext.findContext(pageContext);
-  String progressId = c.getEngine().getProgressManager().getNewProgressIdentifier();
 %>
-
+<c:set var="progressId" value="<%= c.getEngine().getProgressManager().getNewProgressIdentifier() %>" />
 <div class="page-content">
 <wiki:Permission permission="upload">
 
-  <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>"
-         class="accordion-close"
+  <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='${progressId}'/></wiki:Link>"
+         class="accordion<wiki:HasAttachments>-close</wiki:HasAttachments>"
             id="uploadform"
         method="post"
        enctype="multipart/form-data" accept-charset="<wiki:ContentEncoding/>" >
 
-
     <h4><fmt:message key="attach.add"/></h4>
+    <input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
+    <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+    <input type="hidden" name="action" value="upload" />
+
     <wiki:Messages div="alert alert-danger" />
 
-    <%--
-    <p><fmt:message key="attach.add.info" /></p>
-    --%>
+    <%-- <p><fmt:message key="attach.add.info" /></p> --%>
     <div class="form-group">
       <label class="control-label form-col-20" for="files"><fmt:message key="attach.add.selectfile"/></label>
 
@@ -64,14 +66,11 @@
       <input class="form-control form-col-50" type="text" name="changenote" id="changenote" maxlength="80" size="60" />
     </div>
     <div class="form-group">
-    <input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
-    <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
-    <input class="btn btn-primary form-col-offset-20 form-col-50"
-           type="submit" name="upload" id="upload" disabled="disabled" value="<fmt:message key='attach.add.submit'/>" />
-    <input type="hidden" name="action" value="upload" />
+      <input class="btn btn-primary form-col-offset-20 form-col-50"
+             type="submit" name="upload" id="upload" disabled="disabled" value="<fmt:message key='attach.add.submit'/>" />
     </div>
     <div class="hidden form-col-offset-20 form-col-50 progress progress-striped active">
-      <div class="progress-bar" data-progressid="<%=progressId%>" style="width: 100%;"></div>
+      <div class="progress-bar" data-progressid="${progressId}" style="width: 100%;"></div>
     </div>
 
   </form>
@@ -80,7 +79,6 @@
   <div class="warning"><fmt:message key="attach.add.permission"/></div>
 </wiki:Permission>
 
-
 <wiki:HasAttachments>
 
 <%--<h3><fmt:message key="attach.list"/></h3>--%>
@@ -89,25 +87,25 @@
     <%-- hidden delete form --%>
     <form action="tbd"
            class="hidden"
-              id="deleteForm"
+            name="deleteForm" id="deleteForm"
           method="post" accept-charset="<wiki:ContentEncoding />"
       data-modal="<fmt:message key='attach.deleteconfirm'/>" >
 
       <%--TODO: "nextpage" is not yet implemented in Delete.jsp
-      <input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
       --%>
+      <input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
       <input class="btn btn-danger btn-xs" id="delete-all" name="delete-all" type="submit" value="Delete" />
 
     </form>
   </wiki:Permission>
 
-  <div class="slimbox-attachments sortable table-filter-hover-sort table-filter">
+  <div class="slimbox-attachments table-filter-striped-sort-condensed">
   <table class="table">
     <tr>
       <th><fmt:message key="info.attachment.type"/></th>
       <th><fmt:message key="info.attachment.name"/></th>
-      <th><fmt:message key="info.size"/></th>
       <th><fmt:message key="info.version"/></th>
+      <th><fmt:message key="info.size"/></th>
       <th><fmt:message key="info.date"/></th>
       <th><fmt:message key="info.author"/></th>
       <wiki:Permission permission="delete"><th><fmt:message key="info.actions"/></th></wiki:Permission>
@@ -115,41 +113,43 @@
     </tr>
 
     <wiki:AttachmentsIterator id="att">
-    <%
-      String name = att.getFileName();
-      int dot = name.lastIndexOf(".");
-      String attachtype = ( dot != -1 ) ? name.substring(dot+1).toLowerCase() : "&nbsp;";
-
-      String sname = name;
-      if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
-    %>
     <tr>
-      <td><div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype %></div></td>
-      <td><wiki:LinkTo title="<%= name %>" ><%= sname %></wiki:LinkTo></td>
-      <td class="nowrap text-right">
-        <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' maxFractionDigits='1' minFractionDigits='1'/>&nbsp;<fmt:message key="info.kilobytes"/>
+
+      <%-- see styles/fontjspwiki/icon.less : icon-file-<....>-o  --%>
+      <c:set var="parts" value="${fn:split(att.fileName, '.')}" />
+      <c:set var="type" value="${ fn:length(parts)>1 ? parts[fn:length(parts)-1] : ''}" />
+      <td class="attach-type"><span class="icon-file-${type}-o">${type}</span></td>
+
+      <td class="attach-name">${att.fileName}</td>
+
+      <td><wiki:LinkTo><wiki:PageVersion /></wiki:LinkTo></td>
+
+      <td class="nowrap">
+        <fmt:formatNumber value='${att.size/1000.0}' maxFractionDigits='1' minFractionDigits='1'/>&nbsp;<fmt:message key="info.kilobytes"/>
       </td>
-      <td class="center">
-        <a href="<wiki:Link context='info' format='url'/>" title="<fmt:message key='attach.moreinfo.title'/>"><wiki:PageVersion /></a>
+
+      <td class="nowrap" jspwiki:sortvalue="${att.lastModified.time}">
+        <fmt:formatDate value="${att.lastModified}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
       </td>
-	  <td class="nowrap" jspwiki:sortvalue="<%= att.getLastModified().getTime() %>">
-	  <fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
-	  </td>
+
       <td><wiki:Author /></td>
-      <wiki:Permission permission="delete">
-      <td>
+
+      <td class="nowrap">
+        <a class="btn btn-primary btn-xs" href="<wiki:Link context='info' format='url'/>" title="<fmt:message key='attach.moreinfo.title'/>">
+          <fmt:message key="attach.moreinfo"/>
+        </a>
+        <wiki:Permission permission="delete">
           <input type="button"
                 class="btn btn-danger btn-xs"
                 value="<fmt:message key='attach.delete'/>"
                   src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' ><wiki:Param name='tab' value='attach' /></wiki:Link>"
-              onclick="$('deleteForm').set('action',this.src); $('delete-all').click();" />
-
-      </td>
-      </wiki:Permission>
-      <td class="changenote">
-           <% String changenote = (String) att.getAttribute( WikiPage.CHANGENOTE );  %>
-		   <%= (changenote==null) ? "" : changenote  %>
+              onclick="document.deleteForm.action=this.src; document.deleteForm['delete-all'].click();" />
+        </wiki:Permission>
       </td>
+
+      <c:set var="changenote" value="<%= (String)att.getAttribute( WikiPage.CHANGENOTE ) %>" />
+      <td class="changenote">${changenote}</td>
+
     </tr>
     </wiki:AttachmentsIterator>
 

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp Sun Jul 26 19:50:41 2015
@@ -14,43 +14,42 @@
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
-    under the License.  
+    under the License.
 --%>
 
 <%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="java.util.*" %>
 <%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
-<% 
-  WikiContext c = WikiContext.findContext( pageContext );  
-  List history = c.getEngine().getVersionHistory(c.getPage().getName());
-  pageContext.setAttribute( "history", history );
-  pageContext.setAttribute( "diffprovider", c.getEngine().getVariable(c,"jspwiki.diffProvider"));
+<%
+  WikiContext c = WikiContext.findContext( pageContext );
 %>
+<c:set var="history" value="<%= c.getEngine().getVersionHistory(c.getPage().getName()) %>" />
+<c:set var="diffprovider" value='<%= c.getEngine().getVariable(c,"jspwiki.diffProvider") %>' />
 <wiki:PageExists>
-<form action="<wiki:Link jsp='Diff.jsp' format='url' />" method="get" accept-charset="UTF-8">
+<form action="<wiki:Link jsp='Diff.jsp' format='url' />"
+       class="diffbody"
+      method="get" accept-charset="UTF-8">
   <input type="hidden" name="page" value="<wiki:PageName />" />
 
-  <div class="diffbody">
-
-  <p class="form-control btn btn-primary">
+  <p class="btn btn-lg btn-primary btn-block">
        <fmt:message key="diff.difference">
          <fmt:param>
            <select id="r1" name="r1" onchange="this.form.submit();" >
            <c:forEach items="${history}" var="i">
-             <option value="<c:out value='${i.version}'/>" <c:if test="${i.version == olddiff}">selected="selected"</c:if> ><c:out value="${i.version}"/></option>
+             <option value="${i.version}" ${i.version == olddiff ? 'selected="selected"' : ''} >${i.version}</option>
            </c:forEach>
            </select>
          </fmt:param>
          <fmt:param>
            <select id="r2" name="r2" onchange="this.form.submit();" >
            <c:forEach items="${history}" var="i">
-             <option value="<c:out value='${i.version}'/>" <c:if test="${i.version == newdiff}">selected="selected"</c:if> ><c:out value="${i.version}"/></option>
+             <option value="${i.version}" ${i.version == newdiff ? 'selected="selected"' : ''} >${i.version}</option>
            </c:forEach>
            </select>
          </fmt:param>
@@ -64,10 +63,8 @@
       </a>
     </div>
   </c:if>
-    
-  <wiki:InsertDiff><i><fmt:message key="diff.nodiff"/></i></wiki:InsertDiff> 
-  
-  </div>
-  
+
+  <wiki:InsertDiff><i><fmt:message key="diff.nodiff"/></i></wiki:InsertDiff>
+
 </form>
 </wiki:PageExists>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp Sun Jul 26 19:50:41 2015
@@ -17,23 +17,20 @@
     under the License.
 --%>
 
-<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="java.util.Arrays" %>
 <%@ page import="org.apache.wiki.auth.PrincipalComparator" %>
 <%@ page import="org.apache.wiki.auth.authorize.Group" %>
 <%@ page import="org.apache.wiki.*" %>
-<%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page import="org.apache.log4j.*" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
-<%!
-    Logger log = Logger.getLogger("JSPWiki");
-%>
-
 <%
   WikiContext c = WikiContext.findContext( pageContext );
 
@@ -48,76 +45,47 @@
     members = group.members();
     Arrays.sort( members, new PrincipalComparator() );
   }
-  name = TextUtil.replaceEntities(name);
+
+  StringBuffer membersAsString = new StringBuffer();
+  for ( int i = 0; i < members.length; i++ )
+  {
+    membersAsString.append( members[i].getName().trim() ).append( '\n' );
+  }
+
 %>
-<div class="page-content">
+<c:set var="name" value="<%= name%>" />
+<c:set var="members" value="<%= membersAsString%>" />
 
-  <h3>
-    <%=LocaleSupport.getLocalizedMessage(pageContext, "editgroup.tab")%>
-    <code><%=name%></code>
-  </h3>
+<div class="page-content">
 
-  <form action="<wiki:Link format='url' jsp='EditGroup.jsp'/>"
-         class=""
+  <form action="<wiki:Link format='url' jsp='EditGroup.jsp' />"
             id="editGroup"
         method="POST" accept-charset="UTF-8">
 
-    <!-- Members -->
-    <%
-      StringBuffer s = new StringBuffer();
-      for ( int i = 0; i < members.length; i++ )
-      {
-        s.append( members[i].getName().trim() );
-        s.append( '\n' );
-      }
-    %>
-    <div class="help-block">
-    <fmt:message key="editgroup.instructions">
-      <fmt:param><%=name%></fmt:param>
-     </fmt:message>
-    </div>
-    <div class="help-block">
-      <wiki:Messages div="error" topic="group" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"editgroup.saveerror") %>' />
-    </div>
+    <input type="hidden" name="group" value="${name}" />
 
     <div class="form-group">
-      <label><fmt:message key="group.name"/></label>
-      <%=name%>
-    </div>
-    <div class="form-group">
-      <label><fmt:message key="group.members"/></label>
-
-      <textarea id="members" name="members" rows="10" cols="30"><%=TextUtil.replaceEntities(s.toString())%></textarea>
-      <div class="help-block"><fmt:message key="editgroup.memberlist"/></div>
-
+      <button class="btn btn-primary" type="submit" name="action" value="save">
+        <fmt:message key="editgroup.submit.save"/>
+      </button>
+      <a class="btn btn-danger pull-right" href="<wiki:Link format='url' jsp='Group.jsp'><wiki:Param name='group' value='${name}'/></wiki:Link>" >
+        <fmt:message key='editgroup.cancel.submit'/>
+      </a>
     </div>
 
-
-
-    <input class="btn btn-primary" type="submit" name="ok" value="<fmt:message key="editgroup.submit.save"/>" />
-    <input type="hidden" name="group" value="<%=name%>" />
-    <input type="hidden" name="action" value="save" />
-
-  <wiki:Permission permission="viewGroup">
-    <a class="btn btn-default" href="<wiki:Link format="url" jsp='Group.jsp'><wiki:Param name='group' value='<%=name%>'/></wiki:Link>" >
-    <%=LocaleSupport.getLocalizedMessage(pageContext, "actions.viewgroup")%>
-  </a>
-  </wiki:Permission>
+    <%--<wiki:Messages div="error help-block" topic="group" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"editgroup.saveerror") %>' />--%>
+    <wiki:Messages div="error help-block" topic="group" prefix="<fmt:message key='editgroup.saveerror'/>" />
 
     <div class="help-block">
-      <fmt:message key="editgroup.savehelp"><fmt:param><%=name%></fmt:param></fmt:message>
+      <fmt:message key="editgroup.instructions"><fmt:param>${name}</fmt:param></fmt:message>
     </div>
 
-  </form>
+    <div class="form-group">
+      <label for="members"><fmt:message key="group.members"/></label><br />
+      <textarea class="form-control form-col-50" rows=8 autofocus="autofocus" name="members" id="members" >${members}</textarea>
+    </div>
+    <div class="help-block"><fmt:message key="editgroup.memberlist"/></div>
 
-  <wiki:Permission permission="deleteGroup">
-  <form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
-         class="" id="deleteGroup"
-    data-modal="'<fmt:message key='grp.deletegroup.confirm'/>"
-        method="POST" accept-charset="UTF-8">
-      <input class="btn btn-danger" type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
-      <input type="hidden" name="group" value="${param.group}" />
   </form>
-  </wiki:Permission>
 
 </div>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp Sun Jul 26 19:50:41 2015
@@ -36,10 +36,10 @@
 
     <input type="text"
            name="query" id="query2"
-           class="form-group form-control"
-          value="<c:out value='${query}'/>"
-          placeholder="<fmt:message key="find.input" />"
-          autofocus="autofocus"
+          class="form-group form-control"
+          value="${query}"
+    placeholder="<fmt:message key="find.input" />"
+      autofocus="autofocus"
            size="32" />
 
     <div class="form-inline form-group">

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp Sun Jul 26 19:50:41 2015
@@ -18,152 +18,4 @@
 --%>
 
 <%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="java.security.Principal" %>
-<%@ page import="java.util.*" %>
-<%@ page import="org.apache.wiki.*" %>
-<%@ page import="org.apache.wiki.auth.PrincipalComparator" %>
-<%@ page import="org.apache.wiki.auth.authorize.Group" %>
-<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
-<%@ page import="org.apache.wiki.preferences.Preferences" %>
-<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ page import="org.apache.log4j.*" %>
-<%@ page errorPage="/Error.jsp" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
-<%!
-  Logger log = Logger.getLogger("JSPWiki");
-%>
-
-<%
-  WikiContext c = WikiContext.findContext( pageContext );
-
-  // Extract the group name and members
-  String name = request.getParameter( "group" );
-  Group group = (Group)pageContext.getAttribute( "Group",PageContext.REQUEST_SCOPE );
-  Principal[] members = null;
-  String modified = "";
-  String created = "";
-  String modifier = "";
-  String creator = "";
-
-  if ( group != null )
-  {
-    name = group.getName();
-    members = group.members();
-    Arrays.sort( members, new PrincipalComparator() );
-    creator = group.getCreator();
-    if ( group.getCreated() != null )
-    {
-      created = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME);
-    }
-    modifier = group.getModifier();
-    if ( group.getLastModified() != null )
-    {
-      modified = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME) ;
-    }
-  }
-  name = TextUtil.replaceEntities(name);
-%>
-
-<div class="page-content">
-
-  <h3><%=name%></h3>
-
-<%
-  if ( group == null )
-  {
-    if ( c.getWikiSession().getMessages( GroupManager.MESSAGES_KEY ).length == 0 )
-    {
-%>
-    <fmt:message key="group.doesnotexist"/>
-    <wiki:Permission permission="createGroups">
-      <fmt:message key="group.createsuggestion">
-        <fmt:param><wiki:Link jsp="NewGroup.jsp">
-                      <wiki:Param name="group" value="<%=name%>" />
-                      <wiki:Param name="group" value="<%=name%>" />
-                      <fmt:message key="group.createit"/>
-                   </wiki:Link>
-        </fmt:param>
-      </fmt:message>
-    </wiki:Permission>
-<%
-    }
-    else
-    {
-%>
-       <wiki:Messages div="error" topic="<%=GroupManager.MESSAGES_KEY%>" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"group.errorprefix")%>'/>
-<%
-    }
-  }
-  else
-  {
-%>
- <table class="wikitable">
-    <tr>
-      <th><fmt:message key="group.name"/></th>
-      <td>
-        <fmt:message key="group.groupintro">
-          <fmt:param><em><%=name%></em></fmt:param>
-        </fmt:message>
-      </td>
-    </tr>
-    <!-- Members -->
-    <tr>
-      <th><fmt:message key="group.members"/>
-      </th>
-      <td><%
-            for ( int i = 0; i < members.length; i++ )
-            {
-              out.println( members[i].getName().trim() );
-              if ( i < ( members.length - 1 ) )
-              {
-                out.println( "<br/>" );
-              }
-            }
-          %></td>
-          <%--fmt:message key="group.membership"/--%>
-      </tr>
-      <tr>
-        <td colspan="2">
-        <fmt:message key="group.modifier">
-           <fmt:param><%=modifier%></fmt:param>
-           <fmt:param><%=modified%></fmt:param>
-        </fmt:message>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2">
-        <fmt:message key="group.creator">
-           <fmt:param><%=creator%></fmt:param>
-           <fmt:param><%=created%></fmt:param>
-        </fmt:message>
-        </td>
-      </tr>
-    </table>
-<%
-  }
-%>
-
-  <form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
-         class="wikiform"
-            id="deleteGroup"
-        data-modal="<fmt:message key='grp.deletegroup.confirm'/>"
-        method="POST" accept-charset="UTF-8">
-
-    <wiki:Permission permission="editGroup">
-      <a class="btn btn-primary"
-          href="<wiki:Link format='url' jsp='EditGroup.jsp'><wiki:Param name='group' value='${param.group}' /></wiki:Link>" >
-        <%=LocaleSupport.getLocalizedMessage(pageContext, "actions.editgroup")%>
-      </a>
-    </wiki:Permission>
-
-    <wiki:Permission permission="deleteGroup">
-      <input class="btn btn-danger" type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
-      <input type="hidden" name="group" value="${param.group}" />
-    </wiki:Permission>
-
-  </form>
-
-</div>
\ No newline at end of file
+<wiki:Include page="PreferencesContent.jsp" ></wiki:Include>
\ No newline at end of file



Mime
View raw message