Index: lams_tool_chat/web/pages/learning/chat_app.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/Attic/chat_app.js,v
diff -u -r1.6 -r1.7
--- lams_tool_chat/web/pages/learning/chat_app.js	11 Aug 2006 07:12:55 -0000	1.6
+++ lams_tool_chat/web/pages/learning/chat_app.js	15 Aug 2006 06:07:13 -0000	1.7
@@ -220,25 +220,20 @@
 	roster.updateDisplay();
 }
 function handleConnected() {
-	document.getElementById("login_pane").style.display = "none";
-	document.getElementById("chat_pane").style.display = "";
 	if (MODE == "learner") {
 		if (LEARNER_FINISHED == "true") {
-			document.getElementById("notebookEntry_pane").style.display = "";
+			//document.getElementById("notebookEntry_pane").style.display = "";
 			if (LOCK_ON_FINISHED == "true") {
     			// disable sending messages.
 				document.getElementById("msgArea").disabled = "disabled";
 				document.getElementById("sendButton").disabled = "disabled";
-				document.getElementById("clearButton").disabled = "disabled";
 			}
-		} else {
-			document.getElementById("finishButton_pane").style.display = "";
 		}
 	}
-	if (MODE == "author") {
-		document.getElementById("finishButton_pane").style.display = "";
-	}
-
+	
+	// clear the response window.
+	document.getElementById("iResp").innerHTML = "";
+	
 	// send presence
 	var aPresence = new JSJaCPresence();
 	aPresence.setTo(CONFERENCEROOM + "/" + NICK);
@@ -253,9 +248,10 @@
 	roster = new Roster();
 }
 function handleError(e) {
-	document.getElementById("loading_message").style.display = "none";
-	document.getElementById("login_err").innerHTML = "Couldn't connect. Please try again...<br />" + htmlEnc("Code: " + e.getAttribute("code") + "\nType: " + e.getAttribute("type") + "\nCondition: " + e.firstChild.nodeName);
-	document.getElementById("finishButton_pane").style.display = "";
+	document.getElementById("msgArea").disabled = "disabled";
+	document.getElementById("sendButton").disabled = "disabled";
+	document.getElementById("iResp").innerHTML = "Couldn't connect. Please try again...<br />" + htmlEnc("Code: " + e.getAttribute("code") + "\nType: " + e.getAttribute("type") + "\nCondition: " + e.firstChild.nodeName);
+	document.getElementById("roster").innerHTML = "";
 }
 /* ******* Init ******* */
 function doLogin() {
@@ -278,8 +274,7 @@
 		con.connect(oArgs);
 	}
 	catch (e) {
-		document.getElementById("login_err").innerHTML = e.toString();
-		document.getElementById("finishButton_pane").style.display = "";
+		document.getElementById("iResp").innerHTML = e.toString();
 	}
 	finally {
 		return false;
@@ -316,4 +311,3 @@
 		return true;
 	}
 }
-
Index: lams_tool_chat/web/pages/learning/chat_style.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/Attic/chat_style.css,v
diff -u -r1.3 -r1.4
--- lams_tool_chat/web/pages/learning/chat_style.css	11 Aug 2006 07:12:55 -0000	1.3
+++ lams_tool_chat/web/pages/learning/chat_style.css	15 Aug 2006 06:07:13 -0000	1.4
@@ -1,7 +1,6 @@
 #chat_content {
 	width: 560px;
 	padding: 12px;
-
 	/* compensate for content image border */
 	margin-left: 4px;
 }
@@ -15,7 +14,8 @@
 	margin-right: 12px;
 	margin-left: 12px;
 	overflow: scroll;
-	border: thin solid gray;
+	border-width: 1px;
+	border-style: solid;
 	padding: 2px;
 }
 
@@ -24,12 +24,14 @@
 	width: 105px;
 	height: 260px;
 	overflow: hidden;
-	border: thin solid gray;
+	border-width: 1px;
+	border-style: solid;
 	font-weight: bold;
+	padding: 2px;
 }
 
 .message {
-	padding-bottom: 4px;	
+	padding-bottom: 4px;
 }
 
 .private_message {
@@ -42,7 +44,7 @@
 }
 
 .selected {
-	background-color: lime;	
+	background-color: lime;
 	padding: 2px;
 	cursor: pointer;
 }
@@ -54,7 +56,5 @@
 }
 
 #msgArea {
-	margin-left: 12px;
-	margin-right: 12px;
-	width: 427px;
+	width: 410px;
 }
\ No newline at end of file
Index: lams_tool_chat/web/pages/learning/chat_ui.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/Attic/chat_ui.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_chat/web/pages/learning/chat_ui.jsp	11 Aug 2006 07:12:55 -0000	1.5
+++ lams_tool_chat/web/pages/learning/chat_ui.jsp	15 Aug 2006 06:07:13 -0000	1.6
@@ -40,76 +40,72 @@
 <div id="header-no-tabs-learner"></div>
 <div id="content-learner">
 	<div id="chat_content">
-
-		<div id="login_pane">
-			<div id="loading_message">
-				<p>
-					<fmt:message>message.loading</fmt:message>
-				</p>
-			</div>
-			<div id="login_err"></div>
-		</div>
-
-		<div>
-			<div id="chat_pane" style="display:none;">
-				<form name="sendForm" action="" onSubmit="return sendMsg(this);">
+		<div id="chat_pane">
+			<form name="sendForm" action="" onSubmit="return sendMsg(this);">
+				<div>
 					<p>
 						<c:out value="${chatDTO.instructions}" escapeXml="false" />
 					</p>
 
 					<div id="roster"></div>
-					<div id="iResp"></div>
+					<div id="iResp">
+						<fmt:message>message.loading</fmt:message>
+					</div>
 
-					<h4>
+					<br />
+
+					<h4 style="margin-left: 12px;">
 						<fmt:message>label.sendMessageTo</fmt:message>
 						<span id="sendToEveryone"><fmt:message>label.everyone</fmt:message>
 						</span><span id="sendToUser" style="display: none"></span>
 					</h4>
 
 
-					<div>
-						<div class="right-buttons">
-							<input id="sendButton" class="button" type="submit"
-								value='<fmt:message>button.send</fmt:message>' />
-						</div>
+					<div style="margin-left: 12px;">
 						<textarea name="msg" onKeyPress="return checkEnter(event);"
-							id="msgArea" rows="2" cols="60"></textarea>
+							id="msgArea" rows="2" cols="20"></textarea>
+							
+						<input id="sendButton" class="button" type="submit"
+							value='<fmt:message>button.send</fmt:message>' />
 					</div>
-				</form>
-			</div>
+				</div>
+			</form>
 
-			<div id="finishButton_pane" class="space-bottom"
-				style="display:none;">
-				<c:set var="dispatch" value="finishActivity" />
-				<c:set var="buttonLabel" value="button.finish" />
-				<c:if test="${chatDTO.reflectOnActivity}">
-					<c:set var="dispatch" value="openNotebook" />
-					<c:set var="buttonLabel" value="button.reflect" />
-				</c:if>
+			<br/>
+			<c:if test="${MODE == 'learner' || MODE == 'author'}">
+				<c:choose>
+					<c:when test="${!chatUserDTO.finishedActivity}">
+							<html:form action="/learning" method="post">
+								<c:set var="dispatch" value="finishActivity" />
+								<c:set var="buttonLabel" value="button.finish" />
+								<c:if test="${chatDTO.reflectOnActivity}">
+									<c:set var="dispatch" value="openNotebook" />
+									<c:set var="buttonLabel" value="button.reflect" />
+								</c:if>
+								<html:hidden property="dispatch" value="${dispatch}" />
+								<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
+								<html:submit styleClass="button right-buttons">
+									<fmt:message>${buttonLabel}</fmt:message>
+								</html:submit>
+							</html:form>
+							<br/>
+					</c:when>
 
-				<html:form action="/learning" method="post">
-					<div class="right-buttons">
-						<html:hidden property="dispatch" value="${dispatch}" />
-						<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
-						<html:submit styleClass="button space-bottom">
-							<fmt:message>${buttonLabel}</fmt:message>
-						</html:submit>
-					</div>
-				</html:form>
-			</div>
+					<c:otherwise>
+						<c:if test="${chatDTO.reflectOnActivity }">
+							<div>
+								<h4 style="margin-left: 12px;">
+									${chatDTO.reflectInstructions}
+								</h4>
+								<p>
+									${chatUserDTO.notebookEntry}
+								</p>
+							</div>
+						</c:if>
+					</c:otherwise>
+				</c:choose>
+			</c:if>
 		</div>
-
-		<div style="height: 65px"></div>
-
-		<div id="notebookEntry_pane" style="width: 100%; display: none;">
-			<h4>
-				${chatDTO.reflectInstructions}
-			</h4>
-			<p>
-				${chatUserDTO.notebookEntry}
-			</p>
-		</div>
-
 	</div>
 </div>
 <div id="footer-learner"></div>