Index: lams_tool_imscc/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/conf/language/lams/ApplicationResources.properties,v diff -u -r1.9.2.5 -r1.9.2.6 --- lams_tool_imscc/conf/language/lams/ApplicationResources.properties 4 Dec 2016 10:04:09 -0000 1.9.2.5 +++ lams_tool_imscc/conf/language/lams/ApplicationResources.properties 1 Mar 2017 06:57:49 -0000 1.9.2.6 @@ -131,6 +131,9 @@ label.monitoring.heading =Common Cartridge Monitoring label.resource.options =Resource options label.activity.completion =End of activity +errors.maxfilesize =Uploaded file exceeded maximum size: {0} +error.attachment.executable =Uploaded file is executable +label.upload.info =Uploaded file must not be executable and not exceed size of {0} #======= End labels: Exported 125 labels for en AU ===== Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag,v diff -u -r1.9.2.2 -r1.9.2.3 --- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag 13 Dec 2016 04:23:15 -0000 1.9.2.2 +++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag 1 Mar 2017 06:57:49 -0000 1.9.2.3 @@ -123,7 +123,7 @@ }
- + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/FileUpload.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/WaitingSpinner.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.6.2.7 -r1.6.2.8 --- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld 25 Nov 2016 17:09:20 -0000 1.6.2.7 +++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld 1 Mar 2017 06:57:49 -0000 1.6.2.8 @@ -529,5 +529,13 @@ CommentsAuthor /WEB-INF/tags/CommentsAuthor.tag + + FileUpload + /WEB-INF/tags/FileUpload.tag + + + WaitingSpinner + /WEB-INF/tags/WaitingSpinner.tag + Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp,v diff -u -r1.3.2.5 -r1.3.2.6 --- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp 12 Nov 2016 22:36:08 -0000 1.3.2.5 +++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp 1 Mar 2017 06:57:49 -0000 1.3.2.6 @@ -1,22 +1,47 @@ <%@ include file="/common/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> +<%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> <%@ include file="/common/header.jsp"%> - + + + + - + <%@ include file="/common/messages.jsp"%> - @@ -27,7 +52,7 @@
-
+
Index: lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp 20 Oct 2016 22:26:02 -0000 1.1.2.2 +++ lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp 1 Mar 2017 06:57:49 -0000 1.1.2.3 @@ -23,6 +23,10 @@ - +
+ +
+

${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}

+