From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 24 Jul 2014 09:21:40 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~49^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3734fc1fa7de8b5b9d6df8c42dff9f21874cede8;hp=0ba711378fecea12bf4cc9996b22a10081bf7c36;p=myslice.git

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

diff --git a/manifoldapi/static/js/manifold.js b/manifoldapi/static/js/manifold.js
index 7dfcb4db..d96deed5 100644
--- a/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@ -462,7 +462,7 @@ function QueryStore() {
     {
         var query_ext = this.find_analyzed_query_ext(query_uuid);
         query_ext.filters = $.grep(query_ext.filters, function(x) {
-            return x == filter;
+            return x != filter;
         });
 
         this.apply_filters(query_uuid);
@@ -1832,6 +1832,7 @@ case TYPE_LIST_OF_VALUES:
             // FILTERS
 
             case FILTER_ADDED: 
+                console.log("FILTER ADDED", data);
                 /* Update internal record state */
                 manifold.query_store.add_filter(query_uuid, data);
 
@@ -1841,6 +1842,7 @@ case TYPE_LIST_OF_VALUES:
                 break;
 
             case FILTER_REMOVED:
+                console.log("FILTER REMOVED", data);
                 /* Update internal record state */
                 manifold.query_store.remove_filter(query_uuid, data);
 
diff --git a/plugins/filter_status/static/js/filter_status.js b/plugins/filter_status/static/js/filter_status.js
index 3bcd15c2..9c1c244b 100644
--- a/plugins/filter_status/static/js/filter_status.js
+++ b/plugins/filter_status/static/js/filter_status.js
@@ -117,9 +117,10 @@
 
             // ... and communicate the appropriate filters to the manager
             // NOTE: we use the manifold namespace for internal filters 
-            if (self.prev_filter_status)
-                manifold.raise_event(self.options.query_uuid, FILTER_REMOVED, self.prev_filter_status);
-
+            if (self.prev_filter_status) {
+                var filter = ['manifold:status', '==', self.prev_filter_status];
+                manifold.raise_event(self.options.query_uuid, FILTER_REMOVED, filter);
+            }
             // XXX The datatables will be refreshed twice !
             if (filter_status != 'all') {
                 // No filter for 'all'
diff --git a/plugins/filter_status/templates/filter_status.html b/plugins/filter_status/templates/filter_status.html
index a2e7a0a1..91b3bb58 100644
--- a/plugins/filter_status/templates/filter_status.html
+++ b/plugins/filter_status/templates/filter_status.html
@@ -22,7 +22,7 @@
   </a>
   
   <a href="#" class="list-group-item sl-resources"
-     style='display: inline-block !important; font-size: inherit;' 
+     style='display: inline-block !important; font-size: inherit; width:130px;' 
      id="{{ domid }}__unconfigured" 
      data-status="unconfigured"
      title="View resources that you have selected to add to your slice, that require configuration before they can be reserved. Hover you mouse over the symbol next to the checkbox for more details."
diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 1104c988..4c53cce0 100644
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -369,6 +369,8 @@ a.sl-resources, a.sl-resources:hover {
     padding:2px 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
+    width:125px;
+    text-align: center;
 }
 a.sl-resources.active, a.sl-resources.active:hover, a.sl-resources.active:focus {
     border:0;
@@ -692,4 +694,4 @@ div.slogan {
     color:white;
     padding-top:60px;
     text-shadow: 1px 1px #013540;
-}
\ No newline at end of file
+}
diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index a8a9ac9f..3355e0c7 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -47,7 +47,7 @@ $(document).ready(function() {
 		</div>
 	
 		<div class="row">
-			<div class="col-md-4">
+			<div class="col-md-6">
 				{{ filter_status }}
 			</div>
 			<div class="col-md-2">