X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-resource-view.html;h=062908d00409f9031088e90fc10130467c7cf090;hb=ba476841726dc818c0efd3ed25e42955a39fc504;hp=b153c31f78e0f34957e1ec932d97f3d8d6cc411b;hpb=05621c49e9b3bb8c2238155d67e01364a1fa5289;p=unfold.git

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index b153c31f..062908d0 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -14,8 +14,8 @@
 		
 		<div class="list-group-item list-resources">
 			<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 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>
 		
@@ -52,19 +52,52 @@
 			  <li id="Scheduler"><a data-panel="scheduler-tab" href="#">Scheduler</a></li>
 			</ul>
 		</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">
+				 <!-- 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;">
+                <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>