1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-14 08:58:29 +00:00

The rest of 1-21 changes. Mostly visual flow between tournament school and wrestlers

This commit is contained in:
Jacob Cody Wimer
2014-01-21 21:43:48 -05:00
parent 1112699025
commit 73d22a126a
10 changed files with 62 additions and 24 deletions

View File

@@ -10,9 +10,7 @@
<body>
<%= render 'layouts/header' %>
<div class="container">
<% flash.each do |key, value| %>
<div class="alert alert-<%= key %>"><%= value %></div>
<% end %>
<%= yield %>
<%= render 'layouts/footer' %>
<%= debug(params) if Rails.env.development? %>

View File

@@ -19,6 +19,19 @@
<%= f.label :score %><br>
<%= f.number_field :score %>
</div>
<% if @school %>
<%= f.hidden_field :tournament_id, :value => @tournament %>
<% else %>
<div class="field">
<%= f.label 'Tournament' %><br>
<%= f.collection_select :tournament_id, Tournament.all, :id, :name %>
</div>
<% end %>
<div class="actions">
<%= f.submit %>
</div>

View File

@@ -10,6 +10,11 @@
<%= @school.score %>
</p>
<p>
<strong>Tournament:</strong>
<%= Tournament.find(@school.tournament_id).name %>
</p>
<%= link_to "Edit #{@school.name}", edit_school_path(@school) %> |
<%= link_to 'Back to Schools', schools_path %> |
<%= link_to 'Back to Admin', '/admin/index' %>

View File

@@ -1,7 +1,25 @@
<h1>CCHS Wrestling</h1>
<h3>1st Annual Comet Classic</h3>
<p>Central Crossing High School</p>
<p>4500 Big Run South Rd, Grove City, OH</p>
<h1>Pick A Tournament</h1>
<%= link_to 'New Tournament', new_tournament_path, :class=>"btn" %>
</br>
</br>
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>Name</th>
<th></th>
</tr>
</thead>
<tbody>
<% @tournaments.each do |tournament| %>
<tr>
<td><%= tournament.name %></td>
<td><%= link_to 'Show', tournament, :class=>"btn" %><%= link_to 'Edit', edit_tournament_path(tournament), :class=>"btn" %><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' }, :class=>"btn btn-danger" %></td>
</tr>
<% end %>
</tbody>
</table>
<br>
<br>
<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q=Central+Crossing+High+School,+Big+Run+South+Road,+Grove+City,+OH&amp;aq=0&amp;oq=central+crossing&amp;sll=40.365277,-82.669252&amp;sspn=4.888292,10.821533&amp;t=h&amp;ie=UTF8&amp;hq=Central+Crossing+High+School,+Big+Run+South+Road,+Grove+City,+OH&amp;ll=39.89637,-83.113117&amp;spn=0.019228,0.042272&amp;z=14&amp;iwloc=A&amp;cid=10210402163347601240&amp;output=embed"></iframe><br /><small><a href="https://maps.google.com/maps?f=q&amp;source=embed&amp;hl=en&amp;geocode=&amp;q=Central+Crossing+High+School,+Big+Run+South+Road,+Grove+City,+OH&amp;aq=0&amp;oq=central+crossing&amp;sll=40.365277,-82.669252&amp;sspn=4.888292,10.821533&amp;t=h&amp;ie=UTF8&amp;hq=Central+Crossing+High+School,+Big+Run+South+Road,+Grove+City,+OH&amp;ll=39.89637,-83.113117&amp;spn=0.019228,0.042272&amp;z=14&amp;iwloc=A&amp;cid=10210402163347601240" style="color:#0000FF;text-align:left">View Larger Map</a></small>