From 08bdbc0bccd82def1e6878670a7bb64f832f1bcf Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 2 Jan 2014 21:44:13 -0500
Subject: [PATCH] cleanup of PR - fixed some logic bugs and linted

---
 README.md                       |  1 -
 public/src/forum/admin/users.js | 43 ++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 11847141ab..d5fcc5718f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # NodeBB
 **NodeBB** is a robust Node.js driven forum built on a redis database. It is powered by web sockets, and is compatible down to IE8.
 
-
 * [NodeBB Homepage](http://www.nodebb.org/ "NodeBB")
 * [Demo & Meta Discussion](http://try.nodebb.org)
 * [Wiki Guides](https://github.com/designcreateplay/NodeBB/wiki) - includes setup for other platforms
diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js
index 93f3ea9e20..1d82b1ae11 100644
--- a/public/src/forum/admin/users.js
+++ b/public/src/forum/admin/users.js
@@ -19,7 +19,7 @@ define(function() {
 			return parent.attr('data-uid');
 		}
 
-		  function updateUserBanButtons() {
+		function updateUserBanButtons() {
 			jQuery('.ban-btn').each(function(index, element) {
 				var banBtn = $(element);
 				var uid = getUID(banBtn);
@@ -31,31 +31,31 @@ define(function() {
 					banBtn.removeClass('disabled');
 				else
 					banBtn.removeClass('btn-warning');
-				    updateUserAdminButtons();
-
+					updateUserAdminButtons();
 			});
 		}
-        function updateUserAdminButtons() {
-			jQuery('.admin-btn').each(function(index, element) {
-				var banBtn = $(element);
-				var uid = getUID(banBtn);
-				if (isUserAdmin(banBtn) || uid === yourid)
-					
-				banBtn.attr('value', 'UnMake Admin').html('Remove as Admin');
 
-				else if (isUserBanned(banBtn))
-					banBtn.addClass('disabled');
-				else if (!isUserBanned(banBtn))
-					banBtn.removeClass('disabled');
+		function updateUserAdminButtons() {
+			jQuery('.admin-btn').each(function(index, element) {
+				var adminBtn = $(element);
+				var uid = getUID(adminBtn);
+				if (isUserAdmin(adminBtn)) {
+					adminBtn.attr('value', 'UnMake Admin').html('Remove Admin');
+					if (uid === yourid) {
+						adminBtn.addClass('disabled');
+					}
+				}
+				else if (isUserBanned(adminBtn))
+					adminBtn.addClass('disabled');
+				else if (!isUserBanned(adminBtn))
+					adminBtn.removeClass('disabled');
 				else
-					banBtn.removeClass('btn-warning');
+					adminBtn.removeClass('btn-warning');
 
 			});
 		}
 
-
 		function initUsers() {
-
 			updateUserBanButtons();
 			updateUserAdminButtons();
 
@@ -95,11 +95,16 @@ define(function() {
 				var uid = getUID(adminBtn);
 			
 				    if(uid === yourid){
-				    	alert("you can't remove yourself as admin");
+						app.alert({
+							title: 'Error',
+							message: 'You can\'t remove yourself as Administrator!',
+							type: 'danger',
+							timeout: 5000
+						});
 				    }
 					else if (!isAdmin) {
 						socket.emit('api:admin.user.makeAdmin', uid);
-						adminBtn.attr('value', 'UnMake Admin').html('Remove as Admin');
+						adminBtn.attr('value', 'UnMake Admin').html('Remove Admin');
 						parent.attr('data-admin', 1);
 						updateUserBanButtons();