diff --git a/templates/css/theme.css b/templates/css/theme.css index 92d6805..2ee6e94 100644 --- a/templates/css/theme.css +++ b/templates/css/theme.css @@ -111,37 +111,39 @@ body.noscroll }*/ - .campusAvatar img - { +.campusAvatar img +{ /* - margin-top: 1em; - margin-right: 1em; - position: center; - */ + margin-top: 1em; + margin-right: 1em; + position: center; + */ - border-radius: 40px; - position:center; - width: 80px; - height: 80px; - margin: 6px; - -webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); - -moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); - box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); - } + border-radius: 40px; + position:center; + width: 80px; + height: 80px; + margin: 6px; + -webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); + -moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); + box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75); +} - .spacer{ - margin-right: auto; - margin-left: auto; - } +.spacer{ + margin-right: auto; + margin-left: auto; +} - .port_spacer{ - margin-top: auto; - margin-bottom: auto; - } +.port_spacer +{ + margin-top: auto; + margin-bottom: auto; +} - .mail_suffix{ - margin-top: auto; - } +.mail_suffix +{ + margin-top: auto; +} .createCampus @@ -149,6 +151,43 @@ body.noscroll position:relative; } +.listdemoBasicUsage md-divider +{ + margin-top: 10px; + margin-bottom: 10px; +} + +.md-avatar img +{ + /*TODO*/ +} + +.feedContent +{ + padding-left: 6%; + font-size: 15px; + display:table; +} + +.md-no-sticky +{ + background-color: blue; +} + +.roundUserAvatar +{ + width: 6%; + height: auto; + border-radius: 150px; + -webkit-border-radius: 150px; + -moz-border-radius: 150px; + /*background: url(http://i61.tinypic.com/v86f7.png) no-repeat;*/ + box-shadow: 0 0 8px rgba(0, 0, 0, .8); + -webkit-box-shadow: 0 0 8px rgba(0, 0, 0, .8); + -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8); +} + + /*div.img campusAvatar { diff --git a/templates/js/controllers/registerController.js b/templates/js/controllers/registerController.js index a2ca317..071096c 100644 --- a/templates/js/controllers/registerController.js +++ b/templates/js/controllers/registerController.js @@ -6,11 +6,11 @@ angular.module('SeHub') $scope.createCampusClicked = false; $scope.isEmpty = true; // if the academic email line is empty $scope.jsonCreateCampus = - { - "title": "Create Campus", - "email": "email_ending", - "avatar": "self.avatar.url" - } + { + "title": "Create Campus", + "email": "email_ending", + "avatar": "self.avatar.url" + } $rootScope.seToken = $cookies['com.sehub.www']; var token = $rootScope.seToken; @@ -57,10 +57,25 @@ angular.module('SeHub') $scope.submitClicked = function(ev) { var emailValid = false; + var jsonUpdateUser = + { + "lecturerStat": "$scope.user.isLecturer", + "campName": "$scope.campusName" + } + if($scope.user.AcMail != null) { var fullMail = $scope.user.AcMail + $scope.campusObj.email_ending; // Holds the full academic email of the user + apiService.updateUser($scope.user.seToken, jsonUpdateUser).success(function(data) + { + + }).error(function() + { + // TODO Error + console.log("Error occured on updateUser"); + }); + console.log("Mail: " + fullMail); apiService.sendValidationMail($scope.user.seToken, fullMail).success(function(data)