X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-resource-view.html;h=0a5d65eda7dfbd8197a32216572e545661c19cdc;hb=75b26254fbc898b1adb7aab4eb654b2ef5dcb375;hp=93285e12d036a6bd7d0368eeab7e5a7071f8648a;hpb=5c6d3dfae3a4aed1a18a9f1a946655631328351d;p=myslice.git

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index 93285e12..0a5d65ed 100644
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -33,7 +33,7 @@ $(document).ready(function() {
 		</div>
 	
 		<div class="row">
-			<div class="col-md-6">
+			<div class="col-md-9">
 				{{ filter_status }}
 			</div>
 			<div class="col-md-1">
@@ -54,9 +54,8 @@ $(document).ready(function() {
 			<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="#openflowcontroller" role="tab" data-toggle="tab">OpenFlow Controller</a></li>
-              <li> <a href="#resourceflowspace" role="tab" data-toggle="tab">Flowspace</a></li>
-			  <li> <a href="#resourcescheduler" role="tab" data-toggle="tab">Scheduler</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>
@@ -92,28 +91,13 @@ $(document).ready(function() {
 				<div class="tab-pane" id="resourcemap">
 	                {{map_resources}}
 				</div>
-                <div class="tab-pane" id="openflowcontroller">
-                    <p>{{vms_list}}</p>
-                    <p>{{vm_form}}</p>
-
-                    <p>{{below_table}}</p>
-                </div>
-
-                <div class="tab-pane" id="resourceflowspace">
-                    <p>{{welcome}}</p>
-                    <p>{{flowspaces}}</p>
-                    <p>{{flowspaces_form}}</p>
-                    <p>{{oflowspaces_form}}</p>
-                    <p>{{topology}}</p>
-                    <p>{{resources}}</p>
-
-                    <p>{{below_table}}</p>
-                </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%">