X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-resource-view.html;fp=portal%2Ftemplates%2Fslice-resource-view.html;h=2346bf2300df7010e87c413ed5ed576014be98c0;hb=e45ccc4c4c327a81cc6a001ceff0655358ea09c5;hp=626b7f5d078da4f0ec1c6949dbce0f8921efc3bb;hpb=e494918d8e6d9dab21b9ff30c3c2db2157dc0a20;p=myslice.git

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index 626b7f5d..2346bf23 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>
@@ -50,7 +36,7 @@ $(document).ready(function() {
 			<div class="col-md-6">
 				{{ filter_status }}
 			</div>
-			<div class="col-md-2">
+			<div class="col-md-1">
 				{{ apply }}
 			</div>
 		</div>
@@ -98,13 +84,25 @@ $(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>
 				<div class="tab-pane" id="resourcemap">
 	                {{map_resources}}
 				</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>