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

diff --cc plugins/filter_status/templates/filter_status.html
index 3b40d29,8dc661f..498c149
--- 1/plugins/filter_status/templates/filter_status.html
--- 2/plugins/filter_status/templates/filter_status.html
+++ b/plugins/filter_status/templates/filter_status.html
@@@ -25,9 -25,9 +25,9 @@@
       style='display: inline-block !important;' 
       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 aside the checkbox for more details."
 +     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."
       rel='tooltip'>
-       <p class="list-group-item-heading">Unconfigured</p>
+       Unconfigured
        <span class="badge" id="badge-unconfigured" style="display:none;"></span></a>
    </a>
    
@@@ -35,9 -35,9 +35,9 @@@
       style='display: inline-block !important;' 
       id="{{ domid }}__pending" 
       data-status="pending"
 -     title="View pending changes to your slice, resources that you have selected to add, and resources that you have selected to remove. Click on the Apply button to apply those changes, and on the Cancel button to cancel them."
 +     title="View pending changes to your slice: resources that you have selected to add, and resources that you have selected to remove. Click on the Apply button to apply those changes, or on the Cancel button to cancel them."
       rel='tooltip'>
-       <p class="list-group-item-heading">Pending</p>
+       Pending
        <span class="badge" id="badge-pending" style="display:none;"></span></a>
    </a>
  </div> 

diff --cc plugins/querytable/templates/querytable.html
Simple merge

diff --cc portal/sliceresourceview.py
Simple merge