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

diff --cc portal/templates/slice-resource-view.html
index b153c31,1875e0b..f84d1ce
--- 1/portal/templates/slice-resource-view.html
--- 2/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@@ -11,16 -11,16 +11,16 @@@
  
  {% block content %}
        <div class="col-md-2">
 -              <!-- <div id="select-platform" class="list-group"></div> -->
 -        {{filter_testbeds}}
 -
 +              
                <div class="list-group-item list-resources">
 -                      <span class="list-group-item-heading">Resources</span>
 +                      <span class="list-group-item-heading">View</span>
                        <a class="list-group-item" data-panel="resources" href="#">All</a>
-                       <a class="list-group-item" data-panel="resources" href="#">Reserved</a>
+                       <a class="list-group-item" data-panel="reserved" href="#">Reserved</a>
                        <a class="list-group-item" data-panel="pending" href="#">Pending <span class="badge" id="badge-pending" data-number="0"></span></a>
                </div>
 -      
 +              
 +              <!-- <div id="select-platform" class="list-group"></div> -->
 +              {{filter_testbeds}}
        </div>
        <div class="col-md-10" style="height:100%;">
                <div class="row">