Index: lams_tool_chat/web/chat_client/chat_app.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/chat_client/Attic/chat_app.js,v
diff -u -r1.9 -r1.10
--- lams_tool_chat/web/chat_client/chat_app.js	30 Jun 2006 14:44:12 -0000	1.9
+++ lams_tool_chat/web/chat_client/chat_app.js	3 Jul 2006 08:33:16 -0000	1.10
@@ -1,7 +1,7 @@
 // Constants
 var GROUPCHAT_MSG = "groupchat_message";
 var PRIVATE_MSG = "private_message";
-var colours = ["#0000FF", "#006699", "#0066FF", "#6633FF", "#00CCFF", "#009900", "#00CC33", "#339900", "#008080", "#66FF66", "#CC6600", "#FF6600", "#FF9900", "#CC6633", "#FF9933", "#990000", "#A50021", "#990033", "#CC3300", "#FF6666", "#330033", "#663399", "#6633CC", "#660099", "#FF00FF", "#999900", "#808000", "#FFFF00", "#666633", "#CCFF00", "#292929", "#666666"];
+var colours = ["#0000FF", "#006699", "#0066FF", "#6633FF", "#00CCFF", "#009900", "#00CC33", "#339900", "#008080", "#66FF66", "#CC6600", "#FF6600", "#FF9900", "#CC6633", "#FF9933", "#990000", "#A50021", "#990033", "#CC3300", "#FF6666", "#330033", "#663399", "#6633CC", "#660099", "#FF00FF", "#999900", "#808000", "#FFFF00", "#666633", "#292929", "#666666"];
 
 // Variables
 var roster = new Roster();
@@ -219,7 +219,9 @@
     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 = "";
 }
 function doLogin() {
     try {
@@ -248,6 +250,7 @@
     }
     catch (e) {
         document.getElementById("login_err").innerHTML = e.toString();
+        document.getElementById("finishButton_pane").style.display = "";
     }
     finally {
         return false;
Index: lams_tool_chat/web/chat_client/chat_ui.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/chat_client/Attic/chat_ui.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_chat/web/chat_client/chat_ui.jsp	2 Jul 2006 07:12:17 -0000	1.8
+++ lams_tool_chat/web/chat_client/chat_ui.jsp	3 Jul 2006 08:33:16 -0000	1.9
@@ -36,10 +36,12 @@
 	<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>
-			<p>
-				<fmt:message>message.loading</fmt:message>
-			</p>
 		</div>
 
 		<div id="chat_pane" style="display:none;">
@@ -71,17 +73,17 @@
 					<input id="clearButton" class="button" type="button" onclick="resetInputs();" value='<fmt:message>button.clear</fmt:message>' />
 				</div>
 			</form>
+		</div>
 
-			<div id="finishButton_pane" class="space-bottom" style="display:none;">
-				<form name="finishActivity" action="${tool}learning.do" method="post">
-					<div class="right-buttons">
-						<input type="hidden" name="dispatch" value="finishActivity" />
-						<input type="hidden" name="chatUserUID" value="${USER_UID}" />
-						<input type="hidden" name="toolSessionID" value="${SESSION_ID}" />
-						<input type="submit" class="button" value='<fmt:message>button.finish</fmt:message>' />
-					</div>
-				</form>
-			</div>
+		<div id="finishButton_pane" class="space-bottom" style="display:none;">
+			<form name="finishActivity" action="${tool}learning.do" method="post">
+				<div class="right-buttons">
+					<input type="hidden" name="dispatch" value="finishActivity" />
+					<input type="hidden" name="chatUserUID" value="${USER_UID}" />
+					<input type="hidden" name="toolSessionID" value="${SESSION_ID}" />
+					<input type="submit" class="button" value='<fmt:message>button.finish</fmt:message>' />
+				</div>
+			</form>
 		</div>
 	</div>
 </div>