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

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

Author: szimano
Date: 2005-08-26 08:45:47 -0400 (Fri, 26 Aug 2005)
New Revision: 970

Modified:
   trunk/forge/portal-extensions/forge-wiki/project.xml
   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:
Tests back on, added MAIN link over the buttons


Modified: trunk/forge/portal-extensions/forge-wiki/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/project.xml	2005-08-26 10:58:17 UTC (rev 969)
+++ trunk/forge/portal-extensions/forge-wiki/project.xml	2005-08-26 12:45:47 UTC (rev 970)
@@ -10,15 +10,30 @@
     <id>wiki</id>
     <name>Wiki portlet</name>
     <currentVersion>1.0</currentVersion>
-	 <!--<build>
-	 <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory>
-	 <unitTest>
-	 	<includes>
-	 		<include>**/*Test.java</include>
-	 		<include>**/Test*.java</include>
-	 	</includes>
-	 </unitTest>
-	 </build>-->
+	<build>
+    	<unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory>
+		<unitTest>
+		 	<includes>
+		 		<include>**/*Test.java</include>
+		 		<include>**/Test*.java</include>
+		 	</includes>
+		</unitTest>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/etc/</directory>
+                <include>**/*.properties</include>
+            </resource>
+            <resource>
+                <directory>src/etc/</directory>
+                <include>**/*.xml</include>
+            </resource>
+            <resource>
+                <directory>src/etc/</directory>
+                <include>**/*.types</include>
+            </resource>
+        </resources>
+    </build>
     <organization>
         <name>Tomasz Szymanski</name>
         <url>http://mamut.net.pl</url>
@@ -69,22 +84,4 @@
 	    </dependency>
 	    
     </dependencies>
-    
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>src/etc/</directory>
-                <include>**/*.properties</include>
-            </resource>
-            <resource>
-                <directory>src/etc/</directory>
-                <include>**/*.xml</include>
-            </resource>
-            <resource>
-                <directory>src/etc/</directory>
-                <include>**/*.types</include>
-            </resource>
-        </resources>
-    </build>
 </project>

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-26 10:58:17 UTC (rev 969)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-26 12:45:47 UTC (rev 970)
@@ -342,7 +342,7 @@
 		rReq
 				.setAttribute(
 						"wikiName",
-						"<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\"  border=\"0\" />");
+						"<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\"  border=\"0\" style=\"vertical-align: middle\"/>");
 
 		rReq.setAttribute("wikiContent", pageToShow.getContent());
 

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-26 10:58:17 UTC (rev 969)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-26 12:45:47 UTC (rev 970)
@@ -18,7 +18,15 @@
 	org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
 %>
 
-<h2><a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a>/ <%=wikiPage%> </h2>
+<table style="width: 100%" border="0">
+<tr>
+<td style="font-size: large">
+<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a> <%=wikiPage%> 
+</td>
+<td style="text-align: right;">
+[<a href="<%=actionURL%>&page=<%=defaultPage%>">MAIN</a>]
+</td>
+</table>
 
 <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />-->