diff --git a/app/assets/javascripts/local.js b/app/assets/javascripts/local.js index 5bc13e1..40ba551 100644 --- a/app/assets/javascripts/local.js +++ b/app/assets/javascripts/local.js @@ -106,19 +106,9 @@ $(document).ready(function(){ }); $(function() { - var menuContests; - var menuGather; - var menuMaterial; - var menuForums; - - $(function() { - $('div#indexMenu div.contests').hover(function(){ - }); - }); - $("div#shoutbox").bind("mousewheel",function(ev, delta) { - var scrollTop = $(this).scrollTop(); - $(this).scrollTop(scrollTop-Math.round(delta)); + var scrollTop = $(this).scrollTop(); + $(this).scrollTop(scrollTop-Math.round(delta)); }); // Gather stuff diff --git a/app/assets/stylesheets/components/_gather.scss b/app/assets/stylesheets/components/_gather.scss index e4c01fb..48ccf09 100644 --- a/app/assets/stylesheets/components/_gather.scss +++ b/app/assets/stylesheets/components/_gather.scss @@ -192,4 +192,12 @@ table.gathers { .team2 { width: 35%; } +} + +/* + Player List +*/ + +ul.gatherers { + @include span-columns(12); } \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cad3e43..e471fee 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -114,9 +114,9 @@ module ApplicationHelper def flag country if country and country.to_s.size > 0 - image_tag "flags/#{country}.png", class: "flag" + image_tag "flags/#{country}.png", class: 'flag' else - image_tag "flags/EU.png" + image_tag 'flags/EU.png', class: 'flag' end end diff --git a/app/views/gatherers/_list.html.erb b/app/views/gatherers/_list.html.erb index 5131a12..62e9606 100644 --- a/app/views/gatherers/_list.html.erb +++ b/app/views/gatherers/_list.html.erb @@ -5,13 +5,14 @@ <%= if team.nil? then "Lobby" else team == 1 ? "Marines" : "Aliens" end %> -<%= form_tag("/gathers/pick/#{@gather.id}") do %> +<%= form_tag "/gathers/pick/#{@gather.id}" do %> + <% if pick %> +
+ <%= submit_tag 'Pick' %> +
+ <% end %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index bfe3d27..e8bf55c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,6 +21,7 @@ en: contests_contester_update: "Contester was successfully updated." gather_create: "New Gather was started successfully." gathers_join: "You have joined the Gather." + gathers_user_pick: "You have successfully selected a player for your team." gatherers_update: "Gather player successfully updated." files_create: "File was successfully created." files_update: "File was successfully updated."