Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
66720732
authored
Jul 11, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
templates: use the common base.html
parent
a5becb5d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
94 additions
and
85 deletions
+94
-85
circle/templates/registration/base.html
+10
-17
circle/templates/registration/login.html
+31
-23
circle/templates/registration/password_reset_complete.html
+11
-9
circle/templates/registration/password_reset_confirm.html
+18
-16
circle/templates/registration/password_reset_done.html
+10
-8
circle/templates/registration/password_reset_form.html
+14
-12
No files found.
circle/templates/registration/base.html
View file @
66720732
{% extends "base.html" %}
{% load i18n %}
{% load staticfiles %}
{% 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"
>
<link
href=
"//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css"
rel=
"stylesheet"
>
{% block extra_css %}
<style
type=
"text/css"
>
html
,
body
{
background-color
:
#eee
;
...
...
@@ -77,12 +71,11 @@
display
:
none
;
}
</style>
</head>
<body>
<div
class=
"container"
>
<div
class=
"content"
>
{% block content %}{% endblock %}
</div>
</div>
<!-- /container -->
</body>
</html>
{% 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 %}
circle/templates/registration/login.html
View file @
66720732
...
...
@@ -3,33 +3,41 @@
{% load crispy_forms_tags %}
{% 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 %}
<div
class=
"row"
>
{% if form.password.errors or form.username.errors %}
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
<div
class=
"content"
>
<div
class=
"row"
>
{% if form.password.errors or form.username.errors %}
<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>
{% endif %}
<div
class=
"col-sm-{% if saml2 %}6{% else %}12{% endif %}"
>
<div
class=
"login-form"
>
<form
action=
""
method=
"POST"
>
{% csrf_token %}
{% crispy form %}
</form>
{% if saml2 %}
<div
class=
"col-sm-6"
>
<h4
style=
"padding-top: 0; margin-top: 0;"
>
{% trans "Login with SSO" %}
</h4>
<a
href=
"{% url "
saml2_login
"
%}"
>
{% trans "Click here!" %}
</a>
</div>
</div>
{% if saml2 %}
<div
class=
"col-sm-6"
>
<h4
style=
"padding-top: 0; margin-top: 0;"
>
{% trans "Login with SSO" %}
</h4>
<a
href=
"{% url "
saml2_login
"
%}"
>
{% trans "Click here!" %}
</a>
</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>
{% 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>
{% endblock %}
circle/templates/registration/password_reset_complete.html
View file @
66720732
...
...
@@ -3,17 +3,19 @@
{% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset complete" %}{% endblock %}
{% block title
-page
%}{% trans "Password reset complete" %}{% endblock %}
{% block content %}
<div
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
<div
class=
"col-sm-12"
>
<div
class=
"alert alert-success"
>
{% trans "Password change successful!" %}
<a
href=
"{% url "
accounts
.
login
"
%}"
>
{% trans "Click here to login" %}
</a>
<div
class=
"content"
>
<div
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
<div
class=
"col-sm-12"
>
<div
class=
"alert alert-success"
>
{% trans "Password change successful!" %}
<a
href=
"{% url "
accounts
.
login
"
%}"
>
{% trans "Click here to login" %}
</a>
</div>
</div>
</div>
</div>
...
...
circle/templates/registration/password_reset_confirm.html
View file @
66720732
...
...
@@ -3,26 +3,28 @@
{% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset confirm" %}{% endblock %}
{% block title
-page
%}{% trans "Password reset confirm" %}{% endblock %}
{% block content %}
<div
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
<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
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
{% 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
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>
{% 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>
{% endblock %}
circle/templates/registration/password_reset_done.html
View file @
66720732
...
...
@@ -3,16 +3,18 @@
{% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset done" %}{% endblock %}
{% block title
-page
%}{% trans "Password reset done" %}{% endblock %}
{% block content %}
<div
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
<div
class=
"col-sm-12"
>
<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
class=
"content"
>
<div
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
<div
class=
"col-sm-12"
>
<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>
{% endblock %}
circle/templates/registration/password_reset_form.html
View file @
66720732
...
...
@@ -3,20 +3,22 @@
{% load crispy_forms_tags %}
{% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Password reset" %}{% endblock %}
{% block title
-page
%}{% trans "Password reset" %}{% endblock %}
{% block content %}
<div
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
<div
class=
"col-sm-12"
>
<div
class=
"pull-right"
><a
href=
"{% url "
accounts
.
login
"
%}"
>
{% trans "Back to login" %}
</a></div>
<h4
style=
"margin: 0 0 25px 0;"
>
{% blocktrans %}Enter your email address to reset your password!{% endblocktrans %}
</h4>
<form
action=
""
method=
"POST"
>
{% csrf_token %}
{% crispy form %}
</form>
<div
class=
"content"
>
<div
class=
"row"
>
<div
class=
"login-form-errors"
>
{% include "display-form-errors.html" %}
</div>
<div
class=
"col-sm-12"
>
<div
class=
"pull-right"
><a
href=
"{% url "
accounts
.
login
"
%}"
>
{% trans "Back to login" %}
</a></div>
<h4
style=
"margin: 0 0 25px 0;"
>
{% blocktrans %}Enter your email address to reset your password!{% endblocktrans %}
</h4>
<form
action=
""
method=
"POST"
>
{% csrf_token %}
{% crispy form %}
</form>
</div>
</div>
</div>
{% endblock %}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment