TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tag and space cleanup

Browse Source
This commit is contained in:
Aarni
2016-08-01 19:05:50 +03:00
parent 6bd64d7a66
commit d0b4d04a90
1 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/templates/index.html
+50 -54
View File
@@ -9,13 +9,13 @@
<title>Jäsenrekisteri</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src = "https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<!-- Bootstrap -->
<link href = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel = "stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<!-- Custom CSS -->
<link href="../static/css/simple-sidebar.css" rel="stylesheet">
@@ -24,13 +24,13 @@
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src = "https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src = "https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!--AngularJS-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js"></script>
<script src = "http://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.min.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
{%load staticfiles %}
@@ -53,15 +53,15 @@
<div class="col-lg-12">
<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>
<div ng-view></div>
<!--<script src="../static/js/remove_member.js"></script>-->
<script src="../static/js/post_member.js"></script>
<script src="../static/js/getmembers.js"></script>
<!--<script src="../static/js/remove_member.js"></script>-->
<script src="../static/js/post_member.js"></script>
<script src="../static/js/getmembers.js"></script>
<script type="text/ng-template" id="viewStudents.htm">
<script type="text/ng-template" id="viewStudents.htm">
<div ng-app="getMembersApp" ng-controller="ViewStudentsController">
<div ng-app="getMembersApp" ng-controller="ViewStudentsController">
<table id="choose-address-table" class="ui-widget ui-widget-content">
<table id="choose-address-table" class="ui-widget ui-widget-content">
<thead>
<tr ng-repeat="ui-widget-header">
<th>ID</th>
@@ -83,55 +83,51 @@
<td>{{ x.jas }}</td>
<td>{{ x.POR }}</td>
<td>
<input type="button" value="Remove" class="btn btn-primary" ng-click="removeMember(x.id)"></input>
<input type="button" value="Remove" class="btn btn-primary" ng-click="removeMember(x.id)"></input>
</td>
</tr>
</tbody>
</table>
</div>
</script>
<script type="text/ng-template" id="addStudent.htm">
<div ng-app="postApp" ng-controller="AddStudentController">
</table>
</div>
</script>
<script type="text/ng-template" id="addStudent.htm">
<div ng-app="postApp" ng-controller="AddStudentController">
<div id="input_form">
<form name="memberForm" ng-submit="submitForm()">
<div class="form-group">
<label>Etunimi: </label>
<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="firstName"></input>
</div>
<div class="form-group">
<label>Sukunimi: </label>
<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="lastName"></input>
</div>
<div class="form-group">
<label>Sähköposti: </label>
<input id="emailField" required type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="email"></input>
</div>
<div class="form-group">
<label>AYY jäsen: </label>
<input type="checkbox" id="AYY" value="0" ng-model="AYY"></input>
</div>
<div class="form-group">
<label>JAS-listaan: </label>
<input type="checkbox" id="JAS" value="0" ng-model="JAS"></input>
</div>
<div class="form-group">
<label>Asuinkunta: </label>
<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="POR"></input>
</div>
<button ng-click="send()" type="submit" id="sendmember">Tallenna</button>
</form>
<form name="memberForm" ng-submit="submitForm()">
<div class="form-group">
<label>Etunimi: </label>
<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="firstName"></input>
</div>
<div class="form-group">
<label>Sukunimi: </label>
<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="lastName"></input>
</div>
<div class="form-group">
<label>Sähköposti: </label>
<input id="emailField" required type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="email"></input>
</div>
<div class="form-group">
<label>AYY jäsen: </label>
<input type="checkbox" id="AYY" value="0" ng-model="AYY"></input>
</div>
<div class="form-group">
<label>JAS-listaan: </label>
<input type="checkbox" id="JAS" value="0" ng-model="JAS"></input>
</div>
<div class="form-group">
<label>Asuinkunta: </label>
<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="POR"></input>
</div>
<button ng-click="send()" type="submit" id="sendmember">Tallenna</button>
</form>
</div>
</div>
</script>
</div>
</script>
</div>
<!-- /#page-content -->
<script>
var memberlistApp = angular.module("memberlistApp", ['ngRoute']);
var memberlistApp=angular.module("memberlistApp", ['ngRoute']);
memberlistApp.config(['$routeProvider', function($routeProvider) {
$routeProvider.
@@ -151,11 +147,11 @@
}]);
memberlistApp.controller('AddStudentController', function($scope) {
$scope.content = "This page will be used to display add student form";
$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";
$scope.content="This page will be used to display all the students";
});
</script>