diff --git a/.gitignore b/.gitignore
index c4bb9c0..86b4cf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ db.sqlite3
*.mo
.env
venv/
+.venv/
diff --git a/src/membership/templates/membership/members_admin_detail.html b/src/membership/templates/membership/members_admin_detail.html
index c3e02b7..88cbd4a 100644
--- a/src/membership/templates/membership/members_admin_detail.html
+++ b/src/membership/templates/membership/members_admin_detail.html
@@ -7,6 +7,7 @@
{% block content %}
+
+
Membership settings
{% if not current_membership %}
{% trans "You do not have an active membership!" %}
@@ -24,4 +26,38 @@
{% trans "Period" %}: {{ current_period.lower|date:"SHORT_DATE_FORMAT" }} to {{ current_period.upper|date:"SHORT_DATE_FORMAT"|default:next_general_assembly }}
{% trans "Type" %}: {{ current_membership.membership_type }}
{% endif %}
- {% endblock %}
+
+
+
- {{ error }}
+
+
+ {% if form.non_field_errors %}
+ {% for error in form.non_field_errors %}
+
+ {{ error }}
+
+ {% endfor %}
+ {% endif %}
+
Log in
+
+
+
- {% endfor %}
- {% endif %}
-
-
-
- {% trans "Forgot password?" %}
-
-
-
- {% trans "Or"|upper %}
+
+
+
+
+
-
- {% trans "Become a member" %}
-
-
{% endblock %}
diff --git a/src/project/templates/account/logout.html b/src/project/templates/account/logout.html
index 2549a90..a936337 100644
--- a/src/project/templates/account/logout.html
+++ b/src/project/templates/account/logout.html
@@ -5,17 +5,18 @@
{% block head_title %}{% trans "Sign Out" %}{% endblock %}
{% block content %}
-
{% trans "Sign Out" %}
+
+
{% trans "Sign Out" %}
{% trans 'Are you sure you want to sign out?' %}
-
+
{% endblock %}
diff --git a/src/project/templates/account/pre_login_base.html b/src/project/templates/account/pre_login_base.html
index 79cb228..114386b 100644
--- a/src/project/templates/account/pre_login_base.html
+++ b/src/project/templates/account/pre_login_base.html
@@ -7,76 +7,13 @@
Login – {{ site.name }}
-
-
-
-
-
-
-
+
+
-
-
-
-
-
- {% block non_login_content %}
- {% endblock %}
-
-
-
+
+
+ {% block non_login_content %}
+ {% endblock %}
+
diff --git a/src/project/templates/base.html b/src/project/templates/base.html
index 9225f6d..a822ae6 100644
--- a/src/project/templates/base.html
+++ b/src/project/templates/base.html
@@ -3,211 +3,82 @@
{% load static %}
-
-
-
-
-
{% block head_title %}{% endblock %} – {{ site.name }}
+
+
+
+
+
{% block head_title %}{% endblock %} – {{ site.name }}
+
+
+
+
+
+ data.coop membersystem
+ Log out
+
+
+