diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-22 18:30:11 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-22 18:30:11 -0400 |
| commit | e44115cf206804f7a22c5f98ba422d9c61ad81a7 (patch) | |
| tree | e60532fbbc7639084ca218a196dc4b0e377ba4e7 /app/views | |
| parent | f4373ec761491213a4c5690ef33832f35cbb5e32 (diff) | |
| parent | c0ae56e4974a14433a58951c031d4b4c74f57935 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/matches/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/matches/show.html.erb | 4 | ||||
| -rw-r--r-- | app/views/search/go.html.erb | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 058477a..fda8582 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -37,5 +37,5 @@ <br> <% @tournament.stages_ordered.keys.sort.each do |stage_key| %> - <div class="graph"><%= raw @tournament.stages_ordered[stage_key].to_svg %></div> + <div class="graph"><%= raw @tournament.stages_ordered[stage_key].to_svg(current_user) %></div> <% end %> diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index e7fe791..a1d82a3 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -7,10 +7,6 @@ <%= @match.tournament_stage %> </p> -<p> - <strong>Name:</strong> - <%= @match.name %> -</p> <!-- Match Status 0 => Created, waiting to start Match Status 1 => Match is running, waiting to finish diff --git a/app/views/search/go.html.erb b/app/views/search/go.html.erb index 6d5826f..324fa48 100644 --- a/app/views/search/go.html.erb +++ b/app/views/search/go.html.erb @@ -1,10 +1,11 @@ <%# Show search results if a query was not nill %> <% if !@query.empty? %> - <h3> Showing results for: <span><%= @query %></span></h3> + <% if @tournaments.empty? and @players.empty? %> - <p> No results found for "<%= @query %>" </p> + <h3> No results found for "<%= @query %>" </h3> <% else %> + <h3> Showing results for: <span><%= @query %></span></h3> <% if @tournaments.length > 0 %> <h4> Tournaments </h4> <% end %> |