Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.60.2.13 -r1.60.2.14 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 2 Sep 2015 13:02:43 -0000 1.60.2.13 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 4 Sep 2015 07:50:03 -0000 1.60.2.14 @@ -191,8 +191,6 @@ // create svg, png files on the server getLearningDesignService().createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_SVG); - getLearningDesignService().createLearningDesignSVG(learningDesignId, - SVGGenerator.OUTPUT_FORMAT_PNG); } } return mapping.findForward("lessonIntro"); @@ -419,7 +417,7 @@ HttpServletResponse res) throws JDOMException, IOException, TranscoderException { Long learningDesignId = WebUtil.readLongParam(req, CentralConstants.PARAM_LEARNING_DESIGN_ID); Integer format = WebUtil.readIntParam(req, CentralConstants.PARAM_SVG_FORMAT, true); - format = format == null ? SVGGenerator.OUTPUT_FORMAT_PNG : format; + format = format == null ? SVGGenerator.OUTPUT_FORMAT_SVG : format; Long branchingActivityId = WebUtil.readLongParam(req, "branchingActivityID", true); boolean download = WebUtil.readBooleanParam(req, "download", false); String imagePath = null; @@ -433,12 +431,12 @@ if (download) { String name = getLearningDesignService() .getLearningDesignDTO(learningDesignId, getUser().getLocaleLanguage()).getTitle(); - name += "." + (format == SVGGenerator.OUTPUT_FORMAT_PNG ? "png" : "svg"); + name += "." + "svg"; name = FileUtil.encodeFilenameForDownload(req, name); res.setContentType("application/x-download"); res.setHeader("Content-Disposition", "attachment;filename=" + name); } else { - res.setContentType(format == SVGGenerator.OUTPUT_FORMAT_PNG ? "image/png" : "image/svg+xml"); + res.setContentType("image/svg+xml"); } OutputStream output = res.getOutputStream(); FileInputStream input = new FileInputStream(imagePath); Index: lams_central/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v diff -u -r1.16.2.3 -r1.16.2.4 --- lams_central/web/addLesson.jsp 9 Jun 2015 20:20:02 -0000 1.16.2.3 +++ lams_central/web/addLesson.jsp 4 Sep 2015 07:50:03 -0000 1.16.2.4 @@ -28,7 +28,7 @@ users = ${users}, LAMS_URL = '', - LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&ldId=', + LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&svgFormat=1&ldId=', CANVAS_RESIZE_OPTION_NONE = 0, CANVAS_RESIZE_OPTION_FIT = 1, Index: lams_central/web/includes/javascript/addLesson.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/addLesson.js,v diff -u -r1.7.2.1 -r1.7.2.2 --- lams_central/web/includes/javascript/addLesson.js 5 May 2015 11:08:47 -0000 1.7.2.1 +++ lams_central/web/includes/javascript/addLesson.js 4 Sep 2015 07:50:03 -0000 1.7.2.2 @@ -14,7 +14,7 @@ // show the thumbnail $('#ldScreenshotAuthor').css('display', 'inline'); // resize if needed - var resized = resizeImage('ldScreenshotAuthor', 477, null); + var resized = resizeImage('ldScreenshotAuthor', 477); toggleCanvasResize(resized ? CANVAS_RESIZE_OPTION_FIT : CANVAS_RESIZE_OPTION_NONE); }); @@ -318,19 +318,19 @@ // ********** LESSON TAB FUNCTIONS ********** -function resizeImage(id, width, height) { - var resized = false; - var elem = $('#' + id); - - if (width != null && elem.width() > width) { - elem.css('width', width); - resized = true; +function resizeImage(id, width) { + var elem = $('#' + id), + elemWidth = elem.width(); + + if (width != null && elemWidth > width) { + elem.css({ + 'width' : width, + // compute ratio same as width change + 'height' : Math.round(elem.height() * (width / elemWidth)) + }); + return true; } - if (height != null && elem.height() > height) { - elem.css('height', height); - resized = true; - } - return resized; + return false; } @@ -349,7 +349,7 @@ toggleCanvasResize(CANVAS_RESIZE_OPTION_FULL) }); toggleCanvasResizeLink.css('display', 'inline'); - resizeImage('ldScreenshotAuthor', 477, null); + resizeImage('ldScreenshotAuthor', 477); break; case CANVAS_RESIZE_OPTION_FULL: toggleCanvasResizeLink.html(CANVAS_RESIZE_LABEL_FIT).one('click', Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v diff -u -r1.51.2.19 -r1.51.2.20 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js 17 Aug 2015 08:26:25 -0000 1.51.2.19 +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js 4 Sep 2015 07:50:03 -0000 1.51.2.20 @@ -2544,7 +2544,7 @@ }); }); - GeneralLib.saveLearningDesignImages(); + GeneralLib.saveLearningDesignImage(); if (response.validation.length == 0) { alert(LABELS.SAVE_SUCCESSFUL); @@ -2566,9 +2566,9 @@ /** - * Stores SVG and PNG LD thumbnails on server. + * Stores SVG LD thumbnail on server. */ - saveLearningDesignImages : function() { + saveLearningDesignImage : function() { $.ajax({ type : 'POST', url : LAMS_URL + 'authoring/author.do', @@ -2579,16 +2579,6 @@ 'image' : MenuLib.exportSVG() } }); - $.ajax({ - type : 'POST', - url : LAMS_URL + 'authoring/author.do', - data : { - 'method' : 'saveLearningDesignImage', - 'learningDesignID' : layout.ld.learningDesignID, - 'extension' : 'PNG', - 'image' : MenuLib.exportPNG() - } - }); }, Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v diff -u -r1.121.2.6 -r1.121.2.7 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 22 Jun 2015 03:06:45 -0000 1.121.2.6 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 4 Sep 2015 07:50:06 -0000 1.121.2.7 @@ -193,8 +193,6 @@ public static final String SVG_IMAGE_FILE_NAME = "learning_design.svg"; - public static final String PNG_IMAGE_FILE_NAME = "learning_design.png"; - private static final String ERROR_TOOL_NOT_FOUND = "error.import.matching.tool.not.found"; private static final String ERROR_SERVICE_ERROR = "error.import.tool.service.fail"; @@ -656,13 +654,6 @@ // and should not be used in Monitoring svgFile.delete(); } - - destinationPath = FileUtil.getFullPath(contentDir, ExportToolContentService.PNG_IMAGE_FILE_NAME); - String pngPath = service.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_PNG); - File pngFile = new File(pngPath); - if (pngFile.canRead()) { - FileUtils.copyFile(pngFile, new File(destinationPath)); - } } log.debug("Learning design xml export success");