Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd19a95db673b7cf90351de4d567299c5fa86b450 -rfb1e4ed83170cf87f100a0c5b02f86e1b6480b2d
--- lams_learning/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d19a95db673b7cf90351de4d567299c5fa86b450)
+++ lams_learning/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision fb1e4ed83170cf87f100a0c5b02f86e1b6480b2d)
@@ -193,6 +193,9 @@
if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+
+ presenceURL = presenceURL + "&reloadBootstrap=true";
+
$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
if ( status == "error" ) {
alert("Unable to load IM: " + xhr.status);
@@ -281,16 +284,15 @@
-
- <%-- only have sidebar and presence in learner --%>
-
-
-
+ <%-- only have sidebar and presence in learner --%>
+
+
+
Index: lams_learning/web/includes/javascript/presence.js
===================================================================
diff -u -r83811002f3d39ce647ddfe30f9371ad10bd499af -rfb1e4ed83170cf87f100a0c5b02f86e1b6480b2d
--- lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision 83811002f3d39ce647ddfe30f9371ad10bd499af)
+++ lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision fb1e4ed83170cf87f100a0c5b02f86e1b6480b2d)
@@ -21,10 +21,8 @@
}
});
}
-});
-
-
-var roster = {
+
+ roster = {
// association nick -> localId, the latter being just some ID made in this script
users : {},
maxUserLocalId : 0,
@@ -149,6 +147,9 @@
});
};
+});
+
+
/* ******* HTML write Functions ******* */
function createPrivateTabLabel(nick, tag){
Index: lams_learning/web/presenceChat.jsp
===================================================================
diff -u -r88272da28c18de62ade94eafc89f974ef50c3b29 -rfb1e4ed83170cf87f100a0c5b02f86e1b6480b2d
--- lams_learning/web/presenceChat.jsp (.../presenceChat.jsp) (revision 88272da28c18de62ade94eafc89f974ef50c3b29)
+++ lams_learning/web/presenceChat.jsp (.../presenceChat.jsp) (revision fb1e4ed83170cf87f100a0c5b02f86e1b6480b2d)
@@ -16,6 +16,12 @@
<%-- javascript --%>
+
+ <%-- if the page has tabs, we need to reload bootstrap or the tabs won't work --%>
+
+
+
+