X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Ftemplates%2Fslice-resource-view.html;h=062908d00409f9031088e90fc10130467c7cf090;hb=ba476841726dc818c0efd3ed25e42955a39fc504;hp=bf62d960e6a7cbbd9c5f2aab6ff4bb15a55b5428;hpb=5d68e7cc73f7800fa3c504e1f0a202306262e3fa;p=myslice.git

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index bf62d960..062908d0 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -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>
-			<a class="list-group-item" data-panel="resources" href="#">All</a>
+			<span class="list-group-item-heading">View</span>
+			<a class="list-group-item active" 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>
-	
+		
+		<!-- <div id="select-platform" class="list-group"></div> -->
+		{{filter_testbeds}}
 	</div>
 	<div class="col-md-10" style="height:100%;">
 		<div class="row">
@@ -47,53 +47,58 @@
 		</div>
 		<div class="row">
 			<ul class="nav nav-pills nav-resources">
-			  <li class="active"><a data-panel="resources" href="#">Resources</a></li>
+			  <li class="active"><a data-panel="resources" href="#">Table</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>
+
+		<!-- 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" 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>
+				 <!-- Button trigger modal - columns selector -->
+ 				<button class="btn btn-primary btn-sm" style="float:right;" data-toggle="modal" data-target="#myModal">Select columns</button>
                 {{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}}
+                <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="panel" style="height:370px;display:none;">
+                {{pending_resources}}
+			</div>
+			<div id="sla_dialog" class="panel" style="height:370px;display:none;">
+                {{sla_dialog}}
 			</div>
 			<div id="map" class="panel" style="height:370px;display:none;">
                 {{map_resources}}
 			</div>
 			<div id="scheduler-tab" class="panel" style="height:370px;display:none;">
-                {#scheduler#}
-			</div>
-			<div id="pending" class="panel" style="height:370px;display:none;">
-                {{pending_resources}}
+                {{scheduler}}
 			</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>
 {% endblock %}