Index: lams_central/web/author2.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/Attic/author2.jsp,v diff -u -r1.26 -r1.27 --- lams_central/web/author2.jsp 14 Apr 2014 14:40:40 -0000 1.26 +++ lams_central/web/author2.jsp 15 Apr 2014 11:59:33 -0000 1.27 @@ -144,7 +144,7 @@ - +
Index: lams_central/web/css/authoring.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v diff -u -r1.18 -r1.19 --- lams_central/web/css/authoring.css 14 Apr 2014 14:40:40 -0000 1.18 +++ lams_central/web/css/authoring.css 15 Apr 2014 11:59:33 -0000 1.19 @@ -170,7 +170,7 @@ div#toolbar { padding: 3px; - width: 1235px; + width: 1220px; height: 27px; } @@ -237,7 +237,12 @@ font-family: "Lucida Console", Monaco, monospace; } +td#canvasContainerCell { + vertical-align: top; +} + #ldDescriptionDiv { + margin-right: 15px; background-color: rgb(219, 230, 252); text-align: center; z-index: 1099; 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.26 -r1.27 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js 15 Apr 2014 11:42:01 -0000 1.26 +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js 15 Apr 2014 11:59:33 -0000 1.27 @@ -1286,6 +1286,8 @@ height = Math.max(height, canvas.height()) - 20; paper.setSize(width, height); + $('#templateContainer').height($('#ldDescriptionDiv').height() + + $('#canvas').height() - 10); if (layout.items.bin) { layout.items.bin.remove(); Index: lams_central/web/includes/javascript/authoring/authoringMenu.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringMenu.js,v diff -u -r1.22 -r1.23 --- lams_central/web/includes/javascript/authoring/authoringMenu.js 14 Apr 2014 14:40:40 -0000 1.22 +++ lams_central/web/includes/javascript/authoring/authoringMenu.js 15 Apr 2014 11:59:33 -0000 1.23 @@ -810,13 +810,20 @@ }, + /** + * Expands/collapses description field. + */ toggleDescriptionDiv: function() { $('#ldDescriptionDetails').slideToggle(function(){ $('#ldDescriptionHideTip').text($(this).is(':visible') ? '▲' : '▼'); + $('#templateContainer').height($('#ldDescriptionDiv').height() + $('#canvas').height() - 10); }); }, + /** + * Opens a pop up for importing LD. Loads the imported LD to canvas. + */ importLearningDesign : function(){ var importWindow = window.open(LAMS_URL + 'authoring/importToolContent.do?method=import','Import', 'width=800,height=298,resize=yes,status=yes,scrollbar=no,menubar=no,toolbar=no'), @@ -835,12 +842,16 @@ // check if ID was found and it's not the same as previously if (match && match[1] != currentLearningDesignID) { currentLearningDesignID = match[1]; + // load the imported LD openLearningDesign(currentLearningDesignID); } }, 1000); }, + /** + * Opens a pop up for exporting LD. + */ exportLearningDesign : function(){ if (layout.modified || layout.activities.length == 0) { return;