[Jboss-svn-commits] JBL Code SVN: r1119 - in qa/forge/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki forge-wiki/src/web/WEB-INF/jsp wiki-common/src/etc wiki-common/src/java/org/jboss/wiki/plugins

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

Author: dam...@jb...
Date: 2005-09-14 14:03:47 -0400 (Wed, 14 Sep 2005)
New Revision: 1119

Added:
   qa/forge/portal-extensions/jbosswiki/wiki-common/src/etc/RSSButton.png
Modified:
   qa/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   qa/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
   qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
Log:
MERGED: -r 1115:1118 https://svn.labs.jboss.com/trunk/forge into qa forge.  This is a QA bug fix merge for 1.0.3 release.

Modified: qa/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- qa/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-09-14 17:40:30 UTC (rev 1118)
+++ qa/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-09-14 18:03:47 UTC (rev 1119)
@@ -379,7 +379,8 @@
 		}*/
 
 		rReq.setAttribute("friendlyLink", hostURL+"/wiki/"+pageToShow.getName());
-
+		rReq.setAttribute("rssLink", hostURL+"/wiki/rss/"+pageToShow.getName());
+		
 		rRes.setTitle("Wiki");
 		if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState())
 				|| javax.portlet.WindowState.MAXIMIZED.equals(rReq

Modified: qa/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- qa/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-09-14 17:40:30 UTC (rev 1118)
+++ qa/forge/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-09-14 18:03:47 UTC (rev 1119)
@@ -13,6 +13,7 @@
 	String wikiPage = (String)request.getAttribute("wikiPage");
 	String defaultPage = (String)request.getAttribute("defaultPage");
 	String friendlyLink = (String)request.getAttribute("friendlyLink");
+	String rssLink = (String)request.getAttribute("rssLink");
 	String type = (String)request.getParameter("type");
 	java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
 	org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
@@ -35,7 +36,8 @@
 <table style="width: 100%" border="0">
 <tr style="vertical-align: bottom;">
 <td style="vertical-align: bottom; align-bottom: 0px;">
-<div><a href="<%=friendlyLink%>"><img  style="vertical-align: middle" alt="PERM LINK" src="<%=wikiImagesUrl%>permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div>
+<div><a href="<%=friendlyLink%>"><img  style="vertical-align: middle" alt="PERM LINK" src="<%=wikiImagesUrl%>permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a> </div>
+
 </td>
 <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;">
 
@@ -59,7 +61,8 @@
 
 <%
 if ((type == null)||(type.equals("HTML"))) {
- out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\""+wikiImagesUrl+"historyButton.png\" border=\"0\" /></a><br />");
+ out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\""+wikiImagesUrl+"historyButton.png\" border=\"0\" /></a>");
+ out.println("<a href=\""+rssLink+"\"><img alt=\"RSS\" src=\""+wikiImagesUrl+"RSSButton.png\" border=\"0\" /></a><br />");
  }
  %>
 <input type="text" name="searchQuery" />

Copied: qa/forge/portal-extensions/jbosswiki/wiki-common/src/etc/RSSButton.png (from rev 1118, trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/RSSButton.png)

Modified: qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
===================================================================
--- qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java	2005-09-14 17:40:30 UTC (rev 1118)
+++ qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java	2005-09-14 18:03:47 UTC (rev 1119)
@@ -75,9 +75,6 @@
 
 	public final static String pagePartRegexEnd = "<!--page:end-->";
 
-	private final String pagePartRegex = pagePartRegexStart + ".*"
-			+ pagePartRegexEnd;
-
 	private String wikiHome = "";
 
 	// private String actionType = "&ctrl:type=";
@@ -823,14 +820,14 @@
 		// external link
 		if (isExternalLink(link)) {
 			if (checkImageLink(link)) {
-				result = "<img src=\"" + link + "\" alt=\"" + text + "\">";// external
+				result = "<img src=\"" + link + "\" alt=\"" + text + "\" />";// external
 				// image
 			} else
 				result = "<a href=\""
 						+ link
 						+ "\" target=\"_blank\">"
 						+ text
-						+ "</a><img src=\"/file-access/default/members/jbosswiki/images/out.png\"/>";
+						+ "</a><img src=\"/file-access/default/members/jbosswiki/images/out.png\" />";
 		}
 		// internal link
 		else {
@@ -851,7 +848,7 @@
 			// check if not an image link as well
 			else if (checkImageLink(link)) {
 				result = "<img src=\"" + imagePath + "/" + pageName + "/"
-						+ link + "\" alt=\"" + text + "\">";
+						+ link + "\" alt=\"" + text + "\" />";
 
 			}
 			// check for attachments later on