Index: lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_central/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_central/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_central/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_central/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_central/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_central/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_learning/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_learning/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_assessment/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -r25c7ffad9e4afe99bbf18ad47a779ec5558254ff -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_assessment/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 25c7ffad9e4afe99bbf18ad47a779ec5558254ff) +++ lams_tool_assessment/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,42 +1,13 @@ <%@include file="/common/taglibs.jsp"%> - - - - - <fmt:message key="label.learning.title" /> - <%@ include file="/common/header.jsp"%> - - + - - - - - - - - - - - - - - Index: lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_chat/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -rfe19797ec82718905555353176ed719bec11043e -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_chat/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision fe19797ec82718905555353176ed719bec11043e) +++ lams_tool_chat/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,46 +1,19 @@ - <%@ include file="/common/taglibs.jsp"%> - - - - - - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - + - - - - - - - - - - - - - - <%@ include file="parts/finishButton.jsp"%> - - - - \ No newline at end of file Index: lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_doku/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_doku/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_doku/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -2,82 +2,17 @@ <%@include file="/common/taglibs.jsp"%> - - - <%@ include file="/common/header.jsp"%> - <fmt:message key="label.learning.title" /> + - - - - - - - - - -
-

- ${sessionMap.reflectInstructions} -

- - - -

- - -

- - -

- -

- - - - -
- - -
- - - - - - - - - - - - - - - - - -
- - - - - Index: lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_forum/web/jsps/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_forum/web/jsps/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_forum/web/jsps/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,102 +1,13 @@ <%@ include file="/common/taglibs.jsp"%> -<%@ page import="org.lamsfoundation.lams.util.Configuration" %> -<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)%> -<%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> - - - + + - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - learning/newReflection.do?sessionMapID=${sessionMapID} - - - learning/finish.do?sessionMapID=${sessionMapID} - - - - - - - - - - - - - - - - - - - - - - -
- - - \ No newline at end of file + Index: lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java =================================================================== diff -u -rf7937adfea85b6a6976eaa98df8c68db93f9f060 -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision f7937adfea85b6a6976eaa98df8c68db93f9f060) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -172,6 +172,7 @@ String mode = request.getParameter(McAppConstants.MODE); request.setAttribute(AttributeNames.ATTR_MODE, mode); + request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(new Long(toolSessionID))); McQueUsr user = null; if ((mode != null) && mode.equals(ToolAccessMode.TEACHER.toString())) { @@ -184,25 +185,6 @@ Long userID = user.getQueUsrId(); mcLearningForm.setUserID(userID); - /* - * Is there a deadline set? - */ - Date submissionDeadline = mcContent.getSubmissionDeadline(); - if (submissionDeadline != null) { - - HttpSession ss = SessionManager.getSession(); - UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER); - TimeZone learnerTimeZone = learnerDto.getTimeZone(); - Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); - Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date()); - request.setAttribute("submissionDeadline", submissionDeadline); - - // calculate whether submission deadline has passed, and if so forward to "submissionDeadline" - if (currentLearnerDate.after(tzSubmissionDeadline)) { - return "learning/submissionDeadline"; - } - } - mcLearningForm.setToolContentID(mcContent.getMcContentId().toString()); McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent); @@ -225,6 +207,25 @@ } request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); + /* + * Is there a deadline set? + */ + Date submissionDeadline = mcContent.getSubmissionDeadline(); + if (submissionDeadline != null) { + + HttpSession ss = SessionManager.getSession(); + UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER); + TimeZone learnerTimeZone = learnerDto.getTimeZone(); + Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); + Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date()); + request.setAttribute("submissionDeadline", submissionDeadline); + + // calculate whether submission deadline has passed, and if so forward to "submissionDeadline" + if (currentLearnerDate.after(tzSubmissionDeadline)) { + return "learning/submissionDeadline"; + } + } + List learnerAnswerDtos = mcService.getAnswersFromDatabase(mcContent, user); request.setAttribute(McAppConstants.LEARNER_ANSWER_DTOS, learnerAnswerDtos); // should we show the marks for each questionDescription - we show the marks if any of the questions Index: lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_lamc/web/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_lamc/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_lamc/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,74 +1,11 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Index: lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_laqa/web/learning/submissionDeadline.jsp =================================================================== diff -u -r25c7ffad9e4afe99bbf18ad47a779ec5558254ff -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_laqa/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 25c7ffad9e4afe99bbf18ad47a779ec5558254ff) +++ lams_tool_laqa/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,78 +1,14 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - + Index: lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,65 +1,13 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - -
-
- - \ No newline at end of file + Index: lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_notebook/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_notebook/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_notebook/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,56 +1,16 @@ <%@ include file="/common/taglibs.jsp"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - -
- - + Index: lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp =================================================================== diff -u -r25c7ffad9e4afe99bbf18ad47a779ec5558254ff -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_sbmt/web/learner/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 25c7ffad9e4afe99bbf18ad47a779ec5558254ff) +++ lams_tool_sbmt/web/learner/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -2,51 +2,13 @@ <%@include file="/common/taglibs.jsp"%> - - + -
- - - - - - - - -
- - - - - - - - -
-
- Index: lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -r25c7ffad9e4afe99bbf18ad47a779ec5558254ff -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 25c7ffad9e4afe99bbf18ad47a779ec5558254ff) +++ lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -2,78 +2,16 @@ <%@include file="/common/taglibs.jsp"%> - - + -
- - - - - -
-
- -
- -
-
- -
-
- -
-

- - - - - - - - -

- -
- -
-
-
-
- - -
- - - - - - - - -
-
- Index: lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_survey/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_survey/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_survey/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,92 +1,15 @@ - - <%@include file="/common/taglibs.jsp"%> - - - <%@ include file="/common/header.jsp"%> - <fmt:message key="label.learning.title" /> - - + - - - - - - - - - - - - -
-
- - -
-
- - - -

- - -

- - -
- -
- - - - -
-
- - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - Index: lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_task/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_task/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_task/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,98 +1,16 @@ - - <%@include file="/common/taglibs.jsp"%> - - - <%@ include file="/common/header.jsp"%> - <fmt:message key="label.learning.title" /> - - - - - - - - - - - - - - - -
-
-
-
-
${sessionMap.reflectInstructions}
-
-
- - - - - -
- -
- - - - - - -
-
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java =================================================================== diff -u -r0b845931db55d90f0dcabc0b33cce5c7df688153 -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -708,7 +708,6 @@ Map mapQuestions = voteService.buildQuestionMap(voteContent, null); request.setAttribute(VoteAppConstants.MAP_QUESTION_CONTENT_LEARNER, mapQuestions); - request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); VoteQueUsr user = null; @@ -720,11 +719,12 @@ user = getCurrentUser(toolSessionID); } + boolean isLastActivity = voteService.isLastActivity(new Long(toolSessionID)); + request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, isLastActivity); + // check if there is submission deadline Date submissionDeadline = voteContent.getSubmissionDeadline(); - if (submissionDeadline != null) { - request.setAttribute(VoteAppConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline); HttpSession ss = SessionManager.getSession(); UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER); @@ -739,12 +739,8 @@ } } - boolean isLastActivity = voteService.isLastActivity(new Long(toolSessionID)); - request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, isLastActivity); - /* find out if the content is being modified at the moment. */ if (voteContent.isDefineLater()) { - return "/learning/defineLater"; } Index: lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_vote/web/learning/submissionDeadline.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_vote/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_vote/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,74 +1,13 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - - - - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - + Index: lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_tool_wiki/web/pages/learning/submissionDeadline.jsp =================================================================== diff -u -rfe19797ec82718905555353176ed719bec11043e -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_wiki/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision fe19797ec82718905555353176ed719bec11043e) +++ lams_tool_wiki/web/pages/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -1,46 +1,17 @@ - - <%@ include file="/common/taglibs.jsp"%> - - - - - - - - - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - - - - - - - - <%@ include file="parts/finishButton.jsp"%> - - - -
-
- - \ No newline at end of file + Index: lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag Index: lams_www/web/WEB-INF/tags/SubmissionDeadline.tag =================================================================== diff -u --- lams_www/web/WEB-INF/tags/SubmissionDeadline.tag (revision 0) +++ lams_www/web/WEB-INF/tags/SubmissionDeadline.tag (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -0,0 +1,117 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + + +<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> +<%@ attribute name="submissionDeadline" required="true" rtexprvalue="true" type="java.util.Date"%> +<%@ attribute name="finishSessionUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="continueReflectUrl" required="true" rtexprvalue="true"%> +<%@ attribute name="isNotebookReeditEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="notebookInstructions" required="false" rtexprvalue="true"%> +<%@ attribute name="notebookEntry" required="false" rtexprvalue="true"%> +<%@ attribute name="isContinueReflectButtonEnabled" required="true" rtexprvalue="true"%> +<%@ attribute name="isLastActivity" required="true" rtexprvalue="true"%> + +<%@ attribute name="deadlineAlertLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLastActivityLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="finishButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="continueReflectButtonLabelKey" required="false" rtexprvalue="true"%> + + + +<%@ attribute name="editButtonLabelKey" required="false" rtexprvalue="true"%> + + + + + + + +
+ + + + + + + + + + +
+
+ +
+ +
+
+ +
+
+ +
+

+ + + + + + + + +

+ +
+ +
+
+
+
+ + +
+ + + + + + + + +
+
+ Index: lams_www/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r3988dd2424a42af96cc77cb1c70b6cd59fda1f0a -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 --- lams_www/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3988dd2424a42af96cc77cb1c70b6cd59fda1f0a) +++ lams_www/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3) @@ -365,6 +365,10 @@ SimplePanel /WEB-INF/tags/SimplePanel.tag + + SubmissionDeadline + /WEB-INF/tags/SubmissionDeadline.tag + TextSearch /WEB-INF/tags/TextSearch.tag