diff --git a/app/views/layout.server.view.html b/app/views/layout.server.view.html
index dcc389d6..6c75244e 100755
--- a/app/views/layout.server.view.html
+++ b/app/views/layout.server.view.html
@@ -47,7 +47,7 @@
-
+
diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js
index 9d90f5e4..8f4cb911 100755
--- a/public/modules/core/controllers/header.client.controller.js
+++ b/public/modules/core/controllers/header.client.controller.js
@@ -1,15 +1,21 @@
'use strict';
-angular.module('core').controller('HeaderController', ['$scope', 'Principal', 'Menus', '$state',
- function($scope, Principal, Menus, $state) {
- $scope.authentication = Principal;
+angular.module('core').controller('HeaderController', ['$rootScope','$scope', 'Principal', 'Menus', '$state',
+ function($rootScope, $scope, Auth, Menus, $state) {
+ $rootScope.authentication = Auth;
+ $rootScope.user = {},
$scope.isCollapsed = false;
$scope.hideNav = false;
$scope.menu = Menus.getMenu('topbar');
- Principal.identity().then(function(user){
- $scope.authentication.user = user;
- }).then(function(){
+ // Principal.identity().then(function(user){
+ // $rootScope.user = user;
+ // console.log('topbar')
+ // console.log($scope.user);
+ // },
+ // function(error){
+ // console.log(error);
+ // }).then(function(){
$scope.signout = function() {
// $http.get('/auth/signout').success(function(response) {
// $state.go('home');
@@ -17,12 +23,19 @@ angular.module('core').controller('HeaderController', ['$scope', 'Principal', 'M
// $scope.error = (error.message || error);
// });
- Principal.signout();
- if( angular.isDefined(response_obj.error) ){
- $scope.error = response_obj.error;
- } else{
- $state.go('home');
- }
+ Principal.signout().then(
+ function(result){
+ $state.go('home');
+ },
+ function(error){
+ $scope.error = (error.message || error);
+ }
+ );
+ // if( angular.isDefined(response_obj.error) ){
+ // $scope.error = response_obj.error;
+ // } else{
+ // $state.go('home');
+ // }
};
diff --git a/public/modules/core/controllers/home.client.controller.js b/public/modules/core/controllers/home.client.controller.js
index 9f251a9c..d27115b8 100755
--- a/public/modules/core/controllers/home.client.controller.js
+++ b/public/modules/core/controllers/home.client.controller.js
@@ -1,18 +1,21 @@
'use strict';
-angular.module('core').controller('HomeController', ['$scope', 'Principal',
- function($scope, Principal) {
+angular.module('core').controller('HomeController', ['$rootScope', '$scope', 'Principal',
+ function($rootScope, $scope, Principal) {
// This provides Principal context.
$scope.authentication = Principal;
+ // $scope.user = {};
- console.log($scope.authentication.user);
- Principal.identity().then(function(user){
- console.log(user);
- $scope.authentication.user = user;
- }, function(){
- console.log('error');
- });
+ $rootScope.user = $window.user;
+ console.log($rootScope.user);
+
+ // Principal.identity().then(function(user){
+ // console.log(user);
+ // $scope.user = user;
+ // }, function(){
+ // console.log('error');
+ // });
// console.log("user.displayName: "+Principal.user()._id);
}
diff --git a/public/modules/core/css/core.css b/public/modules/core/css/core.css
index cb916ee7..ec072f82 100755
--- a/public/modules/core/css/core.css
+++ b/public/modules/core/css/core.css
@@ -38,7 +38,7 @@ section.hero-section > .jumbotron {
background-image: url(http://yourplaceandmine.ie/wp-content/uploads/2014/09/Daingean-meeting-048_13-1080x675.jpg);
background-repeat: no-repeat;
background-position: 0 50%;
- background-position-top: 0px;
+ /*background-position-top: 0px;*/
background-size: cover;
}
@@ -47,4 +47,5 @@ section.hero-section > .jumbotron {
color: white;
padding: inherit;
height: inherit;
+ width: inherit;
}
\ No newline at end of file
diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html
index 83c8e83b..b20b4bf0 100755
--- a/public/modules/core/views/header.client.view.html
+++ b/public/modules/core/views/header.client.view.html
@@ -13,7 +13,7 @@