X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-resource-view.html;h=0a5d65eda7dfbd8197a32216572e545661c19cdc;hb=3627ebeae68471c98c796277794e5b4ebed8a0b0;hp=a8a9ac9f5ad3eb624c3ca8a1a49b9953c0bc065c;hpb=4f924a3d5b8d6ca7cf022e15900369c7a0c4ce7e;p=myslice.git

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index a8a9ac9f..0a5d65ed 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -26,20 +26,6 @@ $(document).ready(function() {
 		{{filter_testbeds}}
 	</div>
 	<div class="col-md-10" style="height:100%;">
-		<!-- <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>
@@ -47,10 +33,10 @@ $(document).ready(function() {
 		</div>
 	
 		<div class="row">
-			<div class="col-md-4">
+			<div class="col-md-9">
 				{{ filter_status }}
 			</div>
-			<div class="col-md-2">
+			<div class="col-md-1">
 				{{ apply }}
 			</div>
 		</div>
@@ -69,6 +55,7 @@ $(document).ready(function() {
 			  <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>
@@ -97,7 +84,7 @@ $(document).ready(function() {
 			<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>
+	 				<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>
@@ -107,7 +94,10 @@ $(document).ready(function() {
 				<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%">