Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== diff -u -r56c565f6b6e596ec0de434127769de8986a090be -r25b4e713aa72081e702977a097646e2c5b680641 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 56c565f6b6e596ec0de434127769de8986a090be) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 25b4e713aa72081e702977a097646e2c5b680641) @@ -205,8 +205,6 @@ private static final String EXPORT_NODE_FOLDER_SUFFIX = "export_node"; private static final String EXPORT_NODE_CONTENT_ZIP_PREFIX = "content_"; - private static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition"; - private static final String RESPONSE_CONTENT_TYPE_DOWNLOAD = "application/x-download"; private static final String ENCODING_UTF_8 = "UTF-8"; private static final String DIR_UPLOADED_NODE_SUFFIX = "_uploaded_node"; private static final String EXPORT_NODE_ZIP_PREFIX = "lams_planner_node_"; @@ -945,9 +943,9 @@ PedagogicalPlannerAction.log.debug("Final filename to export: " + filename); - response.setContentType(PedagogicalPlannerAction.RESPONSE_CONTENT_TYPE_DOWNLOAD); + response.setContentType(CentralConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD); // response.setContentType("application/zip"); - response.setHeader(PedagogicalPlannerAction.HEADER_CONTENT_DISPOSITION, "attachment;filename=" + filename); + response.setHeader(CentralConstants.HEADER_CONTENT_DISPOSITION, "attachment;filename=" + filename); } catch (Exception e) { PedagogicalPlannerAction.log.error(e, e); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(PedagogicalPlannerAction.ERROR_KEY_EXPORT)); @@ -1220,7 +1218,7 @@ String fileName = node.getFileName(); PedagogicalPlannerAction.log.debug("Uploading into repository a template file: " + fileName); NodeKey nodeKey = getContentHandler().uploadFile(inputStream, fileName, - PedagogicalPlannerAction.RESPONSE_CONTENT_TYPE_DOWNLOAD, IToolContentHandler.TYPE_OFFLINE); + CentralConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD, IToolContentHandler.TYPE_OFFLINE); node.setFileUuid(nodeKey.getUuid()); } } @@ -1477,10 +1475,9 @@ String filename = FileUtil.encodeFilenameForDownload(request, zipfile); PedagogicalPlannerAction.log.debug("Final filename to export: " + filename); - response.setContentType(PedagogicalPlannerAction.RESPONSE_CONTENT_TYPE_DOWNLOAD); + response.setContentType(CentralConstants.RESPONSE_CONTENT_TYPE_DOWNLOAD); // response.setContentType("application/zip"); - response.setHeader(PedagogicalPlannerAction.HEADER_CONTENT_DISPOSITION, "attachment;filename=" - + filename); + response.setHeader(CentralConstants.HEADER_CONTENT_DISPOSITION, "attachment;filename=" + filename); valid = true; } Index: lams_central/web/css/pedagogicalPlanner.css =================================================================== diff -u -r8f7975d272f91acc26c785848d82d26d6b5dd357 -r25b4e713aa72081e702977a097646e2c5b680641 --- lams_central/web/css/pedagogicalPlanner.css (.../pedagogicalPlanner.css) (revision 8f7975d272f91acc26c785848d82d26d6b5dd357) +++ lams_central/web/css/pedagogicalPlanner.css (.../pedagogicalPlanner.css) (revision 25b4e713aa72081e702977a097646e2c5b680641) @@ -152,4 +152,8 @@ .align-center { text-align: center; +} + +.dummyLink { + color: #47bc23; } \ No newline at end of file Index: lams_central/web/pedagogical_planner/sequenceChooser.jsp =================================================================== diff -u -r2d2ba38d19643bb43a4e298f450ed0fd57f60df2 -r25b4e713aa72081e702977a097646e2c5b680641 --- lams_central/web/pedagogical_planner/sequenceChooser.jsp (.../sequenceChooser.jsp) (revision 2d2ba38d19643bb43a4e298f450ed0fd57f60df2) +++ lams_central/web/pedagogical_planner/sequenceChooser.jsp (.../sequenceChooser.jsp) (revision 25b4e713aa72081e702977a097646e2c5b680641) @@ -195,32 +195,47 @@ <%-- Link to the subnode and its brief description below --%> - - - - - - - - - - - -
- - + + + + + + + + + - "> - - - - - "> -
+ + + + + + + + + +
+ + + + + "> + + + + + "> +
+ + + + + +
<%-- If we are in filter mode, we display the path where was the subnode found --%> Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java =================================================================== diff -u -r9a28a1269fd337e431f26f8515bdc10bcf3a53ee -r25b4e713aa72081e702977a097646e2c5b680641 --- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java (.../PedagogicalPlannerSequenceNodeDTO.java) (revision 9a28a1269fd337e431f26f8515bdc10bcf3a53ee) +++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java (.../PedagogicalPlannerSequenceNodeDTO.java) (revision 25b4e713aa72081e702977a097646e2c5b680641) @@ -27,6 +27,7 @@ import java.util.List; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode; public class PedagogicalPlannerSequenceNodeDTO { @@ -45,6 +46,8 @@ private Boolean isSysAdmin = true; private Boolean importNode = false; + private static final String FULL_DESCRIPTION_NOT_EMPTY = "FULL"; + public PedagogicalPlannerSequenceNodeDTO() { } @@ -65,6 +68,9 @@ PedagogicalPlannerSequenceNodeDTO subnodeDTO = new PedagogicalPlannerSequenceNodeDTO(); subnodeDTO.setTitle(subnode.getTitle()); subnodeDTO.setBriefDescription(subnode.getBriefDescription()); + if (!StringUtils.isEmpty(subnode.getFullDescription())) { + subnodeDTO.setFullDescription(PedagogicalPlannerSequenceNodeDTO.FULL_DESCRIPTION_NOT_EMPTY); + } subnodeDTO.setLocked(subnode.getLocked()); subnodeDTO.setFileName(subnode.getFileName()); subnodeDTO.setUid(subnode.getUid());