From 5b17c49a20acf8de50ef7546c08137458d9ae94b Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Tue, 30 Jun 2015 16:56:36 +0000
Subject: [PATCH] Updated all links

---
 app/controllers/schools_controller.rb         |  1 +
 app/controllers/weights_controller.rb         |  1 +
 app/views/mats/_form.html.erb                 |  4 ++--
 app/views/mats/edit.html.erb                  |  3 +--
 app/views/mats/new.html.erb                   |  3 ++-
 app/views/schools/_form.html.erb              |  4 ++--
 app/views/schools/edit.html.erb               |  7 ++++---
 app/views/schools/new.html.erb                |  6 ++++--
 app/views/schools/show.html.erb               | 15 +++++++-------
 app/views/static_pages/brackets.html.erb      |  2 +-
 .../static_pages/generate_matches.html.erb    |  6 +++---
 app/views/static_pages/index.html.erb         |  4 ++--
 app/views/static_pages/results.html.erb       |  2 +-
 app/views/static_pages/team_scores.html.erb   |  2 +-
 app/views/static_pages/up_matches.html.erb    |  2 +-
 app/views/static_pages/weights.html.erb       |  2 +-
 app/views/tournaments/_form.html.erb          |  2 +-
 app/views/tournaments/edit.html.erb           |  5 +++--
 app/views/tournaments/new.html.erb            |  3 ++-
 app/views/tournaments/show.html.erb           | 20 +++++++++----------
 app/views/weights/_form.html.erb              |  4 ++--
 app/views/weights/edit.html.erb               |  4 ++--
 app/views/weights/new.html.erb                |  7 +++----
 app/views/weights/show.html.erb               |  7 +++----
 app/views/wrestlers/edit.html.erb             |  3 +--
 25 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb
index d3fb5c6..42f647f 100644
--- a/app/controllers/schools_controller.rb
+++ b/app/controllers/schools_controller.rb
@@ -26,6 +26,7 @@ class SchoolsController < ApplicationController
   # GET /schools/1/edit
   def edit
     @tournament_field = @school.tournament_id
+    @tournament = Tournament.find(@school.tournament_id)
   end
 
   # POST /schools
diff --git a/app/controllers/weights_controller.rb b/app/controllers/weights_controller.rb
index 9543845..12a0c34 100644
--- a/app/controllers/weights_controller.rb
+++ b/app/controllers/weights_controller.rb
@@ -31,6 +31,7 @@ class WeightsController < ApplicationController
   def edit
     @tournament_field = @weight.tournament_id
     @mats = Mat.where(tournament_id: @weight.tournament.id)
+    @tournament = Tournament.find(@weight.tournament_id)
   end
 
   # POST /weights
diff --git a/app/views/mats/_form.html.erb b/app/views/mats/_form.html.erb
index 7c8d96b..4a654a0 100644
--- a/app/views/mats/_form.html.erb
+++ b/app/views/mats/_form.html.erb
@@ -24,8 +24,8 @@
       <%= f.collection_select :tournament_id, Tournament.all, :id, :name %>
     </div>
 <% end %>
-
+<br>
   <div class="actions">
-    <%= f.submit %>
+    <%= f.submit 'Submit', :class=>"btn btn-success" %>
   </div>
 <% end %>
diff --git a/app/views/mats/edit.html.erb b/app/views/mats/edit.html.erb
index 08f73fc..a0b6679 100644
--- a/app/views/mats/edit.html.erb
+++ b/app/views/mats/edit.html.erb
@@ -2,5 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @mat %> |
-<%= link_to 'Back', mats_path %>
+<%= link_to 'Back', "/tournaments/#{@tournament.id}" %>
diff --git a/app/views/mats/new.html.erb b/app/views/mats/new.html.erb
index fb54f53..3dfef6e 100644
--- a/app/views/mats/new.html.erb
+++ b/app/views/mats/new.html.erb
@@ -1,5 +1,6 @@
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
+<br>
 <h1>New mat</h1>
 
 <%= render 'form' %>
 
-<%= link_to 'Back', mats_path %>
diff --git a/app/views/schools/_form.html.erb b/app/views/schools/_form.html.erb
index 8829731..7d3c724 100644
--- a/app/views/schools/_form.html.erb
+++ b/app/views/schools/_form.html.erb
@@ -24,9 +24,9 @@
       <%= f.collection_select :tournament_id, Tournament.all, :id, :name %>
     </div>
   <% end %>
-
+<br>
 
   <div class="actions">
-    <%= f.submit %>
+    <%= f.submit 'Submit', :class=>"btn btn-success" %>
   </div>
 <% end %>
diff --git a/app/views/schools/edit.html.erb b/app/views/schools/edit.html.erb
index 15ebfaf..99aadcf 100644
--- a/app/views/schools/edit.html.erb
+++ b/app/views/schools/edit.html.erb
@@ -1,6 +1,7 @@
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
+<br>
 <h1>Editing school</h1>
-
+<br>
+<br>
 <%= render 'form' %>
 
-<%= link_to 'Show', @school %> |
-<%= link_to 'Back', schools_path %>
diff --git a/app/views/schools/new.html.erb b/app/views/schools/new.html.erb
index fb195ab..991775f 100644
--- a/app/views/schools/new.html.erb
+++ b/app/views/schools/new.html.erb
@@ -1,5 +1,7 @@
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
+<br>
 <h1>New school</h1>
-
+<br>
+<br>
 <%= render 'form' %>
 
-<%= link_to 'Back', "/tournaments/#{@tournament.id}" %>
diff --git a/app/views/schools/show.html.erb b/app/views/schools/show.html.erb
index e943958..33b9706 100644
--- a/app/views/schools/show.html.erb
+++ b/app/views/schools/show.html.erb
@@ -1,5 +1,10 @@
 <p id="notice"><%= notice %></p>
-
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}",:class=>"btn btn-default" %> |
+<% if user_signed_in? %>
+  <%= link_to "Edit #{@school.name}", edit_school_path(@school),:class=>"btn btn-primary" %>
+<% end %>
+<br>
+<br>
 <p>
   <strong>Name:</strong>
   <%= @school.name %>
@@ -15,17 +20,13 @@
   <%= Tournament.find(@school.tournament_id).name %>
 </p>
 
-<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %> |
-<% if user_signed_in? %>
-  <%= link_to "Edit #{@school.name}", edit_school_path(@school) %> |
-<% end %>
 
 
 
-<br>
+
 <br>
 <% if user_signed_in? %>
-  <%= link_to "New #{@school.name} Wrestler" , "/wrestlers/new?school=#{@school.id}" %>
+  <%= link_to "New #{@school.name} Wrestler" , "/wrestlers/new?school=#{@school.id}", :class=>"btn btn-success"%>
 <% end %>
 <br>
 <br>
diff --git a/app/views/static_pages/brackets.html.erb b/app/views/static_pages/brackets.html.erb
index 2a25911..59bc0f2 100644
--- a/app/views/static_pages/brackets.html.erb
+++ b/app/views/static_pages/brackets.html.erb
@@ -2,7 +2,7 @@
 </br>
 </br>
 
-<%= link_to "Back to #{@tournament.name} weights", "/static_pages/weights?tournament=#{@tournament.id}" %>
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
 <br>
 <br>
 <h1><%= @weight.max %> lbs Bracket</h1>
diff --git a/app/views/static_pages/generate_matches.html.erb b/app/views/static_pages/generate_matches.html.erb
index c5d6ff8..469b04c 100644
--- a/app/views/static_pages/generate_matches.html.erb
+++ b/app/views/static_pages/generate_matches.html.erb
@@ -1,3 +1,3 @@
-<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %>
-<br>
-Done!
\ No newline at end of file
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
+<br><br>
+Matches successfully generated.
\ No newline at end of file
diff --git a/app/views/static_pages/index.html.erb b/app/views/static_pages/index.html.erb
index 6643e8b..5ad3350 100644
--- a/app/views/static_pages/index.html.erb
+++ b/app/views/static_pages/index.html.erb
@@ -6,7 +6,7 @@
   } );
 </script>
 <% if user_signed_in? %>
-  <%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-default" %>
+  <%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-success" %>
 <% end %>
 </br>
 </br>
@@ -24,7 +24,7 @@
         <td><%= tournament.name %></td>
         <td><%= link_to 'Show', tournament, :class=>"btn btn-default" %>
           <% if user_signed_in? %>
-            <%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-default" %>
+            <%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-primary" %>
             <%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger" %>
           <% end %>
         </td>
diff --git a/app/views/static_pages/results.html.erb b/app/views/static_pages/results.html.erb
index b8a2552..c21a9f4 100644
--- a/app/views/static_pages/results.html.erb
+++ b/app/views/static_pages/results.html.erb
@@ -1,4 +1,4 @@
-<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %>
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
 <br>
 <br>
 <h3>Round 1</h3>
diff --git a/app/views/static_pages/team_scores.html.erb b/app/views/static_pages/team_scores.html.erb
index 9258f9e..34d4d4a 100644
--- a/app/views/static_pages/team_scores.html.erb
+++ b/app/views/static_pages/team_scores.html.erb
@@ -1,4 +1,4 @@
-<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %>
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" , :class=>"btn btn-default"%>
 <br>
 <br>
 
diff --git a/app/views/static_pages/up_matches.html.erb b/app/views/static_pages/up_matches.html.erb
index a14b2df..650dbb5 100644
--- a/app/views/static_pages/up_matches.html.erb
+++ b/app/views/static_pages/up_matches.html.erb
@@ -1,4 +1,4 @@
-<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %>
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default"%>
 <script>
   $(document).ready(function() {
      $('#matchList').dataTable();
diff --git a/app/views/static_pages/weights.html.erb b/app/views/static_pages/weights.html.erb
index 9648158..c724595 100644
--- a/app/views/static_pages/weights.html.erb
+++ b/app/views/static_pages/weights.html.erb
@@ -1,4 +1,4 @@
-<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %>
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
 <br>
 <br>
 <% @weights.each do |weight| %>
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 7b22b04..edb6cb0 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -34,6 +34,6 @@
     <br>
     <br>
   <div class="actions">
-    <%= f.submit %>
+    <%= f.submit 'Submit',:class=>"btn btn-success" %>
   </div>
 <% end %>
diff --git a/app/views/tournaments/edit.html.erb b/app/views/tournaments/edit.html.erb
index 2913025..5887f6d 100644
--- a/app/views/tournaments/edit.html.erb
+++ b/app/views/tournaments/edit.html.erb
@@ -1,6 +1,7 @@
+<%= link_to 'Back', root_path, :class=>"btn btn-default" %>
+<br>
 <h1>Editing tournament</h1>
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @tournament %> |
-<%= link_to 'Back', tournaments_path %>
+
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index 2a60539..6c3e7ba 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -1,5 +1,6 @@
+<%= link_to 'Back', root_path, :class=>"btn btn-default" %>
+<br>
 <h1>New tournament</h1>
 
 <%= render 'form' %>
 
-<%= link_to 'Back', tournaments_path %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index a8dc15f..e52f3e0 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,8 +1,8 @@
 <p id="notice"><%= notice %></p>
 <% if user_signed_in? %>
-  <%= link_to "Edit #{@tournament.name}", edit_tournament_path(@tournament) %> |
+  <%= link_to "Edit #{@tournament.name}", edit_tournament_path(@tournament), :class=>"btn btn-primary" %> |
 <% end %>
-<%= link_to 'Back', root_path %>
+<%= link_to 'Back', root_path, :class=>"btn btn-default" %>
 
 <h1>
   <%= @tournament.name %>
@@ -31,7 +31,7 @@
 </p>
 <br>
 <% if user_signed_in? %>
-<%= link_to "Generate Pool Matches" , "/static_pages/generate_matches?tournament=#{@tournament.id}", :class=>"btn btn-danger" %>
+<%= link_to "Generate Pool Matches" , "/static_pages/generate_matches?tournament=#{@tournament.id}", data: { confirm: 'Are you sure? This will delete all current matches.' }, :class=>"btn btn-success" %>
 <br>
 <br>
 <% end %>
@@ -39,7 +39,7 @@
 <h3>School Lineups</h3>
 <br>
 <% if user_signed_in? %>
-  <%= link_to "New #{@tournament.name} School" , "/schools/new?tournament=#{@tournament.id}", :class=>"btn btn-default" %>
+  <%= link_to "New #{@tournament.name} School" , "/schools/new?tournament=#{@tournament.id}", :class=>"btn btn-success" %>
   <br>
   <br>
 <% end %>
@@ -58,7 +58,7 @@
         <td><%= school.name %></td>
         <td><%= link_to 'Show', school, :class=>"btn btn-default" %>
           <% if user_signed_in? %>
-            <%= link_to 'Edit', edit_school_path(school), :class=>"btn btn-default" %>
+            <%= link_to 'Edit', edit_school_path(school), :class=>"btn btn-primary" %>
             <%= link_to 'Destroy', school, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger" %>
           <% end %>
         </td>
@@ -73,9 +73,9 @@
 <h3>Weight Class Seeds</h3>
 <br>
 <% if user_signed_in? %>
-    <%= link_to "New #{@tournament.name} Weight" , "/weights/new?tournament=#{@tournament.id}", :class=>"btn btn-default" %>
-    <br>
-    <%= link_to "Create HS Weights" , "/static_pages/createCustomWeights?tournament=#{@tournament.id}&customValue=hs", :class=>"btn btn-default" %>
+    <%= link_to "New #{@tournament.name} Weight" , "/weights/new?tournament=#{@tournament.id}", :class=>"btn btn-success" %>
+    <br><br>
+    <%= link_to "Create HS Weights" , "/static_pages/createCustomWeights?tournament=#{@tournament.id}&customValue=hs",data: { confirm: 'Are you sure? This will delete all current weights.' }, :class=>"btn btn-success" %>
 <br>
 <br>
 <% end %>
@@ -95,7 +95,7 @@
         <td><%= weight.bracket_size %></td>
         <td><%= link_to 'Show', weight, :class=>"btn btn-default" %>
           <% if user_signed_in? %>
-            <%= link_to 'Edit', edit_weight_path(weight), :class=>"btn btn-default" %>
+            <%= link_to 'Edit', edit_weight_path(weight), :class=>"btn btn-primary" %>
             <%= link_to 'Destroy', weight, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger" %>
           <% end %>
         </td>
@@ -109,7 +109,7 @@
   <br>
   <h3>Mats</h3>
   <br>
-      <%= link_to "New #{@tournament.name} Mat" , "/mats/new?tournament=#{@tournament.id}", :class=>"btn btn-default" %>
+      <%= link_to "New #{@tournament.name} Mat" , "/mats/new?tournament=#{@tournament.id}", :class=>"btn btn-success" %>
       <br>
       <br>
   <table class="table table-striped table-bordered">
diff --git a/app/views/weights/_form.html.erb b/app/views/weights/_form.html.erb
index eabd963..c85057d 100644
--- a/app/views/weights/_form.html.erb
+++ b/app/views/weights/_form.html.erb
@@ -24,8 +24,8 @@
       <%= f.collection_select :tournament_id, Tournament.all, :id, :name %>
     </div>
   <% end %>
-  
+  <br>
   <div class="actions">
-    <%= f.submit %>
+    <%= f.submit 'Submit', :class=>"btn btn-success" %>
   </div>
 <% end %>
diff --git a/app/views/weights/edit.html.erb b/app/views/weights/edit.html.erb
index 01ca526..1f79b26 100644
--- a/app/views/weights/edit.html.erb
+++ b/app/views/weights/edit.html.erb
@@ -1,6 +1,6 @@
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
+<br>
 <h1>Editing weight</h1>
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @weight %> |
-<%= link_to 'Back', weights_path %>
diff --git a/app/views/weights/new.html.erb b/app/views/weights/new.html.erb
index f1ea9ab..f3c02ee 100644
--- a/app/views/weights/new.html.erb
+++ b/app/views/weights/new.html.erb
@@ -1,7 +1,6 @@
+<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
+<br>
 <h1>New weight</h1>
-<br>
-<br>
-<p>Create weights from the bottom up. For example, start with 106 lbs and create the weight classes through to 285 lbs. This will allow the program to run the tournament starting with the lowest weight each round.</p>
+
 <%= render 'form' %>
 
-<%= link_to 'Back', weights_path %>
diff --git a/app/views/weights/show.html.erb b/app/views/weights/show.html.erb
index e1e3416..3985c0b 100644
--- a/app/views/weights/show.html.erb
+++ b/app/views/weights/show.html.erb
@@ -2,9 +2,9 @@
 
 <h1>Weight Class:<%= @weight.max %></h1>
  
- <%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" %> |
+ <%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %> |
 <% if user_signed_in? %>
-  <%= link_to "Edit #{@weight.max} Weight Class", edit_weight_path(@weight) %> |
+  <%= link_to "Edit #{@weight.max} Weight Class", edit_weight_path(@weight), :class=>"btn btn-primary" %>
 <% end %>
 
 <br>
@@ -45,7 +45,6 @@
           			<% end %></td>
       				<td><%= link_to 'Show', wrestler , :class=>"btn btn-default" %>
       					<% if user_signed_in? %>
-	      					<%= link_to 'Edit', edit_wrestler_path(wrestler) , :class=>"btn btn-default" %>
 	      					<%= link_to 'Destroy', wrestler, method: :delete, data: { confirm: 'Are you sure?' } , :class=>"btn btn-danger" %></td>
 	      				<% end %>
       			</tr>
@@ -54,7 +53,7 @@
   	</tbody>
 </table>
 		<% if user_signed_in? %>
-	      <%= submit_tag "Save"%>
+	      <%= submit_tag "Save", :class=>"btn btn-success"%>
 	    <% end %>
     <% end %>
 
diff --git a/app/views/wrestlers/edit.html.erb b/app/views/wrestlers/edit.html.erb
index 0b081d5..7cc7d68 100644
--- a/app/views/wrestlers/edit.html.erb
+++ b/app/views/wrestlers/edit.html.erb
@@ -2,5 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @wrestler %> |
-<%= link_to 'Back', wrestlers_path %>
+<%= link_to 'Back', "/schools/#{@school.id}" %>