From 8797381b6c215b9c5db304cf5d455a92012f109b Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <cody@wimer-dev.(none)>
Date: Wed, 22 Jan 2014 08:38:55 -0500
Subject: [PATCH] Blocking buttons with Devise Authentication and cleaning up
 views

---
 app/assets/stylesheets/custom.css.scss  | 13 -------------
 app/controllers/schools_controller.rb   |  3 ++-
 app/controllers/wrestlers_controller.rb |  3 ++-
 app/views/layouts/_header.html.erb      |  5 ++---
 app/views/schools/_form.html.erb        |  2 +-
 app/views/schools/new.html.erb          |  2 +-
 app/views/static_pages/index.html.erb   |  4 +++-
 app/views/wrestlers/_form.html.erb      |  2 +-
 app/views/wrestlers/new.html.erb        |  2 +-
 9 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 989267f..58aef00 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -123,19 +123,6 @@ footer {
 }
 
 
-/* forms */
-
-input, textarea, select, .uneditable-input {
-  border: 1px solid #bbb;
-  width: 100%;
-  margin-bottom: 15px;
-  @include box_sizing;
-}
-
-input {
-  height: auto !important;
-}
-
 #error_explanation {
   color: #f00;
   ul {
diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb
index db80dd3..59cce07 100644
--- a/app/controllers/schools_controller.rb
+++ b/app/controllers/schools_controller.rb
@@ -17,7 +17,8 @@ class SchoolsController < ApplicationController
   def new
     @school = School.new
     if params[:tournament]
-      @tournament = params[:tournament]
+      @tournament_field = params[:tournament]
+      @tournament = Tournament.find(params[:tournament])
     end
   end
 
diff --git a/app/controllers/wrestlers_controller.rb b/app/controllers/wrestlers_controller.rb
index 1933d40..945b61e 100644
--- a/app/controllers/wrestlers_controller.rb
+++ b/app/controllers/wrestlers_controller.rb
@@ -16,7 +16,8 @@ class WrestlersController < ApplicationController
   def new
     @wrestler = Wrestler.new
     if params[:school]
-      @school = params[:school]
+      @school_field = params[:school]
+      @school = School.find(params[:school])
     end
   end
 
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index e1e26ab..d591e25 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -6,11 +6,10 @@
         <ul class="nav pull-right">
           <li><%= link_to "Home", root_path %></li>
           <% if @tournament %>
-            <li><%= link_to "Brackets" , '#' %></li>
-            <li><%= link_to "Bout Board" , '#' %></li>
+              <li><%= link_to "Brackets" , '#' %></li>
+              <li><%= link_to "Bout Board" , '#' %></li>
           <% end %>
           <% if user_signed_in? %>
-            <li><%= link_to "Admin" , '/admin/index' %></li>
             <li><%= link_to "Log Out",  destroy_user_session_path, method: :delete %></li>
           <% else %>
             <li><%= link_to "Log In" , new_user_session_path %></li>
diff --git a/app/views/schools/_form.html.erb b/app/views/schools/_form.html.erb
index e82de7a..ff9011a 100644
--- a/app/views/schools/_form.html.erb
+++ b/app/views/schools/_form.html.erb
@@ -23,7 +23,7 @@
 
 
 <% if @school %>
-      <%= f.hidden_field :tournament_id, :value => @tournament %>
+      <%= f.hidden_field :tournament_id, :value => @tournament_field %>
   <% else %>
     <div class="field">
       <%= f.label 'Tournament' %><br>
diff --git a/app/views/schools/new.html.erb b/app/views/schools/new.html.erb
index 73641d5..fb195ab 100644
--- a/app/views/schools/new.html.erb
+++ b/app/views/schools/new.html.erb
@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', schools_path %>
+<%= link_to 'Back', "/tournaments/#{@tournament.id}" %>
diff --git a/app/views/static_pages/index.html.erb b/app/views/static_pages/index.html.erb
index b1e9891..ed3fa6f 100644
--- a/app/views/static_pages/index.html.erb
+++ b/app/views/static_pages/index.html.erb
@@ -1,5 +1,7 @@
 <h1>Pick A Tournament</h1>
-<%= link_to 'New Tournament', new_tournament_path, :class=>"btn" %>
+<% if user_signed_in? %>
+  <%= link_to 'New Tournament', new_tournament_path, :class=>"btn" %>
+<% end %>
 </br>
 </br>
 <table class="table table-striped table-bordered">
diff --git a/app/views/wrestlers/_form.html.erb b/app/views/wrestlers/_form.html.erb
index 7003c67..d748843 100644
--- a/app/views/wrestlers/_form.html.erb
+++ b/app/views/wrestlers/_form.html.erb
@@ -17,7 +17,7 @@
   </div>
 
   <% if @school %>
-      <%= f.hidden_field :school_id, :value => @school %>
+      <%= f.hidden_field :school_id, :value => @school_field %>
   <% else %>
       <div class="field">
         <%= f.label 'School' %><br>
diff --git a/app/views/wrestlers/new.html.erb b/app/views/wrestlers/new.html.erb
index 3922807..99ff05e 100644
--- a/app/views/wrestlers/new.html.erb
+++ b/app/views/wrestlers/new.html.erb
@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', wrestlers_path %>
+<%= link_to 'Back', "/schools/#{@school.id}" %>