Index: lams_learning/web/lessonChat.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/lessonChat.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_learning/web/lessonChat.jsp 14 Apr 2010 15:55:25 -0000 1.1.2.1
+++ lams_learning/web/lessonChat.jsp 19 Apr 2010 13:31:16 -0000 1.1.2.2
@@ -36,32 +36,29 @@
-
+
<%
String jabberServer = Configuration.get(ConfigurationKeys.XMPP_DOMAIN);
%>
<%=jabberServer%>
<%@ include file="/includes/presenceChat.jsp" %>
-
-
+
Index: lams_learning/web/includes/presence.js
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/includes/Attic/presence.js,v
diff -u -r1.7.2.3 -r1.7.2.3.4.1
--- lams_learning/web/includes/presence.js 7 May 2009 06:54:35 -0000 1.7.2.3
+++ lams_learning/web/includes/presence.js 19 Apr 2010 13:31:16 -0000 1.7.2.3.4.1
@@ -54,6 +54,12 @@
}
/* ******* Helper Functions ******* */
+
+function setPresenceShown(b) {
+ if(b != null)
+ presenceShown = b;
+}
+
// resizes chat window
function resizeChat(){
// refresh the window height
Index: lams_learning/web/includes/presenceChat.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/includes/Attic/presenceChat.jsp,v
diff -u -r1.2.2.4.2.2 -r1.2.2.4.2.3
--- lams_learning/web/includes/presenceChat.jsp 15 Apr 2010 14:14:38 -0000 1.2.2.4.2.2
+++ lams_learning/web/includes/presenceChat.jsp 19 Apr 2010 13:31:16 -0000 1.2.2.4.2.3
@@ -39,7 +39,11 @@
// make visible
$("#presenceChat").removeClass("startHidden");
-
+
+ $("div#presenceChatRoster ul").click(function() {
+ handlePresenceClick();
+ });
+
// create chat tabs
$("#presenceChatTabs").tabs({ scrollable: true });
@@ -63,6 +67,9 @@
var messageArea = $("#" + tagToMessageArea(tag));
messageArea.attr("scrollTop", messageArea.attr("scrollHeight"));
});
+
+ setPresenceShown("${param.presenceShown}");
+
// create roster tab
@@ -120,8 +127,8 @@
<%-- always pop the roster --%>
-
- -
+
+ -
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.239.4.8.2.3 -r1.239.4.8.2.4
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v
diff -u -r1.207.4.8.2.3 -r1.207.4.8.2.4
Binary files differ
Index: lams_monitoring/web/monitorLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/monitorLesson.jsp,v
diff -u -r1.25 -r1.25.10.1
--- lams_monitoring/web/monitorLesson.jsp 31 Jan 2008 04:38:56 -0000 1.25
+++ lams_monitoring/web/monitorLesson.jsp 19 Apr 2010 13:31:44 -0000 1.25.10.1
@@ -114,7 +114,7 @@
}
}
if(found == false) {
- pWins.push(window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars=yes,status="+status+",menubar="+menubar+", toolbar="+toolbar));
+ pWins.push(window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars="+scrollbar+",status="+status+",menubar="+menubar+", toolbar="+toolbar));
}
}