[Jboss-svn-commits] JBL Code SVN: r924 - in trunk/forge/portal-extensions/forge-wiki/src: java/org/jboss/wiki web/WEB-INF/jsp

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

Author: szimano
Date: 2005-08-23 11:10:45 -0400 (Tue, 23 Aug 2005)
New Revision: 924

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
attach only when logged in


Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-23 15:02:05 UTC (rev 923)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-23 15:10:45 UTC (rev 924)
@@ -201,6 +201,11 @@
 		}
 
 		if ((rReq.getParameter("action") != null)
+				&& (rReq.getParameter("action").equals("Attach"))) {
+			rReq.setAttribute("fileAttach", "true");
+		}
+				
+		if ((rReq.getParameter("action") != null)
 				&& (rReq.getParameter("action").equals("Edit"))
 				&& (rReq.getUser() != null)) {
 			page = "Edit.jsp";

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-23 15:02:05 UTC (rev 923)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-23 15:10:45 UTC (rev 924)
@@ -25,11 +25,12 @@
 
 
 	if (logedIn.equals("true")) {
-		out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>");
+		out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>"+
+				  "<a href=\""+actionURL+"&action=Attach\">Attach file...</a>");
 
 	}
 	else {
-		out.print("<i>Login to edit pages</i>");
+		out.print("<i><div style='font-size: xx-small'>Login to edit pages and attach files</div></i>");
 	}
 
 %>
@@ -44,6 +45,18 @@
 <hr />
 
 <%
+	String attachFile = (String)request.getAttribute("fileAttach");
+	
+	if ((attachFile != null)&&(attachFile.equals("true"))) {
+		out.println("<h2><b>UPLOAD FILE:</b></h2>\n"+
+					"<FORM ACTION=\""+actionURL+"&page="+wikiPage+"\" METHOD=\"POST\" ENCTYPE=\"multipart/form-data\">"+
+					"<INPUT TYPE=\"file\" NAME=\"file_up\" />"+
+					"<INPUT TYPE=\"submit\" VALUE=\"Upload\" />"+
+					"</FORM><hr />");
+	}
+%>
+
+<%
 	Integer showedVersion = (Integer)request.getAttribute("showedVersion");
 	
 	if (showedVersion != null) {
@@ -72,14 +85,10 @@
 
 
 
-<a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>">More info...</a> <a href="<%=actionURL%>">Attach file...</a>
+<!--<a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>">More info...</a> <a href="<%=actionURL%>&action=Attach">Attach file...</a>-->
 </td>
 </tr>
 </table>
 <br />
 <div class="author">The page last changed on <%=editDate%> by <%=author%>. </div>
 
-<FORM ACTION="<%=actionURL%>&page=<%=wikiPage%>" METHOD="POST" ENCTYPE="multipart/form-data">
-<INPUT TYPE="file" NAME="file_up" />
-<INPUT TYPE="submit" VALUE="Upload" />
-</FORM>