Index: lams_tool_wiki/build.properties
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/build.properties	(.../build.properties)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_wiki/build.properties	(.../build.properties)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -3,5 +3,6 @@
 
 signature=lawiki10
 tool.version=20120315
+tool.version=20160919
 tool.hide=false
 tool.short.name=wiki
\ No newline at end of file
Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	(.../Wiki.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	(.../Wiki.hbm.xml)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -213,6 +213,14 @@
             />
 
         </set>
+        
+        <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
 
         <many-to-one
             name="mainPage"
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -131,6 +131,15 @@
 monitor.th.numlearners  =Number of Learners
 monitor.summary.td.addNotebook  =Add a notebook at end of Wiki
 monitor.summary.td.notebookInstructions  =Notebook instructions
+monitor.summary.date.restriction  =Deadline
+monitor.summary.when.date.restriction.is.set  =Learners will not be able to use the Wiki after the set date and time.
+monitor.summary.after.date  =Date/time:
+monitor.summary.set.restriction  =Set restriction
+monitor.summary.unset.restriction  =Remove restriction
+authoring.info.teacher.set.restriction  =For this activity, the instructor fixed a deadline until {0}. After this time this activity will not be available.
+monitor.summary.notification  =Notification
+monitor.summary.date.restriction.set  =Deadline has been set
+monitor.summary.date.restriction.removed  =Deadline has been removed
 monitor.nosessions  =There are no sessions running yet for this Wiki.
 monitor.notebooks  =Notebook Reflections
 output.learner.number.of.edits  =Number of page edits
Index: lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/db/sql/create_lams_tool_wiki.sql	(.../create_lams_tool_wiki.sql)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/db/sql/create_lams_tool_wiki.sql	(.../create_lams_tool_wiki.sql)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -10,7 +10,7 @@
 create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, primary key (uid))ENGINE=InnoDB;
 create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid))ENGINE=InnoDB;
 create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid))ENGINE=InnoDB;
-create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint, primary key (uid))ENGINE=InnoDB;
+create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint,submission_deadline datetime default null, primary key (uid))ENGINE=InnoDB;
 create table tl_lawiki10_wiki_page (
 	uid bigint not null auto_increment, 
 	wiki_uid bigint, 
Index: lams_tool_wiki/db/sql/table-schema.sql
===================================================================
diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/db/sql/table-schema.sql	(.../table-schema.sql)	(revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7)
+++ lams_tool_wiki/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -18,7 +18,7 @@
 create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, primary key (uid));
 create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid));
 create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid));
-create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint, primary key (uid));
+create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint,submission_deadline datetime, primary key (uid));
 create table tl_lawiki10_wiki_page (uid bigint not null auto_increment, wiki_uid bigint, title varchar(255), editable bit, wiki_current_content bigint, added_by bigint, wiki_session_uid bigint, primary key (uid));
 create table tl_lawiki10_wiki_page_content (uid bigint not null auto_increment, wiki_page_uid bigint, body text, editor bigint, edit_date datetime, version bigint, primary key (uid));
 alter table tl_lawiki10_attachment add index FK9406D87760B3B03B (wiki_uid), add constraint FK9406D87760B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20160919_updateFrom235.sql
===================================================================
diff -u
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20160919_updateFrom235.sql	(revision 0)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20160919_updateFrom235.sql	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -0,0 +1,16 @@
+-- SQL statements to update from LAMS 2.3.5
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+alter table tl_lawiki10_wiki add column submission_deadline datetime default null;
+UPDATE lams_tool SET tool_version = "20160919" WHERE tool_signature = "lawiki10";
+
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java	(.../WikiDTO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java	(.../WikiDTO.java)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -25,6 +25,7 @@
 
 package org.lamsfoundation.lams.tool.wiki.dto;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
@@ -64,9 +65,13 @@
     private Integer minimumEdits;
 
     private Integer maximumEdits;
+   
+    public Date submissionDeadline;
 
-    public Set<WikiSessionDTO> sessionDTOs = new TreeSet<WikiSessionDTO>();
+    
 
+	public Set<WikiSessionDTO> sessionDTOs = new TreeSet<WikiSessionDTO>();
+
     public Long currentTab;
 
     /* Constructors */
@@ -85,8 +90,10 @@
 	notifyUpdates = wiki.isNotifyUpdates();
 	reflectOnActivity = wiki.isReflectOnActivity();
 	reflectInstructions = wiki.getReflectInstructions();
+    submissionDeadline = wiki.getSubmissionDeadline();
 	minimumEdits = wiki.getMinimumEdits();
 	maximumEdits = wiki.getMaximumEdits();
+	
 
 	for (Iterator<WikiSession> iter = wiki.getWikiSessions().iterator(); iter.hasNext();) {
 	    WikiSession session = iter.next();
@@ -228,4 +235,12 @@
     public void setCurrentTab(Long currentTab) {
 	this.currentTab = currentTab;
     }
+    
+    public Date getSubmissionDeadline() {
+    	return submissionDeadline;
+        }
+
+    public void setSubmissionDeadline(Date submissionDeadline) {
+    	this.submissionDeadline = submissionDeadline;
+        }
 }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java	(.../Wiki.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java	(.../Wiki.java)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -95,6 +95,8 @@
     private boolean defineLater;
 
     private Long toolContentId;
+    
+	private Date submissionDeadline;
 
     private Set<WikiSession> wikiSessions;
 
@@ -368,7 +370,21 @@
     public void setMainPage(WikiPage mainPage) {
 	this.mainPage = mainPage;
     }
+    
+    
+    /**
+    *
+    * @return
+    */
+    public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
+    
 
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+    
     /**
      * toString
      *
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -74,4 +74,13 @@
 
     public static final String JAVASCRIPT_TOKEN = "javascript";
     public static final String JAVASCRIPT_REPLACE_TOKEN = "JAVASCRIPTREPLACE";
+    
+    public static final String MESSAGE_SEPARATOR = " ";
+    public static final String TEXT_SEARCH_DEFINITION_NAME = "text.search.output.definition.chat";
+    public static final String TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "text.search.output.definition.chat.default.condition";
+    
+    /* Date time restriction */
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
+
 }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -r1980c17755d5ddc7da8545b352cd45a84f30c0f3 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 1980c17755d5ddc7da8545b352cd45a84f30c0f3)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -26,11 +26,13 @@
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.TimeZone;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -41,6 +43,7 @@
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
+
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiDTO;
@@ -59,6 +62,7 @@
 import org.lamsfoundation.lams.tool.wiki.web.forms.LearningForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
@@ -165,10 +169,12 @@
 	if (wikiService.getEventNotificationService().eventExists(WikiConstants.TOOL_SIGNATURE,
 		WikiConstants.EVENT_NOTIFY_LEARNERS, toolSessionID)
 		&& wikiService.getEventNotificationService().isSubscribed(WikiConstants.TOOL_SIGNATURE,
-			WikiConstants.EVENT_NOTIFY_LEARNERS, toolSessionID, wikiUser.getUserId().longValue())) {
-
+			WikiConstants.EVENT_NOTIFY_LEARNERS, toolSessionID, wikiUser.getUserId())) {
 	    wikiUserDTO.setNotificationEnabled(true);
 	}
+	
+	
+	
 
 	// add the userDTO to attributes
 	request.setAttribute(WikiConstants.ATTR_USER_DTO, wikiUserDTO);
@@ -222,7 +228,30 @@
 	    request.setAttribute(WikiConstants.ATTR_CONTENT_EDITAVLE, true);
 	}
 	request.setAttribute(WikiConstants.ATTR_FINISHED_ACTIVITY, wikiUser.isFinishedActivity());
+	
+	
+	/* Check if submission deadline is null */
+	
+	Date submissionDeadline = wikiDTO.getSubmissionDeadline();
+	request.setAttribute("wikiDTO", wikiDTO);
+	
 
+	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 mapping.findForward("submissionDeadline");
+	    }
+
+	}
+	
 	return mapping.findForward("wiki");
     }
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -29,6 +29,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -55,6 +56,9 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import java.util.Date;
+import org.lamsfoundation.lams.util.DateUtil;
+import java.util.TimeZone;
 
 /**
  * This action handles all the monitoring actions, which include opening
@@ -117,7 +121,21 @@
 
 	Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true);
 	wikiDT0.setCurrentTab(currentTab);
+	
+	/* Check if submission deadline is null */
 
+	Date submissionDeadline = wikiDT0.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);
+	    request.setAttribute("submissionDeadline", tzSubmissionDeadline.getTime());
+
+	}
+
 	request.setAttribute(WikiConstants.ATTR_WIKI_DTO, wikiDT0);
 	request.setAttribute(WikiConstants.ATTR_CONTENT_FOLDER_ID, contentFolderID);
 	request.setAttribute(WikiConstants.ATTR_IS_GROUPED_ACTIVITY, wikiService.isGroupedActivity(toolContentID));
@@ -156,7 +174,44 @@
 
 	return wikiUser;
     }
+    
+    
+    /**
+     * Set Submission Deadline
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
 
+	// set up wikiService
+	if (wikiService == null) {
+		wikiService = WikiServiceProxy.getWikiService(this.getServlet().getServletContext());
+	}
+
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Wiki wiki = wikiService.getWikiByContentId(contentID);
+
+	Long dateParameter = WebUtil.readLongParam(request,WikiConstants.ATTR_SUBMISSION_DEADLINE, true);
+	Date tzSubmissionDeadline = null;
+	if (dateParameter != null) {
+	    Date submissionDeadline = new Date(dateParameter);
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+	}
+	wiki.setSubmissionDeadline(tzSubmissionDeadline);
+	System.out.println("datasetbefore"+wiki);
+	wikiService.saveOrUpdateWiki(wiki);
+	System.out.println("datasetafter"+wiki);
+	return null;
+    }
+
     /**
      * Shows a specific wiki based on the session id
      * 
Index: lams_tool_wiki/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u
--- lams_tool_wiki/web/pages/learning/submissionDeadline.jsp	(revision 0)
+++ lams_tool_wiki/web/pages/learning/submissionDeadline.jsp	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -0,0 +1,18 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="title" scope="request">
+		<fmt:message key="activity.title" />
+</c:set>		
+
+<lams:Page type="learner" title="${title}">
+	<lams:Alert type="danger" close="false" id="submissionDeadline">
+		<fmt:message key="authoring.info.teacher.set.restriction" >
+			<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+		</fmt:message>							
+	</lams:Alert>
+	 	
+	<c:if test="${MODE == 'learner' || MODE == 'author'}">
+		<%@ include file="parts/finishButton.jsp"%>
+	</c:if>
+</lams:Page>
+
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -rf1b987bd4c36f0866ceefd0b02f418158c9f8faa -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision f1b987bd4c36f0866ceefd0b02f418158c9f8faa)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -177,12 +177,25 @@
 
 
                     </c:if>
+                    <c:if test="${mode == 'learner' || mode == 'author'}">
+                    <c:if test="${not empty submissionDeadline}">
 
+			<lams:Alert id="submissionDeadline" type="info" close="true">
+				<fmt:message key="authoring.info.teacher.set.restriction">
+					<fmt:param>
+						<lams:Date value="${submissionDeadline}" />
+					</fmt:param>
+				</fmt:message>
+			</lams:Alert>
+		    </c:if>
+		     </c:if>
+
                     <c:if test="${currentWikiPage.deleted}">
                       <lams:Alert id="pageRemoved" type="danger" close="false">
                         <fmt:message key="label.wiki.removed" />
                       </lams:Alert>
                     </c:if>
+                    
                 <!-- end annoucements -->
 
                 <!-- Wiki main -->
@@ -229,7 +242,7 @@
                               </c:choose>
                             </a>
                           </fmt:param>
-                        </fmt:message>
+                        </fmt:message> 
 
                       </div>
                     </div>
Index: lams_tool_wiki/web/pages/monitoring/daterestriction.jsp
===================================================================
diff -u
--- lams_tool_wiki/web/pages/monitoring/daterestriction.jsp	(revision 0)
+++ lams_tool_wiki/web/pages/monitoring/daterestriction.jsp	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -0,0 +1,29 @@
+<%@include file="/common/taglibs.jsp"%>
+
+<c:set var="ddTitle"><fmt:message key="monitor.summary.date.restriction" /></c:set>
+<lams:RestrictedUsageAccordian title="${ddTitle}">
+
+	<p><fmt:message key="monitor.summary.when.date.restriction.is.set" /></p>
+		
+	<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+		<div class="form-group">
+		<label for="datetime"><fmt:message key="monitor.summary.after.date" />&nbsp;
+		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
+		</label>							
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="btn btn-default">
+			<fmt:message key="monitor.summary.set.restriction" />
+		</html:link>
+		</div>
+	</div>
+
+	<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+		<label><fmt:message key="monitor.summary.after.date" /></span>
+		<span id="dateInfo">
+		</span>
+		</label>
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="btn btn-default">
+			<fmt:message key="monitor.summary.unset.restriction" />
+		</html:link>
+	</div>
+
+</lams:RestrictedUsageAccordian>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d
--- lams_tool_wiki/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d)
@@ -1,7 +1,33 @@
 <%@ include file="/common/taglibs.jsp"%>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<c:set var="lams">
+        <lams:LAMSURL />
+</c:set>
 
+<c:set var="dto" value="${requestScope.monitoringDTO}" />
+
+<link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+
 <script type="text/javascript">
+	//pass settings to monitorToolSummaryAdvanced.js
+	var submissionDeadlineSettings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		toolContentID: '${param.toolContentID}',
+		messageNotification: '<fmt:message key="monitor.summary.notification" />',
+		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
+		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+	};
+</script>
+
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+
+<script type="text/javascript">
 <!--
 	var viewWindow = null;
 	function openViewWindow(url)
@@ -218,4 +244,5 @@
 	</tr>
 	
 </table>
-</lams:AdvancedAccordian> 
\ No newline at end of file
+</lams:AdvancedAccordian> 
+<%@include file="daterestriction.jsp"%>
\ No newline at end of file