Skip to content
GitLab
Commit cefabeb4 authored by leonrod's avatar leonrod Committed by Gustavo Hermínio de Araújo
Browse files

Home page redesign

parent 9061050a
Show whitespace changes
Inline Side-by-side
fibre-vpn/ca.crt 0 → 100644
View file @ cefabeb4
-----BEGIN CERTIFICATE-----
MIIDnDCCAwWgAwIBAgIJALKeJKf+daQbMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD
VQQGEwJCUjELMAkGA1UECBMCR08xEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNVBAoT
BUZJQlJFMQ4wDAYDVQQLEwVGSUJSRTEQMA4GA1UEAxMHZmVkLW9tZjEQMA4GA1UE
KRMHZmVkLW9tZjEfMB0GCSqGSIb3DQEJARYQbWFpbEBob3N0LmRvbWFpbjAeFw0x
MzAxMjIyMjI5NTRaFw0yMzAxMjAyMjI5NTRaMIGRMQswCQYDVQQGEwJCUjELMAkG
A1UECBMCR08xEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNVBAoTBUZJQlJFMQ4wDAYD
VQQLEwVGSUJSRTEQMA4GA1UEAxMHZmVkLW9tZjEQMA4GA1UEKRMHZmVkLW9tZjEf
MB0GCSqGSIb3DQEJARYQbWFpbEBob3N0LmRvbWFpbjCBnzANBgkqhkiG9w0BAQEF
AAOBjQAwgYkCgYEAr5ceOjy6hz9j3v15NTTCoyREbnm+tPJRkbqlKzPFua2PZxts
hfKaCoK0w/Sz3JDgwahQxTSvmXffiu40KhTgRmZmCCpXHSXm7mDl10Pd35ykQc2j
ARsssrw3efdNVZ8v9YJAQ23EXaCKNxFWIGPNu7CrAsZkT5Ldf88PEkLpna0CAwEA
AaOB+TCB9jAdBgNVHQ4EFgQUfzk9i6XhJhR53fv8XDlPNXJroegwgcYGA1UdIwSB
vjCBu4AUfzk9i6XhJhR53fv8XDlPNXJroeihgZekgZQwgZExCzAJBgNVBAYTAkJS
MQswCQYDVQQIEwJHTzEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UEChMFRklCUkUx
DjAMBgNVBAsTBUZJQlJFMRAwDgYDVQQDEwdmZWQtb21mMRAwDgYDVQQpEwdmZWQt
b21mMR8wHQYJKoZIhvcNAQkBFhBtYWlsQGhvc3QuZG9tYWluggkAsp4kp/51pBsw
DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBEK93Tk6pHS3TOvtZQU4BU
O9tnzKikaCmvfbeiTAlv4+f5BfKqXsUG3erl6J7dFKBDzMNkJe7hTX6ZE3omwDSA
RuZL7VNQ7oR9KdU0Hm1fBoCeWby+yJbZePbwQQ/xnTKEo/ToeIKAy66wuW+9JMsb
nAqz/L+P0wVQ12PnNiWC/g==
-----END CERTIFICATE-----
fibre-vpn/fibre-vpn.ovpn 0 → 100644
View file @ cefabeb4
client
dev tun
proto udp
port 1192
remote 200.130.15.189
remote-cert-tls server
resolv-retry infinite
nobind
persist-key
persist-tun
ca ca.crt
comp-lzo
verb 3
auth-user-pass
dhcp-option DNS 10.128.0.80
portal/migrations/0017_auto_20200312_0956.py 0 → 100644
View file @ cefabeb4
# Generated by Django 2.1.7 on 2020-03-12 12:56
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('portal', '0016_auto_20190521_1418'),
]
operations = [
migrations.AlterField(
model_name='useraccountactivationtoken',
name='request_date',
field=models.DateTimeField(default=datetime.datetime(2020, 3, 12, 12, 56, 53, 814850)),
),
migrations.AlterField(
model_name='userpasswordresettoken',
name='request_date',
field=models.DateTimeField(default=datetime.datetime(2020, 3, 12, 12, 56, 53, 814208)),
),
]
portal/static/css/home.css 0 → 100644
View file @ cefabeb4
/*page split*/
.split {
display: flex;
flex-direction: row;
}
.split .left {
float: left;
width: 50%;
background: #337ab7;
color: #fff;
padding: 20px;
}
.split .rigth {
float: right;
width: 50%;
border: 1px solid #eee;
background-color: #f8f8f8;
}
.split .left a {
color: #fff;
text-decoration: underline;
}
/*or connect with cafe - line division*/
.line-center{
margin:0;
padding:0 20px;
background:#f8f8f8;
display:inline-block;
}
h2{
text-align:center;
position:relative;
z-index:2;
}
h2:after{
content:"";
position:absolute;
top:50%;
left:5%;
right:5%;
border-top:solid 1px #e7e7e7;
z-index:-1;
}
/*Maintenance calendar Title*/
#one {
margin-top: 30px;
margin-left: -20px;
padding:20px;
display: flex;
align-items: center;
height: 10px;
width: 100%;
}
.corner {
width: 100px;
background: #eee;
color: #888;
margin: 10px;
position: relative;
}
.corner:after, .corner:before {
content: "";
position: absolute;
left: 100%;
width: 20px;
height: 50%;
}
.corner:before {
top: 0px;
background: linear-gradient(to top right, #eee 50%, transparent 51%);
}
.corner:after {
bottom: 0px;
background: linear-gradient(to bottom right, #eee 50%, transparent 51%);
}
portal/templates/main/base.html
View file @ cefabeb4
......@@ -37,6 +37,9 @@
<link href="{% static 'plugins/toastr/toastr.min.css' %}" rel="stylesheet"/>
<script src="{% static 'plugins/toastr/toastr.min.js' %}"></script>
<!--home page design-->
<link rel="stylesheet" href="{% static 'css/home.css' %}">
<script type="text/javascript">
function getCookie(name) {
var cookieValue = null;
......
portal/templates/members/authentication/home.html
View file @ cefabeb4
......@@ -11,10 +11,11 @@
{% endif %}
<div class="row">
<div class="col-lg-7">
<div class="split">
<div class="left center-block">
<div>
<h3>Welcome to FIBRE</h3>
<h1>Welcome to FIBRE</h1>
<br>
<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,
......@@ -24,149 +25,64 @@
<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>
<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>
<p>FIBRE Wiki:
<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
<div>
<h4>Support channels</h4>
<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>
<p style="font-size: 13px;">
To report bugs, problems or questions contact us at
<a href="mailto:atendimento@rnp.br" >atendimento@rnp.br</a>
</p>
</div>
<div id="one" class="corner">
<h4>Maintenance Calendar</h4>
</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 style="display: flex; align-items: center; justify-content: center; padding: 20px;">
<iframe src =https://calendar.google.com/calendar/embed?src=dubvn3b0ghm7l1d3u95ipm45g0@group.calendar.google.com&ctz=America/Sao_Paulo&hl=en width="100%" height="300" frameborder="0" scrolling="no" align="right"></iframe>
</div>
</div>
{% if not request.session.member_urn %}
<div style="display: flex;">
<div style="border: 1px solid; border-color: #eee; width:480; border-radius: 5px;" class="center-block">
<!--
<div style="height:60px; background-color:#f3f3f3">
<div class="col-xs-12" style="height:100%; margin:10px">
<h4 style="text-align:center">I have an account</h4>
</div>
</div> -->
<div style="display: flex;" class="center-block">
<div style="display: flex; flex-direction: column; width: 100%;">
<img src="{% static "images/fibre_brand.png" %}" class="img-responsive ">
<div style="display: flex;">
<div style="width: 50%; margin: 15px;" class="center-block">
<div class="rigth center-block">
<img src="{% static 'images/fibre_brand.png' %}" class="img-responsive">
<div style="width: 80%; display: flex; align-items: center; margin-bottom: 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>
<a style="margin-top: 10px; display: inline-block;" href="{% url 'portal:password_reset_form' %}" >Forgot your password?</a>
</div>
<div style="width: 50%; margin: 15px;" class="center-block">
<a href="{% url 'portal:account_request_form' %}" role="button" class="btn btn-primary btn-lg btn-block">Sign up</a>
</div>
</div>
</div>
</div>
</div>
<div style="border: 1px solid; border-color: #eee; width:480; border-radius: 5px; align-self: center;" class="center-block">
<!--
<div style="height:60px; background-color:#f3f3f3">
<div class="col-xs-12" style="height:100%; margin:10px">
<h4 style="text-align:center">I have an account</h4>
</div>
</div> -->
<div style="display: flex;" class="center-block">
<div style="width: 50%; padding: 15px; display: flex; flex-direction: column; align-self: flex-end;" class="center-block">
<img src="{% static "images/cafe_logo.png" %}" alt="">
<a href="https://portal.fibre.org.br/Cafe" role="button" class="btn btn-primary btn-lg btn-block">Login with CAFe</a>
</div>
<div style="width: 50%; padding: 15px; display: flex; flex-direction: column; align-self: flex-end;" class="center-block">
<img src="{% static "images/cafex_logo.png" %}" alt="">
<a href="https://portal.fibre.org.br/DS" role="button" class="btn btn-primary btn-lg btn-block">Login with<br>CAFe Expresso</a>
</div>
</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>
</div>
</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">
</div>
<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>
<a style="font-size: 16px; display:block; text-align:center;" href="{% url 'portal:password_reset_form' %}" >Forgot your password?</a>
<div style=" text-align:center; margin-top: 20px; color: #888; font-size: 15px; " class="center-block">
Don't have an account? <a href="{% url 'portal:account_request_form' %}" role="button">Sign up</a>
</div>
<div class=" col-sm-9">
{{field}}
<!--cafeLogin-->
<br>
<h2><span class="line-center" style="color: #888; font-size: 15px;">or connect with CAFe</span></h2>
<div style="display: flex; flex-direction: column; align-items: center; justify-content: center; margin-top: 60px;">
<img src="{% static 'images/cafe_logo.png' %}" class="img-responsive" >
<div style="width: 80%; margin-top: 25px; ">
<a href="https://portal.fibre.org.br/Cafe" role="button1" class="btn btn-primary btn-lg btn-block">Login with CAFe</a>
</div>
</div>
{{field.non_field_errors }}
{{field.errors}}
<script type="text/javascript">
{% if field.errors %} toggleDiv('local-sign-in') {% endif %}
</script>
{% endfor %}
</div>
<div style="height:50px; background-color:#f3f3f3;">
<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">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form>
</div> -->
<!--
<div style="margin-top:10px" >
<p> <a href="{% url 'portal:password_reset_form' %}" >Forgot your password?</a> </p>
</div>
<div style="margin-top:10px" >
<p> If you do not have login, request an account <a href="{% url 'portal:account_request_form' %}" >here.</a></p>
</div>
-->
{% endif %}
</div>
{% endblock content %}
\ No newline at end of file
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