jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject jspwiki git commit: Fix nesting of ul/li in RefferedPagesPlugin
Date Tue, 27 Dec 2016 13:40:19 GMT
Repository: jspwiki
Updated Branches:
  refs/heads/master 82949d603 -> f35556f6a


Fix nesting of ul/li in RefferedPagesPlugin


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/f35556f6
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/f35556f6
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/f35556f6

Branch: refs/heads/master
Commit: f35556f6a1787cc30477ac4f2c7883b187c787aa
Parents: 82949d6
Author: brushed <dirk.frederickx@gmail.com>
Authored: Tue Dec 27 14:40:08 2016 +0100
Committer: brushed <dirk.frederickx@gmail.com>
Committed: Tue Dec 27 14:40:08 2016 +0100

----------------------------------------------------------------------
 ChangeLog                                       |  6 +++++
 .../src/main/java/org/apache/wiki/Release.java  |  2 +-
 .../apache/wiki/plugin/ReferredPagesPlugin.java | 23 +++++++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/f35556f6/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 9c1acc8..16db93c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-27  Dirk Frederickx (brushed AT apache DOT org)
+
+       * 2.10.3-svn-23.
+
+       * Fix nesting of ul/li in RefferedPAgesPlugin.
+
 2016-12-19  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.3-svn-22  Various HADDOCK updates & fixes.

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/f35556f6/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 9cf5f0d..3d987b6 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "22";
+    public static final String     BUILD         = "23";
 
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/f35556f6/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java b/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
index 1f3b2b1..9253a57 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
@@ -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.plugin;
 
@@ -66,19 +66,19 @@ public class ReferredPagesPlugin implements WikiPlugin
 
     /** The parameter name for the type of the references.  Value is <tt>{@value}</tt>.
*/
     public static final String PARAM_TYPE    = "type";
-    
+
     /** The parameter name for the included pages.  Value is <tt>{@value}</tt>.
*/
     public static final String PARAM_INCLUDE = "include";
-    
+
     /** The parameter name for the excluded pages.  Value is <tt>{@value}</tt>.
*/
     public static final String PARAM_EXCLUDE = "exclude";
-    
+
     /** The parameter name for the format.  Value is <tt>{@value}</tt>. */
     public static final String PARAM_FORMAT  = "format";
-    
+
     /** The minimum depth. Value is <tt>{@value}</tt>. */
     public static final int    MIN_DEPTH = 1;
-    
+
     /** The maximum depth. Value is <tt>{@value}</tt>. */
     public static final int    MAX_DEPTH = 8;
 
@@ -225,11 +225,15 @@ public class ReferredPagesPlugin implements WikiPlugin
                         isUL = true; m_result.append("<ul>\n");
                     }
 
-                    m_result.append("<li> " + link + " </li>\n");
+                    //See https://www.w3.org/wiki/HTML_lists  for proper nesting of UL and
LI
+                    m_result.append("<li> " + link + "\n");
 
                     getReferredPages( context, link, depth );  // added recursive
                                                       // call - on general
                                                       // request
+
+                    m_result.append("\n</li>\n");
+
                 }
             }
             else
@@ -240,11 +244,14 @@ public class ReferredPagesPlugin implements WikiPlugin
                 }
 
                 String href = context.getURL(WikiContext.VIEW,link);
-                m_result.append("<li><a class=\"wikipage\" href=\""+ href +"\">"+link+"</a></li>\n"
);
+                m_result.append("<li><a class=\"wikipage\" href=\""+ href +"\">"+link+"</a>\n"
);
 
                 m_exists.add( link );
 
                 getReferredPages( context, link, depth );
+
+                m_result.append("\n</li>\n");
+
             }
         }
 


Mime
View raw message