From: Pedro, Carlos and Rezende <pedroeusebio, carlos, rezende@land.ufrj.br>
Date: Fri, 24 Oct 2014 18:00:22 +0000 (-0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=d9c4cf9cd7f3269068e048563b2975d26af2ae70

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
	portal/homeview.py
	portal/sliceresourceview.py
	portal/templates/slice-resource-view.html
---

d9c4cf9cd7f3269068e048563b2975d26af2ae70
diff --cc manifoldapi/static/js/manifold.js
index 31d4b000,ca111de7..01b48f51
--- a/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@@ -1111,6 -1115,6 +1116,9 @@@ var manifold = 
           * otherwise, publish the main object as well as subqueries
           * XXX how much recursive are we ?
           */
++        if (records == null){
++            records = Array();
++        }
          if (manifold.pubsub_debug)
               messages.debug (">>>>> publish_result_rec " + query.object);
          if (manifold.query_expects_unique_result(query)) {
diff --cc portal/templates/fibre/fibre_home-view.html
index b04b911d,00000000..347be8c0
mode 100644,000000..100644
--- a/portal/templates/fibre/fibre_home-view.html
+++ b/portal/templates/fibre/fibre_home-view.html
@@@ -1,184 -1,0 +1,185 @@@
 +{% extends "layout_base.html" %}
 +{% load portal_filters %}
 +
 +{% block content %}
 +<!-- <div class="row">
 +{% widget '_widget-news.html' %}
 +</div> -->
 +{% if username %}
 +<div class="container dashboard">
 +	<div class="row">
 +		{%if 'is_pi'  in pi %}
 +		<div class="col-md-3">
 +			<h3>
 +				EXPERIMENT
 +			</h3>
 +			<div>
 +				<a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
 +			</div>
 +			<div>
 +				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
 +			</div>
 +			<div>
 +				<p><strong>Your slices </strong>
 +					<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
 +					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'."
 +					class="glyphicon glyphicon-info-sign">
 +				</span>
 +
 +  				</p>
 +			</div>
 +			<div>	
 +				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 +			</div>
 +		</div>
 +		<div class="col-md-3">
 +			<h3>MANAGEMENT</h3>
 +			<div>
 +				<a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a>
 +			</div>
 +			<div>
 +				<button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
 +			</div>
 +		</div>
 +		<div class="col-md-3">
 +			<h3>
 +				SUPPORT
 +			</h3>
 +			<div>
 +				<a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
 +			</div>
 +			<div>
 +				<button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
 +			</div>
 +		</div>
 +		
 +		<div class="col-md-3">
 +			<h3>
 +				ACCOUNT
 +			</h3>
 +			<div>
 +				<a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
 +			</div>
 +			<div>
 +				<button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ person.username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
 +			</div>
 +			<div>
 +				{% if person.last_name %}
 +					{{person.first_name}} {{person.last_name}}<br />
 +				{% endif %}
 +    			<span class="label">Email:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
 +	    	</div>
 +		</div>
 +	</div>
 +	{%else%}
 +	<div class="row">
 +		<div class="col-md-4">
 +			<h3>
 +				EXPERIMENT
 +			</h3>
 +			<div>
 +				<a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
 +			</div>
 +			<div>
 +				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
 +			</div>
 +			<div>
 +				<p><strong>Your slices </strong>
 +				<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
 +					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
 +					However, on the OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
 +					such as on the PlanetLab Europe portal, those slices will not appear here."
 +					class="glyphicon glyphicon-info-sign">
 +				</span>
 +				</p>
 +			</div>
 +			<div>	
 +				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 +			</div>
 +		</div>
 +		<div class="col-md-4">
 +			<h3>
 +				SUPPORT
 +			</h3>
 +			<div>
 +				<a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
 +			</div>
 +			<div>
 +				<button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
 +			</div>
 +		</div>
 +		
 +		<div class="col-md-4">
 +			<h3>
 +				ACCOUNT
 +			</h3>
 +			<div>
 +				<a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
 +			</div>
 +			<div>
 +				<button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
 +			</div>
 +			<div>
 +				{% if person.last_name %}
 +					{{person.first_name}} {{person.last_name}}<br />
 +				{% endif %}
 +    			<span class="label">Email:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
 +	    	</div>
 +		</div>
 +	</div>
 +	{%endif%}
 +
 +</div>
 +{% else %}
 +<div class="container-fluid home">
 +	<div class="">
 +		<div class="col-sm-1"></div>
 +		<div class="col-sm-5 slogan">
 +			<h2>
 +				FIBRE: Future Internet testbeds experimentation between Brazil and Europe
 +			</h2>
 +			<h3>
 +				Access variety of testbeds through your account
 +			</h3>
 +		</div>
 +		<div class="col-sm-5 col-sm-offset-1">
 +   			<div class="row">
 +			    {% include 'fibre__widget-login-fed-manager.html' %}
- 				<a href="/cafe" style="margin-left:80px;"><img src="{{ STATIC_URL }}img/fibre/cafe.jpg" alt="CAFe authentication" /></a>
++				<!--<a href="/cafe" style="margin-left:80px;"><img src="{{ STATIC_URL }}img/fibre/cafe.jpg" alt="CAFe authentication" /></a>-->
++				<a href="/cafe" style="margin-left:80px;"><img src="{{ STATIC_URL }}img/fibre/expresso.png" alt="CAFe Expresso authentication" /></a>
 +			</div>
 +		</div>
 +		<div class="col-sm-1"></div>
 +	</div>
 +</div>
 +{% endif %}
 +
 +
 +<script type="text/javascript">
 +	$(document).ready(function() {
 +		$('a.home-tab').click(function() {
 +			$('ul.nav-tabs li').removeClass('active');
 +			$(this).parent().addClass('active');
 +			$('div.home-panel').hide();
 +			$('div#'+$(this).data('panel')).show();
 +		});
 +		$('button#validaterequestbtn').click(function() {
 +			window.location="/portal/institution#requests";
 +		});
 +		$('button#ticketbtn').click(function() {
 +			window.location="/portal/contact/";
 +		});
 +		$('button#signupbtn').click(function() {
 +			window.location="/portal/register/";
 +		});
 +		$('button#slicerequestbtn').click(function() {
 +			window.location="/portal/slice_request/";
 +		});
 +/*-------
 +List of slices has been moved in 
 +portal/templates/base.html
 +This should go into session
 +--------*/
 +});
 +</script>
 +{% endblock %}
diff --cc portal/templates/fibre/fibre_slice-resource-view.html
index 17e13830,17e13830..bc2a2ed2
--- a/portal/templates/fibre/fibre_slice-resource-view.html
+++ b/portal/templates/fibre/fibre_slice-resource-view.html
@@@ -54,6 -54,6 +54,7 @@@ $(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>
  			</ul>
@@@ -91,8 -91,8 +92,12 @@@
  				<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>
@@@ -101,12 -101,12 +106,11 @@@
                      <p>{{resources}}</p>
  
                      <p>{{below_table}}</p>
--
                  </div>
  				<div class="tab-pane" id="resourcescheduler">
  	                {{scheduler}}
  				</div>
--	
++
  				<!--
  				<div id="reserved" class="tab-pane" style="height:370px;display:none;">
  	                <table width="80%">
diff --cc portal/templates/slice-resource-view.html
index 2346bf23,ff1fc3e0..dcca68ca
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@@ -101,16 -108,11 +108,11 @@@ $(document).ready(function() 
                      <p>{{resources}}</p>
  
                      <p>{{below_table}}</p>
- 
                  </div>
+ 
  				<div class="tab-pane" id="resourcescheduler">
 -	                {{scheduler}}
 +                    {{scheduler}}
  				</div>
- 				<div class="tab-pane" id="resourceflowspace">
-                         {{resources}}
-                         {{flowspaces}}
-                         {{flowspaces_form}}
- 				</div>
  	
  				<!--
  				<div id="reserved" class="tab-pane" style="height:370px;display:none;">