Fisheye: Tag 1.5.2.2 refers to a dead (removed) revision in file `lams_learning/web/lessonChat.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/presenceChat.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/presenceChat.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_learning/web/presenceChat.jsp	23 Aug 2016 11:12:04 -0000	1.5.2.3
+++ lams_learning/web/presenceChat.jsp	5 Nov 2016 15:07:13 -0000	1.5.2.4
@@ -9,10 +9,12 @@
 <lams:head>
 	
 	<%-- css --%>
-	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css">
+	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap.min.css" />
 	<link type="text/css" rel="stylesheet" href="<lams:WebAppURL />css/presence.css" />
 
 	<%-- javascript --%>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript">
 		var LAMS_URL = "<lams:LAMSURL/>",
@@ -64,7 +66,7 @@
 		
 		<%-- always pop the roster --%>
 		<div id="presenceChatRoster" class="ui-corner-all">
-			<div id="presenceUserCount" onclick="javascript:handlePresenceClick()"></div>
+			<div id="presenceUserCount" class="ui-corner-all" onclick="javascript:handlePresenceClick()"></div>
 			<div id="presenceUserListings"></div>
 		</div>
 	</div>
Index: lams_learning/web/css/presence.css
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/css/presence.css,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_learning/web/css/presence.css	23 Aug 2016 11:12:04 -0000	1.2.2.3
+++ lams_learning/web/css/presence.css	5 Nov 2016 15:07:13 -0000	1.2.2.4
@@ -3,10 +3,10 @@
 }
 
 #presenceChat {
-	position: absolute;
+	position: fixed;
 	width: 640px;
 	height: 300px;
-	right: 18px;
+	right: 5px;
 	z-index: 10;
 }
 
@@ -17,13 +17,11 @@
 	width: 73%;
 	height: 260px;
 	font-size: 14px !important;
+	border: 1px solid #aaaaaa;
 }
 
-#presenceChatTabs ul a {
-	color: #337ab7;
-}
-
 #presenceChatTabs li a {
+	color: black;
 	border-bottom: none;
 }
 
@@ -34,8 +32,8 @@
 
 #presenceChatRoster {
 	position: absolute;
-	right: 0pt;
-	bottom: 0pt;
+	right: 0;
+	bottom: 0;
 	width: 25%;
 	height: 100%;
 	background-color: #FFFFFF;
@@ -45,15 +43,14 @@
 #presenceUserCount {
 	text-align: center;
 	cursor: pointer;
-	color: #337ab7;
     background-color: #f5f5f5;
   	border-color: #ddd !important;
     border-bottom: 1px solid transparent;
 }
 
 #presenceUserListings{
 	padding: 5px;
-	height: 255px;
+	height: 275px;
 	overflow-x: hidden;
 	overflow-y: scroll;
 }
@@ -84,7 +81,7 @@
 
 .messageArea {
 	width: 100%;
-	height: 195px;
+	height: 170px;
 	overflow-x: hidden;
 	overflow-y: scroll;
 }
Index: lams_learning/web/includes/javascript/presence.js
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/includes/javascript/presence.js,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_learning/web/includes/javascript/presence.js	28 Jul 2016 03:45:39 -0000	1.4.2.2
+++ lams_learning/web/includes/javascript/presence.js	5 Nov 2016 15:07:13 -0000	1.4.2.3
@@ -1,7 +1,7 @@
 $(document).ready(function (){
 	presenceChat = $("#presenceChat");
 	rosterDiv = $("#presenceUserListings");
-	$( window ).resize(function() {
+	$(window).resize(function() {
 		resizeChat();
 	});
 
@@ -24,8 +24,7 @@
 });
 
 
-var windowHeight = null,
-	roster = {
+var roster = {
 		// association nick -> localId, the latter being just some ID made in this script
 		users : {},
 		maxUserLocalId : 0,
@@ -177,24 +176,20 @@
 }
 
 function resizeChat() {
-	
-	// refresh the window height
-	windowHeight = $(window).height() - 30;
+	var windowHeight = $(window).height();
 
 	// if presence is shown
 	if (presenceShown) {
 		// set presence chat to maximized height
 		presenceChat.css({
-			'top' : windowHeight - 300 + "px",
-			'position' : 'absolute'
+			'top' : windowHeight - 300 + "px"
 		});
 	}
 	// otherwise
 	else {
 		// set presence chat to minimized height
 		presenceChat.css({
-			'top' : windowHeight + "px",
-			'position' : 'fixed'
+			'top' : windowHeight - 23 + "px"
 		});
 	}
 }	
@@ -291,9 +286,10 @@
 }
 
 function handlePresenceClick() {
+	var windowHeight = $(window).height();
 	if (presenceShown) {
 		presenceChat.animate({
-			top : windowHeight + "px"
+			top : windowHeight - 23 + "px"
 		}, 1000);
 		presenceShown = false;
 	} else {
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.33 -r1.27.2.34
--- lams_monitoring/web/monitor.jsp	3 Nov 2016 23:34:24 -0000	1.27.2.33
+++ lams_monitoring/web/monitor.jsp	5 Nov 2016 15:07:13 -0000	1.27.2.34
@@ -311,26 +311,34 @@
 								</dd>
 		
 								<!-- IM & Presence -->
-								<dt>Instant messaging:</dt>
+								<dt><fmt:message key="lesson.im"/>:</dt>
 								<dd>
 									<div class="btn-group btn-group-xs" role="group">
 										<button id="presenceButton" class="btn btn-default roffset10
 											<c:if test="${lesson.learnerPresenceAvailable}">
 												btn-success
 											</c:if>
-											"><i class="fa fa-sm fa-wifi"></i> <span class="hidden-xs">Presence</span> 
+											"><i class="fa fa-sm fa-wifi"></i>
+											<span class="hidden-xs"><fmt:message key="lesson.presence"/></span> 
 											<span id="presenceCounter" class="badge">0</span>
 										</button>
 	
-										<button id="imButton" class="btn btn-default
+										<button id="imButton" class="btn btn-default roffset10
 											<c:if test="${lesson.learnerImAvailable}">
 												btn-success
 											</c:if>
 											"
 											<c:if test="${not lesson.learnerPresenceAvailable}">
 												style="display: none"
 											</c:if>
-										><i class="fa fa-sm fa-comments-o"></i> <span class="hidden-xs">Instant messaging</span></button>
+										><i class="fa fa-sm fa-comments-o"></i>
+										 <span class="hidden-xs"><fmt:message key="lesson.im"/></span>
+										</button>
+										<button id="openImButton" class="btn btn-default">
+											<i class="fa fa-sm fa-comments"></i>
+											<span class="hidden-xs"><fmt:message key="button.open.im"/></span> 
+										</button>
+	
 									</div>
 								</dd>
 							</dl>	
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.44.2.45 -r1.44.2.46
--- lams_monitoring/web/includes/javascript/monitorLesson.js	4 Nov 2016 14:46:29 -0000	1.44.2.45
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	5 Nov 2016 15:07:13 -0000	1.44.2.46
@@ -89,6 +89,8 @@
 		});
 	});
 	
+	$('#openImButton').click(openChatWindow);
+	
 	// sets up calendar for schedule date choice
 	$('#scheduleDatetimeField').datetimepicker({
 		'minDate' : 0
@@ -375,7 +377,7 @@
 
 function openChatWindow(){
 	// variables are set in JSP page
-	window.open(LAMS_URL + 'learning/lessonChat.jsp?lessonID=' + lessonId 
+	window.open(LAMS_URL + 'learning/presenceChat.jsp?lessonID=' + lessonId 
 			+ '&presenceEnabledPatch=true&presenceImEnabled=true&presenceShown=true&createDateTime='
 			+ createDateTimeStr
 			,'Chat'