Index: lams_admin/src/java/org/lamsfoundation/lams/admin/applicationResources.properties
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -ra037ad028d8a31e78d79fdb75c5bbbe0db3bb536
--- lams_admin/src/java/org/lamsfoundation/lams/admin/applicationResources.properties (.../applicationResources.properties) (revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/applicationResources.properties (.../applicationResources.properties) (revision a037ad028d8a31e78d79fdb75c5bbbe0db3bb536)
@@ -22,6 +22,3 @@
cache.explanation3=Warning: If you remove a node, you will remove the node and all its child nodes.
cache.button.remove=Remove
-#========== Deleted Preview Message Screen =======================#
-preview.deleted.title=Preview Data Deleted
-preview.deleted.message=Preview data for {0} lessons has been deleted
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/SysadminAction.java
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -ra037ad028d8a31e78d79fdb75c5bbbe0db3bb536
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/SysadminAction.java (.../SysadminAction.java) (revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/SysadminAction.java (.../SysadminAction.java) (revision a037ad028d8a31e78d79fdb75c5bbbe0db3bb536)
@@ -21,27 +21,14 @@
*
* @struts:action path="/sysadmin" validate="false" parameter="method"
* @struts:action-forward name="sysadmin" path=".sysadmin"
- * @struts:action-forward name="previewdeleted" path=".previewdeleted"
* @struts:action-forward name="error" path=".admin.error"
*/
public class SysadminAction extends LamsDispatchAction {
- public static final String NUM_DELETED = "numDeleted";
private static Logger logger = Logger.getLogger(SysadminAction.class);
- public ActionForward deleteOldPreviewLessons(ActionMapping mapping,
- ActionForm form, HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
-
- logger.debug("deleteOldPreviewLessons");
- IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
- int numDeleted = monitoringService.deleteAllOldPreviewLessons();
- request.setAttribute(NUM_DELETED, Integer.toString(numDeleted));
- return mapping.findForward("message");
- }
-
}
\ No newline at end of file
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -ra037ad028d8a31e78d79fdb75c5bbbe0db3bb536
--- lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision a037ad028d8a31e78d79fdb75c5bbbe0db3bb536)
@@ -106,11 +106,6 @@
redirect="false"
/>
-
-
-
-
-
- |
-
-
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
+<%@ taglib uri="tags-lams" prefix="lams" %>
Index: lams_admin/web/header.jsp
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -ra037ad028d8a31e78d79fdb75c5bbbe0db3bb536
--- lams_admin/web/header.jsp (.../header.jsp) (revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/web/header.jsp (.../header.jsp) (revision a037ad028d8a31e78d79fdb75c5bbbe0db3bb536)
@@ -1 +1 @@
-<%@include file="sharing/share.jsp" %>
Fisheye: Tag a037ad028d8a31e78d79fdb75c5bbbe0db3bb536 refers to a dead (removed) revision in file `lams_admin/web/sharing/share.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag a037ad028d8a31e78d79fdb75c5bbbe0db3bb536 refers to a dead (removed) revision in file `lams_admin/web/sysadmin/previewdeleted.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_admin/web/sysadmin/sysadminContent.jsp
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -ra037ad028d8a31e78d79fdb75c5bbbe0db3bb536
--- lams_admin/web/sysadmin/sysadminContent.jsp (.../sysadminContent.jsp) (revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/web/sysadmin/sysadminContent.jsp (.../sysadminContent.jsp) (revision a037ad028d8a31e78d79fdb75c5bbbe0db3bb536)
@@ -1,15 +1,20 @@
<%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
-System Administration
+System Administration
-
-
+
.
-
-
+
Index: lams_admin/web/template.jsp
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -ra037ad028d8a31e78d79fdb75c5bbbe0db3bb536
--- lams_admin/web/template.jsp (.../template.jsp) (revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/web/template.jsp (.../template.jsp) (revision a037ad028d8a31e78d79fdb75c5bbbe0db3bb536)
@@ -1,4 +1,3 @@
-<%@include file="sharing/share.jsp" %>
<%@ taglib uri="tags-tiles" prefix="tiles" %>
<%@ taglib uri="tags-html" prefix="html" %>
<%@ taglib uri="tags-lams" prefix="lams" %>
@@ -12,7 +11,7 @@
-
+