Index: lams_central/web/author2.jsp
===================================================================
diff -u -raa19ce90c4ed489336e8d4ab26ab432f2ef91501 -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_central/web/author2.jsp	(.../author2.jsp)	(revision aa19ce90c4ed489336e8d4ab26ab432f2ef91501)
+++ lams_central/web/author2.jsp	(.../author2.jsp)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -368,6 +368,14 @@
 			</tr>
 			<tr>
 				<td>
+					Description:
+				</td>
+				<td colspan="3">
+					 <textarea class="propertiesContentFieldDescription"></textarea>
+				</td>
+			</tr>
+			<tr>
+				<td>
 					Type:
 				</td>
 				<td colspan="3">
Index: lams_central/web/css/authoring.css
===================================================================
diff -u -r10c87fd05c34bda4f1695bb872296803ab77faa0 -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_central/web/css/authoring.css	(.../authoring.css)	(revision 10c87fd05c34bda4f1695bb872296803ab77faa0)
+++ lams_central/web/css/authoring.css	(.../authoring.css)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -31,6 +31,10 @@
 	padding: 0 0 0 5px;
 }
 
+div.propertiesDialogContainer .dialogContainer table {
+	width: 100%;
+}
+
 div.propertiesDialogContainer .dialogContainer td {
 	padding-bottom: 5px;
 }
@@ -47,7 +51,7 @@
 	width: 30px;
 }
 
-input.propertiesContentFieldTitle {
+input.propertiesContentFieldTitle, textarea.propertiesContentFieldDescription {
 	width: 98%;	
 }
 
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -raa19ce90c4ed489336e8d4ab26ab432f2ef91501 -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision aa19ce90c4ed489336e8d4ab26ab432f2ef91501)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -82,9 +82,11 @@
 	/**
 	 * Constructor for a Gate Activity.
 	 */
-	GateActivity : function(id, uiid, x, y, gateType, startTimeOffset, gateActivityCompletionBased) {
+	GateActivity : function(id, uiid, x, y, title, description, gateType, startTimeOffset, gateActivityCompletionBased) {
 		this.id = +id || null;
 		this.uiid = +uiid || ++layout.ld.maxUIID;
+		this.title = title;
+		this.description = description;
 		this.gateType = gateType || 'permission';
 		if (gateType == 'schedule') {
 			var day = 24*60;
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -raa19ce90c4ed489336e8d4ab26ab432f2ef91501 -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision aa19ce90c4ed489336e8d4ab26ab432f2ef91501)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -846,14 +846,16 @@
 					// Gate Activity
 					case 3: var gateType = 'sync';
 					case 4: var gateType = gateType || 'schedule';
-					case 5: var gateType = gateType || 'permision';
+					case 5: var gateType = gateType || 'permission';
 					case 14:
 						var gateType = gateType || 'condition';
 						activity = new ActivityLib.GateActivity(
 							activityData.activityID,
 							activityData.activityUIID,
 							activityData.xCoord,
 							activityData.yCoord,
+							activityData.activityTitle,
+							activityData.description,
 							gateType,
 							activityData.gateStartTimeOffset,
 							activityData.gateActivityCompletionBased);
@@ -1469,21 +1471,22 @@
 			'xCoord' 				 : x,
 			'yCoord' 				 : y,
 			'activityTitle' 		 : activity.title,
+			'description'			 : activity.description,
 			'activityCategoryID' 	 : activityCategoryID,
 			'activityTypeID'     	 : activityTypeID,
 			'orderID'				 : activity.orderID,
 			'defaultActivityUIID'    : activity.defaultActivityUIID,
 			'gateStartTimeOffset'	 : activity.gateType == 'schedule' ?
 										activity.offsetDay*24*60 + activity.offsetHour*60 + activity.offsetMinute : null,
 			'gateActivityCompletionBased' : activity.gateActivityCompletionBased,
+			'gateActivityLevelID'    : activity instanceof ActivityLib.GateActivity ? 1 : null,
 			'minOptions'			 : activity.minOptions,
 			'maxOptions'			 : activity.maxOptions,
 			'stopAfterActivity'		 : activity.stopAfterActivity ? true : false,
 			'toolActivityUIID'		 : activity.input ? activity.input.uiid : null,
 			
 			'gradebookToolOutputDefinitionName' : null,
-			'helpText' : null,
-			'description' : null
+			'helpText' : null
 		});
 
 		var activityTransitions = activity instanceof ActivityLib.BranchingActivity ?
Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -raa19ce90c4ed489336e8d4ab26ab432f2ef91501 -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision aa19ce90c4ed489336e8d4ab26ab432f2ef91501)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -962,6 +962,7 @@
 			content = activity.propertiesContent = $('#propertiesContentGate').clone().attr('id', null)
 													.show().data('parentObject', activity);
 			$('.propertiesContentFieldTitle', content).val(activity.title);
+			$('.propertiesContentFieldDescription', content).val(activity.description ? activity.description : '');
 			$('.propertiesContentFieldGateType', content).val(activity.gateType);
 			
 			$('.propertiesContentFieldCreateConditions', content).button().click(function(){
@@ -986,6 +987,9 @@
 						redrawNeeded = true;
             		}
 				}
+				
+				activity.description = $('.propertiesContentFieldDescription', content).val();
+				
 				activity.gateType = $('.propertiesContentFieldGateType', content).val();
 				if (activity.gateType == 'schedule') {
 					$(".propertiesContentRowGateSchedule").show();
@@ -1041,7 +1045,7 @@
 			$('.propertiesContentFieldActivityCompletionBased', content)
 				.attr('checked', activity.gateActivityCompletionBased? 'checked' : null);
 			
-			$('input, select', content).change(changeFunction);
+			$('input, textarea, select', content).change(changeFunction);
 			PropertyLib.fillToolInputDropdown(activity, activity.input);
 			changeFunction.call(content);
 		}
Index: lams_learning/web/gate/conditionGateContent.jsp
===================================================================
diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_learning/web/gate/conditionGateContent.jsp	(.../conditionGateContent.jsp)	(revision 209087915bc219f430c282ad00e5d1e6462f9b5f)
+++ lams_learning/web/gate/conditionGateContent.jsp	(.../conditionGateContent.jsp)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -20,5 +20,8 @@
 	--%>
 
 	<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
+	<%@ taglib uri="tags-lams" prefix="lams" %>
+	
+	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
+	
 	<p><fmt:message key="label.condition.gate.close.message"/></p>
\ No newline at end of file
Index: lams_learning/web/gate/permissionGateContent.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_learning/web/gate/permissionGateContent.jsp	(.../permissionGateContent.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_learning/web/gate/permissionGateContent.jsp	(.../permissionGateContent.jsp)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -20,5 +20,9 @@
 	--%>
 
 	<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
+	<%@ taglib uri="tags-lams" prefix="lams" %>
+	
+	<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
+	
 	<p><fmt:message key="label.permission.gate.message"/></p>
+	
\ No newline at end of file
Index: lams_learning/web/gate/scheduleGateContent.jsp
===================================================================
diff -u -r85694f9f0a27f030bfe567c6aff20029beb604f3 -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_learning/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision 85694f9f0a27f030bfe567c6aff20029beb604f3)
+++ lams_learning/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -25,6 +25,9 @@
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+
+<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
+
 <c:choose>
 	<c:when test="${not empty GateForm.map.reachDate}">
 		<p><fmt:message key="label.schedule.gate.reach"/> <lams:Date value="${GateForm.map.reachDate}"/><br />
Index: lams_learning/web/gate/synchGateContent.jsp
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_learning/web/gate/synchGateContent.jsp	(.../synchGateContent.jsp)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_learning/web/gate/synchGateContent.jsp	(.../synchGateContent.jsp)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -24,7 +24,10 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
+<lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/>
+
 <p><fmt:message key="label.synch.gate.message"/></p> 
 <p><fmt:message key="label.gate.waiting.learners">  
 		<fmt:param value="${GateForm.map.waitingLearners}"/>
Index: lams_monitoring/web/gate/gateInfo.jsp
===================================================================
diff -u -r614080cb0cdefaf39c8453eeaa7977e17d2b0882 -r849974951204f4b6aae6c21564e3a815fec12162
--- lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision 614080cb0cdefaf39c8453eeaa7977e17d2b0882)
+++ lams_monitoring/web/gate/gateInfo.jsp	(.../gateInfo.jsp)	(revision 849974951204f4b6aae6c21564e3a815fec12162)
@@ -18,10 +18,11 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 <c:if test="${not empty GateForm.map.gate.description}">
 	<!-- general information section--> 
-	<p><c:out value="${GateForm.map.gate.description}"/></p>
+	<p><lams:out value="${GateForm.map.gate.description}" escapeHtml="true"/></p>
 </c:if>
 	
 <!--waiting learner information table-->