Index: lams_tool_nb/conf/language/ApplicationResources.properties =================================================================== diff -u -r160d995179aec345c5f37711392035bd1514b586 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 160d995179aec345c5f37711392035bd1514b586) +++ lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -57,8 +57,10 @@ error.exception.NbApplication =An internal error has occured with the Noticeboard Tool. If reporting this error, please report:
{0} error.contentrepository =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. - #======= End labels: Exported 50 labels for en AU ===== #======= New labels: after 12/05/2006 ============= authoring.msg.cancel.save=Do you want to close this window without saving? +#===== New Labels added 28/06/06 +label.save=Save +label.cancel=Cancel Index: lams_tool_nb/conf/xdoclet/taglibs.xml =================================================================== diff -u -r28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision 28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f) +++ lams_tool_nb/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -50,7 +50,7 @@ - tags-fck-editor + fck-editor /WEB-INF/fckeditor/tlds/FCKeditor.tld Index: lams_tool_nb/web/authoring/authoring.jsp =================================================================== diff -u -r0a9205737ad38f2cde57c92fbee07f8d895aaf44 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44) +++ lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -14,10 +14,15 @@ var themeName="aqua"; function init(){ - + + initEditor("title"); + initEditor("content"); var showBasicContent = "${requestScope.showBasicContent}"; if (showBasicContent != "true") { initTabSize(3); + + initEditor("onlineInstructions"); + initEditor("offlineInstructions"); } var tag = document.getElementById("currentTab"); @@ -45,6 +50,7 @@ +
@@ -98,6 +104,7 @@
Index: lams_tool_nb/web/authoring/basic.jsp =================================================================== diff -u -r0a9205737ad38f2cde57c92fbee07f8d895aaf44 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/authoring/basic.jsp (.../basic.jsp) (revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44) +++ lams_tool_nb/web/authoring/basic.jsp (.../basic.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -5,29 +5,12 @@ - - - - - - -
-
- -
+
- - - +
- -
- - - -
Index: lams_tool_nb/web/authoring/instructions.jsp =================================================================== diff -u -r0a9205737ad38f2cde57c92fbee07f8d895aaf44 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/authoring/instructions.jsp (.../instructions.jsp) (revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44) +++ lams_tool_nb/web/authoring/instructions.jsp (.../instructions.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -4,30 +4,17 @@ - - - - - -
- -
- - - +
- -
-
@@ -36,24 +23,13 @@ - + - - - - - - + + + + + +
- + +
- - - -
- -
@@ -71,7 +47,7 @@ - +
Index: lams_tool_nb/web/includes/taglibs.jsp =================================================================== diff -u -r0a9205737ad38f2cde57c92fbee07f8d895aaf44 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/includes/taglibs.jsp (.../taglibs.jsp) (revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44) +++ lams_tool_nb/web/includes/taglibs.jsp (.../taglibs.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -7,5 +7,5 @@ <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> -<%@ taglib uri="tags-fck-editor" prefix="FCK"%> +<%@ taglib uri="fck-editor" prefix="FCK"%> \ No newline at end of file Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp =================================================================== diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/monitoring/m_EditActivity.jsp (.../m_EditActivity.jsp) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) +++ lams_tool_nb/web/monitoring/m_EditActivity.jsp (.../m_EditActivity.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -1,53 +1,42 @@ -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-core" prefix="c" %> +<%@ include file="/includes/taglibs.jsp"%> -
-
Fisheye: Tag 8d197d915eef154832e3bd8073e35bd974ec2c5a refers to a dead (removed) revision in file `lams_tool_nb/web/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/header.jsp =================================================================== diff -u -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/header.jsp (.../header.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) +++ lams_tool_nb/web/header.jsp (.../header.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -1,6 +1,5 @@ -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> +<%@ include file="/includes/taglibs.jsp"%> +
- - - - - - - - - - - - - - - - - - - - - - - -
- -
  
- -
- + + + + + + + -
-
+ + + +
- - - - - + + + + + + + + + + +
- - - - -
+ + + +
+

+ +

+
- + +

+ + + +

+ Index: lams_tool_nb/web/monitoring/m_Instructions.jsp =================================================================== diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/monitoring/m_Instructions.jsp (.../m_Instructions.jsp) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) +++ lams_tool_nb/web/monitoring/m_Instructions.jsp (.../m_Instructions.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -1,86 +1,73 @@ -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ include file="/includes/taglibs.jsp"%> -
- - - - - - - - - - - - - - -
  
-
+ + + + + + + + + +
+ + + +
+ + + +
+ - - -
-
- + + +
+ +

+ +

+ +
- + + + - - - -
+ + + + +   +
- - - - - - - - /download/?uuid=&preferDownload=false - /download/?uuid=&preferDownload=true - - - - - - - - - -
 
- - - - - - - - - - - - - - - -
- '/>")' class="button"> - - - - - - -
-
-
-
+ + /download/?uuid=&preferDownload=false + /download/?uuid=&preferDownload=true + - - +
+ + + + + + + + + + + + '/>")' class="button"> + + + +
+ + Index: lams_tool_nb/web/monitoring/m_Statistics.jsp =================================================================== diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/monitoring/m_Statistics.jsp (.../m_Statistics.jsp) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) +++ lams_tool_nb/web/monitoring/m_Statistics.jsp (.../m_Statistics.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -1,29 +1,37 @@ -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-core" prefix="c" %> +<%@ include file="/includes/taglibs.jsp"%> - - +
+ - - - - - + + + + + + + + + + + + - - - +
- - - -    - - - -
+ + + + +   +
+ + + +
 
+ + -    +
Index: lams_tool_nb/web/monitoring/m_Summary.jsp =================================================================== diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) +++ lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -1,21 +1,22 @@ -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> - +
- - + + - - - - - +
- + + + +
  
+ + - +
Index: lams_tool_nb/web/monitoring/monitoring.jsp =================================================================== diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -r8d197d915eef154832e3bd8073e35bd974ec2c5a --- lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) +++ lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 8d197d915eef154832e3bd8073e35bd974ec2c5a) @@ -1,32 +1,25 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ page import="java.util.HashMap" %> -<%@ page import="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringAction" %> + - - +<%@ include file="/includes/taglibs.jsp"%> - +<%@ page import="java.util.HashMap"%> +<%@ page import="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringAction"%> + + + + + + + + - -<fmt:message key="activity.title"/> + + <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - + + - - - +
+ + + - - - + + + - - - - - - - - +

+ +

+ - - -