From 55fb0cbc0daed851bc579c68202a82dd40bc342e Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Mon, 29 Jun 2015 20:21:05 +0300
Subject: [PATCH] -student mode fixed

---
 templates/views/class.html      | 85 ++++++++++++++---------------
 templates/views/myClasses.html  | 28 ++++------
 templates/views/myProjects.html | 97 +++------------------------------
 3 files changed, 60 insertions(+), 150 deletions(-)

diff --git a/templates/views/class.html b/templates/views/class.html
index c61c87f..d11ceed 100644
--- a/templates/views/class.html
+++ b/templates/views/class.html
@@ -8,7 +8,7 @@
 	</div>
 	<div ng-if = "!projectsEmpty">
 			<md-card class="cardAllProjects">						
-				<div flex ="99" class = "allProjectsShow" layout = "row" ng-repeat = "t in arrayHolder" value = "{{t}}">
+				<div flex ="99" class = "allProjectsShow" layout = "row" ng-repeat = "t in arrayHolder" value = "{{t}}" layout-padding>
 					<div flex = "32" layout = "column" ng-repeat = "project in t" value = "{{project}}" layout-padding>
 						<div ng-if="t.length != 1"> 
 							<md-button ng-click = "goToProject(project.id)" style="width:100%; height:32%;" layout-padding class = "md-raised">
@@ -34,56 +34,55 @@
 	<div ng-if="!isInCourse" layout-padding layout-margin>
 		<md-button ng-click = "joinCourse()" ng class = "md-raised md-primary"> Join Class</md-button>
 	</div>
-	<md-content layout-padding layout-margin>
-		<md-button ng-click="createProjectClicked()" ng class="md-raised md-primary">Create Project</md-button>
-	</md-content>
-	<div ng-if = "isCreateProjectClicked">
-		<md-card layout-padding style="width:60%">
-			<div layout="column">
-				<div>
-					<md-input-container>
-						<label flex>Project Name</label>
-						<input  type = "text" ng-model="project.projectName" required>
-					</md-input-container>
-				</div>
-				<div layout = "row">
+	<div ng-if = "user.isLecturer">
+		<md-content layout-padding layout-margin>
+			<md-button ng-click="createProjectClicked()" ng class="md-raised md-primary">Create Project</md-button>
+		</md-content>
+		<div ng-if = "isCreateProjectClicked">
+			<md-card layout-padding style="width:60%">
+				<div layout="column">
 					<div>
-						<md-input-container flex>
-						<label>GitHub Repository Owner</label>
-						<input type="text" ng-model="project.repoOwner" required>
+						<md-input-container>
+							<label flex>Project Name</label>
+							<input  type = "text" ng-model="project.projectName" required>
 						</md-input-container>
 					</div>
-					<!-- <div>
-						<p>/</p>
-					</div> -->
+					<div layout = "row">
+						<div>
+							<md-input-container flex>
+							<label>GitHub Repository Owner</label>
+							<input type="text" ng-model="project.repoOwner" required>
+							</md-input-container>
+						</div>
+						<!-- <div>
+							<p>/</p>
+						</div> -->
+						<div>
+							<md-input-container flex>
+							<label>GitHub Repository Name</label>
+							<input type="text" ng-model="project.gitRepoName" required>
+							</md-input-container>
+						</div>
+					</div>
+					<div>
+						<b>Example</b>: http://www.github.com/userName/repoName
+						<br/>userName will be GitHub Repository Owner
+						<br/>repoName wil be GitHub Repository Name
+					</div>
 					<div>
 						<md-input-container flex>
-						<label>GitHub Repository Name</label>
-						<input type="text" ng-model="project.gitRepoName" required>
+						<label>Logo Url (optional)</label>
+						<input type="text" ng-model="project.logoUrl">
 						</md-input-container>
 					</div>
-				</div>
-				<div>
-					
-					<b>Example</b>: http://www.github.com/userName/repoName
-					<br/>userName will be GitHub Repository Owner
-					<br/>repoName wil be GitHub Repository Name
-				
-				</div>
-				<div>
-					<md-input-container flex>
-					<label>Logo Url (optional)</label>
-					<input type="text" ng-model="project.logoUrl">
-					</md-input-container>
-				</div>
-				<div layout-padding layout-margin>
-					<md-button ng-click="submitNewProject()" ng class="md-raised md-primary">Submit Project</md-button>
-					<div layout-paddig layout-margin class="loader" ng-if="loadingData">
-						<md-progress-circular md-mode="indeterminate"></md-progress-circular>
+					<div layout-padding layout-margin>
+						<md-button ng-click="submitNewProject()" ng class="md-raised md-primary">Submit Project</md-button>
+						<div layout-paddig layout-margin class="loader" ng-if="loadingData">
+							<md-progress-circular md-mode="indeterminate"></md-progress-circular>
+						</div>
 					</div>
 				</div>
-			</div>
-		</md-card>
+			</md-card>
+		</div>
 	</div>
-	
 </div>
\ No newline at end of file
diff --git a/templates/views/myClasses.html b/templates/views/myClasses.html
index 7764104..9883a0e 100644
--- a/templates/views/myClasses.html
+++ b/templates/views/myClasses.html
@@ -31,21 +31,11 @@
 					</div>
 				</div>
 			</div>
-
-		<!-- <div flex = "99" class = "allcoursesShow" layout = "row" ng-repeat = "t in holdArrays" value = "{{t}}">
-			<div flex ="32" layout = "column" ng-repeat = "course in t" value = "{{course}}" layout-padding>
-				<div ng-if = "!scope.coursesEmpty">
-					<md-card ng-click = "goToClass(course.id)" style="width:32%; height:32%;" layout-padding class = "campusCard">
-						{{course.id}}
-					</md-card>
-				</div>
-				<div ng-if = "scope.coursesEmpty">
-					You Are Not Related To Any Course, You May Join Any Course You Wish.
-				</div>
-			</div>
-		</div> -->
 	</md-card>
-	<div ng-if="user.isLecturer"> <!-- Lecturer Mode -->
+
+
+	<!-- Lecturer Mode -->
+	<div ng-if="user.isLecturer"> 
 		<div layout="row">
 			<div layout-margin layout-padding>
 				<md-button ng-click="createCourseClicked()" ng class="md-raised md-primary">Create Class</md-button>
@@ -83,14 +73,16 @@
 				</div>
 			</md-content>
 		</div>
+	</div>
 <!-- 		<div layout-margin layout-padding ng-if="showMyClass">
 			<md-select placeholder="Choose Existing Course" ng-model="course" ng-click="chooseCourseClicked()" class="courseDropDown">
 				<md-option ng-repeat="c in courses" value="{{c.course}}">{{c.course}}</md-option>
 			</md-select>	
 		</div> -->
-	</div>
-
-	<div ng-if="isStudent"> <!-- Student Mode -->
+	
+	 
+	 <!-- Student Mode -->
+<!-- 	<div ng-if="isStudent">
 		<md-content layout-padding>
 			<div layout="row" layout-margin layout-padding>
 				<div>
@@ -124,5 +116,5 @@
 			</div>
 			<md-select placeholder="Choose Course" ng-model="course" ng-click="chooseCourseClicked()" style="z-index: 300"></md-select>
 		</md-content>
-	</div>
+	</div> -->
 </div>
\ No newline at end of file
diff --git a/templates/views/myProjects.html b/templates/views/myProjects.html
index cb8af1f..895d0cc 100644
--- a/templates/views/myProjects.html
+++ b/templates/views/myProjects.html
@@ -9,17 +9,15 @@
 	<div ng-if="!myProjectsEmpty">
 		<md-card class="cardAllProjects">	
 			<div flex = "99" layout = "row" ng-repeat = "t in arrayHolder" value = "{{t}}" layout-padding>
-				<div flex = "32" layout = "column" ng-repeat = "project in t" value = "{{project}}" >
+				<div flex = "32" layout = "column" ng-repeat = "project in t" value = "{{project}}" layout-padding>
 					<div ng-if="t.length != 1"> 
 						<md-button ng-click="goToProject(project.id)" style="width:100%; height:32%;" layout-padding class = "md-raised">
-							<md-card style="width:97%;height:97%">
-								<md-card-content>
-									<h2 class="md-title">{{project.projectName}}</h2>
-									<div layout-align="center center" style=" width:70%;">
-										<canvas layout-padding layout-margin id="project.projectName" class="chart chart-bar" data="project.info.stats.macro.data" labels="project.info.stats.macro.labels"></canvas> 
-									</div>
-								</md-card-content>
-	    					</md-card>
+							<md-card-content>
+								<h2 class="md-title">{{project.projectName}}</h2>
+								<div layout-align="center center" style=" width:70%;">
+									<canvas layout-padding layout-margin id="project.projectName" class="chart chart-bar" data="project.info.stats.macro.data" labels="project.info.stats.macro.labels"></canvas> 
+								</div>
+							</md-card-content>
 						</md-button>
 					</div>
 					<div ng-if="t.length == 1">
@@ -38,83 +36,4 @@
 			</div>
 		</md-card>
 	</div>
-
-<!-- 			<div flex ="99" class = "allProjectsShow" layout = "row" ng-repeat = "t in arrayHolder" value = "{{t}}">
-				<div flex = "32" layout = "column" ng-repeat = "project in t" value = "{{project}}" layout-padding>
-					<div ng-if = "!scope.myProjectsEmpty">
-						<md-card layout-padding ng-click = "goToMyProject(project.id)" style="width:32%; height:32%;" class = "projectCard">
-							{{project.id}}
-						</md-card>
-					</div>
-				</div>
-				<div ng-if = "scope.myProjectsEmpty">
-						You Do Not Have Any Project, You May Create One.
-				</div>
-			</div> -->
-</div>
-
-
-<!-- div layout-padding layout-margin>	
-			<div layout = "row" layout-padding layout-margin>
-				<div flex = "49">
-					Project Creator: {{user.name}}  Should Be Project creator 
-				</div>
-				<div flex = "49" >
-					<div ng-if="user.isLecturer">
-						<div layout = "row" layout-padding>
-							<div>
-								<md-button ng-click="editPressed()" class="md-raised md-primary">Edit</md-button>
-							</div>
-							<div ng-if="isEditPressed">
-								<md-button ng-click="removeProject()" class="md-raised md-primary">Remove</md-button>
-								
-							</div>
-						</div>	
-					</div>
-				</div>
-			</div>
-			<div layout = "row" layout-padding layout-margin>
-				<div flex = "49">
-					<md-card>
-						Here Will Be Graph - Commits Over Period Of Time
-					</md-card>
-				</div>
-				<div flex = "49">
-					<md-card>
-						Here Will Be Graph (by columns) - Commits, Issues, Open Tasks
-					</md-card>
-				</div>
-			</div>
-			<div flex>
-				<md-card>
-					<md-content class="md-padding">
-						<md-tabs md-dynamic-height md-border-bottom>
-							<md-tab label="Commits">
-								<md-content class="md-padding">
-									<h1 class="md-display-2">Commits</h1>
-									<p>Commits...</p>
-								</md-content>
-							</md-tab>
-							<md-tab label="Issues">
-								<md-content class="md-padding">
-									<h1 class="md-display-2">Issues</h1>
-									<p>Issues...</p>
-								</md-content>
-							</md-tab>
-							<md-tab label="Bugs">
-								<md-content class="md-padding">
-									<h1 class="md-display-2">Bugs</h1>
-									<p> Bugs Bugs Bugs..</p>
-								</md-content>
-							</md-tab>
-							<md-tab label="WhatEver">
-								<md-content class="md-padding">
-									<h1 class="md-display-2">WhatEver</h1>
-									<p>Bla Bla Bla..</p>
-								</md-content>
-							</md-tab>
-						</md-tabs>
-					</md-content>
-				</md-card>
-			</div>
-		</div> -->
\ No newline at end of file
+</div>
\ No newline at end of file