Index: lams_admin/conf/language/ApplicationResources.properties =================================================================== diff -u -r313fd847623c58375c6ba078242669647d093b2e -r95219dd1bf9fbe3081733f637800fd8519b202d7 --- lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 313fd847623c58375c6ba078242669647d093b2e) +++ lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 95219dd1bf9fbe3081733f637800fd8519b202d7) @@ -65,6 +65,8 @@ msg.disable.user.4 = You can enable the user account again by editing the user's profile. msg.delete.user.1 = User has no associated data and can be safely removed. msg.delete.user.2 = Are you sure you want to delete this account? +msg.edit.tool.content.1 = This page contains a list of installed tools. +msg.edit.tool.content.2 = Changes to a tool's content using this screen will affect the tool's default appearance for all authors. #======================= Organisation State =======================# organisation.state.ACTIVE=Active @@ -178,6 +180,7 @@ sysadmin.job.list = Job List sysadmin.list.job = List scheduled jobs in Quartz queue sysadmin.register.server = Register Server +sysadmin.edit.default.tool.content = Edit Default Tool Content #===================== Cache Screen ==============================# cache.maintain = Maintain LAMS Cache @@ -205,4 +208,4 @@ admin.register.server.config.version=Server Version admin.register.server.config.build=Server Build No. admin.register.server.config.locale=Server Language (Locale) -admin.register.server.config.langdate=Language Date +admin.register.server.config.langdate=Language Date \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java =================================================================== diff -u --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java (revision 0) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java (revision 95219dd1bf9fbe3081733f637800fd8519b202d7) @@ -0,0 +1,109 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.admin.web; + +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.lamsfoundation.lams.admin.service.AdminServiceProxy; +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.usermanagement.Role; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +/** + * @author jliew + * + * @struts:action path="/toolcontentlist" + * scope="request" + * validate="false" + * + * @struts:action-forward name="toolcontentlist" path=".toolcontentlist" + * @struts.action-forward name="error" path=".error" + */ +public class ToolContentListAction extends Action { + + //private static Logger log = Logger.getLogger(ToolContentListAction.class); + + public ActionForward execute(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + + // check permission + if(!request.isUserInRole(Role.SYSADMIN)){ + request.setAttribute("errorName","ToolContentListAction"); + request.setAttribute("errorMessage",AdminServiceProxy.getMessageService(getServlet().getServletContext()) + .getMessage("error.authorisation")); + return mapping.findForward("error"); + } + + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + ILearningDesignService learningDesignService = (ILearningDesignService)ctx.getBean("learningDesignServiceTarget"); + + List learningLibraryDTOs = learningDesignService.getAllLearningLibraryDetails(); + + ArrayList activeTools = filterActiveTools(learningLibraryDTOs); + request.setAttribute("activeTools", activeTools); + + return mapping.findForward("toolcontentlist"); + } + + // returns LibraryActivityDTOs of valid tools from full list of tools + private ArrayList filterActiveTools(List learningLibraryDTOs) { + ArrayList activeTools = new ArrayList(); + for (int i=0; i list) { + for (LibraryActivityDTO l : list) { + if (StringUtils.equals(item.getToolSignature(),l.getToolSignature())) return true; + } + return false; + } + +} Index: lams_admin/web/sysadmin.jsp =================================================================== diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -r95219dd1bf9fbe3081733f637800fd8519b202d7 --- lams_admin/web/sysadmin.jsp (.../sysadmin.jsp) (revision baf684f0c64ff2686a9415c68c943ecf4184046d) +++ lams_admin/web/sysadmin.jsp (.../sysadmin.jsp) (revision 95219dd1bf9fbe3081733f637800fd8519b202d7) @@ -8,6 +8,8 @@

+

+

Index: lams_admin/web/toolcontent/toolcontentlist.jsp =================================================================== diff -u --- lams_admin/web/toolcontent/toolcontentlist.jsp (revision 0) +++ lams_admin/web/toolcontent/toolcontentlist.jsp (revision 95219dd1bf9fbe3081733f637800fd8519b202d7) @@ -0,0 +1,27 @@ +<%@ include file="/taglibs.jsp"%> + +

+ + :

+

 

+ +

+   +

+ +

+ + + + + + + +
+ + + ?toolContentID=&contentFolderID=12345678901234567890123456789012"> + + +
+

\ No newline at end of file