From 4639631357f67d5220109cda79d5dfa0f34b960b Mon Sep 17 00:00:00 2001 From: okalintu Date: Mon, 1 Aug 2016 20:55:56 +0300 Subject: [PATCH] Revert "Merge branch 'master' of sika:vtmk/web2.0" This reverts commit 198ddf5bc5e1bbbc0deb9fa6922153f6235ed14e, reversing changes made to a49d2c0b3552e3939305567a07a15fc8aafe8399. --- members/static/html/jasenlista.html | 34 ++++++++++++++++++++++++++++ members/static/html/lisaa_jasen.html | 31 +++++++++++++++++++++++++ members/static/html/rekisteri.html | 26 +++++++++++++++++++++ members/static/js/app.js | 18 +++++++++++++++ members/static/js/controllers.js | 27 ++++++++++++++++++++++ 5 files changed, 136 insertions(+) create mode 100644 members/static/html/jasenlista.html create mode 100644 members/static/html/lisaa_jasen.html create mode 100644 members/static/html/rekisteri.html create mode 100644 members/static/js/app.js create mode 100644 members/static/js/controllers.js diff --git a/members/static/html/jasenlista.html b/members/static/html/jasenlista.html new file mode 100644 index 0000000..cf0f86b --- /dev/null +++ b/members/static/html/jasenlista.html @@ -0,0 +1,34 @@ +

Jäsenlista

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
IDEtunimiSukunimiSähköpostiAYY-jäsenJAS-listallaAsuinpaikka
{{ x.id }}{{ x.first_name }}{{ x.last_name }}{{ x.email }}{{ x.AYY }}{{ x.jas }}{{ x.POR }} + +
+ +
diff --git a/members/static/html/lisaa_jasen.html b/members/static/html/lisaa_jasen.html new file mode 100644 index 0000000..30aba46 --- /dev/null +++ b/members/static/html/lisaa_jasen.html @@ -0,0 +1,31 @@ +

Lis�� j�sen

+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
diff --git a/members/static/html/rekisteri.html b/members/static/html/rekisteri.html new file mode 100644 index 0000000..c8b0e7b --- /dev/null +++ b/members/static/html/rekisteri.html @@ -0,0 +1,26 @@ + + + + Haku + + + + + + + + +
+

Jäsenrekisteri

+

Hae jäsen

+

Syötä jäsenen nimi:

+
+
+ + +
+ +
+ + + \ No newline at end of file diff --git a/members/static/js/app.js b/members/static/js/app.js new file mode 100644 index 0000000..5de01c5 --- /dev/null +++ b/members/static/js/app.js @@ -0,0 +1,18 @@ +'use strict'; +var template = angular.module('memberlistApp',['memberlistApp.getmembers', 'memberlistApp.sendmember']); + +template.config(['$routeProvider', + function($routeProvider) { + $routeProvider. + + when('/members/#/list', { + templateUrl: '../html/jasenlista.html', + controller: 'getController' + }). + + when('/members/#/add', { + templateUrl: '../html/lisaa_jasen.html', + controller: 'postController' + }); + }] +); \ No newline at end of file diff --git a/members/static/js/controllers.js b/members/static/js/controllers.js new file mode 100644 index 0000000..2e79194 --- /dev/null +++ b/members/static/js/controllers.js @@ -0,0 +1,27 @@ +var memberlistApp=angular.module("memberlistApp", ['ngRoute']); +memberlistApp.config(['$routeProvider', function($routeProvider) +{ + $routeProvider + .when('/list', + { + templateUrl: 'viewStudents.htm', + controller: 'ViewStudentsController' + }) + .when('/add', + { + templateUrl: 'addStudent.htm', + controller: 'AddStudentController' + }) + .otherwise( + { + redirectTo: '/list' + }); +}]); +memberlistApp.controller('AddStudentController', function($scope) +{ + $scope.content="This page will be used to display add student form"; +}); +memberlistApp.controller('ViewStudentsController', function($scope) +{ + $scope.content="This page will be used to display all the students"; +}); \ No newline at end of file