Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

moving things around, like the next button

  • Loading branch information...
commit 6315239f1554ed511ccf6c94994835ebd2aec7b7 1 parent 2a42ce0
Anthony Phillips authored
2  app/assets/stylesheets/questions.css.scss
View
@@ -47,7 +47,7 @@
.option{
width:300px;
- height:400px;
+ height:350px;
float:left;
padding-top:20px;
}
2  app/controllers/questions_controller.rb
View
@@ -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
1  app/views/layouts/application.html.erb
View
@@ -45,7 +45,6 @@
</head>
<body>
- <%= params %>
<div class="banner">
<div class='logo'>
<%= image_tag "logo.png" %>
8 app/views/questions/show.html.erb
View
@@ -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">
Please sign in to comment.
Something went wrong with that request. Please try again.