Index: lams_central/web/newLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/newLesson.jsp,v
diff -u -r1.5 -r1.6
--- lams_central/web/newLesson.jsp 10 Jan 2013 18:52:49 -0000 1.5
+++ lams_central/web/newLesson.jsp 11 Jan 2013 14:36:35 -0000 1.6
@@ -103,14 +103,18 @@
-
+ |
▲
|
-
+ |
+
+ |
+
▲
@@ -119,21 +123,37 @@
|
-
+ |
+
+ |
+
+
+
▲
|
-
+ |
+
+ |
+
▲
|
+
+
+
+ |
+
Index: lams_central/web/css/newLesson.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/newLesson.css,v
diff -u -r1.5 -r1.6
--- lams_central/web/css/newLesson.css 10 Jan 2013 18:52:49 -0000 1.5
+++ lams_central/web/css/newLesson.css 11 Jan 2013 14:36:35 -0000 1.6
@@ -121,12 +121,26 @@
}
-table#classTable td {
- width: 50%;
+td.userContainerCell {
vertical-align: top;
- padding: 5px 10px 0px 10px;
+ padding: 5px 5px 0px 5px;
}
+td.userConainterTransferCell {
+ height: 69px;
+ width: 16px;
+ padding: 18px 3px 8px 3px;
+ vertical-align: top;
+}
+
+td.userConainterTransferTopCell {
+ vertical-align: bottom;
+}
+
+td.userConainterTransferCell img {
+ cursor: pointer;
+}
+
.draggableUser {
padding: 3px 0px 3px 0px;
cursor: default;
Index: lams_central/web/includes/javascript/newLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/newLesson.js,v
diff -u -r1.5 -r1.6
--- lams_central/web/includes/javascript/newLesson.js 10 Jan 2013 18:52:49 -0000 1.5
+++ lams_central/web/includes/javascript/newLesson.js 11 Jan 2013 14:36:35 -0000 1.6
@@ -131,32 +131,10 @@
'activeClass' : 'droppableHighlight',
'tolerance' : 'touch',
'accept' : function (draggable) {
- // forbid current user from being removed from monitors
- return containerId != 'unselected-monitors'
- || $(draggable).attr('userId') != userId;
+ return acceptDraggable(draggable, containerId);
},
- 'drop' : function (event, ui) {
- // remove error message, if exists
- $(this).children('.errorMessage').remove();
-
- // move the selected users
- var previousContainer = ui.draggable.parent();
- previousContainer.children('.draggableUserSelected')
- .css({'top' : '0px',
- 'left' : '0px',
- })
- .draggable('option', 'scope', getDraggableScope($(this).attr('id')))
- .appendTo(this);
-
- // recolour both containers
- $(this).children().removeClass('draggableUserSelected');
- colorDraggableUsers(this);
- colorDraggableUsers(previousContainer);
-
- if (containerId.indexOf('learners') > 0) {
- // number of selected learners changed, so update this control too
- updateSplitLearnersFields();
- }
+ 'drop' : function () {
+ transferUsers(containerId);
}
});
});
@@ -464,6 +442,45 @@
}
}
+function acceptDraggable(draggable, toContainerId) {
+ // forbid current user from being removed from monitors
+ return toContainerId != 'unselected-monitors'
+ || $(draggable).attr('userId') != userId;
+}
+
+function transferUsers(toContainerId) {
+ var toContainer = $('#' + toContainerId);
+ var fromContainerId = getDraggableScope(toContainerId);
+ var fromContainer = $('#' + fromContainerId);
+ var selectedUsers = fromContainer.children('.draggableUserSelected');
+ if (selectedUsers.length > 0){
+ // remove error message, if exists
+ toContainer.children('.errorMessage').remove();
+
+ // move the selected users
+ selectedUsers.each(function(){
+ if (acceptDraggable(this, toContainerId)) {
+ $(this).css({'top' : '0px',
+ 'left' : '0px',
+ })
+ .draggable('option', 'scope', fromContainerId)
+ .appendTo(toContainer);
+ }
+ });
+
+
+ // recolour both containers
+ toContainer.children().removeClass('draggableUserSelected');
+ colorDraggableUsers(toContainer);
+ colorDraggableUsers(fromContainer);
+
+ if (toContainerId.indexOf('learners') > 0) {
+ // number of selected learners changed, so update this control too
+ updateSplitLearnersFields();
+ }
+ }
+}
+
// ********** ADVANCED TAB FUNCTIONS **********
function updateSplitLearnersFields(){
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.80 -r1.81
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 10 Jan 2013 18:52:51 -0000 1.80
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 11 Jan 2013 14:36:32 -0000 1.81
@@ -265,7 +265,7 @@
boolean introEnable = WebUtil.readBooleanParam(request, "introEnable", false);
String introDescription = introEnable ? request.getParameter("introDescription") : null;
- boolean introImage = introEnable ? WebUtil.readBooleanParam(request, "introImage", false) : false;
+ boolean introImage = introEnable && WebUtil.readBooleanParam(request, "introImage", false);
boolean startMonitor = WebUtil.readBooleanParam(request, "startMonitor", false);
boolean enableLiveEdit = WebUtil.readBooleanParam(request, "enableLiveEdit", false);
boolean notificationsEnable = WebUtil.readBooleanParam(request, "notificationsEnable", false);