updated login

jonniespratley · Dec 14, 2014 · 5dc304c · 5dc304c
1 parent bceb19c
commit 5dc304c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/scripts/controllers/users.coffee b/app/scripts/controllers/users.coffee
@@ -55,11 +55,10 @@ angular.module('angularCmsApp').controller('UsersCtrl', ($scope, DataService) ->
 			delete user.password if user.password
 			user.updated_at = new Date()
 			DataService.save('users', user).then((data) ->
+				$('#user-modal').modal('hide')
 				$scope.getUsers()
 				$scope.users.push(user) unless user._id
 				$scope.user = {}
-				console.log(data)
-				$('#user-modal').modal('hide')
 			)
 
 )
diff --git a/test/routes/functional/cms-passport.js b/test/routes/functional/cms-passport.js
diff --git a/www/index.html → www/_index.html b/www/index.html → www/_index.html
diff --git a/www/layout.ejs b/www/layout.ejs
@@ -20,17 +20,17 @@
 		</div>
 		<div class="collapse navbar-collapse">
 			<ul class="nav navbar-nav">
-				<li class="active"><a href="#">Home</a></li>
-				<li><a href="#about">About</a></li>
-				<li><a href="#contact">Contact</a></li>
+				<li class="active"><a href="/">Home</a></li>
+				<li><a href="/account">Account</a></li>
+
 			</ul>
 		</div><!--/.nav-collapse -->
 	</div>
 </div>
 
 <div class="container">
 	<%- body %>
-	
+
 
 </div><!-- /.container -->