From b8ce4ab9ad7e6359080e894958a3181cbb3895d2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Apr 2014 20:24:36 -0400 Subject: touch up tournament creation --- app/views/tournaments/_form.html.erb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'app/views') diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index cb4c175..329fc5f 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -7,7 +7,7 @@

<%= 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") %>

<% if @tournament.game.nil? %> @@ -50,32 +50,31 @@
Settings <%= f.fields_for :settings do |setting_fields| %> - <% (@tournament.settings.empty? ? @tournament.game.settings : @tournament.settings).each do |setting| %>

- <% name = setting.name.parameterize.underscore %> - <%= setting_fields.label name %> + <% @tournament.tournament_settings.each do |setting| %>

+ <%= setting_fields.label setting.name %>
<% 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 %>

<% when 3 %> <% 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 %>

<% end %> <% end %> @@ -83,8 +82,8 @@ <%= f.fields_for :stages do |stages_fields| %>
Stages - - <%# submit_tag("Set Stages", :class => "btn") %> + + <%# 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 %> -- cgit v1.2.3-2-g168b From df1cda1faab97f4c424efdcf8b6822f98b73adb8 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Sun, 27 Apr 2014 20:47:31 -0400 Subject: Made some CSS changes all over the website. Added an alert icon.still need ajax to work with it --- app/views/layouts/application.html.erb | 7 +++- app/views/servers/_form.html.erb | 17 +++++---- app/views/tournaments/_form.html.erb | 64 +++++++++++++++++++------------- app/views/tournaments/standings.html.erb | 20 +++++++++- 4 files changed, 70 insertions(+), 38 deletions(-) (limited to 'app/views') diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cf55c18..9eea734 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -28,13 +28,16 @@ <% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> <%= link_to "Messages", pms_path, :class => "signup" %> - <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> <% if current_user.can? :edit_server %> <%= link_to "Server settings", edit_server_path, :class => "server" %> <% end %> <% if current_user.can? :create_alert %> - <%= link_to "Create Alert", new_alert_path, :class => "signin" %> + <%= link_to "Create Alert", new_alert_path, :class => "create-alert" %> <% end %> + <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> + <%= link_to "", alerts_path, :class => "alerts"%> + + <% else %> <%= link_to "Log in", new_session_path, :class => "signin" %> <%= link_to "Sign up", new_user_path, :class => "signup" %> diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb index 1afde11..8853a80 100644 --- a/app/views/servers/_form.html.erb +++ b/app/views/servers/_form.html.erb @@ -1,18 +1,19 @@ <%= form_for(@server) do |f| %> <%= render "common/error_messages", :target => @server %> -
- Default permissions for new users -
    +
    + Default permissions for new users +
      <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %> <% @server.default_user_abilities.keys.each do |ability| %> -
      • +
      • <% end %> <% end %>
    - -
    - <%= f.submit %> -
    +

    +

    + <%= f.submit %> +
    +

    <% end %> diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index cb4c175..2212515 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -3,7 +3,7 @@ method: (@tournament.game.nil? ? "get" : "post")) do |f| %> <%= render "common/error_messages", :target => @tournament %> -
    Attributes +
    Attributes

    <%= f.label :game_id, "Select a game type" %> <%= f.select(:game_id, Game.all.map{|game| [game.name, game.id]}) %> @@ -18,23 +18,33 @@ <%= 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) %>
    +
    +

    + + + + + + + + + + +
    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.label :scoring_method %> @@ -48,7 +58,7 @@

    -
    Settings +
    Settings <%= f.fields_for :settings do |setting_fields| %> <% (@tournament.settings.empty? ? @tournament.game.settings : @tournament.settings).each do |setting| %>

    <% name = setting.name.parameterize.underscore %> @@ -81,17 +91,19 @@ <% end %>

    - <%= f.fields_for :stages do |stages_fields| %>
    Stages + <%= f.fields_for :stages do |stages_fields| %>
    Stages <%# submit_tag("Set Stages", :class => "btn") %> <% 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 %> +

    + <%= 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 %> diff --git a/app/views/tournaments/standings.html.erb b/app/views/tournaments/standings.html.erb index 28d3c22..b8739de 100644 --- a/app/views/tournaments/standings.html.erb +++ b/app/views/tournaments/standings.html.erb @@ -1,4 +1,7 @@ -<% playerscores = @tournament.players.collect {|player| player => tournament.statistics.getStatistic(player.matches.last, player, :score) } %> +<% playerscores = @tournament.players.collect {|player| player => @tournament.statistics.getStatistic(player.matches.last, player, :score) } %> +<% teams = tournament_stage.matches.collect +{ |match| match.teams.collect { |team| team.id => team.players.collect +{ |player| player.user_name => @tournament.statistics.getStatistic(player.matches.last, player, :score } } } %> @@ -9,4 +12,17 @@ <% place += 1%> <% end %> -
    \ No newline at end of file + + +<% teams.each do |team| %> + + + + <% place = 0 %> + <% team.values.sort {|player1, player2| playerscores[player1] <=> playerscores[player2] }.each |player| %> + + <% place += 1%> + <% end %> + +
    Standings:<%= place.to_s + ":" %> <%= player.user_name %>
    +<% end %> \ No newline at end of file -- cgit v1.2.3-2-g168b