use bootstrap to render icons that formerly used jquery-ui

diff --git a/plugins/hazelnut/static/js/hazelnut.js b/plugins/hazelnut/static/js/hazelnut.js
index f38d518..e9753e2 100644 (file)
--- a/plugins/hazelnut/static/js/hazelnut.js
+++ b/plugins/hazelnut/static/js/hazelnut.js
@@ -112,7 +112,7 @@
             /* Setup the SelectAll button in the dataTable header */
             /* xxx not sure this is still working */
             var oSelectAll = $('#datatableSelectAll-'+ this.options.plugin_uuid);
-            oSelectAll.html("<span class='ui-icon ui-icon-check' style='float:right;display:inline-block;'></span>Select All");
+            oSelectAll.html("<span class='glyphicon glyphicon-ok' style='float:right;display:inline-block;'></span>Select All");
             oSelectAll.button();
             oSelectAll.css('font-size','11px');
             oSelectAll.css('float','right');

diff --git a/plugins/query_editor/static/js/query_editor.js b/plugins/query_editor/static/js/query_editor.js
index 90d113d..fac8c72 100644 (file)
--- a/plugins/query_editor/static/js/query_editor.js
+++ b/plugins/query_editor/static/js/query_editor.js
@@ -56,7 +56,7 @@
             // XXX Why isn't it done statically ?
             var nCloneTh = document.createElement( 'th' );
             var nCloneTd = document.createElement( 'td' );
-            nCloneTd.innerHTML = "<span class='ui-icon ui-icon-triangle-1-e' style='cursor:pointer'></span>";
+            nCloneTd.innerHTML = "<span class='glyphicon glyphicon-chevron-right' style='cursor:pointer'></span>";
             //nCloneTd.innerHTML = '<img src="/components/com_tophat/images/details_open.png">';
             nCloneTh.innerHTML = '<b>Info</b>';
             nCloneTd.className = "center";
@@ -93,16 +93,16 @@
             this.elmt('table tbody td span').on('click', function() {
                 var nTr = this.parentNode.parentNode;
                 // use jQuery UI instead of images to keep a common UI
-                // class="ui-icon treeclick ui-icon-triangle-1-s tree-minus"
-                // East oriented Triangle class="ui-icon-triangle-1-e"
-                // South oriented Triangle class="ui-icon-triangle-1-s"
+                // class="glyphicon glyphicon-chevron-down treeclick tree-minus"
+                // East oriented Triangle class="glyphicon-chevron-right"
+                // South oriented Triangle class="glyphicon-chevron-down"
                 
-                if (this.className=="ui-icon ui-icon-triangle-1-e") {
-                    this.removeClass("ui-icon-triangle-1-e").addClass("ui-icon-triangle-1-s");
+                if (this.hasClass("glyphicon-chevron-right")) {
+                    this.removeClass("glyphicon-chevron-right").addClass("glyphicon-chevron-down");
                     // XXX ??????
                     metaTable.fnOpen(nTr, this.fnFormatDetails(metaTable, nTr, self.options.plugin_uuid+'_div'), 'details' );
                 } else {
-                    this.removeClass("ui-icon-triangle-1-s").addClass("ui-icon-triangle-1-e");
+                    this.removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-right");
                     metaTable.fnClose(nTr);
                 }
             });

diff --git a/plugins/query_editor/templates/query_editor.html b/plugins/query_editor/templates/query_editor.html
index cde2fd4..202d9cc 100644 (file)
--- a/plugins/query_editor/templates/query_editor.html
+++ b/plugins/query_editor/templates/query_editor.html
@@ -25,7 +25,7 @@ EOF; -->
     {% for field in fields %}
 
       <tr>
-        <td class='center'><span class='ui-icon ui-icon-triangle-1-e' style='cursor:pointer'></span></td>
+        <td class='center'><span class='glyphicon glyphicon-chevron-right' style='cursor:pointer'></span></td>
         <td class='center'>{{ field.name }}</td>
         <td class='center'>{{ field.resource_type }}</td>
         <td class='center'>{{ field.type }}</td>

diff --git a/plugins/resources_selected/static/js/resources_selected.js b/plugins/resources_selected/static/js/resources_selected.js
index a16d4d5..d64d717 100644 (file)
--- a/plugins/resources_selected/static/js/resources_selected.js
+++ b/plugins/resources_selected/static/js/resources_selected.js
@@ -153,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';
@@ -394,7 +394,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();
@@ -411,7 +411,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();
@@ -426,7 +426,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();