Index: lams_central/web/authoring/template/tbl/tbl.jsp =================================================================== diff -u -r05c00f92856ef13cd90d6fce06acb069418c2512 -rb25b77e1cfc057bfef11ca865fbe9e72c085b0dc --- lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision 05c00f92856ef13cd90d6fce06acb069418c2512) +++ lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision b25b77e1cfc057bfef11ca865fbe9e72c085b0dc) @@ -174,16 +174,10 @@ // extract the ID var qbQuestionUid = +$("#itemArea").text(); if (qbQuestionAddAppexNumber) { - createAssessment('importQbAe', 'numAssessments' + qbQuestionAddAppexNumber, 'divass' + qbQuestionAddAppexNumber, qbQuestionUid); - $('#question-bank-ae-div-' + qbQuestionAddAppexNumber).slideUp(function(){ - $('.panel-collapse', this).empty(); - }); + createAssessment('importQbAe', 'numAssessments' + qbQuestionAddAppexNumber, 'divass' + qbQuestionAddAppexNumber, qbQuestionUid, true); } else { // fetch HTML with filled data from QB question - createQuestion('numQuestions', 'divq', 'divquestions', 'importQbIra', '&qbQuestionUid=' + qbQuestionUid); - $('#question-bank-ira-div').slideUp(function(){ - $('.panel-collapse', this).empty(); - }); + createQuestion('numQuestions', 'divq', 'divquestions', 'importQbIra', '&qbQuestionUid=' + qbQuestionUid, true); } }; Index: lams_central/web/passwordChangeContent.jsp =================================================================== diff -u -r05c00f92856ef13cd90d6fce06acb069418c2512 -rb25b77e1cfc057bfef11ca865fbe9e72c085b0dc --- lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision 05c00f92856ef13cd90d6fce06acb069418c2512) +++ lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision b25b77e1cfc057bfef11ca865fbe9e72c085b0dc) @@ -86,7 +86,7 @@ - + @@ -102,7 +102,7 @@
- " name="oldPassword" id="oldPassword"/> + " name="oldPassword" id="oldPassword" autocomplete="current-password"/>
@@ -135,12 +135,12 @@
-
-
Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r05c00f92856ef13cd90d6fce06acb069418c2512 -rb25b77e1cfc057bfef11ca865fbe9e72c085b0dc --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 05c00f92856ef13cd90d6fce06acb069418c2512) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision b25b77e1cfc057bfef11ca865fbe9e72c085b0dc) @@ -2463,8 +2463,9 @@ * Formats learner name. */ function getLearnerDisplayName(learner, raw) { - return raw ? learner.lastName + ', ' + learner.firstName + ' (' + learner.login + ')' - : escapeHtml(learner.lastName) + ', ' + escapeHtml(learner.firstName) + ' (' + escapeHtml(learner.login) + ')'; + return raw ? learner.lastName + ', ' + learner.firstName + ' (' + learner.login + ')' + (learner.group ? ' - ' + learner.group : '') + : escapeHtml(learner.lastName) + ', ' + escapeHtml(learner.firstName) + ' (' + escapeHtml(learner.login) + ')' + + (learner.group ? ' - ' + escapeHtml(learner.group) : ''); }