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

Merge pull request #163 from sagidayan/UI

Browse source 
Ui
This commit is contained in:
Sagi Dayan 2015-08-03 22:29:26 +03:00
commit ad3dc4beed
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
templates/js/controllers/projectController.js
View file

@ -15,6 +15,7 @@ angular.module('SeHub')
$scope.projectMessages = []; $scope.projectMessages = [];
$scope.msg = {}; $scope.msg = {};
$scope.isMaster = false; $scope.isMaster = false;
$scope.isLecturer = $scope.user.isLecturer;
// $scope.thisProject = {}; // $scope.thisProject = {};
// $scope.thisProject.courseName = $routeParams.className; // $scope.thisProject.courseName = $routeParams.className;

9
templates/views/home.html
View file

@ -120,12 +120,9 @@
</div> </div>
<div> <div>
Latest Message- Latest Message-
<md-card layout-margin layout-padding ng-if="!userMessages"> <md-card layout-margin layout-padding>
{{userMessages[0].message}} {{userMessages[0].message}}
</md-card> </md-card>
<md-card layout-margin layout-padding ng-if="userMessages">
No Messages.
</md-card>
</div> </div>
</div> </div>
<div class ="addMessage" layout="row" layout-margin layout padding> <div class ="addMessage" layout="row" layout-margin layout padding>
@ -158,11 +155,11 @@
<md-tabs md-dynamic-height md-border-bottom> <md-tabs md-dynamic-height md-border-bottom>
<md-tab label="Messages"> <md-tab label="Messages">
<md-card ng-repeat = "msg in userMessages"> <md-card ng-repeat = "msg in userMessages">
<div layout = "column" layout-padding> <div layout = "row" layout-padding>
<div flex = "30" class="md-avatar"> <div flex = "30" class="md-avatar">
<img ng-src="{{msg.user.avatar_url}}" style="width:100%"> <img ng-src="{{msg.user.avatar_url}}" style="width:100%">
</div> </div>
<div flex = "20" layout = "row"> <div flex = "20" layout = "column">
<div> <div>
{{msg.user.username}} {{msg.user.username}}
</div> </div>

2
templates/views/project.html
View file

@ -18,7 +18,7 @@
<div layout = "row" flex = "45"> <div layout = "row" flex = "45">
<!-- <div ng-if = "isMasterOrLecturer"> --> <!-- <div ng-if = "isMasterOrLecturer"> -->
<md-card layout = "row"> <md-card layout = "row">
<div ng-if="!isMember && !isInProject" layout-padding> <div ng-if="!isLecturer && !isMember && !isInProject" layout-padding>
<md-button ng-click="joinProject($event)" ng class = "md-raised md-primary" aria-label="jP"> <md-button ng-click="joinProject($event)" ng class = "md-raised md-primary" aria-label="jP">
<i class="fa fa-user-plus"></i> <i class="fa fa-user-plus"></i>
</md-button> </md-button>