Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java =================================================================== diff -u -reae819648876ce003b2797c2d2f387e10897e0b1 -r91846a63ca7f8b611b2acb7a09cd42bb522fd305 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision eae819648876ce003b2797c2d2f387e10897e0b1) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision 91846a63ca7f8b611b2acb7a09cd42bb522fd305) @@ -112,6 +112,7 @@ public ActionForward openAuthoring(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { request.setAttribute("tools", getLearningDesignService().getToolDTOs(request.getRemoteUser())); + request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, FileUtil.generateUniqueContentFolderID()); return mapping.findForward("openAutoring"); } @@ -379,7 +380,7 @@ } return null; } - + /** * Creates a LD with the given activity and starts a lesson with default class and settings. */ Index: lams_central/web/author2.jsp =================================================================== diff -u -ree35ce3afcea957fc919c15fb254ae593cdb44c2 -r91846a63ca7f8b611b2acb7a09cd42bb522fd305 --- lams_central/web/author2.jsp (.../author2.jsp) (revision ee35ce3afcea957fc919c15fb254ae593cdb44c2) +++ lams_central/web/author2.jsp (.../author2.jsp) (revision 91846a63ca7f8b611b2acb7a09cd42bb522fd305) @@ -30,18 +30,14 @@
-
+
New
@@ -126,12 +122,16 @@
- - + + - - + +
TitleTitle
DescriptionDescription + +
Index: lams_central/web/css/authoring.css =================================================================== diff -u -r2b85a10098233e40a7d126e29a1b251669c91277 -r91846a63ca7f8b611b2acb7a09cd42bb522fd305 --- lams_central/web/css/authoring.css (.../authoring.css) (revision 2b85a10098233e40a7d126e29a1b251669c91277) +++ lams_central/web/css/authoring.css (.../authoring.css) (revision 91846a63ca7f8b611b2acb7a09cd42bb522fd305) @@ -281,15 +281,10 @@ padding-top: 180px; } -#tabDescription > table td { +.ldDescriptionCell { padding: 0 0 30px 20px; } td.ldDescriptionLabel { font-weight: bold; -} - -#ldDescriptionFieldDescription { - width: 500px; - height: 200px; } \ No newline at end of file Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r668a627903b72826f7dffa148a7e775139af8b5e -r91846a63ca7f8b611b2acb7a09cd42bb522fd305 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 668a627903b72826f7dffa148a7e775139af8b5e) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 91846a63ca7f8b611b2acb7a09cd42bb522fd305) @@ -8,7 +8,7 @@ // configuration and storage of various elements layout = { - // 'isZoomed' : false, + // 'isZoomed' : false, 'activities' : null, 'items' : { 'bin' : null, @@ -71,7 +71,8 @@ */ $(document).ready(function() { canvas = $('#canvas'); - MenuLib.newLearningDesign(true); + MenuLib.newLearningDesign(true, true); + layout.ld.contentFolderID = initContentFolderID; initLayout(); initTemplates(); @@ -353,7 +354,7 @@ } // remove existing activities - MenuLib.newLearningDesign(true); + MenuLib.newLearningDesign(true, true); layout.ld = { 'learningDesignID' : learningDesignID, 'folderID' : ld.workspaceFolderID, @@ -362,7 +363,7 @@ }; $('#ldDescriptionFieldTitle').text(ld.title); - $('#ldDescriptionFieldDescription').text(ld.description); + CKEDITOR.instances['ldDescriptionFieldDescription'].setData(ld.description); var resizeNeeded = false, arrangeNeeded = false, @@ -672,7 +673,7 @@ groupings = [], // trim the title = title.trim(), - description = $('#ldDescriptionFieldDescription').val().trim(), + description = CKEDITOR.instances['ldDescriptionFieldDescription'].getData(), // final success/failure of the save result = false; Index: lams_central/web/includes/javascript/authoring/authoringMenu.js =================================================================== diff -u -r668a627903b72826f7dffa148a7e775139af8b5e -r91846a63ca7f8b611b2acb7a09cd42bb522fd305 --- lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 668a627903b72826f7dffa148a7e775139af8b5e) +++ lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 91846a63ca7f8b611b2acb7a09cd42bb522fd305) @@ -451,25 +451,31 @@ /** * Removes existing activities and prepares canvas for a new sequence. */ - newLearningDesign : function(force){ + newLearningDesign : function(force, soft){ if (!force && layout.activities.length > 0 && !confirm('Are you sure you want to remove all existing activities?')){ return; } - $('.ldDescriptionField').text(''); - - layout.ld = { - 'maxUIID' : 0 - }; - layout.activities = []; - if (paper) { - paper.clear(); + if (soft) { + $('#ldDescriptionFieldTitle').text(''); + CKEDITOR.instances['ldDescriptionFieldDescription'].setData(null); + + layout.ld = { + 'maxUIID' : 0 + }; + layout.activities = []; + if (paper) { + paper.clear(); + } else { + // need to set size right away for Chrome + paper = Raphael('canvas', canvas.width() - 5, canvas.height() - 5); + } + + resizePaper(); } else { - // need to set size right away for Chrome - paper = Raphael('canvas', canvas.width() - 5, canvas.height() - 5); + // full window reload so new content ID gets generated + document.location.href = LAMS_URL + 'authoring/author.do?method=openAuthoring'; } - - resizePaper(); },