cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Removing bootstrap buttons all over the place and replacing with font awesome icons

Browse Source
This commit is contained in:
Jacob Cody Wimer
2019-02-11 16:29:00 +00:00
parent 5a800fccb9
commit 77c416597a
8 changed files with 89 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/layouts/_cdn.html.erb
View File

@@ -6,13 +6,20 @@
<!-- Latest compiled and minified JavaScript --> <!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
<!-- DataTables CDN -->
<script src="https://cdn.datatables.net/1.10.6/js/jquery.dataTables.min.js"></script> <script src="https://cdn.datatables.net/1.10.6/js/jquery.dataTables.min.js"></script>
<!-- Fontawesome CDN -->
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<!--Mobile and tablet detection-->
<script type='text/javascript' src="//wurfl.io/wurfl.js"></script>
<style> <style>
.fa {
color: #777;
}
.fas {
color: #777;
}
.far {
color: #777;
}
</style> </style>

13
app/views/layouts/_tournament-navbar.html.erb
View File

@@ -4,22 +4,25 @@
<div class="container"> <div class="container">
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><%= link_to "" , "/tournaments/#{@tournament.id}", class: "glyphicon glyphicon-home" %></li> <li><%= link_to " Tournament Home" , "/tournaments/#{@tournament.id}", class: "fas fa-home" %></li>
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Brackets <a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="fas fa-poll-h"> Tournament Results</i>
<span class="caret"></span></a> <span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><strong>Results</strong></li>
<li><%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %></li>
<li><strong>Brackets</strong></li>
<% @tournament.weights.sort_by{|weight| weight.max }.each do |weight| %> <% @tournament.weights.sort_by{|weight| weight.max }.each do |weight| %>
<li><%= link_to "#{weight.max}" , "/tournaments/#{@tournament.id}/brackets/#{weight.id}" %></li> <li><%= link_to "#{weight.max}" , "/tournaments/#{@tournament.id}/brackets/#{weight.id}" %></li>
<% end %> <% end %>
<li><%= link_to "All Brackets (Printable)", "/tournaments/#{@tournament.id}/all_brackets?print=true", target: :_blank %></li> <li><%= link_to "All Brackets (Printable)", "/tournaments/#{@tournament.id}/all_brackets?print=true", target: :_blank %></li>
</ul> </ul>
</li> </li>
<li><%= link_to "Bout Board" , "/tournaments/#{@tournament.id}/up_matches" %></li> <li><%= link_to " Bout Board" , "/tournaments/#{@tournament.id}/up_matches", class: "fas fa-list-alt" %></li>
<li><%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %></li>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#director">Tournament Director Links <a class="dropdown-toggle" data-toggle="dropdown" href="#director"><i class="fas fa-tools"> Tournament Director Links</i>
<span class="caret"></span></a> <span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><strong>Pages</strong></li> <li><strong>Pages</strong></li>

40
app/views/schools/show.html.erb
View File

@@ -1,12 +1,7 @@
<% if can? :manage, @school %>
<%= link_to "Edit #{@school.name}", edit_school_path(@school),:class=>"btn btn-primary" %> |
<% end %>
<%= link_to "#{@school.name} Stat Summary", "/schools/#{@school.id}/stats",:class=>"btn btn-primary" %>
<br>
<br>
<p> <p>
<strong>Name:</strong> <strong>Name:</strong>
<%= @school.name %> <%= @school.name %>
<% if can? :manage, @school %><%= link_to " Edit", edit_school_path(@school),:class=>"fas fa-edit" %><% end %>
</p> </p>
<p> <p>
@@ -21,20 +16,12 @@
<p> <p>
<strong>Tournament:</strong> <strong>Tournament:</strong>
<%= @school.tournament.name %> <%= @school.tournament.name %>
</p> </p>
<%= link_to "#{@school.name} Stat Summary", "/schools/#{@school.id}/stats",:class=>"btn btn-sm btn-primary" %>
<br>
<% if can? :manage, @school %>
<%= link_to "New #{@school.name} Wrestler" , "/wrestlers/new?school=#{@school.id}", :class=>"btn btn-success"%>
<% end %>
<br> <br>
<br> <br>
<h3>Roster</h3>
<table class="table table-striped table-bordered table-condensed"> <table class="table table-hover table-condensed">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
@@ -43,14 +30,14 @@
<th>Team Points Scored</th> <th>Team Points Scored</th>
<th>Extra?</th> <th>Extra?</th>
<th>Next Bout/Mat</th> <th>Next Bout/Mat</th>
<th>Actions</th> <% if can? :manage, @school %><th><%= link_to " New Wrestler" , "/wrestlers/new?school=#{@school.id}", :class=>"fas fa-plus"%></th><% end %>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @wrestlers.sort_by{|w| w.weight.max}.each do |wrestler| %> <% @wrestlers.sort_by{|w| w.weight.max}.each do |wrestler| %>
<tr> <tr>
<td><%= wrestler.name %></td> <td><%= link_to "#{wrestler.name}", wrestler %></td>
<td><%= wrestler.weight.max %></td> <td><%= wrestler.weight.max %></td>
<td> <td>
<%= wrestler.original_seed %> <%= wrestler.original_seed %>
@@ -60,13 +47,12 @@
Yes Yes
<% end %></td> <% end %></td>
<td><%= wrestler.next_match_bout_number %> <%= wrestler.next_match_mat_name %></td> <td><%= wrestler.next_match_bout_number %> <%= wrestler.next_match_mat_name %></td>
<td> <% if can? :manage, wrestler.school %>
<%= link_to 'Show', wrestler , :class=>"btn btn-default btn-sm" %> <td>
<% if can? :manage, wrestler.school %> <%= link_to '', edit_wrestler_path(wrestler),:class=>"fas fa-edit" %>
<%= link_to 'Edit', edit_wrestler_path(wrestler),:class=>"btn btn-primary btn-sm" %> <%= link_to '', wrestler, method: :delete, data: { confirm: "Are you sure you want to delete #{wrestler.name}? This will delete all of his matches." }, :class=>"fas fa-trash-alt" %>
<%= link_to 'Destroy', wrestler, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> </td>
<% end %> <% end %>
</td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>

34
app/views/static_pages/my_tournaments.html.erb
View File

@@ -5,64 +5,52 @@
// pagingType: "bootstrap"; // pagingType: "bootstrap";
// } ); // } );
</script> </script>
<% if user_signed_in? %>
<%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-success" %>
<% end %>
</br> </br>
</br> <table class="table table-hover" id="tournamentList">
<table class="table table-striped table-bordered table-condensed" id="tournamentList">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Date</th> <th>Date</th>
<th></th> <th><% if user_signed_in? %><%= link_to ' New Tournament', new_tournament_path, :class=>"fas fa-plus" %></th><% end %>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @tournaments.each do |tournament| %> <% @tournaments.each do |tournament| %>
<tr> <tr>
<td><%= tournament.name %></td> <td><%= link_to "#{tournament.name}", tournament %></td>
<td><%= tournament.date %></td> <td><%= tournament.date %></td>
<td><%= link_to 'Show', tournament, :class=>"btn btn-default btn-sm" %>
<% if can? :manage, tournament %> <% if can? :manage, tournament %>
<%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-primary btn-sm" %> <td>
<% end %> <%= link_to '', edit_tournament_path(tournament), :class=>"fas fa-edit" %>
<% if can? :destroy, tournament %> <% if can? :destroy, tournament %>
<%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> <%= link_to '', tournament, method: :delete, data: { confirm: "Are you sure you want to delete #{tournament.name}?" }, :class=>"fas fa-trash-alt" %>
<% end %>
</td>
<% end %> <% end %>
</td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<br> <br>
<br>
<% if @schools.size > 0 %> <% if @schools.size > 0 %>
<h1>My Schools</h1> <h1>My Schools</h1>
<br> <br>
<br> <table class="table table-hover" id="tournamentList">
<table class="table table-striped table-bordered table-condensed" id="tournamentList">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Tournament Name</th> <th>Tournament Name</th>
<th>Tournament Date</th> <th>Tournament Date</th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @schools.each do |school| %> <% @schools.each do |school| %>
<tr> <tr>
<td><%= school.name %></td> <td><%= link_to "#{school.name}", school %></td>
<td><%= school.tournament.name %></td> <td><%= school.tournament.name %></td>
<td><%= school.tournament.date %></td> <td><%= school.tournament.date %></td>
<td><%= link_to 'Show', school, :class=>"btn btn-default btn-sm" %>
<% if can? :manage, school %>
<%= link_to 'Edit', edit_school_path(school), :class=>"btn btn-primary btn-sm" %>
<% end %>
</td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>

26
app/views/tournaments/index.html.erb
View File

@@ -9,33 +9,29 @@
// pagingType: "bootstrap"; // pagingType: "bootstrap";
// } ); // } );
</script> </script>
<% if user_signed_in? %> <br>
<%= link_to 'New Tournament', new_tournament_path, :class=>"btn btn-success" %> <table class="table table-hover table-condensed" id="tournamentList">
<% end %>
</br>
</br>
<table class="table table-striped table-bordered table-condensed" id="tournamentList">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Date</th> <th>Date</th>
<th></th> <th><% if user_signed_in? %><%= link_to ' New Tournament', new_tournament_path, :class=>"fas fa-plus" %></th><% end %>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @tournaments.each do |tournament| %> <% @tournaments.each do |tournament| %>
<tr> <tr>
<td><%= tournament.name %></td> <td><%= link_to "#{tournament.name}", tournament %></td>
<td><%= tournament.date %></td> <td><%= tournament.date %></td>
<td><%= link_to 'Show', tournament, :class=>"btn btn-default btn-sm" %>
<% if can? :manage, tournament %> <% if can? :manage, tournament %>
<%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn btn-primary btn-sm" %> <td>
<% end %> <%= link_to '', edit_tournament_path(tournament), :class=>"fas fa-edit" %>
<% if can? :destroy, tournament %> <% if can? :destroy, tournament %>
<%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> <%= link_to '', tournament, method: :delete, data: { confirm: "Are you sure you want to delete #{tournament.name}?" }, :class=>"fas fa-trash-alt" %>
<% end %> <% end %>
</td> </td>
<% end %>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>

60
app/views/tournaments/show.html.erb
View File

@@ -27,16 +27,11 @@
<br> <br>
<h3>School Lineups</h3> <h3>School Lineups</h3>
<br> <br>
<% if can? :manage, @tournament %> <table class="table table-hover table-condensed">
<%= link_to "New #{@tournament.name} School" , "/schools/new?tournament=#{@tournament.id}", :class=>"btn btn-success btn-sm" %>
<br>
<br>
<% end %>
<table class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th></th> <% if can? :manage, @tournament %><th><%= link_to " New School" , "/schools/new?tournament=#{@tournament.id}", :class=>"fas fa-plus" %></th><% end %>
</tr> </tr>
</thead> </thead>
@@ -44,14 +39,15 @@
<tbody> <tbody>
<% @schools.each do |school| %> <% @schools.each do |school| %>
<tr> <tr>
<td><%= school.name %></td> <td><%= link_to "#{school.name}", school %>
<td><%= link_to 'Show', school, :class=>"btn btn-default btn-sm" %>
<% if can? :manage, school %> <% if can? :manage, school %>
<%= link_to 'Edit', edit_school_path(school), :class=>"btn btn-primary btn-sm" %> <td><%= link_to '', edit_school_path(school), :class=>"fas fa-edit" %>
<% end %> <% if can? :manage, @tournament %>
<% if can? :manage, @tournament %> <%= link_to '', school, method: :delete, data: { confirm: "Are you sure you want to delete #{school.name}?" }, :class=>"fas fa-trash-alt" %>
<%= link_to 'Destroy', school, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> <% end %>
</td>
<% end %> <% end %>
</td> </td>
</tr> </tr>
<% end %> <% end %>
@@ -63,31 +59,26 @@
<h3>Weight Class Seeds</h3> <h3>Weight Class Seeds</h3>
<br> <br>
<% if can? :manage, @tournament %> <table class="table table-hover table-condensed">
<%= link_to "New #{@tournament.name} Weight" , "/weights/new?tournament=#{@tournament.id}", :class=>"btn btn-success btn-sm" %>
<br>
<br>
<% end %>
<table class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr> <tr>
<th>Weight Class</th> <th>Weight Class</th>
<th>Bracket Size</th> <th>Bracket Size</th>
<th></th> <% if can? :manage, @tournament %><th><%= link_to " New Weight Class" , "/weights/new?tournament=#{@tournament.id}", :class=>"fas fa-plus" %></th><% end %>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @weights.each do |weight| %> <% @weights.each do |weight| %>
<tr> <tr>
<td><%= weight.max %></td> <td><%= link_to "#{weight.max} lbs", weight %></td>
<td><%= weight.bracket_size %></td> <td><%= weight.bracket_size %></td>
<td><%= link_to 'Show', weight, :class=>"btn btn-default btn-sm" %>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
<%= link_to 'Edit', edit_weight_path(weight), :class=>"btn btn-primary btn-sm" %> <td>
<%= link_to 'Destroy', weight, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> <%= link_to '', edit_weight_path(weight), :class=>"fas fa-edit" %>
<%= link_to '', weight, method: :delete, data: { confirm: "Are you sure you want to delete the #{weight.max} weight class?" }, :class=>"fas fa-trash-alt" %>
</td>
<% end %> <% end %>
</td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
@@ -96,29 +87,24 @@
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
<br> <br>
<br> <br>
<h3>Mats</h3> <h3>Mats</h3><br>
<br> <table class="table table-hover table-condensed">
<%= link_to "New #{@tournament.name} Mat" , "/mats/new?tournament=#{@tournament.id}", :class=>"btn btn-success btn-sm" %>
<br>
<br>
<table class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th></th> <th><%= link_to " New Mat" , "/mats/new?tournament=#{@tournament.id}", :class=>"fas fa-plus" %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @mats.each do |mat| %> <% @mats.each do |mat| %>
<tr> <tr>
<td><%= mat.name %></td> <td><%= link_to "Mat #{mat.name}", mat %></td>
<td>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
<%= link_to 'Show', mat, :class=>"btn btn-default btn-sm" %> <td>
<%= link_to 'Destroy', mat, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger btn-sm" %> <%= link_to '', mat, method: :delete, data: { confirm: "Are you sure you want to delete Mat #{mat.name}?" }, :class=>"fas fa-trash-alt" %>
</td>
<% end %> <% end %>
</td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>

19
app/views/weights/show.html.erb
View File

@@ -1,15 +1,12 @@
<h3>Weight Class:<%= @weight.max %> <% if can? :manage, @tournament %><%= link_to " Edit", edit_weight_path(@weight), :class=>"fas fa-edit" %><% end %></h3>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
<%= link_to "Edit #{@weight.max} Weight Class", edit_weight_path(@weight), :class=>"btn btn-primary" %> |
<%= form_for(@weight, url: regen_weight_path(@weight.id), :method => "post") do |f| %> <%= form_for(@weight, url: regen_weight_path(@weight.id), :method => "post") do |f| %>
<%= submit_tag "Regenerate Weight Class Matches", :class=>"btn btn-default"%> <%= submit_tag "Regenerate Weight Class Matches", :class=>"btn btn-sm btn-default"%>
<% end %> <% end %>
<% end %> <% end %>
<br>
<h1>Weight Class:<%= @weight.max %></h1>
<br> <br>
<br> <br>
<table class="table table-striped table-bordered table-condensed"> <table class="table table-hover table-condensed">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
@@ -18,7 +15,6 @@
<th>Record</th> <th>Record</th>
<th>Seed Criteria</th> <th>Seed Criteria</th>
<th>Extra?</th> <th>Extra?</th>
<% if can? :manage, @tournament %><th>Actions for wrestler</th><% end %>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -26,7 +22,7 @@
<% @wrestlers.sort_by{|w| [w.original_seed ? 0 : 1, w.original_seed || 0]}.each do |wrestler| %> <% @wrestlers.sort_by{|w| [w.original_seed ? 0 : 1, w.original_seed || 0]}.each do |wrestler| %>
<% if wrestler.weight_id == @weight.id %> <% if wrestler.weight_id == @weight.id %>
<tr> <tr>
<td><%= wrestler.name %></td> <td><%= link_to "#{wrestler.name}", wrestler %></td>
<td><%= wrestler.school.name %></td> <td><%= wrestler.school.name %></td>
<td> <td>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
@@ -43,8 +39,9 @@
Yes Yes
<% end %></td> <% end %></td>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
<td><%= link_to 'Show', wrestler , :class=>"btn btn-default btn-sm" %> <td>
<%= link_to 'Destroy', wrestler, method: :delete, data: { confirm: 'Are you sure?' } , :class=>"btn btn-danger btn-sm" %></td> <%= link_to '', wrestler, method: :delete, data: { confirm: "Are you sure you want to delete #{wrestler.name}?" } , :class=>"fas fa-trash-alt" %>
</td>
<% end %> <% end %>
</tr> </tr>
<% end %> <% end %>
@@ -54,7 +51,7 @@
<br><p>*All wrestlers without a seed (determined by tournament director) will be assigned a random seed.</p> <br><p>*All wrestlers without a seed (determined by tournament director) will be assigned a random seed.</p>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
<br> <br>
<%= submit_tag "Save", :class=>"btn btn-success"%> <%= submit_tag "Save Seeds", :class=>"btn btn-success"%>
<% end %> <% end %>
<% end %> <% end %>

12
app/views/wrestlers/show.html.erb
View File

@@ -1,17 +1,11 @@
<%= link_to "Back to #{@school.name}", "/schools/#{@school.id}", :class=>"btn btn-sm btn-default" %>
<%= link_to "Back to #{@school.name}", "/schools/#{@school.id}", :class=>"btn btn-default" %>
<% if can? :manage, @school %>
| <%= link_to "Edit #{@wrestler.name}", edit_wrestler_path(@wrestler), :class=>"btn btn-primary" %>
<% end %>
<% cache ["#{@wrestler.id}", @wrestler] do %>
<br> <br>
<br> <br>
<p> <p>
<strong>Name:</strong> <strong>Name:</strong>
<%= @wrestler.name %> <%= @wrestler.name %> <% if can? :manage, @school %><%= link_to " Edit", edit_wrestler_path(@wrestler), :class=>"fas fa-edit" %><% end %>
</p> </p>
<% cache ["#{@wrestler.id}", @wrestler] do %>
<p> <p>
<strong>School:</strong> <strong>School:</strong>
<%= @wrestler.school.name %> <%= @wrestler.school.name %>