alaashafaee#470 commiting for Rspec session

mohamedsaeed93 · May 12, 2014 · 4a7e765 · 4a7e765
1 parent f65978e
commit 4a7e765
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/tutor/app/controllers/students_controller.rb b/tutor/app/controllers/students_controller.rb
@@ -10,4 +10,6 @@ def show
 		@student = Student.find(params[:id])
 		@courses = @student.courses.order("created_at desc")
 	end
+
+
 end
diff --git a/tutor/app/views/students/_show.html.erb b/tutor/app/views/students/_show.html.erb
@@ -38,17 +38,17 @@
 				<div class="tab-pane active" id="tab11">
 					<div>
 						<h2 align="center">Continue from where you left off</h2><br>
-						<div class = "greyLine">
-		<p><font size="3"><%= @post.owner.name %></font> </p>
-		<div class="panel panel-primary">
-			<div style="margin-left:1%;">
-				<h2><%= @post.content %></h2>
-				<p><font size="3"><%= distance_of_time_in_words_to_now @post.
-					created_at %> ago</p></font>
-			</div>
-		</div>
-	</div>			
-					</div><br>
+						<div class = "reply">
+							
+						<p>
+							<%= @reply.content %>
+						<br>
+						</p>
+						<p><font size="1"><%= distance_of_time_in_words_to_now reply.created_at %> ago </p>
+						</div>
+					<div>
+
+			</div><br>
 					<h2 align="center">Your Progress</h2>
 					<table class = "table table-striped">
 					<tr>

diff --git a/tutor/db/development.sqlite3 b/tutor/db/development.sqlite3
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,6 @@ def show @@
     		@student = Student.find(params[:id])
     		@courses = @student.courses.order("created_at desc")
     	end
     end