[Jboss-svn-commits] JBL Code SVN: r913 - trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-22 08:51:11 -0400 (Mon, 22 Aug 2005)
New Revision: 913

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
new way of getting pages


Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp	2005-08-22 12:50:52 UTC (rev 912)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/PageInfo.jsp	2005-08-22 12:51:11 UTC (rev 913)
@@ -41,7 +41,7 @@
 
 	
 	for (int i = topVersion; i > 0; i--) {
-		org.jboss.wiki.WikiPage prevWikiPage = pageAtTop.getPageAtVersion(i);
+		org.jboss.wiki.WikiPage prevWikiPage = pageAtTop.getPageAtVersion(false,i);
 		
 		String author;
 	
@@ -57,7 +57,7 @@
 		prevWikiPage.getEditDate()+
 		"</td><td>"+
 		author +
-		"</td><td>"+prevWikiPage.getContent().length()+
+		"</td><td>"+prevWikiPage.getLength()+
 		"</td><td>"+ ((i > 1) ? "<a href='"+actionURL+"&action=Diff&version="+i+"&page="+wikiPage+"'>Changes from "+(i-1)+" to "+i+"</a>" : "") +"</td>");
 	}
 %>

Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-22 12:50:52 UTC (rev 912)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-22 12:51:11 UTC (rev 913)
@@ -43,6 +43,16 @@
 
 <hr />
 
+<%
+	Integer showedVersion = (Integer)request.getAttribute("showedVersion");
+	
+	if (showedVersion != null) {
+	out.println("<table style='border-style: dashed; text-align: center; margin-left: auto; margin-right:auto; border-color: red'>"+
+				"<tr><td>This is <b>version  "+showedVersion+"</b> of page "+wikiPage+".<br>"+
+				"You can go back to <a href='"+actionURL+"&page="+wikiPage+"'>latest version</a> or <a href='"+actionURL+"&action=Edit&page="+wikiPage+"&version="+showedVersion+"'>rollback this version</a></td></tr></table>");
+	}
+%>
+
 <table style="width: 100%">
 <tr>
 <td class="wikiContent"><%=wikiContent%><td>