I REALLY hope I'm not overwriting anything

Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/custom.css.scss

3 files changed, 42 insertions, 27 deletions

diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 302283d..3b14404 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -1,25 +1,5 @@
-<form accept-charset="UTF-8" action="/users" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="authenticity_token" type="hidden" value="6WQoPLFISlDYCsi4LhAgT0hgrht19yydD3w5TlKfb7I=" /></div>
-  <p>
-    <label for="GameType">Game</label><br>
-    <input id="GameType" name="League of Legends" type="text" />
-  </p>
- <p>
-    <label for="players_per_team">Number of Players</label><br>
-    <input id="players_per_team" name="5" type="text" />
-  </p>
-  <p>
-    <label for="teams_per_match">Teams per Match</label><br>
-    <input id="teams_per_match" name="2" type="text" />
-  </p>
-   <p>
-    <label for="set_rounds">Set Number of Rounds?</label><br>
-    <input id="set_rounds" name="1" type="text" />
-  </p>
-  <p>
-    <label for="randomized_teams">Randomized Teams?</label><br>
-    <input id="randomized_teams" name="0" type="text" />
-  </p>
-  <p>
-    <input name="create" type="submit" value="Create Tournament" />
-  </p>
-</form>
\ No newline at end of file
+
+  <%= content_tag(:p, "Hello World") %>
+
+
+<%= tag(:label, for: 'GameType') %>
\ No newline at end of file
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
new file mode 100644
index 0000000..26d0643
--- /dev/null
+++ b/app/views/tournaments/index.html.erb
@@ -0,0 +1,27 @@
+<h1>Listing tournaments</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Tournament ID</th>
+      <th>Show Tournament</th>
+      <th>Edit Tournament</th>
+      <th>Delete Tournament</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @tournaments.each do |tournament| %>
+      <tr>
+        <td><%= tournament.id %></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>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Tournament',  new_tournament_path, :class => "btn btn-warning btn-lg" %>
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index f1dec90..a6dfa4d 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -1,11 +1,19 @@
+<%= javascript_include_tag :defaults %>
+
 <h1>New tournament</h1>
 
-<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %>
+<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> <%= link_to 'Select', 'new?game=1', :class => "btn btn-warning btn-lg" %>
+
+
 
 <br />
 <div id='ajax-form'>
-	<% render :partial => "selected" %>
+	<% if not @game.nil? %>
+		<%= render 'selected' %>
+	<% end %>
 </div>
 <br /><br />
 
+<%= link_to 'Select', 'selected', :class => "btn btn-warning btn-lg" %>
+
 <%= link_to 'Back', tournaments_path %>