Index: lams_gradebook/web/releaseLessonMarks.jsp
===================================================================
diff -u -ra9c5e4550ac78c7dde3dc3796d6cf8dc03d455e8 -r67eb08b1f83112e23be227fbf6923a46d0dc95ba
--- lams_gradebook/web/releaseLessonMarks.jsp	(.../releaseLessonMarks.jsp)	(revision a9c5e4550ac78c7dde3dc3796d6cf8dc03d455e8)
+++ lams_gradebook/web/releaseLessonMarks.jsp	(.../releaseLessonMarks.jsp)	(revision 67eb08b1f83112e23be227fbf6923a46d0dc95ba)
@@ -1,5 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 <style>
+	#release-marks-learner-list {
+		cursor: pointer;
+	}
+
 	#gbox_release-marks-learner-list {
 		max-width: 600px;
 		margin: auto;
@@ -19,10 +23,9 @@
 		padding-bottom: 10px;
 	}
 	
-	#release-marks-buttons {
+	#release-marks-buttons > button {
 		margin-top: 10px;
 		margin-bottom: 20px;
-		float: right;
 	}
 </style>
 
@@ -31,6 +34,7 @@
 	var releaseMarksLessonID = ${param.lessonID};
 
 	jQuery(document).ready(function() {
+		displayMarksReleaseOption();
 		
 		//initialize user list 
 		var grid = jQuery("#release-marks-learner-list").jqGrid({
@@ -66,19 +70,51 @@
 				   row.addClass('warning');
 
 				   let userID = row.attr('id');
-				   $('#release-marks-email-preview')
-				   		.show()
-				   		.children('#release-marks-email-preview-content')
+				   $('#release-marks-email-preview-content')
 				   		.load('<lams:LAMSURL/>gradebook/gradebookMonitoring/getReleaseMarksEmailContent.do',{
 							'lessonID' : releaseMarksLessonID,
 							'userID'   : userID
+					   }, function(){
+						   $(this).parent().slideDown();
 					   });
 			   }
 			   return false;
 			}
 		});
 	});
-
+	
+	function toggleMarksRelease() {
+		if (confirm(marksReleased ? "<fmt:message key="gradebook.monitor.releasemarks.check2"/>" : "<fmt:message key="gradebook.monitor.releasemarks.check"/>")) {
+			$.post(
+				"<lams:LAMSURL/>gradebook/gradebookMonitoring/toggleReleaseMarks.do", 
+				{
+				  	"<csrf:tokenname/>":"<csrf:tokenvalue/>",
+					lessonID: releaseMarksLessonID
+				}, 
+				function(xml) {
+					var str = new String(xml)
+			    	if (str.indexOf("success") != -1) {
+				    	marksReleased = !marksReleased;
+		    			displayMarksReleaseOption();
+		    			
+			    	} else {
+			    		alert("<fmt:message key="error.releasemarks.fail"/>");
+			    	}
+		    	}
+		    );
+	    }
+	}
+	
+	function displayMarksReleaseOption() {
+		if (marksReleased) {
+			$('#marksNotReleased, #padlockLocked').hide();
+			$('#marksReleased, #padlockUnlocked').show();
+		} else {
+			$('#marksReleased, #padlockUnlocked').hide();
+			$('#marksNotReleased, #padlockLocked').show();
+		}
+	}
+	
 	function sendReleaseMarksEmails(){
 		$.ajax({
 			'url'      : '<lams:LAMSURL/>gradebook/gradebookMonitoring/sendReleaseMarksEmails.do',
@@ -105,5 +141,20 @@
 	<div id="release-marks-email-preview-content"></div>
 </div>
 <div id="release-marks-buttons">
-	<button type="button" class="btn btn-default" onClick="javascript:sendReleaseMarksEmails()">Send emails to all selected learners</button>
+	<button type="button" class="btn btn-default pull-left" onClick="javascript:sendReleaseMarksEmails()">Send emails to all selected learners</button>
+			
+	<button type="button" id="marksNotReleased" onClick="javascript:toggleMarksRelease()" class="btn btn-primary pull-right"
+		title="<fmt:message key="gradebook.monitor.releasemarks.1" />&nbsp;<fmt:message key="gradebook.monitor.releasemarks.3" />" >
+		<i class="fa fa-share-alt "></i>
+		<span class="hidden-xs">
+			<fmt:message key="gradebook.monitor.releasemarks.1" />&nbsp;<fmt:message key="gradebook.monitor.releasemarks.3" />
+		</span>
+	</button>
+	<button type="button" id="marksReleased" onClick="javascript:toggleMarksRelease()" class="btn btn-primary pull-right"
+		title="<fmt:message key="gradebook.monitor.releasemarks.2" />&nbsp;<fmt:message key="gradebook.monitor.releasemarks.3" />" >
+		<i class="fa fa-share-alt "></i>
+		<span class="hidden-xs">
+			<fmt:message key="gradebook.monitor.releasemarks.2" />&nbsp;<fmt:message key="gradebook.monitor.releasemarks.3" />
+		</span>
+	</button> 
 </div>
\ No newline at end of file