From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 31 Mar 2014 14:25:43 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~161
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0ea4d9fd262684724c1680c733bd4ea7dfc8df89;p=unfold.git

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

0ea4d9fd262684724c1680c733bd4ea7dfc8df89
diff --cc portal/templates/slice-resource-view.html
index b153c31f,1875e0bb..f84d1ce1
--- a/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">