diff --git a/members/static/html/tommy.html b/members/static/html/tommy.html deleted file mode 100644 index 2e3c9eb..0000000 --- a/members/static/html/tommy.html +++ /dev/null @@ -1,4 +0,0 @@ -

Tommyn jäsenlista

-
- -
\ No newline at end of file diff --git a/members/static/css/application.css b/members/static/members/css/application.css similarity index 91% rename from members/static/css/application.css rename to members/static/members/css/application.css index f6f2eed..09738f6 100644 --- a/members/static/css/application.css +++ b/members/static/members/css/application.css @@ -1,7 +1,7 @@ body { background-color: #fcfcfc; max-width: 750px; - margin: auto; + margin: 2rem auto 0; } h3 { text-align: center; diff --git a/members/static/css/members.css b/members/static/members/css/members.css similarity index 99% rename from members/static/css/members.css rename to members/static/members/css/members.css index fbe20db..d6302b7 100644 --- a/members/static/css/members.css +++ b/members/static/members/css/members.css @@ -1,6 +1,7 @@ html, body { font-size: 14px; width: 100%; + position: absolute; } div { diff --git a/static/css/lib/simple-sidebar.css b/members/static/members/css/simple-sidebar.css similarity index 100% rename from static/css/lib/simple-sidebar.css rename to members/static/members/css/simple-sidebar.css diff --git a/members/static/img/excel_csv_save_example.PNG b/members/static/members/img/excel_csv_save_example.PNG similarity index 100% rename from members/static/img/excel_csv_save_example.PNG rename to members/static/members/img/excel_csv_save_example.PNG diff --git a/members/static/img/excel_csv_save_tutorial.PNG b/members/static/members/img/excel_csv_save_tutorial.PNG similarity index 100% rename from members/static/img/excel_csv_save_tutorial.PNG rename to members/static/members/img/excel_csv_save_tutorial.PNG diff --git a/members/static/img/members_example.png b/members/static/members/img/members_example.png similarity index 100% rename from members/static/img/members_example.png rename to members/static/members/img/members_example.png diff --git a/members/templates/application_delete_confirm.html b/members/templates/application_delete_confirm.html index c3a82e2..0da32d0 100644 --- a/members/templates/application_delete_confirm.html +++ b/members/templates/application_delete_confirm.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/application_edit.html b/members/templates/application_edit.html index 71b91ac..a342be6 100644 --- a/members/templates/application_edit.html +++ b/members/templates/application_edit.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/application_form_base.html b/members/templates/application_form_base.html index aa0ae3a..986925f 100644 --- a/members/templates/application_form_base.html +++ b/members/templates/application_form_base.html @@ -1,5 +1,6 @@ -{% load staticfiles %} +{% load static %} {% load i18n %} + @@ -11,18 +12,23 @@ Jäsenhakemus - - + + + + + - + - - - + + + + + diff --git a/members/templates/application_index.html b/members/templates/application_index.html index a34f831..db16f1e 100644 --- a/members/templates/application_index.html +++ b/members/templates/application_index.html @@ -4,7 +4,6 @@ {% load i18n %} {% block content %} -

{% trans "Killan jäseneksi liittyminen on helppoa ja hauskaa!" %}

{% trans "Täytä vain alla oleva lomake" %}

{% trans "Muista myös maksaa jäsenmaksusi!" %}

diff --git a/members/templates/application_list.html b/members/templates/application_list.html index ae22bcf..bad5fcc 100644 --- a/members/templates/application_list.html +++ b/members/templates/application_list.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} diff --git a/members/templates/members_base.html b/members/templates/base.html similarity index 75% rename from members/templates/members_base.html rename to members/templates/base.html index 3957588..e51dc0c 100644 --- a/members/templates/members_base.html +++ b/members/templates/base.html @@ -14,14 +14,14 @@ {% trans "Member register" %} - - - + + + - - - - + + + + @@ -84,17 +84,13 @@ -
- {% block content %} {% endblock content %} -
- - - {% include "footer.html" %} + + {% include "webapp:footer.html" %} diff --git a/members/templates/member_add.html b/members/templates/member_add.html index e14af92..8f42188 100644 --- a/members/templates/member_add.html +++ b/members/templates/member_add.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load bootstrap3 %} {% load i18n %} diff --git a/members/templates/member_add_many.html b/members/templates/member_add_many.html index 8595c2f..574fbdc 100644 --- a/members/templates/member_add_many.html +++ b/members/templates/member_add_many.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} {% load static %} @@ -20,13 +20,13 @@
- +

{% blocktrans %}Columns: First name, last name, email address, place of origin, AYY member, JAS recipient{% endblocktrans %}

-
+
{% csrf_token %} diff --git a/members/templates/member_add_many_confirm.html b/members/templates/member_add_many_confirm.html index 2cff70a..abde658 100644 --- a/members/templates/member_add_many_confirm.html +++ b/members/templates/member_add_many_confirm.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} diff --git a/members/templates/member_delete_confirm.html b/members/templates/member_delete_confirm.html index 9b82ca0..a613750 100644 --- a/members/templates/member_delete_confirm.html +++ b/members/templates/member_delete_confirm.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/member_edit.html b/members/templates/member_edit.html index 4f2c7ea..cdec20c 100644 --- a/members/templates/member_edit.html +++ b/members/templates/member_edit.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/member_list.html b/members/templates/member_list.html index 2dc38f8..8b65bb6 100644 --- a/members/templates/member_list.html +++ b/members/templates/member_list.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load static %} {% load i18n %} diff --git a/members/templates/payment_add.html b/members/templates/payment_add.html index 90bca77..ae6a1d6 100644 --- a/members/templates/payment_add.html +++ b/members/templates/payment_add.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load bootstrap3 %} {% load i18n %} diff --git a/members/templates/payment_delete_confirm.html b/members/templates/payment_delete_confirm.html index fc13360..02b541e 100644 --- a/members/templates/payment_delete_confirm.html +++ b/members/templates/payment_delete_confirm.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/payment_edit.html b/members/templates/payment_edit.html index 44ce144..5033a69 100644 --- a/members/templates/payment_edit.html +++ b/members/templates/payment_edit.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load i18n %} {% load bootstrap3 %} diff --git a/members/templates/payment_list.html b/members/templates/payment_list.html index bce2421..c7afbda 100644 --- a/members/templates/payment_list.html +++ b/members/templates/payment_list.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load static %} {% load i18n %} diff --git a/members/templates/settings.html b/members/templates/settings.html index ad70cb0..7767302 100644 --- a/members/templates/settings.html +++ b/members/templates/settings.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% load static %} {% load i18n %} diff --git a/members/templates/upload_form.html b/members/templates/upload_form.html index b028b1d..23ed103 100644 --- a/members/templates/upload_form.html +++ b/members/templates/upload_form.html @@ -1,4 +1,4 @@ -{% extends "members_base.html" %} +{% extends "members:base.html" %} {% block content %}

{{ title }}