2 files changed, 28 insertions, 5 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index d862d57..f1019ec 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -1,5 +1,6 @@
-<h1>Listing matches</h1>
+<h1><%= @tournament.name %> Matches</h1>
 
+<!--
 <table>
   <thead>
     <tr>
@@ -30,5 +31,17 @@
 </table>
 
 <br>
+-->
 
-<%= link_to 'New Match', new_tournament_match_path %>
+<SVG version="1.1"
+   baseProfile="full"
+   width="<%= 300 * @matches.count / 2 + 50 %>" height="<%= 200 * @matches.count + 50 %>"
+   xmlns="http://www.w3.org/2000/svg">
+
+   <% @matches.each do |tournament | %>
+    <g class="svg-match" >
+   
+    </g>
+   <% end %>
+
+</SVG>
+\ No newline at end of file
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index cc0f0e3..df85dcf 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -71,10 +71,17 @@
     <input type="hidden" name="update_action" value="join">
     <%= submit_tag("Join Tournamnet") %>
   <% end %>
+
+<% elsif @tournament.players.include?(current_user) %>
+    <%= form_tag(tournament_path(@tournament), method: "put") do %>
+    <input type="hidden" name="update_action" value="leave">
+    <%= submit_tag("Leave Tournamnet") %>
+  <% end %>
 <% end %>
 
 <%# If user is the host, let them start the tournment %>
 <% if @tournament.hosts.include?(current_user) %>
+  
   <%= form_tag(tournaments_path.to_s + "/" + @tournament.id.to_s + "/edit", method: "get") do %>
     <input type="hidden" name="close_action" value="close">
     <% if @tournament.players.count >= @tournament.min_players_per_team * @tournament.min_teams_per_match  %> 
@@ -83,9 +90,12 @@
       <%= submit_tag("Start Tournament", disabled: true) %>
     <% end %>
     <br />
-  <%= link_to 'Edit', edit_tournament_path(@tournament) %> |
-  <%= link_to 'Back', tournaments_path %>
-<% end %>
+    <%= link_to 'Edit', edit_tournament_path(@tournament) %> |
+    <%= link_to 'Back', tournaments_path %> |
+    <%= link_to 'Cancel Tournament', @tournament, method: :delete, data: { confirm: 'Are you sure?' } %>
+  <% end %>
+
+
 <%end %>
 </div>