summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-04-27 21:01:25 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-04-27 21:01:25 -0400
commit0f6489cdfcc1c75500a66bc906a13b98629e0617 (patch)
tree8ccf9591650f3de07463b81e144b1a932a73181f
parente526f5b62b3dc91ca30eb0382c071227b74baddf (diff)
fixed username for alerts and made tournament listings btter
-rw-r--r--app/views/alerts/index.html.erb2
-rw-r--r--app/views/common/_show_tournament.html.erb8
2 files changed, 6 insertions, 4 deletions
diff --git a/app/views/alerts/index.html.erb b/app/views/alerts/index.html.erb
index 1d441a2..c978bea 100644
--- a/app/views/alerts/index.html.erb
+++ b/app/views/alerts/index.html.erb
@@ -15,7 +15,7 @@
<% if !@alerts.nil? %>
<% @alerts.each do |alert| %>
<tr>
- <td><%= alert.author %></td>
+ <td><%= alert.author.user_name %></td>
<td><%= alert.message %></td>
<td><%= link_to 'Show', alert %></td>
<td><%= link_to 'Edit', edit_alert_path(alert) %></td>
diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb
index a1d01d2..151e5d2 100644
--- a/app/views/common/_show_tournament.html.erb
+++ b/app/views/common/_show_tournament.html.erb
@@ -25,9 +25,11 @@
<% if signed_in? %>
<% if !target.players.include?(current_user) %>
<%= form_tag(tournament_path(target), method: "put") do %>
- <input type="hidden" name="update_action" value="join">
- <%= submit_tag("Join")%>
- <% end %>
+ <p>
+ <input type="hidden" name="update_action" value="join">
+ <%= submit_tag("Join")%>
+ <% end %>
+ </p>
<% else %>
<p style="margin-top:10px;"> You've signed up for this tournament! </p>
<% end %>