Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== diff -u -r4f284603a74199f14d9eb0d5e1cc04b89755ba31 -r76aaa4283f0c9c4b95cae2104bdf453c02ee7721 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 4f284603a74199f14d9eb0d5e1cc04b89755ba31) +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 76aaa4283f0c9c4b95cae2104bdf453c02ee7721) @@ -393,6 +393,12 @@ lessonLinks.add(new IndexLinkBean("index.remove.lesson", removeLessonLink, null, "mycourses-removelesson-img", "index.remove.lesson.tooltip")); } + + if ((isGroupManagerOrMonitor && stateId.equals(OrganisationState.ACTIVE)) + || (stateId.equals(OrganisationState.ARCHIVED) && contains(roles, Role.ROLE_GROUP_MANAGER))) { + lessonLinks.add(new IndexLinkBean("index.monitor", + "javascript:showMonitorLessonDialog(" + bean.getId() + ")", null, "mycourses-monitor-img", null)); + } if (lessonLinks.size() > 0) { bean.setLinks(lessonLinks); Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -r4f284603a74199f14d9eb0d5e1cc04b89755ba31 -r76aaa4283f0c9c4b95cae2104bdf453c02ee7721 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 4f284603a74199f14d9eb0d5e1cc04b89755ba31) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 76aaa4283f0c9c4b95cae2104bdf453c02ee7721) @@ -392,10 +392,12 @@ public ActionForward createLearningDesignThumbnail(ActionMapping mapping, ActionForm form, HttpServletRequest req, HttpServletResponse res) throws JDOMException, IOException, TranscoderException { Long learningDesignId = WebUtil.readLongParam(req, CentralConstants.PARAM_LEARNING_DESIGN_ID); - String imagePath = getLearningDesignService().createLearningDesignSVG(learningDesignId, - SVGGenerator.OUTPUT_FORMAT_PNG); + Integer format = WebUtil.readIntParam(req, CentralConstants.PARAM_SVG_FORMAT, true); + format = format == null ? SVGGenerator.OUTPUT_FORMAT_PNG : format; - res.setContentType("image/png"); + String imagePath = getLearningDesignService().createLearningDesignSVG(learningDesignId, format); + + res.setContentType(format == SVGGenerator.OUTPUT_FORMAT_PNG ? "image/png" : "image/svg+xml"); OutputStream output = res.getOutputStream(); FileInputStream input = new FileInputStream(imagePath); IOUtils.copy(input, output); Index: lams_central/web/images/icons/door_open.png =================================================================== diff -u -r38d257ae9ba914964511a4a8fa1f51d5ace5af2e -r76aaa4283f0c9c4b95cae2104bdf453c02ee7721 Binary files differ Index: lams_central/web/main.jsp =================================================================== diff -u -r4f284603a74199f14d9eb0d5e1cc04b89755ba31 -r76aaa4283f0c9c4b95cae2104bdf453c02ee7721 --- lams_central/web/main.jsp (.../main.jsp) (revision 4f284603a74199f14d9eb0d5e1cc04b89755ba31) +++ lams_central/web/main.jsp (.../main.jsp) (revision 76aaa4283f0c9c4b95cae2104bdf453c02ee7721) @@ -31,11 +31,11 @@