Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r59bfecd711928c0ac9acfb15c64156bfa38bf216 -r13912543234d7fdec6cb7dec5ab9ba803c07ff19 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 59bfecd711928c0ac9acfb15c64156bfa38bf216) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 13912543234d7fdec6cb7dec5ab9ba803c07ff19) @@ -185,6 +185,8 @@ label.return.to.myprofile =Return to My Profile label.help =Help? label.completed = Completed! +label.enable.lesson.sorting = enable lesson sorting +label.lesson.sorting.enabled = lesson sorting enabled #======= End labels: Exported 178 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r59bfecd711928c0ac9acfb15c64156bfa38bf216 -r13912543234d7fdec6cb7dec5ab9ba803c07ff19 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 59bfecd711928c0ac9acfb15c64156bfa38bf216) +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 13912543234d7fdec6cb7dec5ab9ba803c07ff19) @@ -185,6 +185,8 @@ label.return.to.myprofile =Return to My Profile label.help =Help? label.completed = Completed! +label.enable.lesson.sorting = enable lesson sorting +label.lesson.sorting.enabled = lesson sorting enabled #======= End labels: Exported 178 labels for en AU ===== Index: lams_central/web/groupContents.jsp =================================================================== diff -u -r59bfecd711928c0ac9acfb15c64156bfa38bf216 -r13912543234d7fdec6cb7dec5ab9ba803c07ff19 --- lams_central/web/groupContents.jsp (.../groupContents.jsp) (revision 59bfecd711928c0ac9acfb15c64156bfa38bf216) +++ lams_central/web/groupContents.jsp (.../groupContents.jsp) (revision 13912543234d7fdec6cb7dec5ab9ba803c07ff19) @@ -6,7 +6,17 @@
-
-lessons" class="j-lessons"> +
-lessons" class="j-lessons"> + + + + + +

" class="j-single-lesson"> " class="disabled-sequence-name-link"> @@ -25,7 +35,8 @@

-
+
+
@@ -70,12 +81,3 @@
- - - - Index: lams_central/web/groupHeader.jsp =================================================================== diff -u -r07578aaa7f526c0c1b537c127cf5f88e0410d472 -r13912543234d7fdec6cb7dec5ab9ba803c07ff19 --- lams_central/web/groupHeader.jsp (.../groupHeader.jsp) (revision 07578aaa7f526c0c1b537c127cf5f88e0410d472) +++ lams_central/web/groupHeader.jsp (.../groupHeader.jsp) (revision 13912543234d7fdec6cb7dec5ab9ba803c07ff19) @@ -5,7 +5,7 @@
-

+

( )

Index: lams_central/web/includes/javascript/groupDisplay.js =================================================================== diff -u -r3e10e8eaf62fd5d62ddf1082b2775fcaf0ec8f9c -r13912543234d7fdec6cb7dec5ab9ba803c07ff19 --- lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 3e10e8eaf62fd5d62ddf1082b2775fcaf0ec8f9c) +++ lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 13912543234d7fdec6cb7dec5ab9ba803c07ff19) @@ -35,6 +35,7 @@ saveCollapsed(orgId, "true"); } } + makeAllUnsortable(); }); } @@ -78,6 +79,35 @@ }); } + function makeOrgSortable(orgId) { + var org = jQuery("div.course-bg#"+orgId); + if (jQuery("div.j-lessons", org).size() > 0) { + var jLessons = jQuery("div.j-lessons#"+orgId+"-lessons"); + makeSortable(jLessons, "j-single-lesson"); + jQuery("div.j-subgroup-lessons", org).each(function() { + makeSortable(jQuery(this), "j-single-subgroup-lesson"); + }); + jQuery("div.mycourses-right-buttons", jLessons).html(getSortingEnabledText()); + } + } + + function makeAllUnsortable() { + jQuery("div.course-bg").each(function() { + var orgId = this.id; + if (jQuery("div.j-lessons", this).size() > 0) { + var jLessons = jQuery("div.j-lessons#"+orgId+"-lessons") + var link = jQuery("div.mycourses-right-buttons", jLessons); + if (link.html().indexOf(getSortingEnabledText()) >= 0) { + jLessons.SortableDestroy(); + link.html(""+getEnableSortingText()+""); + jQuery("div.j-subgroup-lessons", this).each(function() { + jQuery(this).SortableDestroy(); + }); + } + } + }); + } + function makeSortable(element, acceptClass) { jQuery(element).Sortable({ accept: acceptClass, Index: lams_central/web/main.jsp =================================================================== diff -u -r3e10e8eaf62fd5d62ddf1082b2775fcaf0ec8f9c -r13912543234d7fdec6cb7dec5ab9ba803c07ff19 --- lams_central/web/main.jsp (.../main.jsp) (revision 3e10e8eaf62fd5d62ddf1082b2775fcaf0ec8f9c) +++ lams_central/web/main.jsp (.../main.jsp) (revision 13912543234d7fdec6cb7dec5ab9ba803c07ff19) @@ -36,6 +36,14 @@