Skip to content

Commit fd35697

Browse files
author
Alexandre Vincent
committed
[change] Add login and confirmation templates in sample_app
1 parent 54e03b9 commit fd35697

7 files changed

Lines changed: 100 additions & 99 deletions

File tree

‎openwisp_users/templates/admin/action_confirmation.html‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1 @@
1-
{% extends 'admin/base_site.html' %}
2-
{% load i18n l10n admin_urls static %}
3-
4-
{% block extrahead %}
5-
{{ block.super }}
6-
{{ media }}
7-
<script src='{% static 'admin/js/cancel.js' %}'></script>
8-
{% endblock %}
9-
10-
{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation
11-
delete-selected-confirmation{% endblock %}
12-
13-
{% block breadcrumbs %}
14-
<div class='breadcrumbs'>
15-
<a href='{% url 'admin:index' %}'>{% trans 'Home' %}</a>
16-
&rsaquo; <a href='{% url 'admin:app_list' app_label=opts.app_label %}'>{{ opts.app_config.verbose_name }}</a>
17-
&rsaquo; <a href='{% url opts|admin_urlname:'changelist' %}'>{{ opts.verbose_name_plural|capfirst }}</a>
18-
&rsaquo; {% trans 'Modify active status' %}
19-
</div>
20-
{% endblock %}
21-
22-
{% block content %}
23-
{% if action == 'make_inactive' %}
24-
<p>{% blocktrans %}Are you sure you want to make the selected users inactive?{% endblocktrans %}</p>
25-
{% else %}
26-
<p>{% blocktrans %}Are you sure you want to make the selected users active?{% endblocktrans %}</p>
27-
{% endif %}
28-
<h2>{% trans "Summary" %}</h2>
29-
<ul>
30-
{% for user in queryset.all %}
31-
<li>{% trans "User" %}: {{ user }}</li>
32-
{% endfor %}
33-
</ul>
34-
<form action='' method='post'>{% csrf_token %}
35-
{% for obj in queryset.all %}
36-
<input type='hidden' name='_selected_action' value='{{ obj.pk|unlocalize }}'/>
37-
{% endfor %}
38-
<div class='submit-row'>
39-
<input type='hidden' name='action' value='{{ action }}'/>
40-
<input type='submit' name='confirmation' value='{% trans "Confirm" %}'/>
41-
<a href='#' onclick='window.history.back(); return false;'
42-
class='button cancel-link'>{% trans 'No, take me back' %}</a>
43-
</div>
44-
</form>
45-
{% endblock %}
1+
{% extends 'admin/openwisp_users/action_confirmation.html' %}

‎openwisp_users/templates/admin/login.html‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1 @@
1-
{% extends "admin/login.html" %}
2-
{% load i18n %}
3-
{% block content %}
4-
{% if form.errors and not form.non_field_errors %}
5-
<p class="errornote">
6-
{% if form.errors.items|length == 1 %}Please correct the error below{% else %}Please correct the errors below{% endif %}
7-
</p>
8-
{% endif %}
9-
10-
{% if form.non_field_errors %}
11-
{% for error in form.non_field_errors %}
12-
<p class="errornote">
13-
{{ error }}
14-
</p>
15-
{% endfor %}
16-
{% endif %}
17-
18-
<div id="content-main">
19-
20-
{% if user.is_authenticated %}
21-
<p class="errornote">
22-
{% block trimmed %}
23-
You are authenticated as {{ username }}, but are not authorized to
24-
access this page. Would you like to login to a different account?
25-
{% endblock %}
26-
</p>
27-
{% endif %}
28-
29-
<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
30-
<div class="form-row">
31-
{{ form.username.errors }}
32-
<label class="required" for="id_username">
33-
{% trans 'Email, phone number or username' %}:
34-
</label>
35-
{{ form.username }}
36-
</div>
37-
<div class="form-row">
38-
{{ form.password.errors }}
39-
{{ form.password.label_tag }} {{ form.password }}
40-
<input type="hidden" name="next" value="{{ next }}" />
41-
</div>
42-
<div class="form-row">
43-
<a href="{% url 'account_reset_password' %}">Forgot Password?</a>
44-
</div>
45-
<div class="submit-row">
46-
<input type="submit" value="Log in" />
47-
</div>
48-
</form>
49-
50-
</div>
51-
{% endblock %}
1+
{% extends 'admin/openwisp_users/login.html' %}

‎openwisp_users/templates/admin/openwisp_users/action_confirmation.html‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{% extends 'admin/base_site.html' %}
2+
{% load i18n l10n admin_urls static %}
3+
4+
{% block extrahead %}
5+
{{ block.super }}
6+
{{ media }}
7+
<script src='{% static 'admin/js/cancel.js' %}'></script>
8+
{% endblock %}
9+
10+
{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation
11+
delete-selected-confirmation{% endblock %}
12+
13+
{% block breadcrumbs %}
14+
<div class='breadcrumbs'>
15+
<a href='{% url 'admin:index' %}'>{% trans 'Home' %}</a>
16+
&rsaquo; <a href='{% url 'admin:app_list' app_label=opts.app_label %}'>{{ opts.app_config.verbose_name }}</a>
17+
&rsaquo; <a href='{% url opts|admin_urlname:'changelist' %}'>{{ opts.verbose_name_plural|capfirst }}</a>
18+
&rsaquo; {% trans 'Modify active status' %}
19+
</div>
20+
{% endblock %}
21+
22+
{% block content %}
23+
{% if action == 'make_inactive' %}
24+
<p>{% blocktrans %}Are you sure you want to make the selected users inactive?{% endblocktrans %}</p>
25+
{% else %}
26+
<p>{% blocktrans %}Are you sure you want to make the selected users active?{% endblocktrans %}</p>
27+
{% endif %}
28+
<h2>{% trans "Summary" %}</h2>
29+
<ul>
30+
{% for user in queryset.all %}
31+
<li>{% trans "User" %}: {{ user }}</li>
32+
{% endfor %}
33+
</ul>
34+
<form action='' method='post'>{% csrf_token %}
35+
{% for obj in queryset.all %}
36+
<input type='hidden' name='_selected_action' value='{{ obj.pk|unlocalize }}'/>
37+
{% endfor %}
38+
<div class='submit-row'>
39+
<input type='hidden' name='action' value='{{ action }}'/>
40+
<input type='submit' name='confirmation' value='{% trans "Confirm" %}'/>
41+
<a href='#' onclick='window.history.back(); return false;'
42+
class='button cancel-link'>{% trans 'No, take me back' %}</a>
43+
</div>
44+
</form>
45+
{% endblock %}

‎openwisp_users/templates/admin/openwisp_users/login.html‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{% extends "admin/login.html" %}
2+
{% load i18n %}
3+
{% block content %}
4+
{% if form.errors and not form.non_field_errors %}
5+
<p class="errornote">
6+
{% if form.errors.items|length == 1 %}Please correct the error below{% else %}Please correct the errors below{% endif %}
7+
</p>
8+
{% endif %}
9+
10+
{% if form.non_field_errors %}
11+
{% for error in form.non_field_errors %}
12+
<p class="errornote">
13+
{{ error }}
14+
</p>
15+
{% endfor %}
16+
{% endif %}
17+
18+
<div id="content-main">
19+
20+
{% if user.is_authenticated %}
21+
<p class="errornote">
22+
{% block trimmed %}
23+
You are authenticated as {{ username }}, but are not authorized to
24+
access this page. Would you like to login to a different account?
25+
{% endblock %}
26+
</p>
27+
{% endif %}
28+
29+
<form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
30+
<div class="form-row">
31+
{{ form.username.errors }}
32+
<label class="required" for="id_username">
33+
{% trans 'Email, phone number or username' %}:
34+
</label>
35+
{{ form.username }}
36+
</div>
37+
<div class="form-row">
38+
{{ form.password.errors }}
39+
{{ form.password.label_tag }} {{ form.password }}
40+
<input type="hidden" name="next" value="{{ next }}" />
41+
</div>
42+
<div class="form-row">
43+
<a href="{% url 'account_reset_password' %}">Forgot Password?</a>
44+
</div>
45+
<div class="submit-row">
46+
<input type="submit" value="Log in" />
47+
</div>
48+
</form>
49+
50+
</div>
51+
{% endblock %}

‎tests/openwisp2/sample_users/templates/admin/action_confirmation.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends 'admin/openwisp_users/action_confirmation.html' %}

‎tests/openwisp2/sample_users/templates/admin/login.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends 'admin/openwisp_users/login.html' %}

‎tests/openwisp2/settings.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@
8989
TEMPLATES = [
9090
{
9191
"BACKEND": "django.template.backends.django.DjangoTemplates",
92-
"DIRS": [
93-
os.path.join(os.path.dirname(BASE_DIR), "openwisp_users", "templates")
94-
],
9592
"OPTIONS": {
9693
"loaders": [
9794
"django.template.loaders.filesystem.Loader",

0 commit comments

Comments
 (0)