+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- |
-
- |
-
-
- |
-
-
-
-
- ![]()
- 
-
- |
-
-
- |
-
- |
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
- |
-
-
- |
-
- 
- |
-
-
-
- ▲
+
+ |
-
-
-
- 
- |
-
-
- |
-
- ▲
-
-
-
- |
-
-
- |
-
-
- ▲
-
-
-
- |
-
-
- |
-
- |
-
-
-
-
-
+
Index: lams_central/web/css/addLesson.css
===================================================================
diff -u -rb75c055c6e1fbc3f8522de9376363afb19539679 -rdc4ba204bb906332f9bb94cf9d24c1cf6d2c1630
--- lams_central/web/css/addLesson.css (.../addLesson.css) (revision b75c055c6e1fbc3f8522de9376363afb19539679)
+++ lams_central/web/css/addLesson.css (.../addLesson.css) (revision dc4ba204bb906332f9bb94cf9d24c1cf6d2c1630)
@@ -56,8 +56,7 @@
div.tabTitle {
padding: 5px 0px 5px 0px;
- font-size: small;
- font-weight: bold;
+ font-size: larger;
text-align: center;
}
@@ -132,7 +131,7 @@
td.userConainterTransferCell {
height: 100px;
- width: 16px;
+ width: 25px;
padding: 18px 3px 8px 3px;
vertical-align: top;
}
@@ -158,9 +157,7 @@
}
.userContainerTitle {
- padding: 0px 0px 5px 0px;
- height: 15px;
- font-size: small;
+ margin-bottom: 5px;
font-weight: bold;
text-align: center;
}
@@ -187,12 +184,7 @@
padding-left: 30px;
}
-input[type="checkbox"] {
- margin: 10px 5px 0px 0px;
- border: none;
-}
-
-.fieldSectionTitle {
+.p {
padding: 15px 0px 5px 15px;
font-size: small;
font-weight: bold;
@@ -214,28 +206,6 @@
display: none;
}
-#introImageField {
- margin-top: 20px;
-}
-
-table#splitLearnersTable {
- height: 40px;
- display: none;
-}
-
-td#splitLearnersCell {
- padding: 0px 0px 0px 30px;
-}
-
-#splitLearnersCountField {
- width: 50px;
- margin: 0px 0px 0px 5px !important;
-}
-
-td#splitLearnersDescriptionCell {
- padding: 0px;
-}
-
span#splitLearnersDescription {
font-style: italic;
}
@@ -255,16 +225,20 @@
display: none;
}
-div#timeLimitDiv {
- padding: 10px 0px 0px 30px;
- display: none;
+.lead {
+ margin-top: 15px;
+ margin-bottom: 10px;
}
-#timeLimitDaysField {
- width: 50px;
- margin: 0px 0px 0px 5px !important;
+.options {
+ margin-left: 25px;
}
-#timeLimitIndividualField {
- margin-top: 15px;
-}
\ No newline at end of file
+.separator {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ border: 0px;
+ border-top: 1px solid #eee;
+ width: 100%;
+}
+
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -r27a58f395dec9927221147dac08a0b75213fd354 -rdc4ba204bb906332f9bb94cf9d24c1cf6d2c1630
--- lams_central/web/includes/javascript/addLesson.js (.../addLesson.js) (revision 27a58f395dec9927221147dac08a0b75213fd354)
+++ lams_central/web/includes/javascript/addLesson.js (.../addLesson.js) (revision dc4ba204bb906332f9bb94cf9d24c1cf6d2c1630)
@@ -186,12 +186,12 @@
$('#introDescriptionDiv').hide();
});
- $('#splitLearnersCountField').spinner({
- 'incremental' : false,
+ $('#splitLearnersCountField').attr({
+ 'step' : 1,
'min' : 1,
'max' : users.selectedLearners ? users.selectedLearners.length : 1,
'stop' : updateSplitLearnersFields
- }).spinner('value', 1);
+ });
$('#splitLearnersField').change(function(){
if ($(this).is(':checked')) {
@@ -321,7 +321,7 @@
if ($('#splitLearnersField').is(':checked')) {
var maxLearnerCount = $('#selected-learners div.draggableUser').length;
- var learnerCount = $('#splitLearnersCountField').spinner('value');
+ var learnerCount = $('#splitLearnersCountField').val();
var instances = Math.ceil(maxLearnerCount/learnerCount);
$('#splitNumberLessonsField').val(instances);
}
@@ -532,8 +532,8 @@
if ($('#splitLearnersField').is(':checked')) {
// put users into groups
var maxLearnerCount = $('#selected-learners div.draggableUser').length;
- var learnerCount = $('#splitLearnersCountField').spinner('option', 'max', maxLearnerCount < 1 ? 1 : maxLearnerCount)
- .spinner('value');
+ var learnerCount = $('#splitLearnersCountField').val();
+ alert($('#splitLearnersCountField').val());
var instances = Math.ceil(maxLearnerCount/learnerCount);
learnerCount = Math.ceil(maxLearnerCount/instances);
var description = SPLIT_LEARNERS_DESCRIPTION.replace('[0]', instances).replace('[1]', learnerCount);
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
diff -u -r64d328ea0d7c6839143a522755843fb3c5b50382 -rdc4ba204bb906332f9bb94cf9d24c1cf6d2c1630
--- lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 64d328ea0d7c6839143a522755843fb3c5b50382)
+++ lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision dc4ba204bb906332f9bb94cf9d24c1cf6d2c1630)
@@ -192,7 +192,7 @@
},
'modal' : true,
'draggable' : false,
- 'height' : 700,
+ 'height' : 740,
'width' : 850,
'open' : function() {
var dialog = $(this);
+