Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 353fe07604639c2166ed68fbf832810959f3f3cf) +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -150,13 +150,13 @@ if ((!isSysAdmin) && (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) { moreLinks.add(new IndexLinkBean("index.classman", - "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", + "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-ellipsis-v", null)); } if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_AUTHOR) || roles.contains(Role.ROLE_MONITOR))) { moreLinks.add(new IndexLinkBean("index.orggroup", - "javascript:showOrgGroupDialog(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", + "javascript:showOrgGroupingDialog(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", null)); } @@ -181,7 +181,7 @@ if (org.getEnableGradebookForMonitors() && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN))) { String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")"; - moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "course-gradebook-button", + moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "fa fa-fw fa-list-ol", "index.coursegradebook.tooltip")); } Index: lams_central/web/css/orgGroup.css =================================================================== diff -u -r3ead910e766fb518a08fc2d2cf53382431313cbf -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/web/css/orgGroup.css (.../orgGroup.css) (revision 3ead910e766fb518a08fc2d2cf53382431313cbf) +++ lams_central/web/css/orgGroup.css (.../orgGroup.css) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -10,38 +10,31 @@ } div#titleDiv { - padding: 0 5px 0 5px; - font-size: small; - font-weight: bold; - border-bottom: thin dotted #2E6E9E; + padding: 5px 0 0 5px; } div#titleDiv input { - margin: 5px 0 5px 0; + margin-left: 10px; width: 290px; } -div#titleDiv .ui-button { - margin-bottom: 5px; - font-size: inherit; +div#titleDiv button { + margin-right: 10px; } #titleInstructions { + text-align: center; margin-top: 7px; - float: right; + border-bottom: thin dotted #2E6E9E; } -table#groupsTable { - height: 375px; -} - table#groupsTable td { vertical-align: top; + padding: 5px; } td#unassignedUserCell { width: 200px; - padding: 5px; border-right: thin dotted #2E6E9E; } @@ -81,8 +74,6 @@ .removeGroupButton { float: left; cursor: pointer; - width: 16px; - height: 16px; } .userContainer { @@ -100,7 +91,7 @@ margin-right: 5px; } -.groupContainer .sortUsersButton, .groupContainer .removeGroupButton { +.groupContainer .sortUsersButton { padding-top: 3px; } Index: lams_central/web/forgotPasswordChange.jsp =================================================================== diff -u -rcfaad805a2e6c23b476f8966e7be15bc7b7f1baa -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision cfaad805a2e6c23b476f8966e7be15bc7b7f1baa) +++ lams_central/web/forgotPasswordChange.jsp (.../forgotPasswordChange.jsp) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -23,8 +23,6 @@ - <fmt:message key="title.forgot.password" /> Fisheye: Tag 970546106e9b05a4d1a507b26be2ce96130b4f01 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/groupDisplay.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/javascript/main.js =================================================================== diff -u -r055289acb7212f0a65e5be99e457e1eef9fef7a6 -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/web/includes/javascript/main.js (.../main.js) (revision 055289acb7212f0a65e5be99e457e1eef9fef7a6) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -360,27 +360,66 @@ }); } +function showOrgGroupingDialog(orgID, activityID) { + $('#dialogOrgGroup').modal('hide'); + showDialog("dialogOrgGrouping", { + 'width' : 460, + 'height': 460, + 'title' : LABELS.COURSE_GROUPS_TITLE, + 'open' : function() { + // load contents after opening the dialog + $('iframe', this).attr('src', LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID=' + orgID + + (activityID ? '&activityID=' + activityID : '')); + } + }, true); +} -function showOrgGroupDialog(orgID) { +function showOrgGroupDialog(url) { + $('#dialogOrgGrouping').modal('hide'); showDialog("dialogOrgGroup", { - 'data' : { - 'orgID' : orgID - }, - 'modal' : true, - 'height' : 460, - 'width' : 'auto', + 'width' : 850, + 'height': 470, 'title' : LABELS.COURSE_GROUPS_TITLE, 'open' : function() { // load contents after opening the dialog - $('iframe', this) - .attr('src', LAMS_URL - + 'OrganisationGroup.do?method=viewGroupings&organisationID=' - + $(this).data('orgID')); - $(this).css("maxWidth", "460px").css("margin", "auto"); + $('iframe', this).attr('src', url); } }, true); } +function saveOrgGroups() { + var groupsSaved = saveGroups(); + if (groupsSaved) { + showOrgGroupDialogContents(null, 460, 460, + LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID=' + + $('#dialogOrgGroup').data('orgID')); + } +} + +function showOrgGroupDialogContents(title, width, height, url) { + var id = "dialogOrgGroup", + dialog = $('#' + id), + exists = dialog.length > 0, + orgID = null; + if (exists) { + if (!title) { + title = $('.modal-title', dialog).text(); + } + orgID = dialog.data('orgID'); + } + showDialog(id, { + 'data' : { + 'orgID' : orgID + }, + 'height' : height, + 'width' : width, + 'title' : title, + 'open' : function() { + $('iframe', this).attr('src', url); + } + }, true, exists); +} + function showAddSingleActivityLessonDialog(orgID, toolID, learningLibraryID) { showDialog("dialogAddSingleActivityLesson", { 'data' : { Index: lams_central/web/includes/javascript/orgGroup.js =================================================================== diff -u -r6ad3d1341b3dc1f066c69c7129a8c1dff15980a5 -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/web/includes/javascript/orgGroup.js (.../orgGroup.js) (revision 6ad3d1341b3dc1f066c69c7129a8c1dff15980a5) +++ lams_central/web/includes/javascript/orgGroup.js (.../orgGroup.js) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -24,8 +24,6 @@ toggleBackButton(); } else { $('#groupingName').val(grouping.name); - // move Save button to the titlebar, i.e. outside of this iframe to the enveloping dialog - $('div.ui-dialog-titlebar', window.parent.document).append($('.customDialogButton')); } if (canEdit) { @@ -398,15 +396,14 @@ return false; } - var groupsSaved = false; var newGrouping = { 'groupingId' : grouping.groupingId, 'name' : groupingName, 'groups' : [] }; groupContainers.each(function(){ - var groupId = $(this).attr('groupId'); - var users = $('div.draggableUser', this); + var groupId = $(this).attr('groupId'), + users = $('div.draggableUser', this); if (!groupId && users.length == 0) { return true; } @@ -435,11 +432,9 @@ }, type : 'POST', success : function() { - groupsSaved = true; + window.parent.showOrgGroupingDialog(organisationId); } }); - - return groupsSaved; } /** @@ -486,18 +481,7 @@ * If there are any existing (not new) groups, forbid going back to grouping list. */ function toggleBackButton() { - if (lessonMode) { - var backButton = $('#backButton'); - var disabled = $('.groupContainer[groupId]').length > 0; - if (disabled) { - backButton.off('click').button('option', 'disabled', true); - } else { - backButton.click(function(){ - document.location.href = LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&activityID=' - + groupingActivityId + '&organisationID=' + grouping.organisationId; - }).button('option', 'disabled', false); - } - } + $('#backButton').prop('disabled', $('.groupContainer[groupId]').length == 0); } /** Index: lams_central/web/includes/javascript/orgGrouping.js =================================================================== diff -u -refd67298c7f0ea03a8fc9d670329812589db742a -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/web/includes/javascript/orgGrouping.js (.../orgGrouping.js) (revision efd67298c7f0ea03a8fc9d670329812589db742a) +++ lams_central/web/includes/javascript/orgGrouping.js (.../orgGrouping.js) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -1,9 +1,5 @@ var gtbDialog = null; -$(document).ready(function() { - $(".ui-button").button(); -}); - function removeGrouping(groupingId) { if (!lessonMode && confirm(LABELS.REMOVE_GROUPING_CONFIRM_LABEL)) { document.location.href = "OrganisationGroup.do?method=removeGrouping&organisationID=" @@ -12,8 +8,7 @@ } function viewGroups(groupingId, force) { - var url = LAMS_URL + 'OrganisationGroup.do?method=viewGroups&organisationID=' - + organisationId; + var url = LAMS_URL + 'OrganisationGroup.do?method=viewGroups&organisationID=' + organisationId; if (lessonId) { url += '&lessonID=' + lessonId; } @@ -35,7 +30,7 @@ } } else { // load to dialog - window.parent.showOrgGroupDialogContents(null, 880, 500, url); + window.parent.showOrgGroupDialog(url); } } /** Index: lams_central/web/orgGroup.jsp =================================================================== diff -u -rbda1ae3773b097fded724ec9010fb2a271b76d0c -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/web/orgGroup.jsp (.../orgGroup.jsp) (revision bda1ae3773b097fded724ec9010fb2a271b76d0c) +++ lams_central/web/orgGroup.jsp (.../orgGroup.jsp) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -7,43 +7,45 @@ - + + - + @@ -52,24 +54,13 @@ -
+
+
- - - - - - - - - - @@ -80,21 +71,34 @@ + + + + +
- - - - - - - - - - - +
+ + + + + + + + +
+
@@ -119,8 +123,7 @@
- + Index: lams_central/web/orgGrouping.jsp =================================================================== diff -u -r0df610c9b83ea7a6b984aab1aae115280ea0cb3e -r970546106e9b05a4d1a507b26be2ce96130b4f01 --- lams_central/web/orgGrouping.jsp (.../orgGrouping.jsp) (revision 0df610c9b83ea7a6b984aab1aae115280ea0cb3e) +++ lams_central/web/orgGrouping.jsp (.../orgGrouping.jsp) (revision 970546106e9b05a4d1a507b26be2ce96130b4f01) @@ -7,7 +7,7 @@ - +