From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 25 Mar 2014 17:01:50 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~177
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=957065ca108ec856b8d6406ab7bcc18e2ea677bf;hp=2084bfaa9d0a7a3200dc24a7cdef8faa142f38bf;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 8637e728..b182a1aa 100644
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -91,7 +91,8 @@
             var actual_options = {
                 // Customize the position of Datatables elements (length,filter,button,...)
                 // we use a fluid row on top and another on the bottom, making sure we take 12 grid elt's each time
-                sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>",
+                //sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>",
+                sDom: "<'row'<'col-xs-5'f><'col-xs-1'r><'col-xs-6 columns_selector'>>t<'row'<'col-xs-5'l><'col-xs-7'p>>",
 		// XXX as of sept. 2013, I cannot locate a bootstrap3-friendly mode for now
 		// hopefully this would come with dataTables v1.10 ?
 		// in any case, search for 'sPaginationType' all over the code for more comments
@@ -145,6 +146,11 @@
                 //manifold.raise_event(self.options.query_all_uuid, FIELD_REMOVED, field);
                 self.hide_column(field);
             });
+            $(".dataTables_filter").append("<div style='display:inline-block;height:27px;width:27px;padding-left:6px;padding-top:4px;'><span class='glyphicon glyphicon-search'></span></div>");
+            $(".dataTables_filter input").css("width","100%");
+            $(".columns_selector").append("columns");
+            $(".columns_selector").css("float","right");
+            $(".columns_selector").css("width","inherit");
         }, // initialize_table
 
         /**
diff --git a/portal/static/css/fed4fire.css b/portal/static/css/fed4fire.css
index 9d3ce4ce..e8a798ce 100644
--- a/portal/static/css/fed4fire.css
+++ b/portal/static/css/fed4fire.css
@@ -474,3 +474,9 @@ div#slice-info td {
 tr.active, tr.active td {
     background-color:#FFFFCC !important;
 }
+
+div.dataTables_filter label{
+    float:left;
+    width:400px;
+}
+
diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index df675b1a..07a77eb6 100644
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -474,3 +474,7 @@ div#slice-info td {
 tr.active, tr.active td {
     background-color:#FFFFCC !important;
 }
+div.dataTables_filter label{
+    float:left;
+    width:400px;
+}