|
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -rfdbf1be4d3301ea8f5ebfd9abb5a272ab327dc76 -rafc23c933fe5ce406a5112d67c95581b0b9ac3ce
--- lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision fdbf1be4d3301ea8f5ebfd9abb5a272ab327dc76)
+++ lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision afc23c933fe5ce406a5112d67c95581b0b9ac3ce)
@@ -565,7 +565,7 @@
}
td#templateContainerCell #collapse-heading-tool-category-1 .collapse-heading-bottom-border,
-td#templateContainerCell #collapse-heading-tool-category-1 div.template:hover > div {
+td#templateContainerCell #collapse-tool-category-1 div.template:hover > div {
background-color: #caddfb; }
td#templateContainerCell #collapse-heading-tool-category-2 .collapse-heading-bottom-border,
Index: lams_central/web/images/grouping.png
===================================================================
diff -u -r40c0555670eae84b4e4f27c79fb96ba95e87edbe -rafc23c933fe5ce406a5112d67c95581b0b9ac3ce
Binary files differ
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r54613e14332031bce49e424b8e0ebc3700a2ccd7 -rafc23c933fe5ce406a5112d67c95581b0b9ac3ce
--- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 54613e14332031bce49e424b8e0ebc3700a2ccd7)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision afc23c933fe5ce406a5112d67c95581b0b9ac3ce)
@@ -43,7 +43,9 @@
'Zoom' : 2,
'Resources and Forum' : 5,
'Chat and Scribe' : 5,
- 'Forum and Scribe' : 5
+ 'Forum and Scribe' : 5,
+
+ 'grouping' : 1
},
ActivityDefs = {
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -rf83b3ec0b47a5daf5f0743a9a688c3eb77eb2c84 -rafc23c933fe5ce406a5112d67c95581b0b9ac3ce
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision f83b3ec0b47a5daf5f0743a9a688c3eb77eb2c84)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision afc23c933fe5ce406a5112d67c95581b0b9ac3ce)
@@ -34,10 +34,6 @@
'dialogs' : [],
// for storing icons and other activity metadata
'toolMetadata': {
- 'grouping' : {
- 'iconPath' : 'images/svg/grouping.svg',
- 'cursorPath' : 'images/grouping.png'
- },
'gateClosed' : {
'iconPath' : 'images/svg/gateClosed.svg',
'cursorPath' : 'images/gateClosed.png'
@@ -183,7 +179,7 @@
// store some template data in JS structures
$('.template', templateContainerCell).each(function(){
- var learningLibraryID = +$(this).attr('learningLibraryId'),
+ var learningLibraryID = $(this).attr('learningLibraryId'),
learningLibraryTitle = $(this).attr('learningLibraryTitle'),
activityCategoryID = ActivityCategories[learningLibraryTitle],
parallelChildActivityDefs = null;
@@ -219,7 +215,7 @@
layout.initWindowHeight = $(window).height();
$('.template', templateContainerCell).each(function(){
- var learningLibraryID = +$(this).attr('learningLibraryId'),
+ var learningLibraryID = $(this).attr('learningLibraryId'),
activityCategoryID = layout.toolMetadata[learningLibraryID].activityCategoryID;
$('#collapse-tool-category-' + activityCategoryID, templateContainerCell).append(this);
@@ -247,7 +243,7 @@
$(draggable.helper).remove();
// calculate the position and create an instance of the tool activity
- var learningLibraryID = +draggable.draggable.attr('learningLibraryId'),
+ var learningLibraryID = draggable.draggable.attr('learningLibraryId'),
toolID = +draggable.draggable.attr('toolId'),
activityCategoryID = layout.toolMetadata[learningLibraryID].activityCategoryID,
x = draggable.offset.left + canvas.scrollLeft() - canvas.offset().left,
@@ -257,8 +253,11 @@
translatedEvent = GeneralLib.translateEventOnCanvas(event),
eventX = translatedEvent[0],
eventY = translatedEvent[1];
-
- if (activityCategoryID == 5) {
+ if (activityCategoryID === 1) {
+ if (learningLibraryID == 'grouping'){
+ activity = new ActivityDefs.GroupingActivity(null, null, x, y)
+ }
+ } else if (activityCategoryID === 5) {
// construct child activities out of previously referenced HTML templates
var childActivities = [];
layout.toolMetadata[learningLibraryID].parallelChildActivityDefs.each(function(){
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -rab6d520b217a9978bad3f8cfecacf2b60f59893b -rafc23c933fe5ce406a5112d67c95581b0b9ac3ce
--- lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision ab6d520b217a9978bad3f8cfecacf2b60f59893b)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision afc23c933fe5ce406a5112d67c95581b0b9ac3ce)
@@ -139,36 +139,6 @@
/**
- * Creates a new grouping activity.
- */
- addGrouping : function() {
- if (layout.isGroupingStarted) {
- layout.isGroupingStarted = false;
- HandlerLib.resetCanvasMode(true);
- $('#groupButton').blur();
- } else {
- layout.isGroupingStarted = true;
- HandlerLib.resetCanvasMode();
-
- canvas.css('cursor', 'url("' + LAMS_URL + layout.toolMetadata.grouping.cursorPath + '"), move')
- .click(function(event){
- layout.isGroupingStarted = false;
- // pageX and pageY tell event coordinates relative to the whole page
- // we need relative to canvas
- var translatedEvent = GeneralLib.translateEventOnCanvas(event),
- x = translatedEvent[0] - 47,
- y = translatedEvent[1] - 2;
-
- layout.activities.push(new ActivityDefs.GroupingActivity(null, null, x, y));
-
- GeneralLib.setModified(true);
- HandlerLib.resetCanvasMode(true);
- });
- }
- },
-
-
- /**
* Creates a new optional activity.
*/
addOptionalActivity : function() {
| 
+