Index: lams_tool_wiki/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/build.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_wiki/build.xml	8 Oct 2008 05:33:01 -0000	1.1
+++ lams_tool_wiki/build.xml	17 Oct 2008 01:58:37 -0000	1.2
@@ -211,6 +211,7 @@
 				<include name="pages/**" />
 				<include name="template/**" />
 				<include name="wiki_client/**" />
+				<include name="wikilink/**" />
 				<!-- used by tiles -->
 			</fileset>
 		</war>
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.2 -r1.3
--- lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	15 Oct 2008 03:30:46 -0000	1.2
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	17 Oct 2008 01:58:37 -0000	1.3
@@ -103,18 +103,22 @@
 label.authoring.basic.instructions  =Instructions:
 label.wiki.body  =Wiki Body
 label.wiki.edit  =Edit
+label.wiki.edit.toolTip  =Edit the current Wiki page
 label.wiki.add  =Add
+label.wiki.add.toolTip  =Add a new Wiki page to this Wiki
 label.wiki.add.title.exists  =A Wiki page with title "{0}" already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
 label.wiki.last.edit  =Last edited by {0}, at {1}
 label.wiki.view  =View
+label.wiki.view.toolTip  =View this Wiki page
 label.wiki.remove  =Remove
+label.wiki.remove.toolTip  =Remove this Wiki page
 label.wiki.remove.confirm =Delete entire Wiki page? This action cannot be undone.
 label.wiki.pages  =Wiki Pages
-label.wiki.main  =(Main)
 label.wiki.savechanges  =Save changes
 label.wiki.remove.confirm =Are you sure you want to delete this Wiki page? This action cannot be undone.
 label.wiki.history  =History
+label.wiki.history.toolTip  =View previous versions of this Wiki page
 label.wiki.history.version  =Version
 label.wiki.history.empty  =There are no previous versions of this Wiki page.
 label.wiki.history.date  =Edit Date
Index: lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/rams/Attic/ApplicationResources_en_AU.properties,v
diff -u -r1.6 -r1.7
--- lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties	15 Oct 2008 03:30:46 -0000	1.6
+++ lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties	17 Oct 2008 01:58:37 -0000	1.7
@@ -102,19 +102,24 @@
 titleHeading.instructions  =Instructions
 label.authoring.basic.instructions  =Instructions:
 label.wiki.body  =Wiki Body
-label.wiki.edit  =Edit
-label.wiki.add  =Add
+label.wiki.edit  =Edit Page
+label.wiki.edit.toolTip  =Edit the current Wiki page
+label.wiki.add  =Add New Page
+label.wiki.add.toolTip  =Add a new Wiki page to this wiki
 label.wiki.add.title.exists  =A Wiki page with title "{0}" already exists, please choose a different title.
 label.wiki.add.title.required  =A title is required for the Wiki page.
 label.wiki.last.edit  =Last edited by {0}, at {1}
-label.wiki.view  =View
-label.wiki.remove  =Remove
+label.wiki.view  =View Page
+label.wiki.view.toolTip  =View this wiki page
+label.wiki.remove  =Remove Page
+label.wiki.remove.toolTip  =Remove this wiki page
 label.wiki.remove.confirm =Delete entire Wiki page? This action cannot be undone.
 label.wiki.pages  =Wiki Pages
 label.wiki.main  =(Main)
 label.wiki.savechanges  =Save changes
 label.wiki.remove.confirm =Are you sure you want to delete this Wiki page? This action cannot be undone.
-label.wiki.history  =History
+label.wiki.history  =View Page History
+label.wiki.history.toolTip  =View previous versions of this Wiki page
 label.wiki.history.version  =Version
 label.wiki.history.empty  =There are no previous versions of this Wiki page.
 label.wiki.history.date  =Edit Date
Index: lams_tool_wiki/web/images/tree_closed.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/images/tree_closed.gif,v
diff -u
Binary files differ
Index: lams_tool_wiki/web/images/tree_open.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/images/tree_open.gif,v
diff -u
Binary files differ
Index: lams_tool_wiki/web/includes/javascript/wikiCommon.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/includes/javascript/wikiCommon.js,v
diff -u -r1.2 -r1.3
--- lams_tool_wiki/web/includes/javascript/wikiCommon.js	10 Oct 2008 01:18:47 -0000	1.2
+++ lams_tool_wiki/web/includes/javascript/wikiCommon.js	17 Oct 2008 01:58:37 -0000	1.3
@@ -65,3 +65,21 @@
 	compareWindow = window.open(url,'compareWindow','resizable,width=796,height=570,scrollbars');
 	compareWindow.window.focus();
 }
+
+function toggleWikiList(webUrl)
+{
+	
+	var wikiListDiv = document.getElementById("wikiList");
+	var wikiListImage = document.getElementById("wikiListImage");
+	
+	if (wikiListDiv.style.display=="block")
+	{
+		wikiListDiv.style.display = "none";
+		wikiListImage.src = webUrl +"/images/tree_closed.gif";
+	}
+	else
+	{
+		wikiListDiv.style.display = "block";
+		wikiListImage.src = webUrl + "/images/tree_open.gif";
+	}
+}
Index: lams_tool_wiki/web/pages/aa.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/Attic/aa.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_wiki/web/pages/aa.jsp	17 Oct 2008 01:58:37 -0000	1.1
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+                    "http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+<head>
+  <script type="text/javascript"src="<lams:WebAppURL />/includes/javascript/jquery-latest.pack.js"></script>
+  <link rel="stylesheet" href="<lams:WebAppURL />/includes/css/screen.css" type="text/css" />
+  <link rel="stylesheet" href="<lams:WebAppURL />/includes/css/jquery.treeview.css" type="text/css" />
+  <script type="text/javascript" src="<lams:WebAppURL />/includes/javascript/jquery.treeview.pack.js"></script>
+  <script>
+  $(document).ready(function(){
+    $("#example").treeview();
+  });
+  </script>
+  
+</head>
+<body>
+  <ul id="example" class="filetree">
+		<li><span class="file">&nbsp;<a href="http://yahoo.com">yahoo.com</a></span>
+			<ul>
+				<li><span class="file">Item 1.1</span></li>
+			</ul>
+		</li>
+  </ul>
+</body>
+</html>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/authoring/basic.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_wiki/web/pages/authoring/basic.jsp	15 Oct 2008 23:20:26 -0000	1.5
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	17 Oct 2008 01:58:37 -0000	1.6
@@ -1,202 +1,256 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-
-
-<c:set var="formBean"
-	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-
 <!-- ========== Basic Tab ========== -->
 
-<div id="wikimenu">
+<div id="wikimenu" style="margin-right:75px;">
 
-<div id="breadcrumb" style="float: left; width: 30%;"><c:if
-	test="${currentWikiPage.title != mainWikiPage.title}">
-	<a href='javascript:changeWikiPage("${mainWikiPage.javaScriptTitle}")'>/${mainWikiPage.title}</a>
-</c:if> <a
-	href='javascript:changeWikiPage("${currentWikiPage.javaScriptTitle}")'>/${currentWikiPage.title}</a>
+	<div id="breadcrumb" style="float: left; width: 30%;">
+		<c:if test="${currentWikiPage.title != mainWikiPage.title}">
+			<a href='javascript:changeWikiPage("${mainWikiPage.javaScriptTitle}")'>${mainWikiPage.title}</a> :
+		</c:if> 
+		<a href='javascript:changeWikiPage("${currentWikiPage.javaScriptTitle}")'>${currentWikiPage.title}</a>
+	</div>
+	
+	<div id="buttons" style="float: right; width: 70%; text-align:right; " >
+		<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
+			<fmt:message key="label.wiki.view"></fmt:message>
+		</a> 
+		&nbsp;
+		<a href="javascript:changeDiv('edit');" title='<fmt:message key="label.wiki.edit.toolTip"></fmt:message>'>
+			<fmt:message key="label.wiki.edit"></fmt:message>
+		</a> 
+		&nbsp;
+		<a href="javascript:cancelAdd();changeDiv('add');" title='<fmt:message key="label.wiki.add.toolTip"></fmt:message>'>
+			<fmt:message key="label.wiki.add"></fmt:message>
+		</a> 
+		&nbsp;
+		<a href="javascript:changeDiv('history');" title='<fmt:message key="label.wiki.history.toolTip"></fmt:message>'>
+			<fmt:message key="label.wiki.history"></fmt:message>
+		</a> 
+		<c:if test="${currentWikiPage.title != mainWikiPage.title}">
+			&nbsp;
+			<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
+				title='<fmt:message key="label.wiki.remove.toolTip"></fmt:message>'
+			>
+				<fmt:message key="label.wiki.remove"></fmt:message>
+			</a>
+		</c:if>
+	</div>
 </div>
 
-<div id="buttons" style="float: right; width: 70%;"><a
-	href="javascript:changeDiv('view');" class="button"><fmt:message
-	key="label.wiki.view"></fmt:message></a> <a
-	href="javascript:changeDiv('edit');" class="button"><fmt:message
-	key="label.wiki.edit"></fmt:message></a> <a
-	href="javascript:cancelAdd();changeDiv('add');" class="button"><fmt:message
-	key="label.wiki.add"></fmt:message></a> <a
-	href="javascript:changeDiv('history');" class="button"><fmt:message
-	key="label.wiki.history"></fmt:message></a> <c:if
-	test="${currentWikiPage.title != mainWikiPage.title}">
-	<a
-		href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
-		class="button"><fmt:message key="label.wiki.remove"></fmt:message></a>
-</c:if></div>
-</div>
 <br />
 <br />
 <hr />
 <br />
 
-<div id="view">
-<h1>${currentWikiPage.title}</h1>
-<br />
-<i> <fmt:message key="label.wiki.last.edit">
-	<fmt:param>
-		<c:choose>
-			<c:when
-				test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-				<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-			</c:when>
-			<c:otherwise>
+<div id="view" style="margin-right:75px;">
+	<h1>
+		${currentWikiPage.title}
+	</h1>
+	
+	<br />
+	
+	<i> 
+		<fmt:message key="label.wiki.last.edit">
+			<fmt:param>
+				<c:choose>
+					<c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+						<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+					</c:when>
+					<c:otherwise>
 						${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
 					</c:otherwise>
-		</c:choose>
-	</fmt:param>
-	<fmt:param>
-		<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
-	</fmt:param>
-</fmt:message> </i> <br />
-<br />
-<div id="viewBody">${currentWikiPage.currentWikiContentDTO.body}</div>
+				</c:choose>
+			</fmt:param>
+			<fmt:param>
+				<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
+			</fmt:param>
+		</fmt:message> 
+	</i> 
+	
+	<br />
+	<br />
+	
+	<div id="viewBody">
+		${currentWikiPage.currentWikiContentDTO.body}
+	</div>
 </div>
 
 <div id="history" style="display: none;">
 
-<h1><fmt:message key="label.wiki.history" /> -
-${currentWikiPage.title}</h1>
-<br />
-<c:choose>
-	<c:when test="${not empty wikiPageContentHistory}">
-		<table class="alternative-color">
-			<tr>
-				<th><fmt:message key="label.wiki.history.version"></fmt:message>
-				</th>
-				<th><fmt:message key="label.wiki.history.date"></fmt:message></th>
-				<th><fmt:message key="label.wiki.history.editor"></fmt:message>
-				</th>
-				<th><fmt:message key="label.wiki.history.actions"></fmt:message>
-				</th>
-			</tr>
-			<c:forEach var="wikiContentPageVersion"
-				items="${wikiPageContentHistory}">
-				<c:if
-					test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
-					<tr>
-						<td>${wikiContentPageVersion.version}</td>
-						<td><lams:Date value="${wikiContentPageVersion.editDate}" />
-						</td>
-						<td><c:choose>
-							<c:when test="${wikiContentPageVersion.editorDTO != null}">
-								${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-							</c:otherwise>
-						</c:choose></td>
-						<td><a
-							href="javascript:doRevert('${wikiContentPageVersion.uid}');"
-							title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-						<fmt:message key="label.wiki.history.actions.revert" /> </a> &nbsp; <a
-							href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');"
-							title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-						<fmt:message key="label.wiki.history.actions.compare" /> </a> &nbsp;
-						<a
-							href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');"
-							title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-						<fmt:message key="label.wiki.history.actions.view" /> </a></td>
-					</tr>
-				</c:if>
-			</c:forEach>
-		</table>
-	</c:when>
-	<c:otherwise>
-		<fmt:message key="label.wiki.history.empty" />
-	</c:otherwise>
-</c:choose></div>
+	<h1>
+	<fmt:message key="label.wiki.history" /> - ${currentWikiPage.title}
+	</h1>
+	
+	<br />
+	
+	<c:choose>
+		<c:when test="${not empty wikiPageContentHistory}">
+			<table class="alternative-color">
+				<tr>
+					<th>
+						<fmt:message key="label.wiki.history.version"></fmt:message>
+					</th>
+					<th>
+						<fmt:message key="label.wiki.history.date"></fmt:message>
+					</th>
+					<th>
+						<fmt:message key="label.wiki.history.editor"></fmt:message>
+					</th>
+					<th>
+						<fmt:message key="label.wiki.history.actions"></fmt:message>
+					</th>
+				</tr>
+				
+				<c:forEach var="wikiContentPageVersion"items="${wikiPageContentHistory}">
+					<c:if test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
+						<tr>
+							<td>
+								${wikiContentPageVersion.version}
+							</td>
+							<td>
+								<lams:Date value="${wikiContentPageVersion.editDate}" />
+							</td>
+							<td>
+								<c:choose>
+									<c:when test="${wikiContentPageVersion.editorDTO != null}">
+										${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+									</c:otherwise>
+								</c:choose>
+							</td>
+							<td>
+								<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+									<fmt:message key="label.wiki.history.actions.revert" /> 
+								</a>
+								&nbsp; 
+								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+									<fmt:message key="label.wiki.history.actions.compare" /> 
+								</a>
+								&nbsp;
+								<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+									<fmt:message key="label.wiki.history.actions.view" /> 
+								</a>
+							</td>
+						</tr>
+					</c:if>
+				</c:forEach>
+			</table>
+		</c:when>
+		<c:otherwise>
+			<fmt:message key="label.wiki.history.empty" />
+		</c:otherwise>
+	</c:choose>
+</div>
 
 
 <div id="edit" style="display: none;">
-<h1><fmt:message key="label.wiki.edit"></fmt:message> -
-${currentWikiPage.title}</h1>
-<table cellpadding="0">
-	<tr>
-		<td>
-		<div class="field-name"><fmt:message
-			key="label.authoring.basic.title"></fmt:message></div>
-		<html:text property="title" styleId="title" style="width: 99%;"
-			value="${currentWikiPage.title}"></html:text></td>
-	</tr>
-	<tr>
-		<td>
-		<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
-		</div>
-		<lams:FCKEditor id="wikiBody"
-			value="${currentWikiPage.currentWikiContentDTO.body}"
-			contentFolderID="${sessionMap.contentFolderID}"
-			toolbarSet="Custom-Learner" height="400px">
-		</lams:FCKEditor></td>
-	</tr>
-	<tr>
-		<td><html:checkbox property="isEditable" value="1"
-			styleClass="noBorder" styleId="isEditable"></html:checkbox>&nbsp;<fmt:message
-			key="label.authoring.basic.wikipagevisible"></fmt:message></td>
-	</tr>
-	<tr>
-		<td align="right"><a href="javascript:doEditOrAdd('editPage');"
-			class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-		<a href="javascript:changeDiv('view');" class="button"><fmt:message
-			key="button.cancel"></fmt:message></a></td>
-	</tr>
-</table>
+	<h1>
+		<fmt:message key="label.wiki.edit"></fmt:message> - ${currentWikiPage.title}
+	</h1>
+	
+	<table cellpadding="0">
+		<tr>
+			<td>
+				<div class="field-name"><fmt:message key="label.authoring.basic.title"></fmt:message></div>
+				<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<div class="field-name">
+					<fmt:message key="label.wiki.body"></fmt:message>
+				</div>
+				<lams:FCKEditor id="wikiBody"
+					value="${currentWikiPage.currentWikiContentDTO.body}"
+					contentFolderID="${sessionMap.contentFolderID}"
+					toolbarSet="Custom-Wiki" height="400px">
+				</lams:FCKEditor>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<html:checkbox property="isEditable" value="1" styleClass="noBorder" styleId="isEditable"></html:checkbox>
+				&nbsp;
+				<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
+			</td>
+		</tr>
+		<tr>
+			<td align="right">
+				<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+				<a href="javascript:changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 <div id="add" style="display: none;">
 
-<h1><fmt:message key="label.wiki.add"></fmt:message></h1>
-<table cellpadding="0">
-	<tr>
-		<td>
-		<div class="field-name"><fmt:message
-			key="label.authoring.basic.title"></fmt:message></div>
-		<html:text property="newPageTitle" styleId="newPageTitle"
-			style="width: 99%;" value=""></html:text></td>
-	</tr>
-	<tr>
-		<td>
-		<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
-		</div>
-		<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
-			contentFolderID="${sessionMap.contentFolderID}"
-			toolbarSet="Custom-Learner"></lams:FCKEditor></td>
-	</tr>
-	<tr>
-		<td><html:checkbox property="newPageIsEditable"
-			styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>&nbsp;<fmt:message
-			key="label.authoring.basic.wikipagevisible"></fmt:message></td>
-	</tr>
-	<tr>
-		<td align="right"><a href="javascript:doEditOrAdd('addPage');"
-			class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-		<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message
-			key="button.cancel"></fmt:message></a></td>
-	</tr>
-</table>
+	<h1>
+		<fmt:message key="label.wiki.add"></fmt:message>
+	</h1>
+	<table cellpadding="0">
+		<tr>
+			<td>
+				<div class="field-name">
+					<fmt:message key="label.authoring.basic.title"></fmt:message>
+				</div>
+				<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<div class="field-name">
+					<fmt:message key="label.wiki.body"></fmt:message>
+				</div>
+				<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
+					contentFolderID="${sessionMap.contentFolderID}"
+					toolbarSet="Custom-Wiki">
+				</lams:FCKEditor>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<html:checkbox property="newPageIsEditable" styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>
+				&nbsp;
+				<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
+			</td>
+		</tr>
+		<tr>
+			<td align="right">
+				<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+				<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
+			</td>
+		</tr>
+	</table>
 </div>
 
 <br />
 <hr />
 <br />
 
-<div class="field-name"><fmt:message key="label.wiki.pages"></fmt:message>
+<div class="field-name">
+	<fmt:message key="label.wiki.pages"></fmt:message>
 </div>
-<c:forEach var="wikiPage" items="${wikiPages}">
-	<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">
-	${wikiPage.title} <c:if test="${wikiPage.title == mainWikiPage.title}">
-		<fmt:message key="label.wiki.main"></fmt:message>
-	</c:if> </a>
-	<br />
-</c:forEach>
 
+<img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
+	onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
+&nbsp;
+<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">${mainWikiPage.title}</a>
+<div id="wikiList" style="display:none;">
+	<c:forEach var="wikiPage" items="${wikiPages}">
+		<c:if test="${wikiPage.title != mainWikiPage.title}">
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+			<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">${wikiPage.title}</a>
+			<br />
+		</c:if> 
+	</c:forEach>
+</div>
+
 <script type="text/javascript">
 <!--
 	var wikiLinkArray = new Array();
@@ -212,20 +266,7 @@
 		
 	}
 	
-	/*
-	window.onload = function () {
-		<c:forEach var="wikiPage" items="${wikiPages}">
-			wikiLinkArray[wikiLinkArray.length] = '${wikiPage.javaScriptTitle}';
-		</c:forEach>
-		
-		var oEditor = FCKeditorAPI.GetInstance('wikiBody');
-		var oEditor2 = FCKeditorAPI.GetInstance('newPageWikiBody');
-		
-		oEditor.wikiLinkArray = wikiLinkArray;
-		oEditor2.wikiLinkArray = wikiLinkArray;
-	}
-	*/
-	
+
 	function doEditOrAdd(dispatch)
 	{
 		var title="";
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/wiki.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_wiki/web/pages/learning/wiki.jsp	15 Oct 2008 23:20:26 -0000	1.8
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	17 Oct 2008 01:58:37 -0000	1.9
@@ -8,7 +8,7 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
-
+	
 	function validateForm() {
 	
 		// Validates that there's input from the user. 
@@ -42,283 +42,332 @@
 </script>
 
 
-<div id="content"><!-- Display the advanced option warnings -->
-<div class="info" id="messageDiv" style="display: none;"><c:if
-	test="${wikiDTO.lockOnFinish and mode == 'learner'}">
-	<p><c:choose>
-		<c:when test="${finishedActivity}">
-			<fmt:message key="message.activityLocked" />
-		</c:when>
-		<c:otherwise>
-			<fmt:message key="message.warnLockOnFinish" />
-		</c:otherwise>
-	</c:choose></p>
-</c:if> <c:if test="${not (wikiDTO.lockOnFinish and finishedActivity) }">
-	<c:choose>
-		<c:when test="${currentWikiPage.editable}">
-			<c:if test="${not minEditsReached}">
-				<p><fmt:message key="message.minumumEditsNotReached">
-					<fmt:param>
-								${wikiDTO.minimumEdits}
-							</fmt:param>
-				</fmt:message></p>
-			</c:if>
+<div id="content">
 
-			<c:if test="${wikiDTO.maximumEdits > 0}">
-				<p><c:choose>
-					<c:when test="${maxEditsReached}">
-						<fmt:message key="message.maxEditsReached" />
+	<!-- Display the advanced option warnings -->
+	<div class="info" id="messageDiv" style="display: none;">
+		<c:if test="${wikiDTO.lockOnFinish and mode == 'learner'}">
+			<p>
+				<c:choose>
+					<c:when test="${finishedActivity}">
+						<fmt:message key="message.activityLocked" />
 					</c:when>
 					<c:otherwise>
-						<fmt:message key="message.warnMaxEdits">
-							<fmt:param>
-										${editsLeft} 
-										</fmt:param>
-						</fmt:message>
+						<fmt:message key="message.warnLockOnFinish" />
 					</c:otherwise>
-				</c:choose></p>
-			</c:if>
-		</c:when>
-		<c:otherwise>
-			<p><fmt:message key="message.pageNotEditable" /></p>
-		</c:otherwise>
-	</c:choose>
-</c:if></div>
-
-&nbsp; <html:form action="/learning" method="post"
-	styleId="learningForm" enctype="multipart/form-data">
-	<html:hidden property="dispatch" styleId="dispatch"
-		value="finishActivity" />
-	<html:hidden property="toolSessionID" />
-	<html:hidden property="mode" />
-	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}"
-		styleId="currentWikiPage" />
-	<input type="hidden" id="wikiLinks" />
-	<html:hidden property="newPageName" styleId="newPageName" />
-	<html:hidden property="historyPageContentId"
-		styleId="historyPageContentId" />
-	<c:set var="lrnForm"
-		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-
-	<!-- Set up edit and add flags -->
-	<c:set var="editableFlag"
-		value="${currentWikiPage.editable and not maxEditsReached}" />
-	<c:set var="addFlag"
-		value="${wikiDTO.allowLearnerCreatePages and not maxEditsReached}" />
-
-
-	<div id="wikimenu">
-	<div id="breadcrumb" style="float: left; width: 30%;"><c:if
-		test="${currentWikiPage.title != mainWikiPage.title}">
-		<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">/${mainWikiPage.title}</a>
-	</c:if> <a
-		href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">/${currentWikiPage.title}</a>
-	</div>
-
-	<div id="buttons" style="float: right; width: 70%;"><c:if
-		test="${contentEditable}">
-		<c:if test="${editableFlag or addFlag}">
-			<a href="javascript:changeDiv('view');" class="button"><fmt:message
-				key="label.wiki.view"></fmt:message></a>
-		</c:if>
-		<c:if test="${editableFlag}">
-			<a href="javascript:changeDiv('edit');" class="button"><fmt:message
-				key="label.wiki.edit"></fmt:message></a>
-		</c:if>
-		<c:if test="${addFlag}">
-			<a href="javascript:cancelAdd();changeDiv('add');" class="button"><fmt:message
-				key="label.wiki.add"></fmt:message></a>
-		</c:if>
-		<c:if test="${editableFlag}">
-			<a href="javascript:changeDiv('history');" class="button"><fmt:message
-				key="label.wiki.history"></fmt:message></a>
-		</c:if>
-		<c:if
-			test="${currentWikiPage.title != mainWikiPage.title && editableFlag}">
-			<a
-				href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
-				class="button"><fmt:message key="label.wiki.remove"></fmt:message></a>
-		</c:if>
-	</c:if></div>
-	</div>
-
-	<br />
-	<br />
-	<hr />
-	<br />
-
-	<div id="view">
-	<h1>${currentWikiPage.title}</h1>
-	<i> <fmt:message key="label.wiki.last.edit">
-		<fmt:param>
+				</c:choose>
+			</p>
+		</c:if> 
+		
+		<c:if test="${not (wikiDTO.lockOnFinish and finishedActivity) }">
 			<c:choose>
-				<c:when
-					test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-					<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+				<c:when test="${currentWikiPage.editable}">
+					<c:if test="${not minEditsReached}">
+						<p>
+							<fmt:message key="message.minumumEditsNotReached">
+								<fmt:param>
+									${wikiDTO.minimumEdits}
+								</fmt:param>
+							</fmt:message>
+						</p>
+					</c:if>
+		
+					<c:if test="${wikiDTO.maximumEdits > 0}">
+						<p>
+							<c:choose>
+								<c:when test="${maxEditsReached}">
+									<fmt:message key="message.maxEditsReached" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="message.warnMaxEdits">
+										<fmt:param>
+											${editsLeft} 
+										</fmt:param>
+									</fmt:message>
+								</c:otherwise>
+							</c:choose>
+						</p>
+					</c:if>
 				</c:when>
 				<c:otherwise>
-								${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
-							</c:otherwise>
+					<p><fmt:message key="message.pageNotEditable" /></p>
+				</c:otherwise>
 			</c:choose>
-		</fmt:param>
-		<fmt:param>
-			<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
-		</fmt:param>
-	</fmt:message> </i> <br />
-	<br />
-	<div id="viewBody">${currentWikiPage.currentWikiContentDTO.body}
+		</c:if>
 	</div>
-	</div>
 
-	<div id="history" style="display: none;">
-	<h1><fmt:message key="label.wiki.history" /> -
-	${currentWikiPage.title}</h1>
-	<br />
-	<c:choose>
-		<c:when test="${not empty wikiPageContentHistory}">
-			<table class="alternative-color">
-				<tr>
-					<th><fmt:message key="label.wiki.history.version"></fmt:message>
-					</th>
-					<th><fmt:message key="label.wiki.history.date"></fmt:message>
-					</th>
-					<th><fmt:message key="label.wiki.history.editor"></fmt:message>
-					</th>
-					<th><fmt:message key="label.wiki.history.actions"></fmt:message>
-					</th>
-				</tr>
-				<c:forEach var="wikiContentPageVersion"
-					items="${wikiPageContentHistory}">
-					<c:if
-						test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
-						<tr>
-							<td>${wikiContentPageVersion.version}</td>
-							<td><lams:Date value="${wikiContentPageVersion.editDate}" />
-							</td>
-							<td><c:choose>
-								<c:when test="${wikiContentPageVersion.editorDTO != null}">
-										${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
-									</c:when>
-								<c:otherwise>
-									<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-								</c:otherwise>
-							</c:choose></td>
-							<td><a
-								href="javascript:doRevert('${wikiContentPageVersion.uid}');"
-								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.revert" /> </a> &nbsp;
-							<a
-								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');"
-								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.compare" /> </a> &nbsp;
-							<a
-								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');"
-								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.view" /> </a></td>
-						</tr>
-					</c:if>
-				</c:forEach>
-			</table>
-		</c:when>
-		<c:otherwise>
-			<fmt:message key="label.wiki.history.empty" />
-		</c:otherwise>
-	</c:choose></div>
+	&nbsp; 
 
-
-	<div id="edit" style="display: none;">
-	<h1><fmt:message key="label.wiki.edit"></fmt:message> -
-	${currentWikiPage.title}</h1>
-	<table cellpadding="0">
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message
-				key="label.authoring.basic.title"></fmt:message></div>
-			<html:text property="title" styleId="title" style="width: 99%;"
-				value="${currentWikiPage.title}"></html:text></td>
-		</tr>
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
+	<html:form action="/learning" method="post"styleId="learningForm" enctype="multipart/form-data">
+		<html:hidden property="dispatch" styleId="dispatch" value="finishActivity" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="mode" />
+		<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
+		<input type="hidden" id="wikiLinks" />
+		<html:hidden property="newPageName" styleId="newPageName" />
+		<html:hidden property="historyPageContentId" styleId="historyPageContentId" />
+		
+		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	
+		<!-- Set up edit and add flags -->
+		<c:set var="editableFlag" value="${currentWikiPage.editable and not maxEditsReached}" />
+		<c:set var="addFlag" value="${wikiDTO.allowLearnerCreatePages and not maxEditsReached}" />
+	
+	
+		<div id="wikimenu">
+			<div id="breadcrumb" style="float: left; width: 30%;">
+				<c:if test="${currentWikiPage.title != mainWikiPage.title}">
+					<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">${mainWikiPage.title}</a> :
+				</c:if> 
+				<a href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">${currentWikiPage.title}</a>
 			</div>
-			<lams:FCKEditor id="wikiBody"
-				value="${currentWikiPage.currentWikiContentDTO.body}"
-				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"
-				height="400px">
-			</lams:FCKEditor></td>
-		</tr>
-		<tr>
-			<td align="right"><br />
-			<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message
-				key="label.wiki.savechanges"></fmt:message></a> <a
-				href="javascript:changeDiv('view');" class="button"><fmt:message
-				key="button.cancel"></fmt:message></a></td>
-		</tr>
-	</table>
-	</div>
-
-	<div id="add" style="display: none;">
-	<h1><fmt:message key="label.wiki.add"></fmt:message></h1>
-	<table cellpadding="0">
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message
-				key="label.authoring.basic.title"></fmt:message></div>
-			<html:text property="newPageTitle" styleId="newPageTitle"
-				style="width: 99%;" value=""></html:text></td>
-		</tr>
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
+	
+			<div id="buttons" style="float: right; width: 70%; text-align:right;">
+			
+				<c:if test="${contentEditable}">
+				
+					<c:if test="${editableFlag or addFlag}">
+						<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
+							<fmt:message key="label.wiki.view"></fmt:message>
+						</a>
+					</c:if>
+					
+					<c:if test="${editableFlag}">
+						&nbsp;
+						<a href="javascript:changeDiv('edit');" title='<fmt:message key="label.wiki.edit.toolTip"></fmt:message>'>
+							<fmt:message key="label.wiki.edit"></fmt:message>
+						</a>
+					</c:if>
+					
+					<c:if test="${addFlag}">
+						&nbsp;
+						<a href="javascript:cancelAdd();changeDiv('add');" title='<fmt:message key="label.wiki.add.toolTip"></fmt:message>'>
+							<fmt:message key="label.wiki.add"></fmt:message>
+						</a>
+					</c:if>
+					
+					<c:if test="${editableFlag}">
+						&nbsp;
+						<a href="javascript:changeDiv('history');" title='<fmt:message key="label.wiki.history.toolTip"></fmt:message>'>
+							<fmt:message key="label.wiki.history"></fmt:message>
+						</a>
+					</c:if>
+					
+					<c:if test="${currentWikiPage.title != mainWikiPage.title && editableFlag}">
+						&nbsp;
+						<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
+							title='<fmt:message key="label.wiki.remove.toolTip"></fmt:message>'
+						>
+							<fmt:message key="label.wiki.remove"></fmt:message>
+						</a>
+					</c:if>
+				</c:if>
 			</div>
-			<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
-				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"></lams:FCKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td align="right"><br />
-			<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message
-				key="label.wiki.savechanges"></fmt:message></a> <a
-				href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message
-				key="button.cancel"></fmt:message></a></td>
-		</tr>
-	</table>
-	</div>
-
-	<br />
-	<hr />
-	<br />
-
-
-	<div class="field-name"><fmt:message key="label.wiki.pages"></fmt:message>
-	</div>
-	<c:forEach var="wikiPage" items="${wikiPages}">
-		<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">
-		${wikiPage.title} <c:if test="${wikiPage.title == mainWikiPage.title}">
-			<fmt:message key="label.wiki.main"></fmt:message>
-		</c:if> </a>
+		</div>
+	
 		<br />
-	</c:forEach>
-
-	<!-- 
-		<div id="finishButtonDiv">
+		<br />
+		<hr />
+		<br />
+	
+		<div id="view">
+			<h1>${currentWikiPage.title}</h1>
+			<i> 
+				<fmt:message key="label.wiki.last.edit">
+					<fmt:param>
+						<c:choose>
+							<c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+								<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+							</c:when>
+							<c:otherwise>
+								${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
+							</c:otherwise>
+						</c:choose>
+					</fmt:param>
+					<fmt:param>
+						<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
+					</fmt:param>
+				</fmt:message> 
+			</i> 
 			
+			<br />
+			<br />
+			<div id="viewBody">
+				${currentWikiPage.currentWikiContentDTO.body}
+			</div>
+		</div>
+	
+		<div id="history" style="display: none;">
+			<h1>
+				<fmt:message key="label.wiki.history" /> - ${currentWikiPage.title}
+			</h1>
+			<br />
 			<c:choose>
-				<c:when test="${contentEditable and minEditsReached}">
-					<div class="space-bottom-top align-right" id="finishButtonDiv">
-						<a href="javascript:submitWiki('finishActivity');" class="button"><fmt:message key="button.finish"></fmt:message></a>
-					</div>
+				<c:when test="${not empty wikiPageContentHistory}">
+					<table class="alternative-color">
+						<tr>
+							<th>
+								<fmt:message key="label.wiki.history.version"></fmt:message>
+							</th>
+							<th>
+								<fmt:message key="label.wiki.history.date"></fmt:message>
+							</th>
+							<th>
+								<fmt:message key="label.wiki.history.editor"></fmt:message>
+							</th>
+							<th>
+								<fmt:message key="label.wiki.history.actions"></fmt:message>
+							</th>
+						</tr>
+						<c:forEach var="wikiContentPageVersion"items="${wikiPageContentHistory}">
+							<c:if test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
+								<tr>
+									<td>${wikiContentPageVersion.version}</td>
+									
+									<td>
+										<lams:Date value="${wikiContentPageVersion.editDate}" />
+									</td>
+									
+									<td>
+										<c:choose>
+											<c:when test="${wikiContentPageVersion.editorDTO != null}">
+												${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
+											</c:when>
+											<c:otherwise>
+												<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+											</c:otherwise>
+										</c:choose>
+									</td>
+									
+									<td>
+										<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+											<fmt:message key="label.wiki.history.actions.revert" /> 
+										</a> 
+										
+										&nbsp;
+										<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+											<fmt:message key="label.wiki.history.actions.compare" />
+										</a> 
+										
+										&nbsp;
+										<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+											<fmt:message key="label.wiki.history.actions.view" /> 
+										</a>
+									</td>
+								</tr>
+							</c:if>
+						</c:forEach>
+					</table>
 				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.wiki.history.empty" />
+				</c:otherwise>
 			</c:choose>
+		</div>
+	
+	
+		<div id="edit" style="display: none;">
+			<h1>
+				<fmt:message key="label.wiki.edit"></fmt:message> - ${currentWikiPage.title}
+			</h1>
 			
+			<table cellpadding="0">
+				<tr>
+					<td>
+						<div class="field-name">
+							<fmt:message key="label.authoring.basic.title"></fmt:message>
+						</div>
+						
+						<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<div class="field-name">
+							<fmt:message key="label.wiki.body"></fmt:message>
+						</div>
+						<lams:FCKEditor id="wikiBody"
+							value="${currentWikiPage.currentWikiContentDTO.body}"
+							contentFolderID="${contentFolderID}" toolbarSet="Custom-Wiki"
+							height="400px">
+						</lams:FCKEditor>
+					</td>
+				</tr>
+				<tr>
+					<td align="right">
+					<br />
+						<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a> 
+						<a href="javascript:changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
+					</td>
+				</tr>
+			</table>
+		</div>
+	
+		<div id="add" style="display: none;">
+			<h1>
+				<fmt:message key="label.wiki.add"></fmt:message>
+			<h1>
 			
-			
+			<table cellpadding="0">
+				<tr>
+					<td>
+						<div class="field-name">
+							<fmt:message key="label.authoring.basic.title"></fmt:message>
+						</div>
+						<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<div class="field-name">
+							<fmt:message key="label.wiki.body"></fmt:message>
+						</div>
+						
+						<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
+							contentFolderID="${contentFolderID}" toolbarSet="Custom-Wiki">
+						</lams:FCKEditor>
+					</td>
+				</tr>
+				<tr>
+					<td align="right">
+						<br />
+						<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a> 
+						<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
+					</td>
+				</tr>
+			</table>
 		</div>
-		-->
-</html:form> <c:if test="${mode == 'learner' || mode == 'author'}">
-	<%@ include file="parts/finishButton.jsp"%>
-</c:if></div>
+	
+		<br />
+		<hr />
+		<br />
+	
+	
+		<div class="field-name">
+			<fmt:message key="label.wiki.pages"></fmt:message>
+		</div>
 
+		<img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
+			onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
+		&nbsp;
+		<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">${mainWikiPage.title}</a>
+		<div id="wikiList" style="display:none;">
+			<c:forEach var="wikiPage" items="${wikiPages}">
+				<c:if test="${wikiPage.title != mainWikiPage.title}">
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">${wikiPage.title}</a>
+					<br />
+				</c:if> 
+			</c:forEach>
+		</div>
+	</html:form> 
+
+	<c:if test="${mode == 'learner' || mode == 'author'}">
+		<%@ include file="parts/finishButton.jsp"%>
+	</c:if>
+
+</div>
+
 <script type="text/javascript">
 <!--
 	var wikiLinkArray = new Array();
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	15 Oct 2008 23:20:26 -0000	1.7
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	17 Oct 2008 01:58:37 -0000	1.8
@@ -1,234 +1,292 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<html:form action="/monitoring" styleId="monitoringForm" method="post" enctype="multipart/form-data">
 
-
-
-
-<html:form action="/monitoring" styleId="monitoringForm" method="post"
-	enctype="multipart/form-data">
-
-	<c:set var="formBean"
-		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<html:hidden property="dispatch" styleId="dispatch" />
 	<html:hidden property="toolSessionID" />
 	<!--<html:hidden property="mode"/>-->
-	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}"
-		styleId="currentWikiPage" />
+	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
 	<input type="hidden" id="wikiLinks" />
 	<html:hidden property="newPageName" styleId="newPageName" />
-	<html:hidden property="historyPageContentId"
-		styleId="historyPageContentId" />
+	<html:hidden property="historyPageContentId" styleId="historyPageContentId" />
 
-	<div id="wikimenu">
-	<h4>${sessionDTO.sessionName}</h4>
-	<br />
-	<div id="breadcrumb" style="float: left; width: 30%;"><c:if
-		test="${currentWikiPage.title != mainWikiPage.title}">
-		<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">/${mainWikiPage.title}</a>
-	</c:if> <a
-		href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">/${currentWikiPage.title}</a>
-	</div>
+	<div id="wikimenu" style="margin-right:75px;">
+		<h4>
+			${sessionDTO.sessionName}
+		</h4>
+		<br />
+		<div id="breadcrumb" style="float: left; width: 30%;">
+			<c:if test="${currentWikiPage.title != mainWikiPage.title}">
+				<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">${mainWikiPage.title}</a> :
+			</c:if> 
+			<a href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">${currentWikiPage.title}</a>
+		</div>
 
-	<div id="buttons" style="float: right; width: 70%;"><a
-		href="javascript:changeDiv('view');" class="button"><fmt:message
-		key="label.wiki.view"></fmt:message></a> <a
-		href="javascript:changeDiv('edit');" class="button"><fmt:message
-		key="label.wiki.edit"></fmt:message></a> <a
-		href="javascript:cancelAdd();changeDiv('add');" class="button"><fmt:message
-		key="label.wiki.add"></fmt:message></a> <a
-		href="javascript:changeDiv('history');" class="button"><fmt:message
-		key="label.wiki.history"></fmt:message></a> <c:if
-		test="${currentWikiPage.title != mainWikiPage.title}">
-		<a
-			href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
-			class="button"><fmt:message key="label.wiki.remove"></fmt:message></a>
-	</c:if></div>
+		<div id="buttons" style="float: right; width: 70%; text-align:right;">
+			<a href="javascript:changeDiv('view');" title='<fmt:message key="label.wiki.view.toolTip"></fmt:message>'>
+				<fmt:message key="label.wiki.view"></fmt:message>
+			</a> 
+			&nbsp;
+			<a href="javascript:changeDiv('edit');" title='<fmt:message key="label.wiki.edit.toolTip"></fmt:message>'>
+				<fmt:message key="label.wiki.edit"></fmt:message>
+			</a> 
+			&nbsp;
+			<a href="javascript:cancelAdd();changeDiv('add');" title='<fmt:message key="label.wiki.add.toolTip"></fmt:message>'>
+				<fmt:message key="label.wiki.add"></fmt:message>
+			</a> 
+			&nbsp;
+			<a href="javascript:changeDiv('history');" title='<fmt:message key="label.wiki.history.toolTip"></fmt:message>' >
+				<fmt:message key="label.wiki.history"></fmt:message>
+			</a> 
+			<c:if test="${currentWikiPage.title != mainWikiPage.title}">
+				&nbsp;
+				<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
+					title='<fmt:message key="label.wiki.remove.toolTip"></fmt:message>'
+				>
+					<fmt:message key="label.wiki.remove"></fmt:message>
+				</a>
+			</c:if>
+		</div>
 	</div>
 
 	<br />
 	<br />
 	<hr />
 	<br />
 
-
-	<div id="view">
-	<h1>${currentWikiPage.title}</h1>
-	<br />
-	<i> <fmt:message key="label.wiki.last.edit">
-		<fmt:param>
-			<c:choose>
-				<c:when
-					test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-					<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-				</c:when>
-				<c:otherwise>
+	<div id="view" style="margin-right:75px;">
+		<h1>
+			${currentWikiPage.title}
+		</h1>
+		
+		<br />
+		
+		<i> 
+			<fmt:message key="label.wiki.last.edit">
+				<fmt:param>
+					<c:choose>
+						<c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+							<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+						</c:when>
+						<c:otherwise>
 							${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
 						</c:otherwise>
-			</c:choose>
-		</fmt:param>
-		<fmt:param>
-			<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
-		</fmt:param>
-	</fmt:message> </i> <br />
-	<br />
-	<div id="viewBody">${currentWikiPage.currentWikiContentDTO.body}
+					</c:choose>
+				</fmt:param>
+				<fmt:param>
+					<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
+				</fmt:param>
+			</fmt:message> 
+		</i> 
+		
+		<br />
+		<br />
+		
+		<div id="viewBody">${currentWikiPage.currentWikiContentDTO.body}
+		</div>
 	</div>
-	</div>
 
 	<div id="history" style="display: none;">
 
-	<h1><fmt:message key="label.wiki.history" /> -
-	${currentWikiPage.title}</h1>
-	<br />
-	<c:choose>
-		<c:when test="${not empty wikiPageContentHistory}">
-			<table class="alternative-color">
-				<tr>
-					<th><fmt:message key="label.wiki.history.version"></fmt:message>
-					</th>
-					<th><fmt:message key="label.wiki.history.date"></fmt:message>
-					</th>
-					<th><fmt:message key="label.wiki.history.editor"></fmt:message>
-					</th>
-					<th><fmt:message key="label.wiki.history.actions"></fmt:message>
-					</th>
-				</tr>
-				<c:forEach var="wikiContentPageVersion"
-					items="${wikiPageContentHistory}">
-					<c:if
-						test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
-						<tr>
-							<td>${wikiContentPageVersion.version}</td>
-							<td><lams:Date value="${wikiContentPageVersion.editDate}" />
-							</td>
-							<td><c:choose>
-								<c:when test="${wikiContentPageVersion.editorDTO != null}">
-									${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
-								</c:when>
-								<c:otherwise>
-									<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-								</c:otherwise>
-							</c:choose></td>
-							<td><a
-								href="javascript:doRevert('${wikiContentPageVersion.uid}');"
-								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.revert" /> </a> &nbsp;
-							<a
-								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');"
-								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.compare" /> </a> &nbsp;
-							<a
-								href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');"
-								title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
-							<fmt:message key="label.wiki.history.actions.view" /> </a></td>
-						</tr>
-					</c:if>
-				</c:forEach>
-			</table>
-		</c:when>
-		<c:otherwise>
-			<fmt:message key="label.wiki.history.empty" />
-		</c:otherwise>
-	</c:choose></div>
+		<h1>
+			<fmt:message key="label.wiki.history" /> - ${currentWikiPage.title}
+		</h1>
+		
+		<br />
+		
+		<c:choose>
+			<c:when test="${not empty wikiPageContentHistory}">
+				<table class="alternative-color">
+					<tr>
+						<th>
+							<fmt:message key="label.wiki.history.version"></fmt:message>
+						</th>
+						<th>
+							<fmt:message key="label.wiki.history.date"></fmt:message>
+						</th>
+						<th>
+							<fmt:message key="label.wiki.history.editor"></fmt:message>
+						</th>
+						<th>
+							<fmt:message key="label.wiki.history.actions"></fmt:message>
+						</th>
+					</tr>
+					
+					<c:forEach var="wikiContentPageVersion" items="${wikiPageContentHistory}">
+						<c:if test="${wikiContentPageVersion.version != currentWikiPage.currentWikiContentDTO.version}">
+							<tr>
+								<td>
+									${wikiContentPageVersion.version}
+								</td>
+								<td>
+									<lams:Date value="${wikiContentPageVersion.editDate}" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${wikiContentPageVersion.editorDTO != null}">
+											${wikiContentPageVersion.editorDTO.firstName} ${wikiContentPageVersion.editorDTO.firstName}
+										</c:when>
+										<c:otherwise>
+											<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td>
+									<a href="javascript:doRevert('${wikiContentPageVersion.uid}');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+										<fmt:message key="label.wiki.history.actions.revert" /> 
+									</a> 
+									&nbsp;
+									
+									<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'comparePage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+										<fmt:message key="label.wiki.history.actions.compare" />
+									</a> 
+									&nbsp;
+									
+									<a href="javascript:doCompareOrView('<lams:WebAppURL/>', '${wikiContentPageVersion.uid}', '${currentWikiPage.uid}', 'viewPage');" title='<fmt:message key="label.wiki.history.actions.compare.tooltip" />'>
+										<fmt:message key="label.wiki.history.actions.view" /> 
+									</a>
+								</td>
+							</tr>
+						</c:if>
+					</c:forEach>
+				</table>
+			</c:when>
+			<c:otherwise>
+				<fmt:message key="label.wiki.history.empty" />
+			</c:otherwise>
+		</c:choose>
+	</div>
 
 	<div id="edit" style="display: none;">
-	<h1><fmt:message key="label.wiki.edit"></fmt:message> -
-	${currentWikiPage.title}</h1>
-	<table cellpadding="0">
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message
-				key="label.authoring.basic.title"></fmt:message></div>
-			<html:text property="title" styleId="title" style="width: 99%;"
-				value="${currentWikiPage.title}"></html:text></td>
-		</tr>
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
-			</div>
-			<lams:FCKEditor id="wikiBody"
-				value="${currentWikiPage.currentWikiContentDTO.body}"
-				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"
-				height="400px">
-			</lams:FCKEditor></td>
-		</tr>
-		<tr>
-			<td><html:checkbox property="isEditable" value="1"
-				styleClass="noBorder" styleId="isEditable"></html:checkbox>&nbsp;<fmt:message
-				key="label.authoring.basic.wikipagevisible"></fmt:message></td>
-		</tr>
-		<tr>
-			<td align="right"><a href="javascript:doEditOrAdd('editPage');"
-				class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-			<a href="javascript:changeDiv('view');" class="button"><fmt:message
-				key="button.cancel"></fmt:message></a></td>
-		</tr>
-	</table>
+		
+		<h1>
+			<fmt:message key="label.wiki.edit"></fmt:message> - ${currentWikiPage.title}
+		</h1>
+		
+		<table cellpadding="0">
+			<tr>
+				<td>
+					<div class="field-name">
+						<fmt:message key="label.authoring.basic.title"></fmt:message>
+					</div>
+					<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<div class="field-name">
+						<fmt:message key="label.wiki.body"></fmt:message>
+					</div>
+					<lams:FCKEditor id="wikiBody"
+						value="${currentWikiPage.currentWikiContentDTO.body}"
+						contentFolderID="${contentFolderID}" toolbarSet="Custom-Wiki"
+						height="400px">
+					</lams:FCKEditor>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<html:checkbox property="isEditable" value="1" styleClass="noBorder" styleId="isEditable"></html:checkbox>
+					&nbsp;
+					<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
+				</td>
+			</tr>
+			<tr>
+				<td align="right">
+					<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+					<a href="javascript:changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
+				</td>
+			</tr>
+		</table>
 	</div>
 
 	<div id="add" style="display: none;">
 
-	<h1><fmt:message key="label.wiki.add"></fmt:message></h1>
-	<table cellpadding="0">
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message
-				key="label.authoring.basic.title"></fmt:message></div>
-			<html:text property="newPageTitle" styleId="newPageTitle"
-				style="width: 99%;" value=""></html:text></td>
-		</tr>
-		<tr>
-			<td>
-			<div class="field-name"><fmt:message key="label.wiki.body"></fmt:message>
-			</div>
-			<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
-				contentFolderID="${contentFolderID}" toolbarSet="Custom-Learner"></lams:FCKEditor></td>
-		</tr>
-		<tr>
-			<td><html:checkbox property="newPageIsEditable"
-				styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>&nbsp;<fmt:message
-				key="label.authoring.basic.wikipagevisible"></fmt:message></td>
-		</tr>
-		<tr>
-			<td align="right"><a href="javascript:doEditOrAdd('addPage');"
-				class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-			<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message
-				key="button.cancel"></fmt:message></a></td>
-		</tr>
-	</table>
+		<h1>
+			<fmt:message key="label.wiki.add"></fmt:message>
+		</h1>
+		
+		<table cellpadding="0">
+			<tr>
+				<td>
+					<div class="field-name">
+						<fmt:message key="label.authoring.basic.title"></fmt:message>
+					</div>
+					<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<div class="field-name">
+						<fmt:message key="label.wiki.body"></fmt:message>
+					</div>
+					<lams:FCKEditor id="newPageWikiBody" value="" height="400px"
+						contentFolderID="${contentFolderID}" toolbarSet="Custom-Wiki">
+					</lams:FCKEditor>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<html:checkbox property="newPageIsEditable" styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>
+					&nbsp;
+					<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
+				</td>
+			</tr>
+			<tr>
+				<td align="right">
+					<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+					<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
+				</td>
+			</tr>
+		</table>
 	</div>
 
 	<br />
 	<hr />
 	<br />
 
-	<div class="field-name"><fmt:message key="label.wiki.pages"></fmt:message>
+	<div class="field-name">
+		<fmt:message key="label.wiki.pages"></fmt:message>
 	</div>
-	<c:forEach var="wikiPage" items="${wikiPages}">
-		<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">
-		${wikiPage.title} <c:if test="${wikiPage.title == mainWikiPage.title}">
-			<fmt:message key="label.wiki.main"></fmt:message>
-		</c:if> </a>
-		<br />
-	</c:forEach>
+	
+	<img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
+		onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
+	&nbsp;
+	<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">${mainWikiPage.title}</a>
+	<div id="wikiList" style="display:none;">
+		<c:forEach var="wikiPage" items="${wikiPages}">
+			<c:if test="${wikiPage.title != mainWikiPage.title}">
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">${wikiPage.title}</a>
+				<br />
+			</c:if> 
+		</c:forEach>
+	</div>
 
 	<!-- Reflections -->
-	<c:if
-		test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity}">
+	<c:if test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity}">
 
 		<br />
 		<hr />
 		<br />
 
-		<h4><fmt:message key="monitor.notebooks"></fmt:message></h4>
+		<h4>
+			<fmt:message key="monitor.notebooks"></fmt:message>
+		</h4>
+		
 		<br />
+		
 		<table class="alternative-color">
 			<c:forEach var="user" items="${sessionDTO.userDTOs}">
 				<c:if test="${not empty user.notebookEntry}">
 					<tr>
-						<td>${user.firstName} ${user.lastName}</td>
-						<td><lams:out escapeHtml="true" value="${user.notebookEntry}" />
+						<td>
+							${user.firstName} ${user.lastName}
 						</td>
+						<td>
+							<lams:out escapeHtml="true" value="${user.notebookEntry}" />
+						</td>
 					</tr>
 				</c:if>
 			</c:forEach>
Index: lams_tool_wiki/web/pages/wiki/compare.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/wiki/compare.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wiki/web/pages/wiki/compare.jsp	8 Oct 2008 05:33:01 -0000	1.1
+++ lams_tool_wiki/web/pages/wiki/compare.jsp	17 Oct 2008 01:58:37 -0000	1.2
@@ -16,7 +16,7 @@
 		<div id="header">
 		</div>
 		
-		<div id="content">
+		<div id="content" style="margin-right:75px;">
 			<h1>
 				${compareTitle} 
 			</h1>
Index: lams_tool_wiki/web/pages/wiki/viewWiki.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/wiki/viewWiki.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wiki/web/pages/wiki/viewWiki.jsp	8 Oct 2008 05:33:01 -0000	1.1
+++ lams_tool_wiki/web/pages/wiki/viewWiki.jsp	17 Oct 2008 01:58:37 -0000	1.2
@@ -17,7 +17,7 @@
 		<div id="header">
 		</div>
 		
-		<div id="content">
+		<div id="content" style="margin-right:75px;">
 			<h1>
 				${currentWikiPage.title}
 			</h1>