summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-03-03 11:40:05 -0500
committerAndrewMurrell <amurrel@purdue.edu>2014-03-03 11:40:05 -0500
commitd220b5f8e86d1c8b4503948c09f2497d11710d98 (patch)
treea4240880516a0f07d21e33a81050e6f7c5019c55 /app/views
parent399543c7ad0577afa2c840b1e39e368acfcb0076 (diff)
Some of the stuff I forgot to commit last night. Updated and cleaned up some pages as well as getting the gameType listing to work.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/application.html.erb1
-rw-r--r--app/views/tournaments/index.html.erb8
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8a81c0a..3910cf6 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,6 +5,7 @@
<%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
<%= csrf_meta_tags %>
+ <%= yield :head %>
</head>
<body>
<div role="navigation" class="navbar navbar-inverse">
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 8ab3c15..7810b50 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -1,9 +1,9 @@
<h1>Listing tournaments</h1>
-<table class="table table-hover">
+<table>
<thead>
<tr>
- <th>Game</th>
+ <th></th>
<th></th>
<th></th>
<th></th>
@@ -13,7 +13,7 @@
<tbody>
<% @tournaments.each do |tournament| %>
<tr>
- <td><%= %></td>
+ <td><%= tournament.game %></td>
<td><%= link_to 'Show', tournament %></td>
<td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
<td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td>
@@ -24,4 +24,4 @@
<br>
-<%= link_to 'New Tournament', new_tournament_path, :class => "btn btn-warning" %>
+<%= link_to 'New Tournament', new_tournament_path, :class => "btn btn-warning btn-lg" %>