Cleanup

benjaminwootton-zz · Mar 23, 2013 · 5b1a97c · 5b1a97c
1 parent 7d23756
commit 5b1a97c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,6 @@ capybara-*.html
 **.orig
 rerun.txt
 pickle-email-*.html
-.project
+.project
+#*
+*~
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -15,7 +15,9 @@
 	<%= javascript_include_tag "application" %>
 	<%= javascript_include_tag :all %>
 
-	<link href='http://fonts.googleapis.com/css?family=Nosifer' rel='stylesheet' type='text/css'>
+
+	<link href='http://fonts.googleapis.com/css?family=Bad+Script' rel='stylesheet' type='text/css'>
+
 
 	<script src="/javascripts/plugin.js" type="text/javascript"></script>
 
@@ -30,7 +32,7 @@
   <body>
 	<div id="wrapper">
 	  <div id="nav">	
-		<div class="mega-container" style="font-family: 'Nosifer', cursive;color:yellow; float:left; padding:15px;">
+		<div class="mega-container" style="font-family: 'Bad Script', cursive;color:yellow; float:left; padding:15px;font-size:22px;">
 		  RunBook
 		</div>
 		<div style="padding:13px;">

diff --git a/app/views/steps/show.html.erb b/app/views/steps/show.html.erb
@@ -4,62 +4,58 @@
 
   <%= form_for(@step, :html => { :class => "form label-inline" } ) do |f| %>
 
-  <!-- Navigation buttons -->
-  <div style="clear:both"/>
-  <% unless @step.previous.nil? %>
-  <button class="btn btn-blue btn-check"> 
-	<%= link_to 'Previous', @step.previous  %>
-  </button>
-  <% end %>
-  <% if !@step.next.nil? %>
-  <button class="btn btn-blue btn-check"> 
-	<%= link_to 'Next', @step.next   %>
-  </button>
-  <% else %>
-  <button class="btn btn-blue btn-check"> 
-	<%= link_to 'Finish', :controller => 'runs', :id => @current_run.id, :action => 'finish'   %>
-  </button>
-  <% end %>
-  <br/><br/>
-
-  <!-- End navigation buttons -->
 
   <h2><%= @step.book.title %></h2>
-  <h3><b><%= @step.title %></b></h3>
+  <h2><b>Step 2 of <%= @step.book.steps.size %> - <%= @step.title %></b></h2>
   <hr>
 
   <div id="description">
   <p><i><%= simple_format(@step.description) %></i></p>
-  </br></br>
   </div>
 
 
   <% if @step.step_screenshot? %>
-  <h3>Image</h3>
-  <hr>
-  <%= image_tag @step.step_screenshot.url %>
+  <%= image_tag @step.step_screenshot.url, :width => '300' %>
   </br></br>
   <% end %>
 
   <% if @step.capture_output %>
-  <h3>Captured Output</h3>  
-  <hr>
+  <h3><b>Please Copy & Paste Captured Output Here:</b></h3>  
   <div class="field">
     <%= f.text_area :captured_output, :cols => 100, :rows => 5  %>
   </div>
   <% end %>
 
   <div style="clear:both"/>
   <% if !@step.step_validations.empty? %>
-  <h2>Validation Steps</h2>
-  <hr>
-  <p>
+  <h3><b>Please Acknowledge The Following Validation Checks Before Continuing:</b></h3>
 	<% @step.step_validations.each do |validation|  %>
 	<%= image_tag 'cross.png', :align => 'absmiddle' %> <%= validation.description %><br>
 	<% end %>
-  </p>
   <% end %>
-</div>
+</div></br>
+
+
+
+  <!-- Navigation buttons -->
+  <div style="clear:both"/>
+  <% unless @step.previous.nil? %>
+  <button class="btn btn-blue btn-check"> 
+	<%= link_to 'Previous', @step.previous  %>
+  </button>
+  <% end %>
+  <% if !@step.next.nil? %>
+  <button class="btn btn-blue btn-check"> 
+	<%= link_to 'Next', @step.next   %>
+  </button>
+  <% else %>
+  <button class="btn btn-blue btn-check"> 
+	<%= link_to 'Finish', :controller => 'runs', :id => @current_run.id, :action => 'finish'   %>
+  </button>
+  <% end %>
+  <br/><br/>
+
+  <!-- End navigation buttons -->
 
 
 <% end %>

diff --git a/db/development.sqlite3 b/db/development.sqlite3
diff --git a/public/robots.txt b/public/robots.txt
@@ -3,3 +3,4 @@
 # To ban all spiders from the entire site uncomment the next two lines:
 # User-Agent: *
 # Disallow: /
+
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
-
+  
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #