diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:40:14 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:40:14 -0500 |
| commit | 7f9720bf101e0c8ef3d2869b76a1fae098f4f3ee (patch) | |
| tree | 8a56846b5b2f538af3e60aa5938a66928d5405f4 /app/views | |
| parent | f959591c62d7e66454f676d9c2a9abdd6fac3a7f (diff) | |
| parent | 3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (diff) | |
Merge branch 'master' of github.com:LukeShu/leaguer
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/tournaments/join.html.erb | 2 | ||||
| -rw-r--r-- | app/views/tournaments/show.html.erb | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/app/views/tournaments/join.html.erb b/app/views/tournaments/join.html.erb new file mode 100644 index 0000000..1d38d68 --- /dev/null +++ b/app/views/tournaments/join.html.erb @@ -0,0 +1,2 @@ + <%= @user.name %> + diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 0cda6c1..c3a40e7 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -1,10 +1,11 @@ <% if @tournament.joinable_by?(current_user) %> <%= form_tag(tournament_path(@tournament), method: "put") do %> <input type="hidden" name="update_action" value="join"> - <%= submit_tag("Join") %> + <%= current_user.name %><%= submit_tag("Join") %> <% end %> <% end %> +<% if current_user.in_group?(:host) %> <p> <strong>Game:</strong> <%= @tournament.game %> @@ -45,5 +46,18 @@ <%= @tournament.randomized_teams %> </p> +<p> + <strong>Status:</strong> + <%= @tournament.status %> +</p> + +<%= form_tag(tournaments_path.to_s + "/" + @tournament.id.to_s + "/edit", method: "get") do %> + <input type="hidden" name="close_action" value="close"> + <%= submit_tag("Close Tournament Registration") %> +<% end %> + <%= link_to 'Edit', edit_tournament_path(@tournament) %> | <%= link_to 'Back', tournaments_path %> + +<% end %> + |