Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/edit.jsp,v
diff -u -r1.25.2.7 -r1.25.2.8
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp 13 Sep 2016 09:22:06 -0000 1.25.2.7
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp 27 Feb 2017 10:11:07 -0000 1.25.2.8
@@ -1,5 +1,4 @@
-
<%@ include file="/common/taglibs.jsp"%>
@@ -16,7 +15,7 @@
<%@ include file="/common/messages.jsp"%>
-
+
">
Index: lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp,v
diff -u -r1.4.2.3 -r1.4.2.4
--- lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp 20 Feb 2017 01:11:45 -0000 1.4.2.3
+++ lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp 27 Feb 2017 10:11:07 -0000 1.4.2.4
@@ -1,4 +1,9 @@
<%@ 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" %>
+<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%>
+
@@ -17,20 +22,14 @@
-
-
-
-
-
-
- ${sessionMap.uploadMaxFileSize}
-
-
-
+
+
+
+
Index: lams_tool_forum/web/jsps/learning/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/create.jsp,v
diff -u -r1.12.2.3 -r1.12.2.4
--- lams_tool_forum/web/jsps/learning/create.jsp 18 Apr 2016 02:22:18 -0000 1.12.2.3
+++ lams_tool_forum/web/jsps/learning/create.jsp 27 Feb 2017 10:11:07 -0000 1.12.2.4
@@ -4,6 +4,7 @@
function doSubmit() {
disableSubmitButton();
if (validateForm()) {
+ showBusy("itemAttachmentArea");
return true;
}
enableSubmitButton();
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/edit.jsp,v
diff -u -r1.8.2.6 -r1.8.2.7
--- lams_tool_forum/web/jsps/learning/edit.jsp 19 Aug 2016 00:54:28 -0000 1.8.2.6
+++ lams_tool_forum/web/jsps/learning/edit.jsp 27 Feb 2017 10:11:07 -0000 1.8.2.7
@@ -13,7 +13,6 @@
});
$('#editForm').submit(function() { // catch the form's submit event
-
disableSubmitButton();
if ( validateForm() ) {
@@ -22,6 +21,7 @@
CKEDITOR.instances[instance].updateElement();
}
+ showBusy("itemAttachmentArea");
var formData = new FormData(this);
$.ajax({ // create an AJAX call...
@@ -54,6 +54,7 @@
// No valid id? Validation failed! Assume it is the form coming back.
$('#edit').html(response);
}
+ hideBusy("itemAttachmentArea");
}
});
} // end validateForm()
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/reply.jsp,v
diff -u -r1.16.2.11 -r1.16.2.12
--- lams_tool_forum/web/jsps/learning/reply.jsp 5 Dec 2016 12:00:46 -0000 1.16.2.11
+++ lams_tool_forum/web/jsps/learning/reply.jsp 27 Feb 2017 10:11:07 -0000 1.16.2.12
@@ -22,8 +22,8 @@
CKEDITOR.instances[instance].updateElement();
}
+ showBusy("itemAttachmentArea");
var formData = new FormData(this);
-
$.ajax({ // create an AJAX call...
data: formData,
processData: false, // tell jQuery not to process the data
@@ -78,6 +78,7 @@
} // end validateForm()
else {
enableSubmitButton();
+ hideBusy("itemAttachmentArea");
}
return false;
});
@@ -103,10 +104,10 @@
-
+
<%@ include file="/jsps/learning/message/topicreplyform.jsp"%>
-
+
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp,v
diff -u -r1.18.2.8 -r1.18.2.9
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp 20 Oct 2016 22:17:29 -0000 1.18.2.8
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp 27 Feb 2017 10:11:07 -0000 1.18.2.9
@@ -15,7 +15,7 @@
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicform.jsp,v
diff -u -r1.17.2.6 -r1.17.2.7
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp 20 Feb 2017 01:11:45 -0000 1.17.2.6
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp 27 Feb 2017 10:11:07 -0000 1.17.2.7
@@ -14,12 +14,7 @@
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp,v
diff -u -r1.18.2.9 -r1.18.2.10
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp 20 Feb 2017 01:11:45 -0000 1.18.2.9
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp 27 Feb 2017 10:11:07 -0000 1.18.2.10
@@ -13,16 +13,11 @@
+
+
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v
diff -u -r1.31.2.14 -r1.31.2.15
--- lams_tool_forum/web/jsps/monitoring/summary.jsp 13 Dec 2016 22:51:37 -0000 1.31.2.14
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp 27 Feb 2017 10:11:07 -0000 1.31.2.15
@@ -158,7 +158,7 @@
-
+
Index: lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.13.2.5 -r1.13.2.6
--- lams_tool_pixlr/conf/language/lams/ApplicationResources.properties 4 Dec 2016 01:41:47 -0000 1.13.2.5
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources.properties 27 Feb 2017 10:01:40 -0000 1.13.2.6
@@ -104,6 +104,8 @@
message.no.reflection.available =No notebook entry has been added.
label.image.options =Image options
label.activity.completion =End of activity
+errors.maxfilesize =Uploaded file exceeded maximum size of {0}
+label.upload.info =Uploaded file must not be executable and not exceed size of {0}
#======= End labels: Exported 98 labels for en AU =====
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.11.2.2 -r1.11.2.3
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag 13 Dec 2016 04:32:51 -0000 1.11.2.2
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag 27 Feb 2017 10:01:40 -0000 1.11.2.3
@@ -123,7 +123,7 @@
}
-
-
+
+
+
+