From bcb492751cb6d8b6da67566071456b1e84f6ddce Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Sun, 22 Sep 2013 00:01:31 -0400
Subject: [PATCH] closes #313, also fixed progressbar

---
 public/src/forum/accountedit.js  | 15 ++++++++-------
 public/templates/accountedit.tpl | 10 ++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js
index 527eed2180..25c6018e91 100644
--- a/public/src/forum/accountedit.js
+++ b/public/src/forum/accountedit.js
@@ -27,6 +27,7 @@ $(document).ready(function() {
 			},
 
 			uploadProgress: function(event, position, total, percent) {
+				console.log(percent);
 				$('#upload-progress-bar').css('width', percent + '%');
 			},
 
@@ -60,25 +61,25 @@ $(document).ready(function() {
 	});
 
 	function hideAlerts() {
-		$('#alert-status').hide();
-		$('#alert-success').hide();
-		$('#alert-error').hide();
-		$('#upload-progress-box').hide();
+		$('#alert-status').addClass('hide');
+		$('#alert-success').addClass('hide');
+		$('#alert-error').addClass('hide');
+		$('#upload-progress-box').addClass('hide');
 	}
 
 	function status(message) {
 		hideAlerts();
-		$('#alert-status').text(message).show();
+		$('#alert-status').text(message).removeClass('hide');
 	}
 
 	function success(message) {
 		hideAlerts();
-		$('#alert-success').text(message).show();
+		$('#alert-success').text(message).removeClass('hide');
 	}
 
 	function error(message) {
 		hideAlerts();
-		$('#alert-error').text(message).show();
+		$('#alert-error').text(message).removeClass('hide');
 	}
 
 	function changeUserPicture(type) {
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index bb0c303bbd..36c0238e48 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -48,13 +48,15 @@
 						<input id="imageUploadCsrf" type="hidden" name="_csrf" value="" />
 					</form>
 
-					<div id="upload-progress-box" class="progress progress-striped active hide">
-						<div id="upload-progress-bar" class="bar" style="width: 0%;"></div>
+					<div id="upload-progress-box" class="progress progress-striped">
+						<div id="upload-progress-bar" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0">
+							<span class="sr-only"> success</span>
+						</div>
 					</div>
 
-					<div id="alert-status" class="alert hide"></div>
+					<div id="alert-status" class="alert alert-info hide"></div>
 					<div id="alert-success" class="alert alert-success hide"></div>
-					<div id="alert-error" class="alert alert-error hide"></div>
+					<div id="alert-error" class="alert alert-danger hide"></div>
 				</div>
 				<div class="modal-footer">
 					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>