diff --git a/global_static/css/footer.css b/global_static/css/footer.css index 8c5e91e..03adad6 100644 --- a/global_static/css/footer.css +++ b/global_static/css/footer.css @@ -1,16 +1,10 @@ #footer-div { height:10vh; } + .footer { - position: fixed; - bottom: 0; - left: 0; - right: 0; text-align: center; - background-color: #cfcfcf; - padding: 1rem; - max-height: 10vh; - font-size: 3vh; + margin-top: 2rem; } #fi-button { diff --git a/members/static/css/members.css b/members/static/css/members.css index 048bbe5..b235b31 100644 --- a/members/static/css/members.css +++ b/members/static/css/members.css @@ -8,6 +8,14 @@ div { input { padding: 0.5rem; + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} + +#wrapper { + padding-right: 0; + padding-top: 0; + padding-bottom: 0; } /* fixes for the sidebar layout */ @@ -23,6 +31,8 @@ input { left: 0; width: 100%; padding-top: 0.5rem; + height: 100%; + position: relative; } .sidebar-nav li ul { @@ -43,15 +53,10 @@ input { margin-left: 20px; } -.content-area { - padding-left: 15px; - padding-right: 15px; - padding-bottom: 2rem; -} - -.content-area-title { - text-align: left; - float: left; +#header h1 { + margin-bottom: 5rem; + margin-top: 2rem; + text-align: center; } .table-button { @@ -64,6 +69,11 @@ input { text-align: right; } +.pagination li { + padding: 0.5rem; + margin: 0.5rem; +} + #filter-collapser { float: right; margin-left: 1rem; @@ -114,4 +124,14 @@ input { .inline-title { display: inline; +} + +.logout-container { + bottom: 1rem; + position: absolute; + width: 100%; +} + +.logout-container input { + width: 80%; } \ No newline at end of file diff --git a/members/templates/application_list.html b/members/templates/application_list.html index 929c882..4bad49d 100644 --- a/members/templates/application_list.html +++ b/members/templates/application_list.html @@ -4,10 +4,10 @@ {% block content %}
-

{% trans "Member applications" %}

+

{% trans "Member applications" %}

+
-
- {{ table|safe }} -
+
+ {{ table|safe }}
{% endblock content %} diff --git a/members/templates/member_list.html b/members/templates/member_list.html index bca9fe7..f44f88e 100644 --- a/members/templates/member_list.html +++ b/members/templates/member_list.html @@ -6,52 +6,55 @@ {% block content %}
- - {% trans "Show filters" %} - + +
+

{% trans "Member register" %}

+ {% trans "Download CSV" %} +
+ + {{ table|safe }} + +
-
-
-
- -
-
-
-
-
{% trans "Added after" %}
- -
-
-
{% trans "Added before" %}
- -
-
-
-
-
{% trans "Paid after" %}
- -
-
-
{% trans "Paid before" %}
- -
-
-
-
- - -
+
+
+
+
- -
-
-
-

{% trans "Member register" %}

- +
+
+
{% trans "Added after" %}
+ +
+
+
{% trans "Added before" %}
+
- {{ table|safe }} +
+
+
{% trans "Paid after" %}
+ +
+
+
{% trans "Paid before" %}
+ +
+
+
+
+ + +
+
+
+ + +
{% endblock content %} diff --git a/members/templates/members_base.html b/members/templates/members_base.html index 9c6a850..d032292 100644 --- a/members/templates/members_base.html +++ b/members/templates/members_base.html @@ -47,40 +47,46 @@
  • {% trans "Payments" %}
  • {% trans "Applications" %}
    • +
  • + + +
    {% csrf_token %} + +
    +
    • -
    -
    {% csrf_token %} - -
    -
    - -
    - diff --git a/members/templates/payment_list.html b/members/templates/payment_list.html index 236e902..53af160 100644 --- a/members/templates/payment_list.html +++ b/members/templates/payment_list.html @@ -4,53 +4,53 @@ {% load i18n %} {% block content %}
    - - {% trans "Show filters" %} - -
    -
    -
    -
    - -
    -
    -
    -
    -
    {% trans "Added after" %}
    - -
    -
    -
    {% trans "Added before" %}
    - -
    -
    -
    -
    -
    {% trans "Paid after" %}
    - -
    -
    -
    {% trans "Paid before" %}
    - -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -

    {% trans "Member register" %}

    - -
    -
    +
    +

    {% trans "Payment events" %}

    + {% trans "Download CSV" %} +
    - {{ table|safe }} + {{ table|safe }} + +
    +
    +
    +
    + +
    +
    +
    +
    +
    {% trans "Added after" %}
    + +
    +
    +
    {% trans "Added before" %}
    + +
    +
    +
    +
    +
    {% trans "Paid after" %}
    + +
    +
    +
    {% trans "Paid before" %}
    + +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    {% endblock content %} diff --git a/members/templates/settings.html b/members/templates/settings.html new file mode 100644 index 0000000..1428684 --- /dev/null +++ b/members/templates/settings.html @@ -0,0 +1,24 @@ +{% extends "members_base.html" %} + +{% load static %} +{% load i18n %} +{% block content %} +
    +
    +

    {% trans "Settings" %}

    +
    + +
    +
    {% csrf_token %} + +

    {% trans "Language" %}

    + + + +
    +
    +
    +{% endblock content %} diff --git a/members/urls.py b/members/urls.py index 25cf9a7..3333f77 100644 --- a/members/urls.py +++ b/members/urls.py @@ -2,7 +2,7 @@ from django.conf.urls import url from django.views.generic.base import RedirectView # members -from members.views import member_list, payment_add, payment_submit +from members.views import member_list, payment_add, payment_submit, settings_page from members.views import member_add from members.views import member_add_many from members.views import member_edit @@ -62,6 +62,9 @@ urlpatterns = [ # add payment event url(r'^payment_add', payment_add), + # settings page + url(r'^settings', settings_page), + # favourite icon url(r'^favicon\.ico$', favicon_view), ] diff --git a/members/views.py b/members/views.py index 4fb67e7..859cf6f 100644 --- a/members/views.py +++ b/members/views.py @@ -257,6 +257,12 @@ def payment_submit(request, *args, **kwargs): print(form.errors) return HttpResponse('oh shit') +@ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') +def settings_page(request, *args, **kwargs): + return render(request, 'settings.html', {}) + @ensure_csrf_cookie @require_http_methods(["POST"]) @permission_required('members.change_member', login_url='/login') diff --git a/templates/footer.html b/templates/footer.html index 67453c2..736d423 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -3,10 +3,6 @@ {% load staticfiles %}
    -
    {% csrf_token %} - - -
    {% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}