sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #47 from sagidayan/UI

Browse source 
Ui
This commit is contained in:
Sagi Dayan 2015-06-17 22:45:52 +03:00
parent d736cb021a 998bba0e29
commit 3756d8b2a6
2 changed files with 85 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
templates/css/theme.css
View file

@ -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
{

25
templates/js/controllers/registerController.js
View file

@ -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)