Commit afd035c9 authored by Benoit Alessandroni's avatar Benoit Alessandroni

Merge branch 'master' into 31-registration-not-working-anymore-after-update

parents 30acbdcd dddd0b2a
Pipeline #6078 passed with stage
in 27 seconds
......@@ -12,17 +12,23 @@ from djangoldp_account.forms import LDPUserForm
from .models import ChatProfile, Account
from .views import userinfocustom, RPLoginView, RPLoginCallBackView, check_user
Group._meta.serializer_fields = ['name']
Group._meta.anonymous_perms = getattr(settings, 'GROUP_ANONYMOUS_PERMISSIONS', ['view'])
Group._meta.authenticated_perms = getattr(settings, 'GROUP_AUTHENTICATED_PERMISSIONS', ['inherit'])
Group._meta.owner_perms = getattr(settings, 'GROUP_OWNER_PERMISSIONS', ['inherit'])
urlpatterns = [
url(r'^groups/',
LDPViewSet.urls(model=Group, fields=['@id', 'name', 'user_set'],
permission_classes=getattr(settings, 'GROUP_PERMISSION_CLASSES', [LDPPermissions]),
)),
)
),
url(r'^auth/register/$',
RegistrationView.as_view(
form_class=LDPUserForm
),
name='django_registration_register',
),
),
url(r'^auth/', include('django_registration.backends.activation.urls')),
url(r'^auth/', include('django.contrib.auth.urls')),
url(r'^accounts/', LDPViewSet.urls(model=Account, permission_classes=[LDPPermissions])),
......@@ -33,7 +39,3 @@ urlpatterns = [
url(r'^check-user/?$', csrf_exempt(check_user)),
url(r'^', include('oidc_provider.urls', namespace='oidc_provider'))
]
Group._meta.serializer_fields = ['name']
Group._meta.anonymous_perms = getattr(settings, 'GROUP_ANONYMOUS_PERMISSIONS', ['view'])
Group._meta.authenticated_perms = getattr(settings, 'GROUP_AUTHENTICATED_PERMISSIONS', ['inherit']),
Group._meta.owner_perms = getattr(settings, 'GROUP_OWNER_PERMISSIONS', ['inherit']),
body {
background-color: #3d4057;
border: none;
color: white;
font-family: Open Sans, sans-serif;
margin: 0;
padding: 0;
}
#content {
border: none;
height: 100%;
margin: 0;
text-align: center;
width: 100%;
}
input {
align-content: center;
align-items: center;
background-color: white;
border: 1px solid grey;
display: inline-flex;
height: 2.5em;
}
input:hover, input:active, input:focus {
border-color: #424242;
}
input[type="submit"] {
box-shadow: 4px 4px 8px 0 rgba(0, 0, 0, 0.2);
color: black;
height: 3em;
justify-content: center;
margin: 1em;
padding: 2px 14px;
transition: 0.2s;
}
input[type="submit"]:hover {
background-color: #424242;
color: white;
}
.sib-oidc-authorization-page .decline-button,
.sib-oidc-authorization-page .accept-button {
width: 10em;
}
.sib-oidc-authorization-page .decline-button:hover {
background-color: darkred;
color: white;
width: 10em;
}
.sib-oidc-authorization-page .accept-button:hover {
background-color: darkslategrey;
color: white;
}
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<title>{% block title %}My amazing site{% endblock %}</title>
<meta charset="UTF-8">
<title>{% block title %}{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="/styles/index.css">
{% block supplementary_css %}{% endblock %}
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700&amp;amp;subset=latin-ext">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i">
</head>
<body>
......
{% extends "base.html" %}
{% load i18n %}
{% load static %}
{% block title %}
{% trans "Informations access request" %}
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
<link rel="stylesheet" href="{% static 'oidc_provider/authorize.css' %}"/>
{% endblock %}
{% block content %}
<div class="sib-oidc-authorization-page">
<h1>{% trans "Request for Permission" %}</h1>
{% if scopes|length > 0 %}
<p>{% trans "Client" %} <strong>{{ client.name }}</strong> {% trans "would like to access this information of you:" %}</p>
{% else %}
<p>{% trans "Client" %} <strong>{{ client.name }}</strong> {% trans "would like to access your account." %}</p>
{% endif %}
<form method="post" action="{% url 'oidc_provider:authorize' %}">
{% csrf_token %}
{{ hidden_inputs }}
<ul>
{% for scope in scopes %}
<li><strong>{{ scope.name }}</strong><br><i>{{ scope.description }}</i></li>
{% endfor %}
</ul>
<input class="sib-oidc-authorization-page-button decline-button" type="submit" value="Decline"/>
<input class="sib-oidc-authorization-page-button accept-button" name="allow" type="submit" value="Authorize"/>
</form>
</div>
{% endblock %}
\ No newline at end of file
{% extends "base.html" %}
{% load i18n %}
{% load static %}
{% block title %}
{% trans "Email Sent" %}
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
{% endblock %}
{% block content %}
<h1>{% trans "Check your inbox." %}</h1>
<p>{% trans "We've emailed you instructions for setting your password. You should receive the email shortly!" %}</p>
{% endblock %}
{% extends "base.html" %}
{% load i18n %}
{% load static %}
{% block title %}
{% trans "Forgot your password?" %}
{% endblock %}
{% block supplementary_css %}
<link rel="stylesheet" href="{% static 'base.css' %}"/>
{% endblock %}
{% block content %}
<h1>{% trans "Forgot your password?" %}</h1>
<p>{% trans "Enter your email address below, and we'll email instructions for setting a new one." %}</p>
<form method="POST">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Send me instructions!">
</form>
{% endblock %}
Markdown is supported
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