From 990d6b853fdfc3c90e466f2e3874b01254b405d4 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 5 Feb 2017 16:39:49 +0200 Subject: [PATCH] Move templates in members app to templates dir This is kind of a huge, monolithic commit. Templates were being served as static files, so Django template tags could not be used for, e.g. internationalization. Now all html files are served as Django templates. --- members/admin.py | 3 + members/static/html/jasenhakemukset.html | 31 ----- members/static/html/jasenlista.html | 66 --------- members/static/html/lisaa_jasen.html | 31 ----- members/static/html/lisaa_jasenia.html | 24 ---- members/static/html/muokkaa_hakemusta.html | 32 ----- members/static/html/muokkaa_jasenta.html | 32 ----- members/static/js/appconfig.js | 9 +- members/static/js/members_controllers.js | 22 +-- members/static/js/members_routers.js | 37 ----- members/templates/add_many_members.html | 28 ++++ members/templates/add_member.html | 39 ++++++ members/templates/application_base.html | 43 ++++++ members/templates/application_index.html | 151 +++++++++------------ members/templates/application_success.html | 21 +-- members/templates/edit_application.html | 41 ++++++ members/templates/edit_member.html | 41 ++++++ members/templates/list_applications.html | 40 ++++++ members/templates/member_list.html | 73 ++++++++++ members/templates/members_base.html | 77 +++++++++++ members/templates/members_index.html | 91 ++++--------- members/templates/tommy_blooper.html | 8 ++ members/views.py | 51 ++++++- sikweb/urls.py | 17 ++- 24 files changed, 572 insertions(+), 436 deletions(-) delete mode 100644 members/static/html/jasenhakemukset.html delete mode 100644 members/static/html/jasenlista.html delete mode 100644 members/static/html/lisaa_jasen.html delete mode 100644 members/static/html/lisaa_jasenia.html delete mode 100644 members/static/html/muokkaa_hakemusta.html delete mode 100644 members/static/html/muokkaa_jasenta.html delete mode 100644 members/static/js/members_routers.js create mode 100644 members/templates/add_many_members.html create mode 100644 members/templates/add_member.html create mode 100644 members/templates/application_base.html create mode 100644 members/templates/edit_application.html create mode 100644 members/templates/edit_member.html create mode 100644 members/templates/list_applications.html create mode 100644 members/templates/member_list.html create mode 100644 members/templates/members_base.html create mode 100644 members/templates/tommy_blooper.html diff --git a/members/admin.py b/members/admin.py index 8c38f3f..bacee5d 100644 --- a/members/admin.py +++ b/members/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin +from members.models import Member, MemberRequest # Register your models here. +admin.site.register(Member) +admin.site.register(MemberRequest) diff --git a/members/static/html/jasenhakemukset.html b/members/static/html/jasenhakemukset.html deleted file mode 100644 index 337b6b8..0000000 --- a/members/static/html/jasenhakemukset.html +++ /dev/null @@ -1,31 +0,0 @@ -

Jäsenhakemukset

- -
-
-
{{ x.member.first_name }} {{ x.member.last_name}}
-
-
-
Sähköposti: {{ x.member.email }}
-
-
-
AYY-jäsen: {{ x.member.AYY }}
-
-
-
JAS-listaan: {{ x.member.jas }}
-
-
-
Asuinpaikka: {{ x.member.POR }}
-
-
-
Lisätty: {{ x.member.created }}
-
-
-
- - - Muokkaa -
-
-
-
-
diff --git a/members/static/html/jasenlista.html b/members/static/html/jasenlista.html deleted file mode 100644 index 956ff34..0000000 --- a/members/static/html/jasenlista.html +++ /dev/null @@ -1,66 +0,0 @@ - -
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-

Jäsenlista (jäseniä: {{members.length}})

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
SukunimiEtunimiSähköpostiAYY-jäsenJAS-listallaAsuinpaikkaLisättyMaksanut
{{ x.last_name }}{{ x.first_name }}{{ x.email }}{{ x.AYY }}{{ x.jas }}{{ x.POR }}{{ x.created }}{{ x.paid }} - - Muokkaa - -
-
-
- Tommy -
-
-
diff --git a/members/static/html/lisaa_jasen.html b/members/static/html/lisaa_jasen.html deleted file mode 100644 index be3d3f8..0000000 --- a/members/static/html/lisaa_jasen.html +++ /dev/null @@ -1,31 +0,0 @@ -

Lisää jäsen

- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
-
diff --git a/members/static/html/lisaa_jasenia.html b/members/static/html/lisaa_jasenia.html deleted file mode 100644 index d81e62e..0000000 --- a/members/static/html/lisaa_jasenia.html +++ /dev/null @@ -1,24 +0,0 @@ -
-
-

Lisää useampi jäsen

-
- Syötä jäsentiedot pilkuilla erotettuina formaatissa Etunimi, Sukunimi, Sähköposti, Asuinkunta, AYY-jäsen(0 tai 1), JAS-listaan(0 tai 1) -
-
- Erota jäsenet rivinvaihdoilla toisistaan. -
- -
-
-
-
- -
-
-
-
- -
-
-
-
diff --git a/members/static/html/muokkaa_hakemusta.html b/members/static/html/muokkaa_hakemusta.html deleted file mode 100644 index 07b1614..0000000 --- a/members/static/html/muokkaa_hakemusta.html +++ /dev/null @@ -1,32 +0,0 @@ -

Muokkaa hakemuksen jäsentietoja

- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -
-
\ No newline at end of file diff --git a/members/static/html/muokkaa_jasenta.html b/members/static/html/muokkaa_jasenta.html deleted file mode 100644 index 9bd7202..0000000 --- a/members/static/html/muokkaa_jasenta.html +++ /dev/null @@ -1,32 +0,0 @@ -

Muokkaa jäsentietoja

- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -
-
diff --git a/members/static/js/appconfig.js b/members/static/js/appconfig.js index 9a4841c..a1c15f1 100644 --- a/members/static/js/appconfig.js +++ b/members/static/js/appconfig.js @@ -1,6 +1,11 @@ var app = angular.module('memberApp', ['ngRoute','ngMaterial','ngMessages']); -app.config(['$httpProvider', function ($httpProvider) { +app.config(['$httpProvider', '$locationProvider', function ($httpProvider, $locationProvider) { $httpProvider.defaults.xsrfCookieName = 'csrftoken'; $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken'; -}]); \ No newline at end of file +}]); + +app.config(function($interpolateProvider) { + $interpolateProvider.startSymbol('{$'); + $interpolateProvider.endSymbol('$}'); +}); diff --git a/members/static/js/members_controllers.js b/members/static/js/members_controllers.js index eb5dbb4..30825e1 100644 --- a/members/static/js/members_controllers.js +++ b/members/static/js/members_controllers.js @@ -19,21 +19,22 @@ function notyfication(type, timeout) { var notyError = notyfication('error', 2500); var notySuccess = notyfication('success', 2500); -function memberDataEditor(returnpath) { - return function($scope, $http, $route, $routeParams, $window, $location) { - $scope.member = {"id": $routeParams.id}; - $http.get("/members/api/member/" + $scope.member.id).then(function(response) { +function memberDataEditor(returnPath) { + return function($scope, $http, $window, $location) { + var id = memberId; + console.log("id: " + id); + $http.get("/members/api/member/" + id).then(function(response) { $scope.member = response.data; }); $scope.send = function() { - $http.put("/members/api/member/" + $scope.member.id, $scope.member).then(function(response){ + $http.put("/members/api/member/" + id, $scope.member).then(function(response){ notySuccess("Jäsentiedot tallennettu"); - $location.path(returnpath); + $window.location = returnPath; }); } $scope.cancel = function() { //user canceled. return to list - $location.path(returnpath); + $window.location = returnPath; } } } @@ -47,7 +48,7 @@ app.directive('ngConfirmClick', [ function() { return { buttons: [ { addClass: 'btn btn-danger', text: 'Kyllä', onClick: function($noty) { $noty.close(); - scope.$eval(clickAction) + scope.$eval(clickAction); } }, { @@ -214,7 +215,6 @@ app.controller("postController", function($scope, $http, $location) { $scope.send = function() { $http.post("/members/api/member/", $scope.member).then(function(response){ notySuccess("Jäsen lisätty!"); - $location.path("/list"); }); } }); @@ -258,8 +258,8 @@ app.controller("applController", function($scope, $http){ }; }); -app.controller("editController", memberDataEditor("/list")); -app.controller("applEditController", memberDataEditor("/applications")); +app.controller("editController", memberDataEditor("/members/list")); +app.controller("applEditController", memberDataEditor("/members/applications")); app.controller("addManyController", function($scope, $http, $window) { $scope.memberData = ''; diff --git a/members/static/js/members_routers.js b/members/static/js/members_routers.js deleted file mode 100644 index d569d8e..0000000 --- a/members/static/js/members_routers.js +++ /dev/null @@ -1,37 +0,0 @@ -app.config(['$routeProvider', function($routeProvider){ - $routeProvider - .when('/',{ - templateUrl:"/static/html/jasenlista.html", - controller:'getController', - }) - .when('/list/',{ - templateUrl:"/static/html/jasenlista.html", - controller:'getController', - }) - .when('/add/',{ - templateUrl:"/static/html/lisaa_jasen.html", - controller:'postController', - }) - .when('/edit/:id',{ - templateUrl:"/static/html/muokkaa_jasenta.html", - controller:'editController', - }) - .when('/applications/',{ - templateUrl:"/static/html/jasenhakemukset.html", - controller:'applController', - }) - .when('/applications/edit/:id',{ - templateUrl:"/static/html/muokkaa_jasenta.html", - controller:'applEditController', - }) - .when('/addmany/',{ - templateUrl:"/static/html/lisaa_jasenia.html", - controller:'addManyController', - }) - .when('/tommy/',{ - templateUrl:"/static/html/tommy.html" - }) - .otherwise({ - 'redirectTo':"/" - }) -}]); diff --git a/members/templates/add_many_members.html b/members/templates/add_many_members.html new file mode 100644 index 0000000..510d42d --- /dev/null +++ b/members/templates/add_many_members.html @@ -0,0 +1,28 @@ +{% extends "members_base.html" %} + +{% block content %} +
+
+

Lisää useampi jäsen

+
+ Syötä jäsentiedot pilkuilla erotettuina formaatissa Etunimi, Sukunimi, Sähköposti, Asuinkunta, AYY-jäsen(0 tai 1), JAS-listaan(0 tai 1) +
+
+ Erota jäsenet rivinvaihdoilla toisistaan. +
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+{% endblock content %} diff --git a/members/templates/add_member.html b/members/templates/add_member.html new file mode 100644 index 0000000..72ac254 --- /dev/null +++ b/members/templates/add_member.html @@ -0,0 +1,39 @@ +{% extends "members_base.html" %} + +{% block content %} +
+

Lisää jäsen

+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + + +
+
+
+{% endblock content %} diff --git a/members/templates/application_base.html b/members/templates/application_base.html new file mode 100644 index 0000000..386f66e --- /dev/null +++ b/members/templates/application_base.html @@ -0,0 +1,43 @@ +{% load staticfiles %} +{% load i18n %} + + + + + + + + + Jäsenhakemus + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% block content %} + {% endblock content %} + + diff --git a/members/templates/application_index.html b/members/templates/application_index.html index 47a44e4..c86535a 100644 --- a/members/templates/application_index.html +++ b/members/templates/application_index.html @@ -1,88 +1,67 @@ - - - - - - - +{% extends "application_base.html" %} +{% load static %} - - - - - - - - {%load staticfiles %} - - - - - - - - - -
+{% block content %} + -
- Jäseneksi Aalto-yliopiston Sähköinsinöörikiltaan -

Killan jäseneksi liittyminen on helppoa ja hauskaa!

-

Täytä vain alla oleva lomake

-

Muista myös maksaa jäsenmaksusi!

-
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - - -
-
-
-
- - -
-
-
-
-
-
- -
-
-
- +
+
+
+

Killan jäseneksi liittyminen on helppoa ja hauskaa!

+

Täytä vain alla oleva lomake

+

Muista myös maksaa jäsenmaksusi!

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+
+ +
+
+
+{% endblock content %} diff --git a/members/templates/application_success.html b/members/templates/application_success.html index 370a897..ec8e994 100644 --- a/members/templates/application_success.html +++ b/members/templates/application_success.html @@ -1,15 +1,6 @@ - - - - - - - - - Hienoa! Jäsenhakemuksesi on nyt lähetetty. - - -

Hienoa! Jäsenhakemuksesi on nyt lähetetty.

- Takaisin Sähköinsinöörikillan web-sivuille - - +{% extends "application_base.html" %} + +{% block content %} +

Hienoa! Jäsenhakemuksesi on nyt lähetetty.

+Takaisin Sähköinsinöörikillan web-sivuille +{% endblock content %} diff --git a/members/templates/edit_application.html b/members/templates/edit_application.html new file mode 100644 index 0000000..14a5dda --- /dev/null +++ b/members/templates/edit_application.html @@ -0,0 +1,41 @@ +{% extends "members_base.html" %} + +{% block content %} + +
+

Muokkaa hakemuksen jäsentietoja

+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+
+
+{% endblock content %} diff --git a/members/templates/edit_member.html b/members/templates/edit_member.html new file mode 100644 index 0000000..d756f93 --- /dev/null +++ b/members/templates/edit_member.html @@ -0,0 +1,41 @@ +{% extends "members_base.html" %} + +{% block content %} + +
+

Muokkaa jäsentietoja

+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+
+
+{% endblock content %} diff --git a/members/templates/list_applications.html b/members/templates/list_applications.html new file mode 100644 index 0000000..44dfbe9 --- /dev/null +++ b/members/templates/list_applications.html @@ -0,0 +1,40 @@ +{% extends "members_base.html" %} + +{% block content %} +
+

Jäsenhakemukset

+ +
+
+
{$ x.member.first_name $} {$ x.member.last_name$}
+
+
+
Sähköposti: {$ x.member.email $}
+
+
+
AYY-jäsen: {$ x.member.AYY $}
+
+
+
JAS-listaan: {$ x.member.jas $}
+
+
+
Asuinpaikka: {$ x.member.POR $}
+
+
+
Lisätty: {$ x.member.created $}
+
+
+
+ + + Muokkaa +
+
+
+
+
+
+

Ei jäsenhakemuksia :(

+
+
+{% endblock content %} diff --git a/members/templates/member_list.html b/members/templates/member_list.html new file mode 100644 index 0000000..78a4393 --- /dev/null +++ b/members/templates/member_list.html @@ -0,0 +1,73 @@ +{% extends "members_base.html" %} + +{% load static %} +{% block content %} + +
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+

Jäsenlista (jäseniä: {$ members.length $})

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
SukunimiEtunimiSähköpostiAYY-jäsenJAS-listallaAsuinpaikkaLisättyMaksanut
{$ x.last_name $}{$ x.first_name $}{$ x.email $}{$ x.AYY $}{$ x.jas $}{$ x.POR $}{$ x.created $}{$ x.paid $} + + Muokkaa + +
+
+
+ Tommy +
+
+
+
+{% endblock content %} diff --git a/members/templates/members_base.html b/members/templates/members_base.html new file mode 100644 index 0000000..cd2af83 --- /dev/null +++ b/members/templates/members_base.html @@ -0,0 +1,77 @@ +{% load staticfiles %} +{% load static %} +{% load i18n %} + + + + + + + + + + Jäsenrekisteri + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + {% block content %} + {% endblock content %} +
+ + diff --git a/members/templates/members_index.html b/members/templates/members_index.html index a666be0..6cac673 100644 --- a/members/templates/members_index.html +++ b/members/templates/members_index.html @@ -1,66 +1,31 @@ - - - - - - - +{% extends "members_base.html" %} - Jäsenrekisteri +{% block content %} +
- - - - + + + - - - - - - - - - - - - {%load staticfiles %} - - - - - - - - - - -
- - - - - - -
- -
-
- - + +
+ +
+
+{% endblock content %} diff --git a/members/templates/tommy_blooper.html b/members/templates/tommy_blooper.html new file mode 100644 index 0000000..ef0528b --- /dev/null +++ b/members/templates/tommy_blooper.html @@ -0,0 +1,8 @@ +{% extends "members_base.html" %} + +{% block content %} +

Tommyn jäsenlista

+
+ +
+{% endblock content %} diff --git a/members/views.py b/members/views.py index 7444e59..418a431 100644 --- a/members/views.py +++ b/members/views.py @@ -45,15 +45,58 @@ def send_mail_wrapper(subject, message): @ensure_csrf_cookie @require_http_methods(["GET"]) @permission_required('members.change_member', login_url='/login') -def index(request, *args, **kwargs): - return render(request, 'members_index.html', {}) +def member_list(request, *args, **kwargs): + context = {} + return render(request, 'member_list.html', context) +@ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') +def add_member(request, *args, **kwargs): + return render(request, 'add_member.html', {}) + +@ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') +def add_many_members(request, *args, **kwargs): + return render(request, 'add_many_members.html', {}) + +@ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') +def list_applications(request, *args, **kwargs): + return render(request, 'list_applications.html', {}) + +@ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') +def tommy_blooper(request, *args, **kwargs): + return render(request, 'tommy_blooper.html', {}) + +@ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') +def edit_member(request, *args, **kwargs): + i = kwargs.pop('index', None); + if i is None: + return HttpResponse(status=500, error="{'error': 'No member id specified'}") + else: + return render(request, 'edit_member.html', {'member_id' : i}) + +@ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') +def edit_application(request, *args, **kwargs): + i = kwargs.pop('index', None); + if i is None: + return HttpResponse(status=500, error="{'error': 'No member id specified'}") + else: + return render(request, 'edit_application.html', {'member_id' : i}) @ensure_csrf_cookie def application_index(request, *args, **kwargs): return render(request, 'application_index.html', {}) - @ensure_csrf_cookie def application_success_index(request, *args, **kwargs): return render(request, 'application_success.html', {}) @@ -210,4 +253,4 @@ def export_csv(request, *args, **kwargs): writer.writerow(field_list) - return response \ No newline at end of file + return response diff --git a/sikweb/urls.py b/sikweb/urls.py index a63cf05..e563a20 100644 --- a/sikweb/urls.py +++ b/sikweb/urls.py @@ -23,7 +23,10 @@ from webapp.views import main_index from webapp.views import login_view from webapp.views import logout_view # members -from members.views import index as mindex +from members.views import member_list +from members.views import add_member +from members.views import add_many_members +from members.views import edit_member from members.views import members as mems from members.views import member as mem from members.views import handle_mem_request @@ -31,6 +34,7 @@ from members.views import csv_import as mem_csv_import from members.views import new_member_request from members.views import member_requests from members.views import export_csv as mem_csv_export +from members.views import tommy_blooper #infoscreen from infoscreen.views import index as infoindex from infoscreen.views import default as infodefault @@ -54,6 +58,8 @@ from infoscreen.views import admin as infoscreen_admin from infoscreen.views import hsl_timetable_settings #application from members.views import application_index +from members.views import list_applications +from members.views import edit_application from members.views import application_success_index favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True) @@ -67,7 +73,13 @@ urlpatterns = [ url(r'^login$', login_view), url(r'^logout$', logout_view), # members - url(r'^members/$', mindex), + url(r'^members/$', member_list), + url(r'^members/list$', member_list), + url(r'^members/add$', add_member), + url(r'^members/add_many$', add_many_members), + url(r'^members/edit/(?P\d+)$', edit_member), + url(r'^members/applications$', list_applications), + url(r'^members/edit_application/(?P\d+)$', edit_application), url(r'^members/api/members$', mems), url(r'^members/api/member/(?P\d+)$', mem), url(r'^members/api/member/$', mem), @@ -76,6 +88,7 @@ urlpatterns = [ url(r'^members/api/request$', new_member_request), url(r'^members/api/request/(?P\d+)$', handle_mem_request), url(r'^members/api/getCSV$', mem_csv_export), + url(r'^members/tommy$', tommy_blooper), #infoscreen url(r'^infoscreen/$', infodefault), url(r'^infoscreen/(?P\d+)$', infoindex),