Changeset 192 for trunk/web-app

Timestamp:

Feb 11, 2010, 5:47:49 PM (11 years ago)

Author:

duh

Message:

• temporary commit
• rewriting grouping javascript
• uncommented the bootstrap part I commented previously, it appeared to be a grails cache issue that was resolved after issuing a 'grails clean' command...

Location:

trunk/web-app

Files:

• css/wizard.css (modified) (3 diffs)
• js/grouping.js (modified) (2 diffs)
• js/wizard.js (modified) (1 diff)

trunk/web-app/css/wizard.css

@@ -217 +217 @@
 }
 
-.wizard .grouping .subjects {
-    display: block;
-    float: left;
-}
 .wizard .grouping .ui-selected {
     background-color: red;
@@ -228 +224 @@
 }
 
+.wizard .grouping .subjects {
+    display: block;
+    float: left;
+}
+.wizard .grouping .subjects .subject {
+    margin: 1px;
+    padding: 0.2em;
+    font-size: .8em;
+    height: 14px;
+}
 .wizard .grouping .right {
     display: inline-block;
@@ -252 +258 @@
 .wizard .grouping .group .subjects {
     display: inline-block;
+    height: auto;
 }
 .wizard .grouping .group .subject {
-    display: block;
+    display: inline-block;
     width: 100%;
     font-size: 10px;

trunk/web-app/js/grouping.js

@@ -29 +29 @@
 
         this.initItems();
+        this.initGroupItems();
+        this.initGroups();
+        //this.initGroups();
+        
+        console.log('bla')
     },
 
     initItems: function() {
+        var that = this;
+        
         //$(this.itemsIdentifier).
+        $(this.itemsIdentifier).first().selectable({
+            filter: that.itemIdentifier,
+            stop: function() {
+                // done selecting, make all selected items draggable
+                //that.makeDraggable(this);
+            }
+        });
+    },
+
+    initGroups: function() {
+        this.initGroupItems();
+    },
+
+    initGroupItems: function() {
+        var that = this;
+
+        $(this.groupsIdentifier).selectable({
+            filter: that.itemIdentifier
+        })
     }
 }
@@ -156 +182 @@
 }
 */
+
+// for debugging purposes this is here
+// TODO: to be be migrated to wizard.js....
+$(document).ready(function() {
+    new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
+});

trunk/web-app/js/wizard.js

@@ -43 +43 @@
     
     // GROUPING PAGE
-    new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
+    //new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
 }