Index: lams_central/web/groupContents.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/groupContents.jsp,v
diff -u -r1.20 -r1.21
--- lams_central/web/groupContents.jsp	9 May 2012 16:21:28 -0000	1.20
+++ lams_central/web/groupContents.jsp	23 Sep 2012 16:16:06 -0000	1.21
@@ -10,7 +10,7 @@
 	<div class="sequence-name">
 		<div id="<c:out value="${orgBean.id}"/>-lessons" class="j-lessons">
 		<c:if test="${allowSorting}">
-			<div class="mycourses-right-buttons" style="display:none;">
+			<div id="sorter-div-${orgBean.id}" class="mycourses-right-buttons" style="display:none;">
 				<a class="sorting" onclick="makeOrgSortable(<c:out value="${orgBean.id}"/>)" title="<fmt:message key="label.enable.lesson.sorting"/>">
 					<img src="<lams:LAMSURL/>/images/sorting_disabled.gif">
 				</a>
@@ -195,8 +195,8 @@
 	
 </div>
 
-<c:if test="${allowSorting}"><c:if test="${hasLessonToSort eq 'true'}">
+<c:if test="${allowSorting && (hasLessonToSort eq 'true')}">
 <script>
-	jQuery("div.mycourses-right-buttons").show();
+	jQuery("#sorter-div-${orgBean.id}").show();
 </script>
-</c:if></c:if>
+</c:if>
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.50 -r1.51
--- lams_central/web/main.jsp	15 Aug 2012 10:59:18 -0000	1.50
+++ lams_central/web/main.jsp	23 Sep 2012 16:16:06 -0000	1.51
@@ -83,8 +83,8 @@
 				return "<fmt:message key="label.enable.lesson.sorting"/>";
 			}
 			
-			function getSortingEnabledText() {
-				return "<fmt:message key="label.lesson.sorting.enabled"/>";
+			function getDisableSortingText() {
+				return "<fmt:message key="label.disable.lesson.sorting"/>";
 			}
 			
 			function refresh(){
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/groupDisplay.js,v
diff -u -r1.16 -r1.17
--- lams_central/web/includes/javascript/groupDisplay.js	22 Sep 2012 13:50:06 -0000	1.16
+++ lams_central/web/includes/javascript/groupDisplay.js	23 Sep 2012 16:16:06 -0000	1.17
@@ -115,26 +115,19 @@
 						jQuery("div.j-subgroup-lessons>table.lesson-table tbody", org).each(function() {
 							makeSortable(jQuery(this));
 						});
-						jQuery("div.mycourses-right-buttons", jLessons).html("<a class=\"sorting\" title=\""+getSortingEnabledText()+"\"><img src=\"images/sorting_enabled.gif\"></a>");
+						jQuery("div.mycourses-right-buttons", jLessons).html("<a class=\"sorting\" onclick=\"makeOrgUnsortable(" + orgId + ")\" title=\""+getDisableSortingText()+"\"><img src=\"images/sorting_enabled.gif\"></a>");
 					}
 				}
 				
-				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 jLessonsTable = jQuery("table.lesson-table",jLessons);
-							var link = jQuery("div.mycourses-right-buttons", jLessons);
-							if (link.html().indexOf(getSortingEnabledText()) >= 0) {
-								jLessonsTable.SortableDestroy();
-								link.html("<a class=\"sorting\" onclick=\"makeOrgSortable("+orgId+")\" title=\""+getEnableSortingText()+"\"><img src=\"images/sorting_disabled.gif\"></a>");
-								jQuery("div.j-subgroup-lessons>table.lesson-table tbody", this).each(function() {
-									jQuery(this).SortableDestroy();
-								});
-							}
-						}
+				function makeOrgUnsortable(orgId) {
+					var org = jQuery("div.course-bg#"+orgId);
+					var jLessons = jQuery("div.j-lessons#"+orgId+"-lessons");
+					var jLessonsTable = jQuery("table.lesson-table tbody",jLessons);
+					jLessonsTable.sortable("destroy");
+					jQuery("div.j-subgroup-lessons>table.lesson-table tbody", org).each(function() {
+						jQuery(this).sortable("destroy");
 					});
+					jQuery("div.mycourses-right-buttons", jLessons).html("<a class=\"sorting\" onclick=\"makeOrgSortable(" + orgId + ")\" title=\""+getEnableSortingText()+"\"><img src=\"images/sorting_disabled.gif\"></a>");
 				}
 				
 				function makeSortable(element) {