Merge branch 'master' of https://github.com/LukeShu/leaguer

3 files changed, 16 insertions, 15 deletions

diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb
index a9569b6..280d59d 100644
--- a/app/views/common/_show_tournament.html.erb
+++ b/app/views/common/_show_tournament.html.erb
@@ -1,5 +1,6 @@
 <div class="row tournament-listing">
-	<div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=100&d=mm', class: "t-image") %>
+	<div class="col-md-2 col-sm-3 col-xs-6">
+		<%= image_tag(target.game.name.downcase.tr(" ", "_") + ".png", class: "t-image") %>
 		<p class="t-game"> <%= Game.find(target.game_id).name %></p>
 	</div>
 	<div class="col-md-8 col-sm-7 col-xs-6">
@@ -8,6 +9,7 @@
 		<div class="row" style="margin-left:2%;">
 			<div class="col-md-4 host">
 				Hosted by: <%= target.hosts.first.name %>
+				<%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=45&d=identicon', class: "t-image") %>
 			</div>
 			<div class="col-md-4 things">
 				<p> Players per team: <%= target.min_players_per_team %></p>
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 2212515..e322601 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -7,7 +7,7 @@
 	<p>
 		<%= f.label :game_id, "Select a game type" %>
 		<%= f.select(:game_id, Game.all.map{|game| [game.name, game.id]}) %>
-		<%= submit_tag("Select", :class => "btn") %>
+		<%= f.submit("Select") %>
 	</p>
 
 	<% if @tournament.game.nil? %>
@@ -60,32 +60,31 @@
 
 	<fieldset><legend style="color:rgb(221, 145, 37)">Settings</legend>
 	<%= f.fields_for :settings do |setting_fields| %>
-		<% (@tournament.settings.empty? ? @tournament.game.settings : @tournament.settings).each do |setting| %><p>
-			<% name = setting.name.parameterize.underscore %>
-			<%= setting_fields.label name %>
+		<% @tournament.tournament_settings.each do |setting| %><p>
+			<%= setting_fields.label setting.name %>
 			<br>
 			<% case setting.vartype %>
 			<% when 0 %>
-				<%= setting_fields.text_field( name ) %>
+				<%= setting_fields.text_field( setting.name ) %>
 			<% when 1 %>
-				<%= setting_fields.text_area( name ) %>
+				<%= setting_fields.text_area( setting.name ) %>
 			<% when 2 %>
 				<ul>
 				<% setting.type_opt.split(',').each do |option|%>
-					<li><label><%= setting_fields.radio_button( name, option ) %><%= option %></label></li>
+					<li><label><%= setting_fields.radio_button( setting.name, option ) %><%= option.humanize %></label></li>
 				<% end %>
 				</ul>
 			<% when 3 %>
 				<ul>
 				<% setting.type_opt.split(',').each do |option|%>
-					<li><label><%= check_box_tag(name, value = option, checked = false, options = {}) %><%= option %></label></li>
+					<li><label><%= check_box_tag("tournament[settings][#{setting.name}][]", option, setting.value.split(',').include?(option)) %><%= option.humanize %></label></li>
 				<% end %>
 				</ul>
 			<% when 4 %>
-				<%= setting_fields.radio_button( name, "true" ) %> True
-				<%= setting_fields.radio_button( name, "false" ) %> False
+				<%= setting_fields.radio_button( setting.name, "true" ) %> True
+				<%= setting_fields.radio_button( setting.name, "false" ) %> False
 			<% when 5 %>
-				<%= setting_fields.select( name, setting.type_opt.split(',') ) %>
+				<%= setting_fields.select( setting.name, setting.type_opt.split(',') ) %>
 			<% end %>
 		</p><% end %>
 	<% end %>
@@ -93,8 +92,8 @@
 
 	<%= f.fields_for :stages do |stages_fields| %><fieldset><legend style="color:rgb(221, 145, 37)">Stages</legend>
 		<label for="num_stages">Number of tournament stages</label>
-		<input type="number" name="num_stages" min="1" value="<%= params[:num_stages] ? params[:num_stages].to_i : 1 %>">
-		<%# submit_tag("Set Stages", :class => "btn") %>
+		<input type="number" name="num_stages" min="1" value="<%= params[:num_stages].to_i %>">
+		<%# stage_fields.submit("Set Stages") %>
 		<% for i in 1..(params[:num_stages].to_i) do %>
 			<p>
 				<%= stages_fields.fields_for i.to_s do |stage_fields| %><fieldset><legend style="color:rgb(221, 145, 37)">Stage <%= i %></legend>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a67aed9..b408589 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -2,7 +2,7 @@
 <h1> <%= @user.user_name %>'s Profile </h1>
 
 <p>
-  <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %>
+  <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=identicon' %>
 </p>
 
 <p>