Index: lams_learning/web/css/presence.css =================================================================== diff -u -r60779059ff2b1c6e4009963fdfc131164457e82c -r88272da28c18de62ade94eafc89f974ef50c3b29 --- lams_learning/web/css/presence.css (.../presence.css) (revision 60779059ff2b1c6e4009963fdfc131164457e82c) +++ lams_learning/web/css/presence.css (.../presence.css) (revision 88272da28c18de62ade94eafc89f974ef50c3b29) @@ -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 =================================================================== diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -r88272da28c18de62ade94eafc89f974ef50c3b29 --- lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f) +++ lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision 88272da28c18de62ade94eafc89f974ef50c3b29) @@ -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 { Fisheye: Tag 88272da28c18de62ade94eafc89f974ef50c3b29 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 =================================================================== diff -u -r60779059ff2b1c6e4009963fdfc131164457e82c -r88272da28c18de62ade94eafc89f974ef50c3b29 --- lams_learning/web/presenceChat.jsp (.../presenceChat.jsp) (revision 60779059ff2b1c6e4009963fdfc131164457e82c) +++ lams_learning/web/presenceChat.jsp (.../presenceChat.jsp) (revision 88272da28c18de62ade94eafc89f974ef50c3b29) @@ -9,10 +9,12 @@ <%-- css --%> - + + <%-- javascript --%> +