replaced Chrome browser with PhantomJS in karma tests

moved header to parent page, removed from templates
This commit is contained in:
Brad Rydzewski
2014-06-21 19:40:21 -07:00
parent 18f7209d1d
commit 77daa5743f
17 changed files with 2191 additions and 62 deletions

View File

@@ -1,5 +1,13 @@
'use strict';
angular.module('app').controller("MainCtrl", function($scope, $http) {
$scope.user = "soemthing"
angular.module('app').controller("MainCtrl", function($scope, $http, users) {
$scope.state=0
$scope.user = users.getCurrent().success(function (user) {
$scope.user = user;
$scope.state = 1;
})
.error(function (error) {
$scope.user = undefined;
$scope.state = 1;
});
});