From a780637df7dad0d65afa4b0303977d515d3c56fd Mon Sep 17 00:00:00 2001
From: onurv12 <m.onur_vural@hotmail.com>
Date: Tue, 30 Sep 2014 12:41:26 +0200
Subject: [PATCH 1/5] Implement deleting of users

---
 js/controller/editProfile.js |  6 +++++-
 js/factories/userlist.js     | 10 ++++++++++
 partials/editProfile.html    |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/js/controller/editProfile.js b/js/controller/editProfile.js
index d1af02a..4574d3b 100644
--- a/js/controller/editProfile.js
+++ b/js/controller/editProfile.js
@@ -1,4 +1,4 @@
-app.controller("editProfileController", function ($scope, $rootScope, $routeParams, userlistFactory, userFactory, notificationFactory, hashService, $route) {
+app.controller("editProfileController", function ($scope, $rootScope, $routeParams, userlistFactory, userFactory, notificationFactory, hashService, $route, $location) {
 	var userID = $routeParams.userID;
 	$rootScope.updateHeader();
 	$scope.administratorLoggedIn = false;
@@ -51,6 +51,10 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
 		}
 		$route.reload();
 	};
+	$scope.deleteUser = function(userID) {
+		userlistFactory.deleteUser(userID);
+		$location.path("/userlist");
+	};
 	$scope.getRoleFromUser = function(user) {
 		if (user && user.isAdmin == 1) {
 			if (user.isDeleteable == 1) {
diff --git a/js/factories/userlist.js b/js/factories/userlist.js
index 4055f45..d3d4a40 100644
--- a/js/factories/userlist.js
+++ b/js/factories/userlist.js
@@ -50,5 +50,15 @@
 			}
 		});
 	};
+	object.deleteUser = function(userID) {
+		$http
+		.delete(settingsFactory.backendUrl + "user/" + userID)
+		.success(function(data) {
+			notificationFactory.success({content: "User is successfully deleted"});
+		})
+		.error(function(data, status) {
+			notificationFactory.error({title:"Error:", content: "Server error occurred with status code:  " + status + " and response: " + data});
+		});
+	};
 	return object;
 });;
diff --git a/partials/editProfile.html b/partials/editProfile.html
index 6d84ed8..5359c9e 100644
--- a/partials/editProfile.html
+++ b/partials/editProfile.html
@@ -64,6 +64,7 @@ <h1>My Profile</h1>
 			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']">Change Password</button>
 			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="!changeVer['password']">Cancel</button>
 			<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">Back To Profile</button></a>
+			<button class="btn btn-danger" type="button" style="float: right;" ng-click="deleteUser(user.ID)" ng-show="moderatorLoggedIn && getDropdownForUser(user).length > 1">Delete User</button>
 		</div>
 	</form>
 	<form role="form" novalidate name="passForm" style="width: 50%" ng-submit="updateUser(user.ID, 'Password', newPassword)" ng-show="passChangeable">

From 3e051aafdeee22ad4625ce708eea6b855100946a Mon Sep 17 00:00:00 2001
From: onurv12 <m.onur_vural@hotmail.com>
Date: Tue, 30 Sep 2014 15:07:15 +0200
Subject: [PATCH 2/5] Make admins and mods able to change usernames and full
 names, tweak visibilities

---
 js/controller/editProfile.js |  2 ++
 partials/editProfile.html    | 29 +++++++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/js/controller/editProfile.js b/js/controller/editProfile.js
index 4574d3b..4985877 100644
--- a/js/controller/editProfile.js
+++ b/js/controller/editProfile.js
@@ -3,6 +3,7 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
 	$rootScope.updateHeader();
 	$scope.administratorLoggedIn = false;
 	$scope.moderatorLoggedIn = false;
+	$scope.selfLoggedIn = false;
 	$scope.readOnly = {username: true, fullName: true, email: true, gravatar: true, role: true};
 	$scope.changeVer = {username: true, fullName: true, email: true, gravatar: true, role: true, password: true};
 	$scope.passChangeable = false;
@@ -13,6 +14,7 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
 	$scope.fetchUser = function(size) {
 		userlistFactory.getUser(userID).then(function(data) {
 			$scope.user = data;
+			$scope.selfLoggedIn = userFactory.getUserData()["ID"] == userID;
 			$scope.gravatar = "http://www.gravatar.com/avatar/" + hashService.MD5($scope.user.GravatarEmail) + ".jpg?s=" + size;
 			if($scope.user.isAdmin == "1") {
 				if($scope.user.isDeleteable == "0") {
diff --git a/partials/editProfile.html b/partials/editProfile.html
index 5359c9e..f4464ec 100644
--- a/partials/editProfile.html
+++ b/partials/editProfile.html
@@ -5,31 +5,36 @@ <h1>My Profile</h1>
 		<p><a href="http://www.gravatar.com">Change Picture</a></p>
 	</div>
 	<form id="userForm" name="UserForm" role="form" novalidate>
-		<div class="form-group">
+		<div class="form-group" ng-class="{'has-success': readOnly['username'] == false && UserForm.Username.$dirty && UserForm.Username.$valid, 'has-error': readOnly['username'] == false && UserForm.Username.$dirty && UserForm.Username.$invalid}">
 			<label class="control-label">Username</label>
 			<div class="input-group">
-				<input type="text" class="form-control" value="{{user.Name}}" readonly>
+				<input type="text" class="form-control" name="Username" ng-model="user.Name" ng-readonly="readOnly['username']">
+				<span class="input-group-btn">
+					<button class="btn btn-default" type="button" ng-click="toggleButton('username')" ng-show="changeVer['username']" ng-disabled="(getDropdownForUser(user).length <= 1 && !selfLoggedIn) || !moderatorLoggedIn">Change</button>
+				</span>
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" disabled>Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('username'); updateUser(user.ID, 'Username', user.Name)" ng-hide="changeVer['username']">Save</button>
 				</span>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="control-label">Full Name</label>
+			<label class="control-label" ng-class="{'has-success': readOnly['fullName'] == false && UserForm.FullName.$dirty && UserForm.FullName.$valid, 'has-error': readOnly['fullName'] == false && UserForm.FullName.$dirty && UserForm.FullName.$invalid}">Full Name</label>
 			<div class="input-group">
-				<input type="text" class="form-control" value="{{user.Fullname}}" readonly>
+				<input type="text" class="form-control" name="FullName" ng-model="user.Fullname" ng-readonly="readOnly['fullName']">
+				<span class="input-group-btn">
+					<button class="btn btn-default" type="button" ng-click="toggleButton('fullName')" ng-show="changeVer['fullName']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
+				</span>
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" disabled>Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('fullName'); updateUser(user.ID, 'FullName', user.Fullname)" ng-hide="changeVer['fullName']">Save</button>
 				</span>
 			</div>		
 		</div>
 		<div class="form-group" ng-class="{'has-success': readOnly['email'] == false && UserForm.Email.$dirty && UserForm.Email.$valid, 'has-error': readOnly['email'] == false && UserForm.Email.$dirty && UserForm.Email.$invalid}">
 			<label class="control-label">Email</label>		
 			<div class="input-group">
-			<!-- TODO: make existing emails invalid-->
 				<input type="text" class="form-control" name="Email" ng-model="user.Email" ng-readonly="readOnly['email']">
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" ng-click="toggleButton('email')" ng-show="changeVer['email']">Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('email')" ng-show="changeVer['email']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
 				</span>
 				<span class="input-group-btn">
 					<button class="btn btn-default" type="button" ng-click="toggleButton('email'); updateUser(user.ID, 'Email', user.Email)" ng-hide="changeVer['email']">Save</button>
@@ -41,7 +46,7 @@ <h1>My Profile</h1>
 			<div class="input-group">
 				<input type="text" class="form-control" name="GravatarEmail" ng-model="user.GravatarEmail" ng-readonly="readOnly['gravatar']">
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar')" ng-show="changeVer['gravatar']">Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar')" ng-show="changeVer['gravatar']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
 				</span>
 				<span class="input-group-btn">
 					<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar'); updateUser(user.ID, 'GravatarEmail', user.GravatarEmail)" ng-hide="changeVer['gravatar']">Save</button>
@@ -61,10 +66,10 @@ <h1>My Profile</h1>
 			</div>
 		</div>
 		<div class="form-group">
-			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']">Change Password</button>
+			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change Password</button>
 			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="!changeVer['password']">Cancel</button>
-			<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">Back To Profile</button></a>
-			<button class="btn btn-danger" type="button" style="float: right;" ng-click="deleteUser(user.ID)" ng-show="moderatorLoggedIn && getDropdownForUser(user).length > 1">Delete User</button>
+			<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">To Profile Page</button></a>
+			<button class="btn btn-danger" type="button" style="float: right;" ng-click="deleteUser(user.ID)" ng-show="moderatorLoggedIn && (getDropdownForUser(user).length > 1 || selfLoggedIn)">Delete User</button>
 		</div>
 	</form>
 	<form role="form" novalidate name="passForm" style="width: 50%" ng-submit="updateUser(user.ID, 'Password', newPassword)" ng-show="passChangeable">

From 209e4706f21e19d8145adf4f97748f4825508c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20M=C3=BCcksch?= <tobias@muecks.ch>
Date: Fri, 3 Oct 2014 11:30:12 +0200
Subject: [PATCH 3/5] Update README.md

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 9eacf2b..5899cad 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@
 - Sass
 - Compass
 
-// TODO: list all dependencies
-
 ## Development
 ### Installation
 1. Install node dependencies
@@ -20,6 +18,3 @@
 ### Helpful commands
 - Automatic Sass deployment
 	- `grunt dev`
-
-## Documentation
-	// TODO

From 69950d5038eb418f4ee9c4b75e763cd857ea2fa4 Mon Sep 17 00:00:00 2001
From: onurv12 <m.onur_vural@hotmail.com>
Date: Tue, 30 Sep 2014 12:41:26 +0200
Subject: [PATCH 4/5] Implement deleting of users

---
 js/controller/editProfile.js |  6 +++++-
 js/factories/userlist.js     | 10 ++++++++++
 partials/editProfile.html    |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/js/controller/editProfile.js b/js/controller/editProfile.js
index d1af02a..4574d3b 100644
--- a/js/controller/editProfile.js
+++ b/js/controller/editProfile.js
@@ -1,4 +1,4 @@
-app.controller("editProfileController", function ($scope, $rootScope, $routeParams, userlistFactory, userFactory, notificationFactory, hashService, $route) {
+app.controller("editProfileController", function ($scope, $rootScope, $routeParams, userlistFactory, userFactory, notificationFactory, hashService, $route, $location) {
 	var userID = $routeParams.userID;
 	$rootScope.updateHeader();
 	$scope.administratorLoggedIn = false;
@@ -51,6 +51,10 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
 		}
 		$route.reload();
 	};
+	$scope.deleteUser = function(userID) {
+		userlistFactory.deleteUser(userID);
+		$location.path("/userlist");
+	};
 	$scope.getRoleFromUser = function(user) {
 		if (user && user.isAdmin == 1) {
 			if (user.isDeleteable == 1) {
diff --git a/js/factories/userlist.js b/js/factories/userlist.js
index 4055f45..d3d4a40 100644
--- a/js/factories/userlist.js
+++ b/js/factories/userlist.js
@@ -50,5 +50,15 @@
 			}
 		});
 	};
+	object.deleteUser = function(userID) {
+		$http
+		.delete(settingsFactory.backendUrl + "user/" + userID)
+		.success(function(data) {
+			notificationFactory.success({content: "User is successfully deleted"});
+		})
+		.error(function(data, status) {
+			notificationFactory.error({title:"Error:", content: "Server error occurred with status code:  " + status + " and response: " + data});
+		});
+	};
 	return object;
 });;
diff --git a/partials/editProfile.html b/partials/editProfile.html
index 6d84ed8..5359c9e 100644
--- a/partials/editProfile.html
+++ b/partials/editProfile.html
@@ -64,6 +64,7 @@ <h1>My Profile</h1>
 			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']">Change Password</button>
 			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="!changeVer['password']">Cancel</button>
 			<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">Back To Profile</button></a>
+			<button class="btn btn-danger" type="button" style="float: right;" ng-click="deleteUser(user.ID)" ng-show="moderatorLoggedIn && getDropdownForUser(user).length > 1">Delete User</button>
 		</div>
 	</form>
 	<form role="form" novalidate name="passForm" style="width: 50%" ng-submit="updateUser(user.ID, 'Password', newPassword)" ng-show="passChangeable">

From 49cd9c4cbba65722a5bd75852e67cda5192a6e2d Mon Sep 17 00:00:00 2001
From: onurv12 <m.onur_vural@hotmail.com>
Date: Tue, 30 Sep 2014 15:07:15 +0200
Subject: [PATCH 5/5] Make admins and mods able to change usernames and full
 names, tweak visibilities

---
 js/controller/editProfile.js |  2 ++
 partials/editProfile.html    | 29 +++++++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/js/controller/editProfile.js b/js/controller/editProfile.js
index 4574d3b..4985877 100644
--- a/js/controller/editProfile.js
+++ b/js/controller/editProfile.js
@@ -3,6 +3,7 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
 	$rootScope.updateHeader();
 	$scope.administratorLoggedIn = false;
 	$scope.moderatorLoggedIn = false;
+	$scope.selfLoggedIn = false;
 	$scope.readOnly = {username: true, fullName: true, email: true, gravatar: true, role: true};
 	$scope.changeVer = {username: true, fullName: true, email: true, gravatar: true, role: true, password: true};
 	$scope.passChangeable = false;
@@ -13,6 +14,7 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
 	$scope.fetchUser = function(size) {
 		userlistFactory.getUser(userID).then(function(data) {
 			$scope.user = data;
+			$scope.selfLoggedIn = userFactory.getUserData()["ID"] == userID;
 			$scope.gravatar = "http://www.gravatar.com/avatar/" + hashService.MD5($scope.user.GravatarEmail) + ".jpg?s=" + size;
 			if($scope.user.isAdmin == "1") {
 				if($scope.user.isDeleteable == "0") {
diff --git a/partials/editProfile.html b/partials/editProfile.html
index 5359c9e..f4464ec 100644
--- a/partials/editProfile.html
+++ b/partials/editProfile.html
@@ -5,31 +5,36 @@ <h1>My Profile</h1>
 		<p><a href="http://www.gravatar.com">Change Picture</a></p>
 	</div>
 	<form id="userForm" name="UserForm" role="form" novalidate>
-		<div class="form-group">
+		<div class="form-group" ng-class="{'has-success': readOnly['username'] == false && UserForm.Username.$dirty && UserForm.Username.$valid, 'has-error': readOnly['username'] == false && UserForm.Username.$dirty && UserForm.Username.$invalid}">
 			<label class="control-label">Username</label>
 			<div class="input-group">
-				<input type="text" class="form-control" value="{{user.Name}}" readonly>
+				<input type="text" class="form-control" name="Username" ng-model="user.Name" ng-readonly="readOnly['username']">
+				<span class="input-group-btn">
+					<button class="btn btn-default" type="button" ng-click="toggleButton('username')" ng-show="changeVer['username']" ng-disabled="(getDropdownForUser(user).length <= 1 && !selfLoggedIn) || !moderatorLoggedIn">Change</button>
+				</span>
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" disabled>Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('username'); updateUser(user.ID, 'Username', user.Name)" ng-hide="changeVer['username']">Save</button>
 				</span>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="control-label">Full Name</label>
+			<label class="control-label" ng-class="{'has-success': readOnly['fullName'] == false && UserForm.FullName.$dirty && UserForm.FullName.$valid, 'has-error': readOnly['fullName'] == false && UserForm.FullName.$dirty && UserForm.FullName.$invalid}">Full Name</label>
 			<div class="input-group">
-				<input type="text" class="form-control" value="{{user.Fullname}}" readonly>
+				<input type="text" class="form-control" name="FullName" ng-model="user.Fullname" ng-readonly="readOnly['fullName']">
+				<span class="input-group-btn">
+					<button class="btn btn-default" type="button" ng-click="toggleButton('fullName')" ng-show="changeVer['fullName']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
+				</span>
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" disabled>Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('fullName'); updateUser(user.ID, 'FullName', user.Fullname)" ng-hide="changeVer['fullName']">Save</button>
 				</span>
 			</div>		
 		</div>
 		<div class="form-group" ng-class="{'has-success': readOnly['email'] == false && UserForm.Email.$dirty && UserForm.Email.$valid, 'has-error': readOnly['email'] == false && UserForm.Email.$dirty && UserForm.Email.$invalid}">
 			<label class="control-label">Email</label>		
 			<div class="input-group">
-			<!-- TODO: make existing emails invalid-->
 				<input type="text" class="form-control" name="Email" ng-model="user.Email" ng-readonly="readOnly['email']">
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" ng-click="toggleButton('email')" ng-show="changeVer['email']">Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('email')" ng-show="changeVer['email']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
 				</span>
 				<span class="input-group-btn">
 					<button class="btn btn-default" type="button" ng-click="toggleButton('email'); updateUser(user.ID, 'Email', user.Email)" ng-hide="changeVer['email']">Save</button>
@@ -41,7 +46,7 @@ <h1>My Profile</h1>
 			<div class="input-group">
 				<input type="text" class="form-control" name="GravatarEmail" ng-model="user.GravatarEmail" ng-readonly="readOnly['gravatar']">
 				<span class="input-group-btn">
-					<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar')" ng-show="changeVer['gravatar']">Change</button>
+					<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar')" ng-show="changeVer['gravatar']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
 				</span>
 				<span class="input-group-btn">
 					<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar'); updateUser(user.ID, 'GravatarEmail', user.GravatarEmail)" ng-hide="changeVer['gravatar']">Save</button>
@@ -61,10 +66,10 @@ <h1>My Profile</h1>
 			</div>
 		</div>
 		<div class="form-group">
-			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']">Change Password</button>
+			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change Password</button>
 			<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="!changeVer['password']">Cancel</button>
-			<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">Back To Profile</button></a>
-			<button class="btn btn-danger" type="button" style="float: right;" ng-click="deleteUser(user.ID)" ng-show="moderatorLoggedIn && getDropdownForUser(user).length > 1">Delete User</button>
+			<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">To Profile Page</button></a>
+			<button class="btn btn-danger" type="button" style="float: right;" ng-click="deleteUser(user.ID)" ng-show="moderatorLoggedIn && (getDropdownForUser(user).length > 1 || selfLoggedIn)">Delete User</button>
 		</div>
 	</form>
 	<form role="form" novalidate name="passForm" style="width: 50%" ng-submit="updateUser(user.ID, 'Password', newPassword)" ng-show="passChangeable">