From 0f6489cdfcc1c75500a66bc906a13b98629e0617 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Sun, 27 Apr 2014 21:01:25 -0400 Subject: fixed username for alerts and made tournament listings btter --- app/views/alerts/index.html.erb | 2 +- app/views/common/_show_tournament.html.erb | 8 +++++--- 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| %> - <%= alert.author %> + <%= alert.author.user_name %> <%= alert.message %> <%= link_to 'Show', alert %> <%= link_to 'Edit', edit_alert_path(alert) %> 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 %> - - <%= submit_tag("Join")%> - <% end %> +

+ + <%= submit_tag("Join")%> + <% end %> +

<% else %>

You've signed up for this tournament!

<% end %> -- cgit v1.2.3