Commit 2b660eae authored by Felipe Fonseca's avatar Felipe Fonseca
Browse files

Merge branch '1.2.4'

parents b38550a2 b90ff302
......@@ -11,28 +11,43 @@
{% endif %}
<div class="intro">
<h3>Welcome to FIBRE</h3>
<p>This page gives access to a remote experimental infrastructure (or testbed)
for tests with computer networks and distributed systems, mainly involving
wireless and wired devices. This testbed is part of the project FIBRE,
an initiative between Brazil and Europe.</p>
</div>
<div class="row">
<div class="col-lg-7">
<div>
<h3>Welcome to FIBRE</h3>
<p>This page gives access to a remote experimental infrastructure (or testbed)
for tests with computer networks and distributed systems, mainly involving
wireless and wired devices. This testbed is part of the project FIBRE,
an initiative between Brazil and Europe.</p>
</div>
<div>
<p>FIBRE is open to any researcher, professor or student from any institution to test new applications and network architecture models.</p>
<p>If you have an account, please click in <a href="https://portal.fibre.org.br/Login">Sign in</a> below. Otherwise, you could just fill in an registration form.</p>
</div>
<div>
<p>FIBRE is open to any researcher, professor or student from any institution to test new applications and network architecture models.</p>
{% if not request.session.member_urn %}
<p>If you have an account, please click in <a href="https://portal.fibre.org.br/Login">Sign in</a> below. Otherwise, you could just fill in an registration form.</p>
{% endif %}
</div>
<div>For further information about FIBRE-BR, please access the links below:
<p>About FIBRE project:
<a href="http://www.fibre.org.br" target="_blank">http://www.fibre.org.br</a>
</p>
<div>For further information about FIBRE-BR, please access the links below:
<p>About FIBRE project:
<a href="http://www.fibre.org.br" target="_blank">http://www.fibre.org.br</a>
</p>
<p>FIBRE Wiki:
<a href="https://wiki.rnp.br/display/fibre/Home" target="_blank">https://wiki.rnp.br/display/fibre/Home </a>
</p>
<p>FIBRE Wiki:
<a href="https://wiki.rnp.br/display/fibre/Home" target="_blank">https://wiki.rnp.br/display/fibre/Home </a>
</p>
</div>
<div>Support channels
<p>Public mailing list: <a href="http://listas.rnp.br/mailman/listinfo/fibre-info" target="_blank">http://listas.rnp.br/mailman/listinfo/fibre-info</a></p>
<p>Users mailing list: <a href="http://listas.rnp.br/mailman/listinfo/fibre-users" target="_blank">http://listas.rnp.br/mailman/listinfo/fibre-users</a></p>
</div>
</div>
<div class="col-lg-5" style="margin-top: 1em">
<iframe src =https://calendar.google.com/calendar/embed?src=dubvn3b0ghm7l1d3u95ipm45g0@group.calendar.google.com&ctz=America/Sao_Paulo&hl=en width="400" height="300" frameborder="0" scrolling="no" align="right"></iframe>
</div>
</div>
{% if not request.session.member_urn %}
......@@ -47,7 +62,7 @@
</div> -->
<img src="{% static "images/fibre_brand.png" %}" class="img-responsive center-block">
<div style="display: flex;" class="center-block">
<div style="width: 50%; margin: 15px;" class="center-block">
<a href="https://portal.fibre.org.br/Login" role="button" class="btn btn-primary btn-lg btn-block">Sign in</a>
......@@ -58,10 +73,10 @@
</div>
</div>
</div>
<!-- <div style="border: 1px solid; border-color: #ddd; width:480px; display: table; margin: 0 auto; display: none;" id="local-sign-in"> -->
<!--
<!--
<div style="height:60px; background-color:#f3f3f3">
<div class="col-xs-12" style="height:100%; margin:10px">
<h4 style="text-align:center">Access using local account</h4>
......@@ -69,7 +84,7 @@
</div>
<form class="form-horizontal" role="form" action="" method="post" style="margin-bottom:0px">
<div style="display:none">
<input name="utf8" value="✓" type="hidden">
<input name="authenticity_token" value="U7R1gZoegUCcp4hIY6og327/C0prG+R/Sqz+b5yIrbw=" type="hidden">
......@@ -78,12 +93,12 @@
<div style="padding-left:15px; height:120px; background-color:#fff;">
{% csrf_token %}
{% for field in form %}
<div class="form-group{% if field.errors %} has-error {% endif %}">
<div class="col-sm-3 ">
<label for="{{ field.id_for_label }}" class="control-label">{{ field.label }}</label>
</div>
<div class=" col-sm-9">
{{field}}
</div>
......@@ -91,7 +106,7 @@
{{field.non_field_errors }}
{{field.errors}}
<script type="text/javascript">
{% if field.errors %} toggleDiv('local-sign-in') {% endif %}
......@@ -101,7 +116,7 @@
</div>
<div style="height:50px; background-color:#f3f3f3;">
<div class="col-xs-7" style="height:100%; padding:15px">
<div class="col-xs-7" style="height:100%; padding:15px">
<a href="{% url 'portal:password_reset_form' %}" >Forgot your password?</a>
</div>
<div class="col-xs-5" align="right" style="height:100%; padding:9px">
......
......@@ -305,7 +305,7 @@
</thead>
<tbody>
{% for slice_urn, slice_attrs in slices.operation_message.items %}
{% if member_urn in slice_attrs.members %}
{% if member_urn in slice_attrs.members or request.session.member_privilege == 3 %}
<tr>
<td><a href="{% url 'portal:detail_slice' slice_urn=slice_urn%}" > {{ slice_attrs.slice_name|default:"--" }}</a></td>
......
......@@ -235,8 +235,8 @@
<div class="row">
<div class="col-sm-12 vlan-container">
<label for="vlans">{% trans "Slice"%}</label>
<select class="form-control" name="vlans" id="vlans">
<option value="" disabled selected>{% trans "Select a vlan" %}</option>
<select class="form-control" name="vlans" id="vlans" disabled>
<option value="" selected>{% trans "Select a vlan" %}</option>
{% for vlan in vlans %}
<option value="{{ vlan }}">{{ vlan }}</option>
{% endfor %}
......
......@@ -231,6 +231,11 @@ def detail_project(request, project_urn, project, pane_id = '0'):
if member_urn in members['operation_message'].keys():
# Set the logged user membership.
member_role = members['operation_message'].get(member_urn).get('membership')
elif request.session['member_privilege'] == 3:
for key in members['operation_message'].keys():
if members['operation_message'].get(key).get('membership') == 'owner':
borrowed_urn = key
member_role = members['operation_message'].get(key).get('membership')
else:
messages.error(request, _('You are not a member of this project, request access.'))
return redirect('portal:my_workspace')
......
......@@ -867,7 +867,7 @@ def update_slice_form(request):
# The user submitted the form with new slice data.
else:
# Initialize form with request data.
form = SliceForm(request.POST)
form = SliceForm(request.POST, project=project)
# Add form into context dictionary.
context.update({'form': form})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment