Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #3497 : aligne les messages de la page de connexion #3519

Merged
merged 1 commit into from
Apr 6, 2016
Merged

Fix #3497 : aligne les messages de la page de connexion #3519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 40 additions & 42 deletions templates/member/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,52 +22,50 @@


{% block content_out %}
<section class="content-wrapper">
{% if not user.is_authenticated %}
{% if error %}
<div class="alert-box warning">
{{ error }}
</div>
{% endif %}
<p class="alert-box success">
{% url "register-member" as url_register %}
{% blocktrans %}
Si vous n'avez pas de compte, vous pouvez <a href="{{url_register}}" >vous inscrire</a>.
{% endblocktrans %}
{% if not user.is_authenticated %}
{% if error %}
<p class="alert-box warning">
{{ error }}
</p>
{% endif %}
<p class="alert-box success">
{% url "register-member" as url_register %}
{% blocktrans %}
Si vous n'avez pas de compte, vous pouvez <a href="{{url_register}}" >vous inscrire</a>.
{% endblocktrans %}
</p>

<div>
<div class="content-col-2">
<h2>{% trans "Connexion classique" %}</h2>
{% crispy form %}
<p>
<a href="{% url "member-forgot-password" %}">
{% trans "Mot de passe oublié ?" %}
</a>
</p>
<p>
<a href="{% url "send-validation-email" %}">
{% trans "Vous n'avez pas reçu le courriel d'activation ?" %}
</a>
</p>
</div>
<div class="content-col-2">
<h2>{% trans "Connexion via réseaux sociaux" %}</h2>

<a href="{% url "social:begin" "facebook" %}" class="btn ico-after facebook light btn-facebook btn-holder">
{% trans "Connexion via Facebook" %}
<section class="content-wrapper">
<div class="content-col-2">
<h2>{% trans "Connexion classique" %}</h2>
{% crispy form %}
<p>
<a href="{% url "member-forgot-password" %}">
{% trans "Mot de passe oublié ?" %}
</a>
<a href="{% url "social:begin" "google-oauth2" %}" class="btn ico-after google-plus light btn-google-plus btn-holder">
{% trans "Connexion via Google+" %}
</p>
<p>
<a href="{% url "send-validation-email" %}">
{% trans "Vous n'avez pas reçu le courriel d'activation ?" %}
</a>
</div>
</p>
</div>
{% else %}
<h1>{% trans "Connexion" %}</h1>
<div class="content-col-2">
<h2>{% trans "Connexion via réseaux sociaux" %}</h2>

<p class="alert-box error">
{% trans "Vous êtes déjà connecté" %}.
</p>
{% endif %}
</section>
<a href="{% url "social:begin" "facebook" %}" class="btn ico-after facebook light btn-facebook btn-holder">
{% trans "Connexion via Facebook" %}
</a>
<a href="{% url "social:begin" "google-oauth2" %}" class="btn ico-after google-plus light btn-google-plus btn-holder">
{% trans "Connexion via Google+" %}
</a>
</div>
</section>
{% else %}
<h1>{% trans "Connexion" %}</h1>

<p class="alert-box error">
{% trans "Vous êtes déjà connecté" %}.
</p>
{% endif %}
{% endblock %}