Issue #206 Fixed Index views and added image to profiles

alaashafaee · Apr 22, 2014 · cf9f12c · cf9f12c
1 parent 4538284
commit cf9f12c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 58 deletions.
diff --git a/tutor/app/views/lecturers/index.html.erb b/tutor/app/views/lecturers/index.html.erb
@@ -3,6 +3,6 @@
 	<head>
 		<title>CoolSoft - Java Tutor</title>
 	<body>
-		<h1> I am a lecturer </h1>
+		<h1> lecturers Index </h1>
 	</body>
 </html>
diff --git a/tutor/app/views/lecturers/show.html.erb b/tutor/app/views/lecturers/show.html.erb
@@ -68,7 +68,7 @@
 	<head>
 		<title>CoolSoft - Java tutor | <%= @lecturer.id%>'s Profile</title>
 	<body>
-		<h1> <%= @lecturer.name%>'s Profile </h1>
+		<h1> <%= image_tag(@lecturer.profile_image_url.to_s) if @lecturer.profile_image? %> <%= @lecturer.name%>'s Profile </h1>
 		<div class="tabs">
 			<ul class="tab-links">
 				<li class="active"><a href="#tab1">Info</a></li>

diff --git a/tutor/app/views/students/index.html.erb b/tutor/app/views/students/index.html.erb
@@ -3,6 +3,6 @@
 	<head>
 		<title>CoolSoft - Java Tutor</title>
 	<body>
-		<h1> I am a student </h1>
+		<h1> students Index </h1>
 	</body>
 </html>
diff --git a/tutor/app/views/students/show.html.erb b/tutor/app/views/students/show.html.erb
@@ -66,9 +66,9 @@
 </script>
 <html>
 	<head>
-		<title> <%= @student.id%>'s Profile </title>
+		<title>CoolSoft - Java tutor | <%= @student.id%>'s Profile</title>
 	<body>
-		<h1> <%= @student.name%>'s Profile </h1>
+		<h1> <%= image_tag(@student.profile_image_url.to_s) if @student.profile_image? %> <%= @student.name%>'s Profile </h1>
 		<div class="tabs">
 			<ul class="tab-links">
 				<li class="active"><a href="#tab1">Info</a></li>

diff --git a/tutor/app/views/teaching_assistants/index.html.erb b/tutor/app/views/teaching_assistants/index.html.erb
@@ -2,58 +2,7 @@
 <html>
 	<head>
 		<title>CoolSoft - Java Tutor</title>
-		<%= stylesheet_link_tag "application", "bootstrap", :media => "all"%>
-		<%= javascript_include_tag "application","bootstrap","jquery"%>
-		<%= csrf_meta_tags%>
-	</head>
 	<body>
-		<div class="navbar navbar-default navbar-fixed-top">
-			<div class="container">
-				<div class="nav navbar-nav navbar-left" style="margin-right:12px">
-					<%= link_to image_tag("logo.png" , { :title => "Java Tutor!" , size: "50x50"})%>
-				</div>
-				<a href="../" class="navbar-brand">CoolSoft - Java Tutor</a>
-				<% if signed_in? %>
-					<%= render "layouts/signed_in_header"%>
-				<% else %>
-					<div class="navbar-collapse collapse" id="navbar-main">
-						<ul class="nav navbar-nav navbar-right">
-							<li class="dropdown">
-								<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="themes">Sign in
-									<span class="caret"></span>
-								</a>
-								<ul class="dropdown-menu" aria-labelledby="themes">
-									<li>
-										<a href="../teaching_assistants/sign_in">Teaching Assistant</a>
-									</li>
-								</ul>
-							</li>
-						</ul>
-					</div>
-				<% end %>
-			</div>
-		</div>
-		</br>
-		<div id="main" class="auto-height">
-			<% if signed_in? %>
-				<div class="row">
-					<%= render "layouts/right_side_bar"%>
-					<div class="well main-content">
-						<%= render "problems/system_recommendation" if student_signed_in?%>
-						<%= yield %>
-					</div>
-				</div>
-			<% else %>
-				<div class="well container main-content">
-					<%= yield %>
-				</div>
-			<% end %>
-		</div>
-		</br>
-		<div align="center" class="navbar navbar-default navbar-static-bottom footer">
-			<div class="container">
-				<%= render "layouts/footer"%>
-			</div>
-		</div>
+		<h1> Teaching Assistants Index </h1>
 	</body>
 </html>
diff --git a/tutor/app/views/teaching_assistants/show.html.erb b/tutor/app/views/teaching_assistants/show.html.erb
@@ -68,7 +68,7 @@
 	<head>
 		<title>CoolSoft - Java tutor | <%= @teaching_assistant.id%>'s Profile</title>
 	<body>
-		<h1> <%= @teaching_assistant.name%>'s Profile </h1>
+		<h1> <%= image_tag(@teaching_assistant.profile_image_url.to_s) if @teaching_assistant.profile_image? %> <%= @teaching_assistant.name%>'s Profile </h1>
 		<div class="tabs">
 			<ul class="tab-links">
 				<li class="active"><a href="#tab1">Info</a></li>