Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/johnhutch/GameNight
Browse files Browse the repository at this point in the history
  • Loading branch information
johnhutch committed Mar 24, 2013
2 parents 0585159 + f5a3b9d commit a1bce2f
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion app/views/nights/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,19 @@
</section>

<section id="games" class="games column">
<h3>Your Game Night's collection</h3>
<h3><%= @night.name %>'s game collection</h3>
<ul>
<% for game in night_game_union(@night) do %>
<li><%= game.name %></li>
<% end %>
</ul>
</section>

<section id="invites" class="column">
<h3>Invite your friends to join <%= @night.name %></h3>
<ul>
<% for friend in current_user.friends do %>
<li><%= friend.name %><%= link_to "Add friend to #{@night.name}", "#", :class=> "btn" %></li>
<% end %>
</ul>
</section>

0 comments on commit a1bce2f

Please sign in to comment.