From 4da8847a15d7ee67fabe286f75d4dc0798aef6be Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Mon, 3 Aug 2015 22:20:49 +0300
Subject: [PATCH 1/2] - finish

---
 templates/views/home.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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

From b8b6aa99cbad53ccd7156b9f2d5aaa7b9c3144b1 Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Mon, 3 Aug 2015 22:26:57 +0300
Subject: [PATCH 2/2] - finish

---
 templates/js/controllers/projectController.js | 1 +
 templates/views/project.html                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/js/controllers/projectController.js b/templates/js/controllers/projectController.js
index 18d9d5e..b1cf373 100644
--- a/templates/js/controllers/projectController.js
+++ b/templates/js/controllers/projectController.js
@@ -15,6 +15,7 @@ angular.module('SeHub')
 	$scope.projectMessages = [];
 	$scope.msg = {};
 	$scope.isMaster = false;
+	$scope.isLecturer = $scope.user.isLecturer;
 	
 	// $scope.thisProject = {};
 	// $scope.thisProject.courseName = $routeParams.className;
diff --git a/templates/views/project.html b/templates/views/project.html
index 60438ea..da09dc5 100644
--- a/templates/views/project.html
+++ b/templates/views/project.html
@@ -18,7 +18,7 @@
 				<div layout = "row" flex = "45">
 					<!-- <div ng-if = "isMasterOrLecturer"> -->
 					<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">
 								<i class="fa fa-user-plus"></i>
 							</md-button>