X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-resource-view.html;h=a55d68438dd082b3e75f805decb24619085465dd;hb=6c17f3004de22975899334e899a1882de8340023;hp=bf62d960e6a7cbbd9c5f2aab6ff4bb15a55b5428;hpb=5d68e7cc73f7800fa3c504e1f0a202306262e3fa;p=unfold.git

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index bf62d960..a55d6843 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -6,94 +6,120 @@
 <script src="{{ STATIC_URL }}js/onelab_slice-resource-view.js"></script>
 <script>
 	//myslice.slice = "{{ slice }}";
+
+$(document).ready(function() {
+            $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        // find the plugin object inside the tab content referenced by the current tabs
+        $('.plugin', $($(e.target).attr('href'))).trigger('shown.bs.tab');
+        $('.plugin', $($(e.target).attr('href'))).trigger('show');
+            });
+});
 </script>
 {% endblock %}
 
 {% block content %}
+{% 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 class="list-group-item list-resources">
-			<span class="list-group-item-heading">Resources</span>
-			<a class="list-group-item" data-panel="resources" href="#">All</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>
-	
+		{{filter_testbeds}}
 	</div>
 	<div class="col-md-10" style="height:100%;">
-		<div class="row">
-		  	{% widget '_widget-slice-sections.html' %}
-		</div>
-		<!-- <div class="row slice-pending">
-			<ul class="nav nav-pills">
-				<li><a href="">Unreserved</a></li>
-				<li><a href="">Reserved</a></li>
-				<li><a href="">Pending<span class="badge" id="badge-pending" style="display:none;"></span></a></li>
-				<li>
-					<button type="button" class="btn btn-primary apply" id="ApplyPendind">Apply</button>
-					<button type="button" class="btn btn-default clear">Clear</button>
-				</li>
-				<li>
-					<div id="loading" style="display:none;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading" /></div>
-				</li>
-			</ul>
-		</div> -->
 		<div class="row">
 			{% if msg %}
 			<div class="col-md-12"><p class="alert-success">{{ msg }}</p></div>
 			{% endif %}
 		</div>
+	
 		<div class="row">
-			<ul class="nav nav-pills nav-resources">
-			  <li class="active"><a data-panel="resources" href="#">Resources</a></li>
-			  <li id="GoogleMap"><a data-panel="map" href="#">Map</a></li>
-			  <li id="Scheduler"><a data-panel="scheduler-tab" href="#">Scheduler</a></li>
-			</ul>
-		</div>
-		<div class="row" id="columns_selector" style="height:100%;display:none;">
-        {{columns_editor}}
-        </div>
-		
-		<div class="row" style="height:100%;">
-			<div id="resources" class="panel">
-				<p style="margin-left: 1050px;">
-    				<button type="button" id="show_col_selector" class="btn btn-default btn-sm">Select columns</button>
-    				<button type="button" id="hide_col_selector" style="display:none;" class="btn btn-primary btn-sm">Select columns</button>
-				</p>
-                {{list_resources}}
-				<!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
-			</div>
-			<div id="reserved" class="panel" style="height:370px;display:none;">
-                {{list_reserved_resources}}
+			<div class="col-md-6">
+				{{ filter_status }}
 			</div>
-			<div id="map" class="panel" style="height:370px;display:none;">
-                {{map_resources}}
+			<div class="col-md-1">
+				{{ apply }}
 			</div>
-			<div id="scheduler-tab" class="panel" style="height:370px;display:none;">
-                {#scheduler#}
+		</div>
+		<!--
+		<div class="list-group-item list-resources">
+			<span class="list-group-item-heading" style="padding-left: 0;">Resource status:</span>
+			<a class="list-group-item active" data-panel="resources" href="#" style='display: inline-block !important;'>All</a>
+		  	<a class="list-group-item" data-panel="reserved" href="#" style='display: inline-block !important;'>Reserved</a>
+		  	<a class="list-group-item" data-panel="pending" href="#" style='display: inline-block !important;'>Pending <span class="badge" id="badge-pending" data-number="0"></span></a>
+		</div>
+		-->
+
+		<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>
+			  <li> <a href="#resourcesasap" role="tab" data-toggle="tab">ASAP</a></li>
+			</ul>
 			</div>
-			<div id="pending" class="panel" style="height:370px;display:none;">
-                {{pending_resources}}
+		</div>
+		
+		<!-- Modal - columns selector -->
+		<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  			<div class="modal-dialog">
+    			<div class="modal-content">
+      				<div class="modal-header">
+        				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        					<h4 class="modal-title" id="myModalLabel">Columns selector</h4>
+      				</div>
+      				<div class="modal-body">
+        				{{columns_editor}}
+      				</div>
+      				<div class="modal-footer">
+        				<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      				</div>
+    			</div>
+  			</div>
+		</div>
+		
+		
+		<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-default 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 class="tab-pane" id="resourcesasap">
+	                {{asap}}
+				</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>
-
-<script>
-jQuery(document).ready(function(){
-	jQuery("#show_col_selector").click(function(){
-    	jQuery("#columns_selector").show();
-		jQuery("#hide_col_selector").show();
-       	jQuery("#show_col_selector").hide();
-	});
-	jQuery("#hide_col_selector").click(function(){
-    	jQuery("#columns_selector").hide();
-    	jQuery("#show_col_selector").show();
-    	jQuery("#hide_col_selector").hide();
-	});                 				
-});
-
-			
-</script>
+	</div>
+	</div>
+</div>
 {% endblock %}