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

Removed sidebars, added tournament navbar, and removed chitika ads

Browse Source
This commit is contained in:
Jacob Cody Wimer
2019-01-23 16:05:34 +00:00
parent 19f10ec80b
commit 0be27f05fd
20 changed files with 81 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/tournaments_controller.rb
View File

@@ -166,10 +166,6 @@ class TournamentsController < ApplicationController
GenerateTournamentMatches.new(@tournament).generate GenerateTournamentMatches.new(@tournament).generate
end end
def brackets
@weights = @tournament.weights.sort_by{|w| w.max}
end
def team_scores def team_scores
@schools = @tournament.schools @schools = @tournament.schools
@schools = @schools.sort_by{|s| s.page_score_string}.reverse! @schools = @schools.sort_by{|s| s.page_score_string}.reverse!

9
app/views/layouts/_analytics.html.erb Normal file
View File

@@ -0,0 +1,9 @@
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-64366913-2', 'auto');
ga('send', 'pageview');
</script>

77
app/views/layouts/_lsidebar.html.erb
View File

@@ -1,77 +0,0 @@
<!-- sidebar -->
<% if @tournament %>
<div class="" style="padding-right: 1%;">
<h4>Tournament Links</h4>
<ul>
<li><%= link_to "Tournament home" , "/tournaments/#{@tournament.id}/" %></li>
<li><%= link_to "Brackets" , "/tournaments/#{@tournament.id}/brackets" %></li>
<li><%= link_to "Bout Board" , "/tournaments/#{@tournament.id}/up_matches" %></li>
<li><%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %></li>
</ul>
</div>
<% if can? :manage, @tournament %>
<br><br>
<div class="" style="padding-right: 1%;">
<h4>Tournament Director Links</h4>
<br><strong>Pages</strong><br>
<br><%= link_to "Weigh In Page" , "/tournaments/#{@tournament.id}/weigh_in" %>
<br><%= link_to "All Matches" , "/tournaments/#{@tournament.id}/matches" %>
<br><%= link_to "Full Screen Bout Board" , "/tournaments/#{@tournament.id}/up_matches?print=true" , target: :_blank %>
<br>Bout Sheets: <ul>
<% if @tournament.total_rounds > 0 %>
<% 1.upto(@tournament.total_rounds) do |round| %>
<li><%= link_to "Round #{round}" , "/tournaments/#{@tournament.id}/bout_sheets?round=#{round}&print=true" , target: :_blank %></li>
<% end %>
<% end %>
<li><%= link_to "All Rounds" , "/tournaments/#{@tournament.id}/bout_sheets?round=All&print=true" , target: :_blank %></li>
</ul>
<br><%= link_to "Deduct Team Points" , "/tournaments/#{@tournament.id}/teampointadjust" %>
<% if can? :destroy, @tournament %>
<br><%= link_to "Tournament Delegation" , "/tournaments/#{@tournament.id}/delegate" %>
<% end %>
<br><%= link_to "School Delegation" , "/tournaments/#{@tournament.id}/school_delegate"%>
<br><br><strong>Time Savers</strong><br>
<br><%= link_to "Create High School Weights" , "/tournaments/#{@tournament.id}/create_custom_weights?customValue=hs",data: { confirm: 'Are you sure? This will delete all current weights.' } %>
<br><br><strong>Tournament Actions</strong><br>
<br><%= link_to "Generate Brackets" , "/tournaments/#{@tournament.id}/generate_matches", data: { confirm: 'Are you sure? This will delete all current matches.' } %>
</div>
<% end %>
<% end %>
<br>
<% if Rails.env.production? %>
<div class="adLNav">
<script type="text/javascript">
if(WURFL.is_mobile){
//Mobile and tablet ad
(function (){
if(window.CHITIKA===undefined) {window.CHITIKA = {'units' :[]};};
var unit = {"calltype":"async[2]","publisher":"cwimer","width":468,"height":60,"sid":"Chitika Default"};
var placement_id = window.CHITIKA.units.length;
window.CHITIKA.units.push(unit);
document.write('<div id="chitikaAdBlock-' + placement_id + '"></div>');
}());
} else {
//Desktop ad
(function (){
if(window.CHITIKA===undefined) {window.CHITIKA = {'units' :[]};};
var unit = {"calltype":"async[2]","publisher":"cwimer","width":160,"height":160,"sid":"Chitika Default"};
var placement_id = window.CHITIKA.units.length;
window.CHITIKA.units.push(unit);
document.write('<div id="chitikaAdBlock-' + placement_id + '"></div>');
}());
}
</script>
<script type="text/javascript" src="//cdn.chitika.net/getads.js" async></script>
</div>
<% end %>

49
app/views/layouts/_tournament-navbar.html.erb Normal file
View File

@@ -0,0 +1,49 @@
<% if @tournament %>
<nav class="navbar navbar-default navbar-lower" role="navigation">
<div class="container">
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><%= link_to "#{@tournament.name} Home" , "/tournaments/#{@tournament.id}/" %></li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Brackets
<span class="caret"></span></a>
<ul class="dropdown-menu">
<% @tournament.weights.sort_by{|weight| weight.max }.each do |weight| %>
<li><%= link_to "#{weight.max}" , "/tournaments/#{@tournament.id}/brackets/#{weight.id}" %></li>
<% end %>
<li><%= link_to "All Brackets (Printable)", "/tournaments/#{@tournament.id}/all_brackets?print=true", target: :_blank %></li>
</ul>
</li>
<li><%= link_to "Bout Board" , "/tournaments/#{@tournament.id}/up_matches" %></li>
<li><%= link_to "Team Scores" , "/tournaments/#{@tournament.id}/team_scores" %></li>
<% if can? :manage, @tournament %>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#director">Tournament Director Links
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><strong>Pages</strong></li>
<li><%= link_to "Weigh In Page" , "/tournaments/#{@tournament.id}/weigh_in" %></li>
<li><%= link_to "All Matches" , "/tournaments/#{@tournament.id}/matches" %></li>
<li><%= link_to "Full Screen Bout Board" , "/tournaments/#{@tournament.id}/up_matches?print=true" , target: :_blank %></li>
<li><%= link_to "Deduct Team Points" , "/tournaments/#{@tournament.id}/teampointadjust" %></li>
<% if can? :destroy, @tournament %>
<li><%= link_to "Tournament Delegation" , "/tournaments/#{@tournament.id}/delegate" %></li>
<% end %>
<li><%= link_to "School Delegation" , "/tournaments/#{@tournament.id}/school_delegate"%></li>
<% if @tournament.total_rounds > 0 %>
<li><strong>Printable Bout Sheets</strong></li>
<% 1.upto(@tournament.total_rounds) do |round| %>
<li><%= link_to "Print Round #{round}" , "/tournaments/#{@tournament.id}/bout_sheets?round=#{round}&print=true" , target: :_blank %></li>
<% end %>
<% end %>
<li><strong>Time Savers</strong></li>
<li><%= link_to "Create High School Weights (106-285)" , "/tournaments/#{@tournament.id}/create_custom_weights?customValue=hs",data: { confirm: 'Are you sure? This will delete all current weights.' } %></li>
<li><strong>Tournament Actions</strong></li>
<li><%= link_to "Generate Brackets" , "/tournaments/#{@tournament.id}/generate_matches", data: { confirm: 'Are you sure? This will delete all current matches.' } %></li>
</ul>
<% end %>
</ul>
</div>
</div>
</nav>
<% end %>

23
app/views/layouts/_rsidebar.html.erb → app/views/layouts/_underheader.html.erb
View File

@@ -1,27 +1,6 @@
<% if Rails.env.production? %> <% if Rails.env.production? %>
<div class="adRnav"> <div class="adRnav">
<script type="text/javascript">
if(WURFL.is_mobile){
//Mobile and tablet ad
(function (){
if(window.CHITIKA===undefined) {window.CHITIKA = {'units' :[]};};
var unit = {"calltype":"async[2]","publisher":"cwimer","width":468,"height":60,"sid":"Chitika Default"};
var placement_id = window.CHITIKA.units.length;
window.CHITIKA.units.push(unit);
document.write('<div id="chitikaAdBlock-' + placement_id + '"></div>');
}());
} else {
//Desktop ad
(function (){
if(window.CHITIKA===undefined) {window.CHITIKA = {'units' :[]};};
var unit = {"calltype":"async[2]","publisher":"cwimer","width":120,"height":600,"sid":"Chitika Default"};
var placement_id = window.CHITIKA.units.length;
window.CHITIKA.units.push(unit);
document.write('<div id="chitikaAdBlock-' + placement_id + '"></div>');
}());
}
</script>
<script type="text/javascript" src="//cdn.chitika.net/getads.js" async></script>
</div> </div>
<% end %> <% end %>
<div class="afs_ads">&nbsp;</div> <div class="afs_ads">&nbsp;</div>

26
app/views/layouts/application.html.erb
View File

@@ -14,16 +14,7 @@
<head> <head>
<title>WrestlingDev</title> <title>WrestlingDev</title>
<% if Rails.env.production? %> <% if Rails.env.production? %>
<script> <%= render layouts/analytics %>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-64366913-2', 'auto');
ga('send', 'pageview');
</script>
<% end %> <% end %>
<%= stylesheet_link_tag "application", media: "all", <%= stylesheet_link_tag "application", media: "all",
"data-turbolinks-track" => true %> "data-turbolinks-track" => true %>
@@ -38,23 +29,22 @@
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
<div id="page-content"> <div id="page-content">
<div class="row">
<%= render 'layouts/tournament-navbar' %>
</div>
<div class="row">
<div class="col-md-12"><%= render 'layouts/underheader' %></div>
</div>
<div class="row no-margin"> <div class="row no-margin">
<div class="col-md-2"> <div class="col-md-12" style="padding-left: 2%;">
<%= render 'layouts/lsidebar' %>
</div>
<div class="col-md-8" style="padding-left: 2%;">
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<div id="view"><%= yield %></div> <div id="view"><%= yield %></div>
</div> </div>
<div class="col-md-2" >
<%= render 'layouts/rsidebar' %>
</div>
</div> </div>
</div> </div>
<%= render 'layouts/footer' %> <%= render 'layouts/footer' %>
</div> </div>
</body> </body>
<% end %> <% end %>
</html> </html>

4
app/views/mats/edit.html.erb
View File

@@ -1,5 +1,3 @@
<h1>Editing mat</h1> <h1>Editing mat</h1>
<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Back', "/tournaments/#{@tournament.id}" %>

2
app/views/mats/new.html.erb
View File

@@ -1,5 +1,3 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<h1>New mat</h1> <h1>New mat</h1>
<%= render 'form' %> <%= render 'form' %>

2
app/views/schools/edit.html.erb
View File

@@ -1,5 +1,3 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<h1>Editing school</h1> <h1>Editing school</h1>
<br> <br>
<br> <br>

2
app/views/schools/new.html.erb
View File

@@ -1,5 +1,3 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<h1>New school</h1> <h1>New school</h1>
<br> <br>
<br> <br>

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

@@ -1,9 +1,7 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}",:class=>"btn btn-default" %>
<% if can? :manage, @school %> <% if can? :manage, @school %>
| <%= link_to "Edit #{@school.name}", edit_school_path(@school),:class=>"btn btn-primary" %> <%= link_to "Edit #{@school.name}", edit_school_path(@school),:class=>"btn btn-primary" %> |
<% end %> <% end %>
| <%= link_to "#{@school.name} Stat Summary", "/schools/#{@school.id}/stats",:class=>"btn btn-primary" %> <%= link_to "#{@school.name} Stat Summary", "/schools/#{@school.id}/stats",:class=>"btn btn-primary" %>
<br> <br>
<br> <br>
<p> <p>

2
app/views/tournaments/_fourPoolQuarterBracket.html.erb
View File

@@ -17,7 +17,7 @@
<li>&nbsp;</li> <li>&nbsp;</li>
<li class="game game-top "><%= match.w1_name %> <span></span></li> <li class="game game-top "><%= match.w1_name %> <span></span></li>
<li><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li> <li class="bout-number"><%= match.bout_number %> <%= match.bracket_score_string %>&nbsp;</li>
<li class="game game-bottom "><%= match.w2_name %><span></span></li> <li class="game game-bottom "><%= match.w2_name %><span></span></li>
<li>&nbsp;</li> <li>&nbsp;</li>

8
app/views/tournaments/all_brackets.html.erb
View File

@@ -6,11 +6,11 @@
border: none; border: none;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
width: 7in; /* width: 7in; */ width: 8in; /* width: 7in; */
height: 9.5in; /* or height: 9.5in; */ height: 9.5in; /* or height: 9.5in; */
font-size: 10px; font-size: 8px;
position: relative; position: relative;
left: 1in; left: 0in;
height: 1in; height: 1in;
} }
/* /*
@@ -70,7 +70,7 @@ li:first-child,li:last-child {
<table class='pagebreak'> <table class='pagebreak'>
<h5><strong><%= @tournament.name %> - <%= w.max %> lbs Bracket</strong></h5> <h5><strong><%= @tournament.name %> - <%= w.max %> lbs Bracket</strong></h5>
<tr> <tr>
<td valign="top" style="padding: 10px;"> <td valign="top" style="padding: 0px;">
<% @weight = w %> <% @weight = w %>
<% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %> <% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
<% @wrestlers = Wrestler.where(weight_id: @weight.id) %> <% @wrestlers = Wrestler.where(weight_id: @weight.id) %>

10
app/views/tournaments/bracket.html.erb
View File

@@ -43,6 +43,9 @@ li:first-child,li:last-child {
border-right:1px solid #aaa; min-height:30px; border-right:1px solid #aaa; min-height:30px;
} }
.bout-number + li {
valign: center;
}
.bracket-winner { .bracket-winner {
border-bottom:1px solid #aaa; border-bottom:1px solid #aaa;
} }
@@ -52,13 +55,6 @@ li:first-child,li:last-child {
} }
</style> </style>
<% cache ["#{@weight.id}_bracket", @weight] do %> <% cache ["#{@weight.id}_bracket", @weight] do %>
</br>
</br>
</br>
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<br>
<table class='pagebreak'> <table class='pagebreak'>
<h5><strong><%= @tournament.name %> - <%= @weight.max %> lbs Bracket</strong></h5> <h5><strong><%= @tournament.name %> - <%= @weight.max %> lbs Bracket</strong></h5>
<tr> <tr>

10
app/views/tournaments/brackets.html.erb
View File

@@ -1,10 +0,0 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<br>
<% @weights.each do |weight| %>
<%= link_to "#{weight.max}" , "/tournaments/#{@tournament.id}/brackets/#{weight.id}" %>
<br>
<% end %>
<% if can? :manage, @tournament %>
<%= link_to "All Brackets (Printable)", "/tournaments/#{@tournament.id}/all_brackets?print=true", target: :_blank %>
<% end %>

2
app/views/weights/edit.html.erb
View File

@@ -1,5 +1,3 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<h1>Editing weight</h1> <h1>Editing weight</h1>
<%= render 'form' %> <%= render 'form' %>

2
app/views/weights/new.html.erb
View File

@@ -1,5 +1,3 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<br>
<h1>New weight</h1> <h1>New weight</h1>
<%= render 'form' %> <%= render 'form' %>

2
app/views/weights/re_gen.html.erb
View File

@@ -1,3 +1 @@
<%= link_to "Back to #{@weight.tournament.name}", "/tournaments/#{@weight.tournament.id}", :class=>"btn btn-default" %>
<br><br>
<%= @weight.max %> lbs Matches are being generated. This can take anywhere from 1-5 minutes to finish. It is recommended to delete all delegated school permissions to prevent lineup changes after the tournament has started. <%= @weight.max %> lbs Matches are being generated. This can take anywhere from 1-5 minutes to finish. It is recommended to delete all delegated school permissions to prevent lineup changes after the tournament has started.

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

@@ -1,11 +1,7 @@
<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
<% if can? :manage, @tournament %> <% if can? :manage, @tournament %>
| <%= link_to "Edit #{@weight.max} Weight Class", edit_weight_path(@weight), :class=>"btn btn-primary" %> <%= 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"%> <%= submit_tag "Regenerate Weight Class Matches", :class=>"btn btn-default"%>
<% end %> <% end %>
<% end %> <% end %>

1
config/routes.rb
View File

@@ -32,7 +32,6 @@ Wrestling::Application.routes.draw do
get 'tournaments/:id/weigh_in' => 'tournaments#weigh_in' get 'tournaments/:id/weigh_in' => 'tournaments#weigh_in'
get 'tournaments/:id/create_custom_weights' => 'tournaments#create_custom_weights' get 'tournaments/:id/create_custom_weights' => 'tournaments#create_custom_weights'
get 'tournaments/:id/all_brackets' => 'tournaments#all_brackets' get 'tournaments/:id/all_brackets' => 'tournaments#all_brackets'
get 'tournaments/:id/brackets' => 'tournaments#brackets'
get 'tournaments/:id/brackets/:weight' => 'tournaments#bracket', :as => :weight_bracket get 'tournaments/:id/brackets/:weight' => 'tournaments#bracket', :as => :weight_bracket
get 'tournaments/:id/generate_matches' => 'tournaments#generate_matches' get 'tournaments/:id/generate_matches' => 'tournaments#generate_matches'
get 'tournaments/:id/team_scores' => 'tournaments#team_scores' get 'tournaments/:id/team_scores' => 'tournaments#team_scores'