X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-resource-view.html;h=3355e0c7829d63b907ed33bdd8e83be1059fad56;hb=b80b6a7f021a04b435125ccf2867cf0faa20e28d;hp=4ecf483d6e8037f442b741bf230a45b773d1f7b0;hpb=1d7b0fb8b69c6eca9880a3966acf0352341882bb;p=unfold.git

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index 4ecf483d..3355e0c7 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -18,11 +18,10 @@ $(document).ready(function() {
 {% endblock %}
 
 {% block content %}
-		<div class="row">
-		  	{% widget '_widget-slice-sections.html' %}
-		</div>
+{% widget '_widget-slice-sections.html' %}
+<div class="container-fluid container-resource">
+	<div class="row">
 	<div class="col-md-2">
-		
 		<!-- <div id="select-platform" class="list-group"></div> -->
 		{{filter_testbeds}}
 	</div>
@@ -46,8 +45,15 @@ $(document).ready(function() {
 			<div class="col-md-12"><p class="alert-success">{{ msg }}</p></div>
 			{% endif %}
 		</div>
-
-		{{ filter_status }}{{ apply }}
+	
+		<div class="row">
+			<div class="col-md-6">
+				{{ filter_status }}
+			</div>
+			<div class="col-md-2">
+				{{ apply }}
+			</div>
+		</div>
 		<!--
 		<div class="list-group-item list-resources">
 			<span class="list-group-item-heading" style="padding-left: 0;">Resource status:</span>
@@ -58,13 +64,15 @@ $(document).ready(function() {
 		-->
 
 		<div class="row">
+			<div class="col-md-12">
 			<ul class="nav nav-tabs">
 			  <li class="active"><a href="#resourcelist" role="tab" data-toggle="tab">Table</a></li>
 			  <li> <a href="#resourcemap" role="tab" data-toggle="tab">Map</a></li>
 			  <li> <a href="#resourcescheduler" role="tab" data-toggle="tab">Scheduler</a></li>
 			</ul>
+			</div>
 		</div>
-
+		
 		<!-- Modal - columns selector -->
 		<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   			<div class="modal-dialog">
@@ -83,38 +91,45 @@ $(document).ready(function() {
   			</div>
 		</div>
 		
-		<div class="tab-content" style="height:100%;">
-			<div class="tab-pane active" id="resourcelist">
-				 <!-- Button trigger modal - columns selector -->
- 				<button class="btn btn-primary btn-sm" style="float:right;" data-toggle="modal" data-target="#myModal">...</button>
-                {{list_resources}}
-				<!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
-			</div>
-			<div class="tab-pane" id="resourcemap">
-                {{map_resources}}
-			</div>
-			<div class="tab-pane" id="resourcescheduler">
-                {{scheduler}}
-			</div>
-
-			<!--
-			<div id="reserved" class="tab-pane" style="height:370px;display:none;">
-                <table width="80%">
-                    <tr><th width="50%" style="text-align:center;">resources</th><th width="50%" style="text-align:center;">leases</th></tr>
-                    <tr>
-                        <td style="text-align:center">{{list_reserved_resources}}</td>
-                        <td style="text-align:center">{{list_reserved_leases}}</td>
-                    </tr>
-                </table>
-			</div>
-			<div id="pending" class="tab-pane" style="height:370px;display:none;">
-                {{pending_resources}}
-			</div>
-			<div id="sla_dialog" class="tab-pane" style="height:370px;display:none;">
-                {{sla_dialog}}
+		
+		<div class="row">
+			<div class="col-md-12">
+			<div class="tab-content" style="height:100%;">
+				<div class="tab-pane active" id="resourcelist">
+					 <!-- Button trigger modal - columns selector -->
+	 				<button class="btn btn-primary btn-sm" style="float:right;" data-toggle="modal" data-target="#myModal">...</button>
+	                {{list_resources}}
+					<!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
+				</div>
+				<div class="tab-pane" id="resourcemap">
+	                {{map_resources}}
+				</div>
+				<div class="tab-pane" id="resourcescheduler">
+	                {{scheduler}}
+				</div>
+	
+				<!--
+				<div id="reserved" class="tab-pane" style="height:370px;display:none;">
+	                <table width="80%">
+	                    <tr><th width="50%" style="text-align:center;">resources</th><th width="50%" style="text-align:center;">leases</th></tr>
+	                    <tr>
+	                        <td style="text-align:center">{{list_reserved_resources}}</td>
+	                        <td style="text-align:center">{{list_reserved_leases}}</td>
+	                    </tr>
+	                </table>
+				</div>
+				<div id="pending" class="tab-pane" style="height:370px;display:none;">
+	                {{pending_resources}}
+				</div>
+				<div id="sla_dialog" class="tab-pane" style="height:370px;display:none;">
+	                {{sla_dialog}}
+				</div>
+	-->
+	
 			</div>
--->
-
 		</div>
 	</div>
+	</div>
+	</div>
+</div>
 {% endblock %}