moving things around, like the next button

sharksforcheap · Feb 26, 2012 · 6315239 · 6315239
1 parent 2a42ce0
commit 6315239
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/assets/stylesheets/questions.css.scss b/app/assets/stylesheets/questions.css.scss
@@ -47,7 +47,7 @@
 
 .option{
   width:300px;
-  height:400px;
+  height:350px;
   float:left;
   padding-top:20px;
 }

diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
@@ -6,7 +6,7 @@ def show
 			@question = Question.find(1)
 			params[:id] = 1
 		end
-		unless @question.id == 5
+		unless @question.id == 4
 			@next_question = Question.find(params[:id].to_i + 1)
 		else
 			@next_question = @question

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -45,7 +45,6 @@
 
 </head>
 <body>
-	<%= params %>
 	<div class="banner">
 	  <div class='logo'>
 	    <%= image_tag "logo.png" %>

diff --git a/app/views/questions/show.html.erb b/app/views/questions/show.html.erb
@@ -59,10 +59,10 @@ $(document).ready(function() {
     <div class="verbal_rep">
       <span>Question</span>
       <span><%= @question.id %></span>
-      <span>of 5</span>
+      <span>of 4</span>
     </div>
     <div class="visual_rep">
-      <% 5.times do |i|%>
+      <% 4.times do |i|%>
         <div class="box <%= (i + 1) == @question.id ? 'special' : 'normal'%>"></div>
       <% end %>
     </div>
@@ -74,7 +74,9 @@ $(document).ready(function() {
       <button class="btn" id="button1"><%= @question.option_1 %></button><br />
       <button class="btn" id="button2"><%= @question.option_2 %></button><br />
       <button class="btn" id="button3"><%= @question.option_3 %></button><br />
-      <button class="btn" id="button4"><%= @question.option_4 %></button><br />
+      <% if @question.option_4 != '' %>
+        <button class="btn" id="button4"><%= @question.option_4 %></button><br />
+      <% end %>
     </div>
 
     <div class="video">