From 1d509d6109c402545e08917e65fd09b471553900 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 28 Apr 2014 11:06:04 -0400 Subject: tidy various forms and inline CSS --- app/views/common/_show_tournament.html.erb | 12 +- app/views/common/_show_user.html.erb | 4 +- app/views/servers/_form.html.erb | 29 +++-- app/views/tournaments/_form.html.erb | 173 +++++++++++++---------------- 4 files changed, 98 insertions(+), 120 deletions(-) diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb index 454377e..826eeaa 100644 --- a/app/views/common/_show_tournament.html.erb +++ b/app/views/common/_show_tournament.html.erb @@ -6,18 +6,18 @@
<%# "header" %> <%= link_to(target) do %>

<%= target.name %>

<% end %> -
+
<%= image_tag('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=45&d=identicon') %> <%= target.hosts.first.name %>'s tournament
-

Players per team: <%= target.min_players_per_team %>

-

Players signed up: <%= target.players.count %>

+

Players per team: <%= target.min_players_per_team %>

+

Players signed up: <%= target.players.count %>

-

<%# (target.randomized_teams)? "Teams are Random" : "Teams are Chosen" %>

-

Players signed up: <%= target.players.count %>

+

<%# (target.randomized_teams)? "Teams are Random" : "Teams are Chosen" %>

+

Players signed up: <%= target.players.count %>

@@ -31,7 +31,7 @@ <% end %>

<% elsif target.players.include?(current_user)%> -

You've signed up for this tournament!

+

You've signed up for this tournament!

<% end %> <% if target.status == 1 && target.stages.first.scheduling_method == "elimination" && target.stages.first.matches.first.status == 0 %> <%= form_tag(tournament_brackets_path(target), method: "post") do %> diff --git a/app/views/common/_show_user.html.erb b/app/views/common/_show_user.html.erb index dd136a0..e442474 100644 --- a/app/views/common/_show_user.html.erb +++ b/app/views/common/_show_user.html.erb @@ -6,7 +6,7 @@ <%# "header" %> <%= link_to(target) do %>

<%= target.user_name %>

<% end %> -
+

Preferred Name:

<%= target.name %>

@@ -21,4 +21,4 @@
-
\ No newline at end of file +
diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb index 8853a80..fd887f3 100644 --- a/app/views/servers/_form.html.erb +++ b/app/views/servers/_form.html.erb @@ -1,19 +1,16 @@ <%= form_for(@server) do |f| %> - <%= render "common/error_messages", :target => @server %> + <%= render "common/error_messages", :target => @server %> -
- Default permissions for new users - -
-

-

- <%= f.submit %> -
-

+ <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %> +
+ Default permissions for new users + +
+ <% end %> + + <%= f.submit %> <% end %> diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index 38f01ee..0937fd2 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -1,9 +1,5 @@ <%= render "common/error_messages", :target => @tournament %>
- - Attributes - - <%= form_for(@tournament, url: new_tournament_path, method: "get") do |f| %> <%= render "common/error_messages", :target => @tournament %>

@@ -13,113 +9,98 @@

<% end %> - <% if @tournament.game.nil? %>
-<% else %> +<% if @tournament.game %> <%= form_for(@tournament, url: tournaments_path, method: "post") do |f| %> - <%= f.hidden_field(:game_id) %> -

- <%= f.label :name %> - <%= f.text_field :name %> -

-
+
+ Attributes + + <%= f.hidden_field(:game_id) %>

- - - - - - - - - - - - - -
MinimumMaximum
Players per team: <%= f.text_field(:min_players_per_team, type: :number, min: 1) %><%= f.text_field(:max_players_per_team, type: :number, min: 1) %>
+ <%= f.label :name %> + <%= f.text_field :name %>

-
-
-

- +
+ + + + + + + + + + + - - + + -
MinimumMaximum
Players per team: <%= f.text_field(:min_players_per_team, type: :number, min: 1) %><%= f.text_field(:max_players_per_team, type: :number, min: 1) %>
Teams per match: <%= f.text_field(:min_teams_per_match, type: :number, min: 1) %><%= f.text_field(:max_teams_per_match, type: :number, min: 1) %><%= f.text_field(:min_teams_per_match, type: :number, min: 1) %><%= f.text_field(:max_teams_per_match, type: :number, min: 1) %>
-

-
+ + -

- <%= f.label :scoring_method %> - <%= f.select(:scoring_method, @tournament.scoring_methods.map{|method| [method.humanize.titleize, method]}) %> -

- +

+ <%= f.label :scoring_method %> + <%= f.select(:scoring_method, @tournament.scoring_methods.map{|method| [method.humanize.titleize, method]}) %> +

+ -
- Settings - - <%= f.fields_for :settings do |setting_fields| %> - <% @tournament.tournament_settings.each do |setting| %>

- <%= setting_fields.label setting.name %> -
- <% case setting.vartype %> - <% when 0 %> - <%= setting_fields.text_field( setting.name ) %> - <% when 1 %> - <%= setting_fields.text_area( setting.name ) %> - <% when 2 %> -

- <% when 3 %> - - <% when 4 %> - <%= setting_fields.radio_button( setting.name, "true" ) %> True - <%= setting_fields.radio_button( setting.name, "false" ) %> False - <% when 5 %> - <%= setting_fields.select( setting.name, setting.type_opt.split(',').collect {|opt| opt.humanize.titleize} ) %> +
+ Settings + <%= f.fields_for :settings do |setting_fields| %> + <% @tournament.tournament_settings.each do |setting| %> +

+ <%= setting_fields.label setting.name %> +
+ <% case setting.vartype %> + <% when 0 %> + <%= setting_fields.text_field( setting.name ) %> + <% when 1 %> + <%= setting_fields.text_area( setting.name ) %> + <% when 2 %> +

    + <% setting.type_opt.split(',').each do |option|%> +
    • + <% end %> +
+ <% when 3 %> +
    + <% setting.type_opt.split(',').each do |option|%> +
    • + <% end %> +
+ <% when 4 %> + <%= setting_fields.radio_button( setting.name, "true" ) %> True + <%= setting_fields.radio_button( setting.name, "false" ) %> False + <% when 5 %> + <%= setting_fields.select( setting.name, setting.type_opt.split(',').collect {|opt| opt.humanize.titleize} ) %> + <% end %> +

<% end %> -

<% end %> - <% end %> -
+
- <%= f.fields_for :stages do |stages_fields| %> + <%= f.fields_for :stages do |stages_fields| %>
- - Stages - - - - - <%# stage_fields.submit("Set Stages") %> - <% for i in 1..(params[:num_stages].to_i) do %> -

- <%= stages_fields.fields_for i.to_s do |stage_fields| %> -

- Stage <%= i %> - - <%= stage_fields.label :scheduling_method %> - <%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize, method]}) %> - <%= stage_fields.label :seeding_method %> - <%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize, method]}) %> -
- <% end %> -

- <% end %> + Stages + + + <%# stage_fields.submit("Set Stages") %> + <% for i in 1..(params[:num_stages].to_i) do %> + <%= stages_fields.fields_for i.to_s do |stage_fields| %> +
+ Stage <%= i %> + <%= stage_fields.label :scheduling_method %> + <%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize, method]}) %> + <%= stage_fields.label :seeding_method %> + <%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize, method]}) %> +
+ <% end %> + <% end %>
- <% end %> + <% end %> <%= f.submit %> -- cgit v1.2.3