- - - - Index: lams_central/web/css/addLesson.css =================================================================== diff -u -r56a78648ef24c607f16cb249439a2d624f6b8f12 -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_central/web/css/addLesson.css (.../addLesson.css) (revision 56a78648ef24c607f16cb249439a2d624f6b8f12) +++ lams_central/web/css/addLesson.css (.../addLesson.css) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -21,18 +21,6 @@ border-bottom: none; } -a#closeButton { - position: absolute; - right: 10px; - top: 11px; - width: 19px; - height: 18px; -} - -a#closeButton span { - background-color: #D0E5F5; -} - a#addButton { position: absolute; right: 60px; Index: lams_central/web/css/index.css =================================================================== diff -u -r365d015a0a78d8a4cceed841e5c5f660369887ad -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_central/web/css/index.css (.../index.css) (revision 365d015a0a78d8a4cceed841e5c5f660369887ad) +++ lams_central/web/css/index.css (.../index.css) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -28,7 +28,7 @@ .dialogContainer iframe { width: 100%; - height: 99.5%; + height: 99.4%; border: none; } @@ -117,7 +117,21 @@ padding: 3px; } -td#actionAccord { - width: 15%; - padding-top: 1px; +/* Style for Monitoring and Add Lesson dialogs. + Put the transparent dialog's titlebar over the tab bar. */ +body > .tabbedDialog .ui-dialog-titlebar { + background : transparent; + border : none; + z-index : 200; + position : absolute; + right : 40px; + top : 10px; +} + +.tabbedDialog .ui-dialog-title { + margin-right: 70px; +} + +body > .addLessonDialog .ui-dialog-titlebar { + right : 10px; } \ No newline at end of file Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== diff -u -r23d1ca610a1da0f865b7d3683bce41f8dd72d82d -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 23d1ca610a1da0f865b7d3683bce41f8dd72d82d) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -1169,7 +1169,6 @@ showDialog("dialogActivity" + activity.toolContentID, { 'height' : 800, 'width' : 1024, - 'resizable' : true, 'title' : activity.title + ' ' + LABELS.ACTIVITY_DIALOG_TITLE_SUFFIX, 'beforeClose' : function(event){ // ask the user if he really wants to exit before saving his work Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r23d1ca610a1da0f865b7d3683bce41f8dd72d82d -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 23d1ca610a1da0f865b7d3683bce41f8dd72d82d) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -578,7 +578,6 @@ }, 'resizable' : false, 'width' : 1240, - 'height' : 785, 'draggable' : false, 'buttonsLoad' : sharedButtons.concat([ { Index: lams_central/web/includes/javascript/dialog.js =================================================================== diff -u -r23d1ca610a1da0f865b7d3683bce41f8dd72d82d -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision 23d1ca610a1da0f865b7d3683bce41f8dd72d82d) +++ lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -21,7 +21,7 @@ 'autoOpen' : true, 'modal' : false, 'draggable' : true, - 'resizable' : false, + 'resizable' : extraButtons == true, 'hide' : 'fold', 'beforeClose' : function(){ $('iframe', this).attr('src', null); Index: lams_central/web/includes/javascript/groupDisplay.js =================================================================== diff -u -r23d1ca610a1da0f865b7d3683bce41f8dd72d82d -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 23d1ca610a1da0f865b7d3683bce41f8dd72d82d) +++ lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -158,15 +158,16 @@ 'height' : 600, 'width' : 1024, 'draggable' : false, - 'resizable' : true, + 'dialogClass' : 'tabbedDialog', + 'title' : LABELS.MONITORING_TITLE, 'open' : function() { // load contents after opening the dialog $('iframe', this).attr('src', LAMS_URL + 'home.do?method=monitorLesson&lessonID=' + $(this).dialog('option', 'lessonID')); }, - }); + }, true); // if it was just created if (dialog) { @@ -176,36 +177,28 @@ win = frame.contentWindow || frame.contentDocument; win.resizeSequenceCanvas(ui.size.width, ui.size.height); }); - // tabs are the title bar, so remove dialog's one - dialog.closest('.ui-dialog').children('.ui-dialog-titlebar').remove(); dialog.dialog('open'); } } function showAddLessonDialog(orgID) { - var dialog = showDialog("dialogAddLesson", { - 'orgID' : orgID, - 'autoOpen' : false, - 'modal' : true, - 'draggable' : false, - 'height' : 600, - 'width' : 800, - 'open' : function() { - // load contents after opening the dialog - $('iframe', this) - .attr('src', LAMS_URL - + 'home.do?method=addLesson&organisationID=' - + $(this).dialog('option', 'orgID')); - } - }); - - // if it was just created - if (dialog) { - // tabs are the title bar, so remove dialog's one - dialog.closest('.ui-dialog').children('.ui-dialog-titlebar').remove(); - dialog.dialog('open'); - } + showDialog("dialogAddLesson", { + 'orgID' : orgID, + 'autoOpen' : true, + 'modal' : true, + 'draggable' : false, + 'dialogClass' : 'tabbedDialog addLessonDialog', + 'height' : 600, + 'width' : 800, + 'open' : function() { + // load contents after opening the dialog + $('iframe', this) + .attr('src', LAMS_URL + + 'home.do?method=addLesson&organisationID=' + + $(this).dialog('option', 'orgID')); + } + }); } @@ -223,7 +216,7 @@ + 'OrganisationGroup.do?method=viewGroupings&organisationID=' + $(this).dialog('option', 'orgID')); } - }); + }, true); } function showAddSingleActivityLessonDialog(orgID, toolID) { @@ -233,7 +226,6 @@ 'height' : 600, 'width' : 850, 'modal' : true, - 'resizable' : true, 'title' : LABELS.SINGLE_ACTIVITY_LESSON_TITLE, 'open' : function() { var dialog = $(this), @@ -293,7 +285,7 @@ + orgID); } } - }); + }, true); } function showGradebookCourseDialog(orgID){ @@ -309,7 +301,7 @@ $('iframe', this).attr('src', LAMS_URL + 'gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID=' + orgID); } - }); + }, true); } function showGradebookLessonDialog(lessonID){ @@ -325,7 +317,7 @@ $('iframe', this).attr('src', LAMS_URL + 'gradebook/gradebookMonitoring.do?lessonID=' + lessonID); } - }); + }, true); } function showGradebookLearnerDialog(orgID){ @@ -341,7 +333,7 @@ $('iframe', this).attr('src', LAMS_URL + 'gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID=' + orgID); } - }); + }, true); } function showConditionsDialog(lessonID){ @@ -357,11 +349,11 @@ $('iframe', this).attr('src', LAMS_URL + 'lessonConditions.do?method=getIndexLessonConditions&lsId=' + lessonID); } - }); + }, true); } function showSearchLessonDialog(orgID){ - var id = "dialoSearchLesson" + orgID; + var id = "dialogSearchLesson" + orgID; showDialog(id, { 'orgID' : orgID, 'height' : 400, @@ -373,15 +365,14 @@ $('iframe', this).attr('src', LAMS_URL + 'findUserLessons.do?dispatch=getResults&courseID=' + orgID); } - }); + }, true); } function showFlashlessAuthoringDialog(){ showDialog('dialogFlashlessAuthoring', { 'height' : 865, 'width' : 1280, - 'resizable' : true, 'title' : 'Authoring', 'beforeClose' : function(){ // if LD was modified, ask the user if he really wants to exit @@ -424,6 +415,7 @@ closeDialog(id, save); } + function closeDialog(id, refresh) { // was the dialog just closed or a lesson removed // if latter, refresh the list @@ -433,6 +425,7 @@ $("#" + id).dialog('close'); } + /** * Loads contents to already open organisation groups dialog. */ Index: lams_central/web/main.jsp =================================================================== diff -u -r23d1ca610a1da0f865b7d3683bce41f8dd72d82d -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_central/web/main.jsp (.../main.jsp) (revision 23d1ca610a1da0f865b7d3683bce41f8dd72d82d) +++ lams_central/web/main.jsp (.../main.jsp) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -71,7 +71,9 @@ COURSE_GROUPS_TITLE : '', - NAVIGATE_AWAY_CONFIRM : decoderDiv.html('').text() + NAVIGATE_AWAY_CONFIRM : decoderDiv.html('').text(), + + MONITORING_TITLE : '', }, tabName = '${tab}', Index: lams_monitoring/web/css/monitorLesson.css =================================================================== diff -u -r982c9efe320a916c06079548a7118c28146195c1 -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 982c9efe320a916c06079548a7118c28146195c1) +++ lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -9,22 +9,10 @@ padding: 0px; } -div#tabs ul li a,a#closeButton { +div#tabs ul li a { border-bottom: none; } -a#closeButton { - position: absolute; - right: 10px; - top: 11px; - width: 19px; - height: 18px; -} - -a#closeButton span { - background-color: #D0E5F5; -} - .errorMessage { font-weight: bold; color: red; Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp =================================================================== diff -u -rc3bd56257a6e413c1a8a874fe4433870f3750d43 -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_monitoring/web/emailnotifications/courseNotifications.jsp (.../courseNotifications.jsp) (revision c3bd56257a6e413c1a8a874fe4433870f3750d43) +++ lams_monitoring/web/emailnotifications/courseNotifications.jsp (.../courseNotifications.jsp) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -48,7 +48,6 @@ Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp =================================================================== diff -u -rc3bd56257a6e413c1a8a874fe4433870f3750d43 -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_monitoring/web/emailnotifications/lessonNotifications.jsp (.../lessonNotifications.jsp) (revision c3bd56257a6e413c1a8a874fe4433870f3750d43) +++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp (.../lessonNotifications.jsp) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -65,14 +65,14 @@ multiselect: true, sortorder: "asc", loadonce: true, - height:'auto', + height:'100%', pagerpos:'left', ignoreCase: true }); jQuery("#list3").jqGrid('navGrid','#pager3',{add:false,del:false,edit:false,position:'right'}); jQuery("#list3").jqGrid('filterToolbar',{stringResult: true, searchOnEnter: true, defaultSearch: 'cn'}); $("#list3").parents('div.ui-jqgrid-bdiv').css("max-height","1000px"); - + //initialize jStepper for additional parameters $("#daysToDeadline").jStepper({minValue:0, maxValue:999, defaultValue:3, allowDecimals:false}); @@ -84,9 +84,10 @@ //initialize accordion $( "#accordion" ).accordion({ - autoHeight: false, create: function(event, ui) { - + // accordion probably sets its height based on empty grid + // once it is loaded, it needs to be adjusted + $('div.ui-accordion-content').css('height', '100%'); }, change: function(event, ui) { if ($('#accordion').accordion('option', 'active') == 0) { Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r9611486dadb7a74fbe7d54b67cd1da4dbf6b3535 -raca771d94d7b2c7c6dccea8ff39d12e4167289b1 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 9611486dadb7a74fbe7d54b67cd1da4dbf6b3535) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision aca771d94d7b2c7c6dccea8ff39d12e4167289b1) @@ -174,10 +174,6 @@

- - - -