X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fresources_selected%2Fstatic%2Fjs%2Fresources_selected.js;h=9a064476fbe718c3ca25a0ba52498b3e8ff948e0;hb=a2069daeaa50cf7328f838d4c3f2ca2da0727bbc;hp=d8705c45c2cc505fa65d502d0aac580d5f86f61c;hpb=2b1211c766c56a7b962d8b82c8f638825b6166cb;p=myslice.git

diff --git a/plugins/resources_selected/static/js/resources_selected.js b/plugins/resources_selected/static/js/resources_selected.js
index d8705c45..9a064476 100644
--- a/plugins/resources_selected/static/js/resources_selected.js
+++ b/plugins/resources_selected/static/js/resources_selected.js
@@ -31,20 +31,25 @@
 
             var self = this;
             this.table = this.elmt('table').dataTable({
-                //sPaginationType: 'full_numbers',  // Use pagination
-                sPaginationType: 'full_numbers',
-                //bJQueryUI      : true,
-                //bRetrieve      : true,
-                sScrollX       : '100%',                 // Horizontal scrolling 
-                bSortClasses   : false,              // Disable style for the sorted column
-                aaSorting      : [[ 0, 'asc' ]],        // Default sorting on URN
-                fnDrawCallback: function() {      // Reassociate close click every time the table is redrawn
-                    /* Prevent to loop on click while redrawing table  */
-                    $('.ResourceSelectedClose').unbind('click');
-                    /* Handle clicks on close span */
-                    /* Reassociate close click every time the table is redrawn */
-                    $('.ResourceSelectedClose').bind('click', self, self._close_click);
-                }
+// the original hazelnut layout was
+//                sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>",
+// however the bottom line with 'showing blabla...' and the navigation widget are not really helpful
+                sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t>",
+// so this does not matter anymore now that the pagination area is turned off
+//                sPaginationType: 'bootstrap',
+		bAutoWidth: true,
+//                bJQueryUI      : true,
+//                bRetrieve      : true,
+//                sScrollX       : '100%',                 // Horizontal scrolling 
+//                bSortClasses   : false,              // Disable style for the sorted column
+//                aaSorting      : [[ 0, 'asc' ]],        // Default sorting on URN
+//                fnDrawCallback: function() {      // Reassociate close click every time the table is redrawn
+//                    /* Prevent to loop on click while redrawing table  */
+//                    $('.ResourceSelectedClose').unbind('click');
+//                    /* Handle clicks on close span */
+//                    /* Reassociate close click every time the table is redrawn */
+//                    $('.ResourceSelectedClose').bind('click', self, self._close_click);
+//                }
              });
             
             // XXX This should not be done at init...
@@ -67,19 +72,20 @@
             manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
         },
 
+	// related buttons are also disabled in the html template
         do_refresh: function(e)
         {
-            throw 'Not implemented';
+            throw 'resource_selected.do_refresh Not implemented';
         },
 
         do_reset: function(e)
         {
-            throw 'Not implemented';
+            throw 'resources_selected.do_reset Not implemented';
         },
 
         do_clear_annotations: function(e)
         {
-            throw 'Not implemented';
+            throw 'resources_selected.do_clear_annotations Not implemented';
         },
         
         /************************** GUI MANIPULATION **************************/
@@ -119,7 +125,12 @@
             var button = '';
 
             var row;
-
+	    
+	    // make sure the change is visible : toggle on the whole plugin
+	    // this might hae to be made an 'auto-toggle' option of this plugin..
+	    // also it might be needed to be a little finer-grained here
+	    this.toggle_on();
+	    
             switch(data.request) {
                 case FIELD_REQUEST_ADD_RESET:
                 case FIELD_REQUEST_REMOVE_RESET:
@@ -142,7 +153,7 @@
             switch(data.status) {
                 case FIELD_REQUEST_PENDING:
                     msg   = 'PENDING';
-                    button = "<span class='ui-icon ui-icon-close ResourceSelectedClose' id='" + data.key + "'/>";
+                    button = "<span class='glyphicon glyphicon-remove ResourceSelectedClose' id='" + data.key + "'/>";
                     break;
                 case FIELD_REQUEST_SUCCESS:
                     msg   = 'SUCCESS';
@@ -303,9 +314,11 @@
         // - Key and confirmation could be sufficient, or key and record state
         // XXX move record state to the manifold plugin API
 
-        on_field_state_changed: function(request, key, value, status)
+        on_field_state_changed: function(result)
         {
-            this.set_state(request, key, value, status);
+            console.log(result)
+            /* this.set_state(result.request, result.key, result.value, result.status); */
+            this.set_state(result);
         },
 
         // XXX we will have the requests for change
@@ -329,7 +342,7 @@
             var remove_urn = this.id; 
             var current_resources = event.data.instance.current_resources;
             var list_resources = $.grep(current_resources, function(x) {return x.urn != remove_urn});
-            //jQuery.publish('selected', 'cancel/'+this.id+'/'+get_value(firstCellVal));
+            //jQuery.publish('selected', 'cancel/'+this.id+'/'+unfold.get_value(firstCellVal));
             $.publish('/update-set/' + event.data.instance.options.resource_query_uuid, [list_resources, true]);
         },
 
@@ -383,7 +396,7 @@
                 var urn = r.urn;
                 time = r.timeslot;
                               
-                var SPAN = "<span class='ui-icon ui-icon-close ResourceSelectedClose' id='"+urn+"'/>";
+                var SPAN = "<span class='glyphicon glyphicon-remove ResourceSelectedClose' id='"+urn+"'/>";
                 var slot = "<span id='resource_"+urn+"'>" + time + "</span>"; //ioi
                 // ioi
                 var newline=Array();
@@ -400,7 +413,7 @@
                 var node = r.urn;
                 time = r.timeslot;
 
-                var SPAN = "<span class='ui-icon ui-icon-close ResourceSelectedClose' id='"+node+"'/>";
+                var SPAN = "<span class='glyphicon glyphicon-renomve ResourceSelectedClose' id='"+node+"'/>";
                 var slot = "<span id='resource_"+node+"'>" + time + "</span>"; //ioi
                 // ioi
                 var newline=Array();
@@ -415,7 +428,7 @@
                 var node = r.urn;
                 var time = r.timeslot;
                     
-                var SPAN = "<span class='ui-icon ui-icon-close ResourceSelectedClose' id='"+node+"'/>";
+                var SPAN = "<span class='glyphicon glyphicon-remove ResourceSelectedClose' id='"+node+"'/>";
                 var slot = "<span id='resource_"+node+"'>" + time + "</span>";
                 // ioi
                 var newline=Array();