Skip to content

Gelencsér Szabolcs / cloud

Go to a project
Commit 66720732 by Kálmán Viktor
Options

templates: use the common base.html

parent a5becb5d
Showing with 94 additions and 85 deletions
circle/templates/registration/base.html
{% extends "base.html" %}
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load staticfiles %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
<html>
<head>
<meta charset="utf-8">
<title>{% block title %}{% endblock %} | CIRCLE</title>
<meta name="description" content="">
<meta name="author" content="">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"> {% block extra_css %}
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<style type="text/css"> <style type="text/css">
html, body { html, body {
background-color: #eee; background-color: #eee;
...@@ -77,12 +71,11 @@ ...@@ -77,12 +71,11 @@
display: none; display: none;
} }
</style> </style>
</head> {% endblock %}
<body>
<div class="container">
<div class="content"> {% block navbar-brand %}
{% block content %}{% endblock %} <a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
</div> <img src="{{ STATIC_URL}}dashboard/img/logo.png" style="height: 25px;"/>
</div> <!-- /container --> </a>
</body> {% endblock %}
</html>
circle/templates/registration/login.html
...@@ -3,33 +3,41 @@ ...@@ -3,33 +3,41 @@
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Login" %}{% endblock %} {% block title-page %}{% trans "Login" %}{% endblock %}
{% block navbar-brand %}
<a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
<img src="{{ STATIC_URL}}dashboard/img/logo.png" style="height: 25px;"/>
</a>
{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="content">
{% if form.password.errors or form.username.errors %} <div class="row">
<div class="login-form-errors"> {% if form.password.errors or form.username.errors %}
{% include "display-form-errors.html" %} <div class="login-form-errors">
{% include "display-form-errors.html" %}
</div>
{% endif %}
<div class="col-sm-{% if saml2 %}6{% else %}12{% endif %}">
<div class="login-form">
<form action="" method="POST">
{% csrf_token %}
{% crispy form %}
</form>
</div>
</div> </div>
{% endif %} {% if saml2 %}
<div class="col-sm-{% if saml2 %}6{% else %}12{% endif %}"> <div class="col-sm-6">
<div class="login-form"> <h4 style="padding-top: 0; margin-top: 0;">{% trans "Login with SSO" %}</h4>
<form action="" method="POST"> <a href="{% url "saml2_login" %}">{% trans "Click here!" %}</a>
{% csrf_token %}
{% crispy form %}
</form>
</div> </div>
</div> {% endif %}
{% if saml2 %} </div>
<div class="col-sm-6"> <div class="row">
<h4 style="padding-top: 0; margin-top: 0;">{% trans "Login with SSO" %}</h4> <div class="col-sm-12">
<a href="{% url "saml2_login" %}">{% trans "Click here!" %}</a> <a class="pull-right" href="{% url "accounts.password-reset" %}">{% trans "Forgot your password?" %}</a>
</div> </div>
{% endif %}
</div>
<div class="row">
<div class="col-sm-12">
<a class="pull-right" href="{% url "accounts.password-reset" %}">{% trans "Forgot your password?" %}</a>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
circle/templates/registration/password_reset_complete.html
...@@ -3,17 +3,19 @@ ...@@ -3,17 +3,19 @@
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset complete" %}{% endblock %} {% block title-page %}{% trans "Password reset complete" %}{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="content">
<div class="login-form-errors"> <div class="row">
{% include "display-form-errors.html" %} <div class="login-form-errors">
</div> {% include "display-form-errors.html" %}
<div class="col-sm-12"> </div>
<div class="alert alert-success"> <div class="col-sm-12">
{% trans "Password change successful!" %} <div class="alert alert-success">
<a href="{% url "accounts.login" %}">{% trans "Click here to login" %}</a> {% trans "Password change successful!" %}
<a href="{% url "accounts.login" %}">{% trans "Click here to login" %}</a>
</div>
</div> </div>
</div> </div>
</div> </div>
......
circle/templates/registration/password_reset_confirm.html
...@@ -3,26 +3,28 @@ ...@@ -3,26 +3,28 @@
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset confirm" %}{% endblock %} {% block title-page %}{% trans "Password reset confirm" %}{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div>
<div class="login-form-errors"> <div class="row">
{% include "display-form-errors.html" %} <div class="login-form-errors">
</div> {% include "display-form-errors.html" %}
<div class="col-sm-12">
<div style="margin: 0 0 25px 0;">
{% blocktrans %}Please enter your new password twice so we can verify you typed it in correctly!{% endblocktrans %}
</div> </div>
<div class="col-sm-12">
{% if form %} <div style="margin: 0 0 25px 0;">
{% crispy form %} {% blocktrans %}Please enter your new password twice so we can verify you typed it in correctly!{% endblocktrans %}
{% else %}
<div class="alert alert-warning">
{% url "accounts.password-reset" as url %}
{% blocktrans with url=url %}This token is expired, please <a href="{{ url }}">request</a> a new password reset link again!{% endblocktrans %}
</div> </div>
{% endif %}
{% if form %}
{% crispy form %}
{% else %}
<div class="alert alert-warning">
{% url "accounts.password-reset" as url %}
{% blocktrans with url=url %}This token is expired, please <a href="{{ url }}">request</a> a new password reset link again!{% endblocktrans %}
</div>
{% endif %}
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
circle/templates/registration/password_reset_done.html
...@@ -3,16 +3,18 @@ ...@@ -3,16 +3,18 @@
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset done" %}{% endblock %} {% block title-page %}{% trans "Password reset done" %}{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="content">
<div class="login-form-errors"> <div class="row">
{% include "display-form-errors.html" %} <div class="login-form-errors">
</div> {% include "display-form-errors.html" %}
<div class="col-sm-12"> </div>
<div class="pull-right"><a href="{% url "accounts.login" %}">{% trans "Back to login" %}</a></div> <div class="col-sm-12">
{% trans "We have sent you an email about your next steps!" %} <div class="pull-right"><a href="{% url "accounts.login" %}">{% trans "Back to login" %}</a></div>
{% trans "We have sent you an email about your next steps!" %}
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
circle/templates/registration/password_reset_form.html
...@@ -3,20 +3,22 @@ ...@@ -3,20 +3,22 @@
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset" %}{% endblock %} {% block title-page %}{% trans "Password reset" %}{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="content">
<div class="login-form-errors"> <div class="row">
{% include "display-form-errors.html" %} <div class="login-form-errors">
</div> {% include "display-form-errors.html" %}
<div class="col-sm-12"> </div>
<div class="pull-right"><a href="{% url "accounts.login" %}">{% trans "Back to login" %}</a></div> <div class="col-sm-12">
<h4 style="margin: 0 0 25px 0;">{% blocktrans %}Enter your email address to reset your password!{% endblocktrans %}</h4> <div class="pull-right"><a href="{% url "accounts.login" %}">{% trans "Back to login" %}</a></div>
<form action="" method="POST"> <h4 style="margin: 0 0 25px 0;">{% blocktrans %}Enter your email address to reset your password!{% endblocktrans %}</h4>
{% csrf_token %} <form action="" method="POST">
{% crispy form %} {% csrf_token %}
</form> {% crispy form %}
</form>
</div>
</div> </div>
</div> </div>
{% endblock %} {% 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 sign in to comment