Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v
diff -u -r1.31 -r1.32
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 16 Jan 2013 11:17:17 -0000 1.31
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 19 Mar 2013 12:16:22 -0000 1.32
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.43 -r1.44
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 16 Jan 2013 11:17:17 -0000 1.43
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 19 Mar 2013 12:16:22 -0000 1.44
@@ -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/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.57 -r1.58
--- lams_central/web/main.jsp 16 Jan 2013 11:17:17 -0000 1.57
+++ lams_central/web/main.jsp 19 Mar 2013 12:16:22 -0000 1.58
@@ -31,11 +31,11 @@