Changeset 192 for trunk/web-app


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/web-app/css/wizard.css

    r178 r192  
    217217}
    218218
    219 .wizard .grouping .subjects {
    220     display: block;
    221     float: left;
    222 }
    223219.wizard .grouping .ui-selected {
    224220    background-color: red;
     
    228224}
    229225
     226.wizard .grouping .subjects {
     227    display: block;
     228    float: left;
     229}
     230.wizard .grouping .subjects .subject {
     231    margin: 1px;
     232    padding: 0.2em;
     233    font-size: .8em;
     234    height: 14px;
     235}
    230236.wizard .grouping .right {
    231237    display: inline-block;
     
    252258.wizard .grouping .group .subjects {
    253259    display: inline-block;
     260    height: auto;
    254261}
    255262.wizard .grouping .group .subject {
    256     display: block;
     263    display: inline-block;
    257264    width: 100%;
    258265    font-size: 10px;
  • trunk/web-app/js/grouping.js

    r189 r192  
    2929
    3030        this.initItems();
     31        this.initGroupItems();
     32        this.initGroups();
     33        //this.initGroups();
     34       
     35        console.log('bla')
    3136    },
    3237
    3338    initItems: function() {
     39        var that = this;
     40       
    3441        //$(this.itemsIdentifier).
     42        $(this.itemsIdentifier).first().selectable({
     43            filter: that.itemIdentifier,
     44            stop: function() {
     45                // done selecting, make all selected items draggable
     46                //that.makeDraggable(this);
     47            }
     48        });
     49    },
     50
     51    initGroups: function() {
     52        this.initGroupItems();
     53    },
     54
     55    initGroupItems: function() {
     56        var that = this;
     57
     58        $(this.groupsIdentifier).selectable({
     59            filter: that.itemIdentifier
     60        })
    3561    }
    3662}
     
    156182}
    157183*/
     184
     185// for debugging purposes this is here
     186// TODO: to be be migrated to wizard.js....
     187$(document).ready(function() {
     188    new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
     189});
  • trunk/web-app/js/wizard.js

    r189 r192  
    4343   
    4444    // GROUPING PAGE
    45     new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
     45    //new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
    4646}
    4747
Note: See TracChangeset for help on using the changeset viewer.