Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java =================================================================== diff -u -r3a9b27c6f8b3eb0462a2a9d91a6aa0b43645442f -r72d525026e011d4ac75686e07377a4242c3eb09f --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 3a9b27c6f8b3eb0462a2a9d91a6aa0b43645442f) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) @@ -22,30 +22,25 @@ package org.lamsfoundation.lams.admin.web.controller; -import java.io.IOException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; -import org.lamsfoundation.lams.learningdesign.LearningLibrary; -import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup; import org.lamsfoundation.lams.learningdesign.dto.LearningLibraryDTO; import org.lamsfoundation.lams.learningdesign.dto.LibraryActivityDTO; import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -56,11 +51,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; - /** * @author jliew */ @@ -101,11 +91,6 @@ } else { return "error"; } - } else if (StringUtils.equals(param, "openLearningLibraryGroups")) { - return openLearningLibraryGroups(request); - } else if (StringUtils.equals(param, "saveLearningLibraryGroups")) { - saveLearningLibraryGroups(request); - return null; } // get learning library dtos and their validity @@ -208,71 +193,4 @@ ldService.setValid(learningLibraryId, true); return "forward:/toolcontentlist/start.do"; } - - /** - * Loads groups and libraries and displays the management dialog. - */ - @RequestMapping(path = "/openLearningLibraryGroups") - public String openLearningLibraryGroups(HttpServletRequest request) throws IOException { - // build full list of available learning libraries - List learningLibraries = learningDesignService - .getAllLearningLibraryDetails(getUserLanguage()); - ArrayNode learningLibrariesJSON = JsonNodeFactory.instance.arrayNode(); - for (LearningLibraryDTO learningLibrary : learningLibraries) { - ObjectNode learningLibraryJSON = JsonNodeFactory.instance.objectNode(); - learningLibraryJSON.put("learningLibraryId", learningLibrary.getLearningLibraryID()); - learningLibraryJSON.put("title", learningLibrary.getTitle()); - learningLibrariesJSON.add(learningLibraryJSON); - } - request.setAttribute("learningLibraries", learningLibrariesJSON.toString()); - - // build list of existing groups - List groups = learningDesignService.getLearningLibraryGroups(); - ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode(); - for (LearningLibraryGroup group : groups) { - ObjectNode groupJSON = JsonNodeFactory.instance.objectNode(); - groupJSON.put("groupId", group.getGroupId()); - groupJSON.put("name", group.getName()); - for (LearningLibrary learningLibrary : group.getLearningLibraries()) { - ObjectNode learningLibraryJSON = JsonNodeFactory.instance.objectNode(); - learningLibraryJSON.put("learningLibraryId", learningLibrary.getLearningLibraryId()); - learningLibraryJSON.put("title", learningLibrary.getTitle()); - groupJSON.withArray("learningLibraries").add(learningLibraryJSON); - } - groupsJSON.add(groupJSON); - } - request.setAttribute("groups", groupsJSON.toString()); - - return "toolcontent/learningLibraryGroup"; - } - - @RequestMapping(path = "/saveLearningLibraryGroups", method = RequestMethod.POST) - private String saveLearningLibraryGroups(HttpServletRequest request) throws IOException { - // extract groups from JSON and persist them - - ArrayNode groupsJSON = JsonUtil.readArray(request.getParameter("groups")); - List groups = new ArrayList<>(groupsJSON.size()); - for (JsonNode groupJSON : groupsJSON) { - LearningLibraryGroup group = new LearningLibraryGroup(); - groups.add(group); - - Long groupId = JsonUtil.optLong(groupJSON, "groupId"); - if (groupId != null) { - group.setGroupId(groupId); - } - group.setName(JsonUtil.optString(groupJSON, "name")); - - group.setLearningLibraries(new HashSet()); - ArrayNode learningLibrariesJSON = (ArrayNode) groupJSON.get("learningLibraries"); - for (JsonNode learningLibraryJSON : learningLibrariesJSON) { - long learningLibraryId = learningLibraryJSON.asLong(); - LearningLibrary learningLibrary = learningDesignService.getLearningLibrary(learningLibraryId); - group.getLearningLibraries().add(learningLibrary); - } - } - - learningDesignService.saveLearningLibraryGroups(groups); - - return "forward:/toolcontentlist/start.do"; - } -} +} \ No newline at end of file Fisheye: Tag 72d525026e011d4ac75686e07377a4242c3eb09f refers to a dead (removed) revision in file `lams_admin/web/includes/javascript/learningLibraryGroup.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 72d525026e011d4ac75686e07377a4242c3eb09f refers to a dead (removed) revision in file `lams_admin/web/toolcontent/learningLibraryGroup.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/web/toolcontent/toolcontentlist.jsp =================================================================== diff -u -r3a68c970297a965f73cc4bda061a05c69a2818de -r72d525026e011d4ac75686e07377a4242c3eb09f --- lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision 3a68c970297a965f73cc4bda061a05c69a2818de) +++ lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) @@ -17,20 +17,6 @@ - - @@ -50,10 +36,6 @@

- -
-

${fn:length(toolLibrary)} 

Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java =================================================================== diff -u -r9091ed8c9bae9a48f88622c0c5031af2a39772dc -r72d525026e011d4ac75686e07377a4242c3eb09f --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java (.../AuthoringController.java) (revision 9091ed8c9bae9a48f88622c0c5031af2a39772dc) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java (.../AuthoringController.java) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) @@ -51,8 +51,6 @@ import org.lamsfoundation.lams.learningdesign.BranchingActivity; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningDesignAccess; -import org.lamsfoundation.lams.learningdesign.LearningLibrary; -import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup; import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO; import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO; import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO; @@ -88,7 +86,6 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -134,18 +131,6 @@ request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, FileUtil.generateUniqueContentFolderID()); request.setAttribute("tools", learningDesignService.getToolDTOs(true, true, request.getRemoteUser())); - // build list of existing learning library groups - List groups = learningDesignService.getLearningLibraryGroups(); - ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode(); - for (LearningLibraryGroup group : groups) { - ObjectNode groupJSON = JsonNodeFactory.instance.objectNode(); - groupJSON.put("name", group.getName()); - for (LearningLibrary learningLibrary : group.getLearningLibraries()) { - groupJSON.withArray("learningLibraries").add(learningLibrary.getLearningLibraryId()); - } - groupsJSON.add(groupJSON); - } - request.setAttribute("learningLibraryGroups", groupsJSON.toString()); List accessList = authoringService.updateLearningDesignAccessByUser(getUserId()); request.setAttribute("access", JsonUtil.toString(accessList)); Index: lams_central/web/authoring/authoring.jsp =================================================================== diff -u -rb05b0b354e28315a7b8e49813399ec4fe4a3d93d -r72d525026e011d4ac75686e07377a4242c3eb09f --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision b05b0b354e28315a7b8e49813399ec4fe4a3d93d) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) @@ -287,7 +287,6 @@ activitiesOnlySelectable = false, initContentFolderID = '${contentFolderID}', initLearningDesignID = '${param.learningDesignID}', - learningLibraryGroups = ${learningLibraryGroups}, initAccess = ${access}, csrfTokenName = '', csrfTokenValue = ''; @@ -435,9 +434,7 @@
- +
@@ -479,7 +476,7 @@ onClick="javascript:MenuLib.toggleDescriptionDiv()"> - ▼ + ?

Index: lams_central/web/css/_authoring_base.scss =================================================================== diff -u -r14157d72996b885cd52d131d142de7bcd5fc2b36 -r72d525026e011d4ac75686e07377a4242c3eb09f --- lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision 14157d72996b885cd52d131d142de7bcd5fc2b36) +++ lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) @@ -451,9 +451,9 @@ vertical-align: top; } -td#templateContainerCell select { - width: 100%; - margin-bottom: 3px; + +td#templateContainerCell #template-container-cell-dummy-placeholder { + height: 22px; } div.templateContainer { Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -rfcdf2dbcbad524eb257a95b5555796ab84c376f9 -r72d525026e011d4ac75686e07377a4242c3eb09f --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision fcdf2dbcbad524eb257a95b5555796ab84c376f9) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 72d525026e011d4ac75686e07377a4242c3eb09f) @@ -215,47 +215,8 @@ // store the initial window height now as on iPad the iframe grows when templates are show, // reporting incorrect window height to the first resizePaper() run layout.initWindowHeight = $(window).height(); - // create list of learning libraries for each group - var templateContainerCell = $('#templateContainerCell'), - learningLibraryGroupSelect = $('select', templateContainerCell), - allGroup = $('option', learningLibraryGroupSelect), - allTemplates = $('#templateContainerCell .templateContainer').show(); - - learningLibraryGroupSelect.change(function(){ - $('.templateContainer').hide(); - // show DIV with the selected learning libraries group - $('option:selected', this).data('templates').show(); - }); - allGroup.data('templates', allTemplates); + $('#templateContainerCell .templateContainer').show(); - $.each(learningLibraryGroups, function(){ - var learningLibraries = this.learningLibraries; - if (!learningLibraries) { - return true; - } - - var templates = allTemplates.clone().appendTo(templateContainerCell); - // cloned everything, now remove ones that are not in the list - $('.template', templates).each(function(){ - var learningLibraryId = $(this).attr('learningLibraryId'), - found = false; - $.each(learningLibraries, function(){ - if (learningLibraryId == this) { - found = true; - return false; - } - }); - - if (!found) { - $(this).remove(); - } - }); - - $('