+ |
Type:
|
Index: lams_central/web/css/authoring.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v
diff -u -r1.25 -r1.26
--- lams_central/web/css/authoring.css 20 May 2014 09:40:46 -0000 1.25
+++ lams_central/web/css/authoring.css 26 May 2014 10:11:54 -0000 1.26
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringActivity.js,v
diff -u -r1.31 -r1.32
--- lams_central/web/includes/javascript/authoring/authoringActivity.js 26 May 2014 09:13:51 -0000 1.31
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js 26 May 2014 10:11:54 -0000 1.32
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.40 -r1.41
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js 26 May 2014 09:13:51 -0000 1.40
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js 26 May 2014 10:11:54 -0000 1.41
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringProperty.js,v
diff -u -r1.21 -r1.22
--- lams_central/web/includes/javascript/authoring/authoringProperty.js 26 May 2014 09:13:51 -0000 1.21
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js 26 May 2014 10:11:54 -0000 1.22
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/conditionGateContent.jsp,v
diff -u -r1.1 -r1.2
--- lams_learning/web/gate/conditionGateContent.jsp 16 Sep 2008 03:18:13 -0000 1.1
+++ lams_learning/web/gate/conditionGateContent.jsp 26 May 2014 10:11:53 -0000 1.2
@@ -20,5 +20,8 @@
--%>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
+ <%@ taglib uri="tags-lams" prefix="lams" %>
+
+
+
\ No newline at end of file
Index: lams_learning/web/gate/permissionGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/permissionGateContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_learning/web/gate/permissionGateContent.jsp 17 Sep 2006 06:18:46 -0000 1.4
+++ lams_learning/web/gate/permissionGateContent.jsp 26 May 2014 10:11:53 -0000 1.5
@@ -20,5 +20,9 @@
--%>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
+ <%@ taglib uri="tags-lams" prefix="lams" %>
+
+
+
+
\ No newline at end of file
Index: lams_learning/web/gate/scheduleGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/scheduleGateContent.jsp,v
diff -u -r1.7 -r1.8
--- lams_learning/web/gate/scheduleGateContent.jsp 6 May 2014 08:08:34 -0000 1.7
+++ lams_learning/web/gate/scheduleGateContent.jsp 26 May 2014 10:11:53 -0000 1.8
@@ -25,6 +25,9 @@
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
<%@ taglib uri="tags-lams" prefix="lams" %>
+
+
+
Index: lams_learning/web/gate/synchGateContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/gate/synchGateContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_learning/web/gate/synchGateContent.jsp 17 Sep 2006 06:18:46 -0000 1.4
+++ lams_learning/web/gate/synchGateContent.jsp 26 May 2014 10:11:53 -0000 1.5
@@ -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" %>
+
+
Index: lams_monitoring/web/gate/gateInfo.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/gateInfo.jsp,v
diff -u -r1.8 -r1.9
--- lams_monitoring/web/gate/gateInfo.jsp 9 Sep 2007 07:48:48 -0000 1.8
+++ lams_monitoring/web/gate/gateInfo.jsp 26 May 2014 10:11:55 -0000 1.9
@@ -18,10 +18,11 @@
http://www.gnu.org/licenses/gpl.txt
--%>
+<%@ taglib uri="tags-lams" prefix="lams" %>
-
+
|