<% if cuser && (gather = cuser.gathers.active.ordered.first) %>
<%= link_to t('gather.status.joined'), gather %>
<% elsif Gather.last && (Gather::FULL - Gather.last.gatherers.count) == 12 %>
diff --git a/app/views/application/_header.html.erb b/app/views/application/_header.html.erb
index 9576d02..cfd0da1 100644
--- a/app/views/application/_header.html.erb
+++ b/app/views/application/_header.html.erb
@@ -23,7 +23,7 @@
- <%= link_to "Staff", controller: "about", action: "staff" %>
- <%= link_to "History", article_url(Article::HISTORY) %>
- - <%= link_to "Rules", article_url(Article::RULES) %>
+ - <%= link_to "Rules", latest_rules %>
- <%= link_to "Hall of Fame", article_url(Article::HOF) %>
- <%= link_to "Bans", bans_url %>
- <%= link_to "Contact", new_issue_path %>
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 7959fc2..a55b407 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -1,6 +1,6 @@
diff --git a/app/views/contesters/show.html.erb b/app/views/contesters/show.html.erb index a8364c2..25ced83 100644 --- a/app/views/contesters/show.html.erb +++ b/app/views/contesters/show.html.erb @@ -1,31 +1,33 @@ -
-
- <%= link_to (h @contester.team.name), team_url(@contester.team, :teamTab => "matches", :anchor => "contest_#{@contester.contest.id}") %> +
+
+ <%= image_tag @contester.team.logo.url, class: 'logo' %>
+
<% end %>
-
-
+ + <%= link_to (h @contester.team.name), team_url(@contester.team, team: 'matches', anchor: "contest_#{@contester.contest.id}") %> +
-- <%= namelink @contester.contest %> -
+ <% if @contester.team.logo %> - <%= image_tag @contester.team.logo.url, :class => "centered" %> ++
+
+
- <%= render :partial => "matches/list", :locals => {:matches => @results, :friendly => @contester.team, :contest => false} %>
+ <%= render partial: 'matches/list', locals: { matches: @results, friendly: @contester.team, contest: false } %>
-
@@ -48,35 +50,29 @@
-
-
-
+
+<%= link_to 'Back', @contester.contest, class: 'button' %>
+
<% if @contester.can_update? cuser %>
- <%= link_to 'Edit', edit_contester_path(@contester) %> |
+ <%= link_to 'Edit', edit_contester_path(@contester), class: 'button' %>
<% end %>
-<%= link_to 'Back', @contester.contest %>
-
diff --git a/app/views/contests/_normal.html.erb b/app/views/contests/_normal.html.erb
index e77b952..f22ed59 100644
--- a/app/views/contests/_normal.html.erb
+++ b/app/views/contests/_normal.html.erb
@@ -1,7 +1 @@
-
- <%= render :partial => "contesters/list", :locals => {:contesters => @contest.contesters.active.ordered, :actions => true} %>
-
-
-
+<%= render partial: 'contesters/list', locals: { contesters: @contest.contesters.active.ordered, actions: true } %>
diff --git a/app/views/contests/show.html.erb b/app/views/contests/show.html.erb
index f04c714..358f82c 100644
--- a/app/views/contests/show.html.erb
+++ b/app/views/contests/show.html.erb
@@ -2,24 +2,23 @@
<% if @contest.contest_type == Contest::TYPE_BRACKET %>
- <%= render :partial => "bracket", :locals => {:contest => @contest} %>
+ <%= render partial: 'bracket', locals: { contest: @contest } %>
<% else %>
- <%= render :partial => "normal" %>
+ <%= render partial: 'normal' %>
<% end %>
-
-
+<% end %>
diff --git a/app/views/gathers/_picking.html.erb b/app/views/gathers/_picking.html.erb
index fcf5e23..071a812 100644
--- a/app/views/gathers/_picking.html.erb
+++ b/app/views/gathers/_picking.html.erb
@@ -1,16 +1,16 @@
-
- <%= render :partial => "gatherers/list", :locals => {:team => nil} %>
+
+ <%= render partial: "gatherers/list", locals: { team: nil } %>
-
- <%= render :partial => "gatherers/list", :locals => {:team => 1} %>
+
+ <%= render partial: "gatherers/list", locals: { team: 1 } %>
-
- <%= render :partial => "gatherers/list", :locals => {:team => 2} %>
+
+ <%= render partial: "gatherers/list", locals: { team: 2 } %>
-<%= render :partial => "status" %>
+<%= render partial: "status" %>
<% if @gatherer and @gatherer.user_id = 176 %>
diff --git a/app/views/gathers/_running.html.erb b/app/views/gathers/_running.html.erb
index 356c88d..bd998d8 100644
--- a/app/views/gathers/_running.html.erb
+++ b/app/views/gathers/_running.html.erb
@@ -1,24 +1,21 @@
-
-
+
+
-
-
- <%= render :partial => "votes" %>
-
- <%= render :partial => "status" %>
+<%= render partial: 'votes' %>
+<%= render partial: 'status' %>
diff --git a/app/views/gathers/_status.html.erb b/app/views/gathers/_status.html.erb
index 8ff8022..ac38146 100644
--- a/app/views/gathers/_status.html.erb
+++ b/app/views/gathers/_status.html.erb
@@ -1,43 +1,52 @@
-
+
<% if @gather.status == Gather::STATE_RUNNING %>
+
<% if @gatherer and @gatherer.can_destroy? cuser %>
- Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.
- <%= link_to 'Leave Gather', @gatherer, :confirm => 'Are you sure?', :method => :delete %>
- <% elsif (g = Gatherer.new(:gather => @gather, :user => cuser)).can_create?(cuser) %>
+ " end%>)
+ (<%= @gather.server.ip %>:<%= @gather.server.port %> ; password = <%= if @gather.server.password then @gather.server.password else "" end %>)
<% end %>
-
<% end %>
+
<% if cuser and cuser.admin? %>
-
-
-
diff --git a/app/views/gathers/_votes.html.erb b/app/views/gathers/_votes.html.erb
index b6aaad9..ef6b347 100644
--- a/app/views/gathers/_votes.html.erb
+++ b/app/views/gathers/_votes.html.erb
@@ -1,68 +1,53 @@
<% vote_maps, vote_servers = false %>
-
-
+
+
+ -
+
+ <%= if server.votes then server.votes else "0" end %>
+
+ <% if server.real_votes.build(user: cuser).can_create? cuser %>
+ <%= link_to server,
+ controller: "votes", action: "create",
+ vote: { votable_id: server.id, votable_type: "GatherServer" },
+ method: "post" %>
+ <% vote_servers = true else %>
+ <%= server %>
+ <% end %>
+
+ <% end %>
+
- <% if vote_servers %>
-
+ <% if vote_servers %>
+
-
-
+
- <% @gather.gather_maps.ordered.each do |map| %>
-
-
- <%= map.votes %>
-
-
- <% if map.real_votes.build(:user => cuser).can_create? cuser %>
- <%= link_to shorten(map, 15),
- :controller => "votes", :action => "create",
- :vote => {:votable_id => map.id, :votable_type => "GatherMap"},
- :method => "post" %>
- <% vote_maps = true else %>
- <%= shorten map, 15 %>
- <% end %>
-
-
- <% end %>
-
+
+ <% if vote_maps %>
+
diff --git a/app/views/gathers/_voting.html.erb b/app/views/gathers/_voting.html.erb
index 328381b..8071d23 100644
--- a/app/views/gathers/_voting.html.erb
+++ b/app/views/gathers/_voting.html.erb
@@ -1,36 +1,29 @@
-<% if @gatherer and cuser %>
-
-<% end %>
+
+
-
+
<% @gather.gatherers.most_voted.each do |gatherer| %>
-
+
<%= flag gatherer.user.country %>
- (<%= gatherer.votes %>)
- <% if @gatherer and gatherer.real_votes.build(:user => cuser).can_create? cuser %>
+
+ (<%= gatherer.votes %>)
+ <% if @gatherer and gatherer.real_votes.build(user: cuser).can_create? cuser %>
<%= link_to (h gatherer.user),
- :controller => "votes", :action => "create",
- :vote => {:votable_id => gatherer.id, :votable_type => "Gatherer"},
- :method => "post" %>
+ controller: "votes", action: "create",
+ vote: { votable_id: gatherer.id, votable_type: "Gatherer"},
+ method: "post" %>
<% else %>
- <%= namelink gatherer.user %>
- <% end %>
+ <%= namelink gatherer.user %>
+ <% end %>
+
<% end %>
<% if @gatherer %>
-
+
-
<%= namelink @contester.contest %>
+ +- Results
- Upcoming
- Info
-- Upcoming -
+Upcoming
- Rank -
- +Rank
<%= cascade @contester, ["total", "win", "loss", "draw"] %> <% if !@contester.active %> -- INACTIVE -
+INACTIVE
<% end %>- Members -
- - <%= render :partial => "teamers/list", :locals => {:teamers => @members, :blacklist => nil, :comment => false} %> +Members
+ <%= render partial: 'teamers/list', locals: { teamers: @members, blacklist: nil, comment: false } %>Details
-- From-to:
-- <%= longdate @contest.start %>
<%= longdate @contest.end %> -
- Rules:
-- <%= namelink @contest.rules %> -
- Status:
-- <%= @contest.statuses[@contest.status] %> -
- Default:
+ +- Sunday: <%= h @contest.default_time.strftime("%H:%M") %> -
+- Start - End
+ -
+ <%= longdate @contest.start %>
+ - Rules
+ - <%= namelink @contest.rules %>
+ - Status
+ - <%= @contest.statuses[@contest.status] %>
+ - Default
+ - Sunday: <%=h @contest.default_time.strftime("%H:%M") %>
+
+ <% if @contest.contest_type == Contest::TYPE_LADDER %> - <%= link_to "Scoring", "/contests/#{@contest}/score" %> + <%= link_to 'Scoring', "/contests/#{@contest}/score" %> <% end %> <% if cuser and cuser.admin? %> <%= link_to 'Edit', edit_contest_path(@contest) %> @@ -27,19 +26,19 @@+ <%= longdate @contest.end %> +
+
+
+
diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb
index 02d646b..b990650 100644
--- a/app/views/forums/new.html.erb
+++ b/app/views/forums/new.html.erb
@@ -1,5 +1,5 @@
-
- Matches
- Predictions
- Maps
-Matches Played @@ -172,5 +171,7 @@
New forum
+New Forum
-<%= render :partial => "form" %> +<%= render partial: "form" %> -<%= link_to 'Back', forums_path %> \ No newline at end of file +<%= link_to 'Back', forums_path, class: 'button' %> \ No newline at end of file diff --git a/app/views/gatherers/_list.html.erb b/app/views/gatherers/_list.html.erb index c38480a..5131a12 100644 --- a/app/views/gatherers/_list.html.erb +++ b/app/views/gatherers/_list.html.erb @@ -1,32 +1,38 @@ <% captain = team == 1 ? @gather.captain1 : @gather.captain2 %> <% pick = false %> -+
+ - <%= form_tag("/gathers/pick/#{@gather.id}") do %> +<%= form_tag("/gathers/pick/#{@gather.id}") do %> +<%= if team.nil? then "Lobby" else team == 1 ? "Marines" : "Aliens" end %> -
+ <% @gather.gatherers.ordered.team(team).each do |gatherer| %> +-
+ <% if @gatherer and gatherer.can_update? cuser, { team: @gatherer.team } %>
+ <% pick = true %>
+ <%= radio_button_tag :player, gatherer.id %><%= flag gatherer.user.country %>
+ <%= namelink gatherer.user %>
-
- <% @gather.gatherers.ordered.team(team).each do |gatherer| %>
-
- <% if @gatherer and gatherer.can_update? cuser, {:team => @gatherer.team} %>
- <% pick = true %>
- <%= radio_button_tag :player, gatherer.id %><%= flag gatherer.user.country %>
- <%= namelink gatherer.user %>
- <% else %>
- <%= flag(gatherer.user.country) if gatherer.user && gatherer.user.country %>
- <% if gatherer == captain and gatherer.team == gatherer.gather.turn %>
- »
- <% else %>
-
- <% end %>
- <%= namelink gatherer.user %><%= " (C)" if gatherer == captain %>
- <% end %>
-
+ <% else %>
+ <%= flag(gatherer.user.country) if gatherer.user && gatherer.user.country %>
+
+ <% if gatherer == captain and gatherer.team == gatherer.gather.turn %>
+ <%= icon 'chevron-right' %>
+ <% end %>
+
+ <%= namelink gatherer.user %>
+
+ <% if gatherer == captain %>
+
+ <%= icon('star') %>
+
+ <% end %>
<% end %>
- <% if pick %>
- >> Pick
- <% end %>
-
+
<% end %>
+ <% if pick %>
+ Pick
+ <% end %>
+
- Signed Up -
+Signed Up
-<% @gather.gatherers.each do |gatherer| %> -
- <%= flag gatherer.user.country %>
- <%= namelink gatherer.user %>
-
- <%# if gatherer.can_destroy? cuser %>
+ -
+ <%= flag gatherer.user.country %>
+ <%= namelink gatherer.user %>
<% if cuser and cuser.admin? %>
-
[<%= link_to "X", gatherer, :method => :delete %>]
+ <%= link_to gatherer, method: :delete, class: 'delete' do %>
+ <%= icon 'times' %>
+ <% end %>
<% end %>
- <% end %>
+
+ <% end %>
+
+
-
Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.
+ <%= link_to 'Leave Gather', @gatherer, confirm: 'Are you sure?', method: :delete, class: 'button tiny' %> + + <% elsif (g = Gatherer.new(gather: @gather, user: cuser)).can_create?(cuser) %> <%= form_for g do |f| %> <%= f.hidden_field :gather_id %> <%= f.hidden_field :user_id %> -- Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed. -
+ +Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.
You can download custom maps via the <%= link_to "Steam Workshop", "http://steamcommunity.com/workshop/browse?searchtext=&childpublishedfileid=0§ion=items&appid=4920&browsesort=trend&requiredtags%5B%5D=level" %>.
+<% if cuser.gatherers.count < 5 %> <%= f.check_box :confirm %> I have read the <%= link_to "rules", article_url(Article::G_RULES) %>, installed NS and Teamspeak3. <% end %> - + Click to join gather!
<% end %> + <% else %> - Log in to join the gather. +Log in to join the gather.p
+ <% end %> + <% elsif @gather.status == Gather::STATE_VOTING %> - Please vote captains and maps. +Please vote captains and maps.
+ <% elsif @gather.status == Gather::STATE_PICKING %> - <% if @gatherer and @gatherer.captain? %> - <% if @gatherer.turn? %> - It is your turn, please pick a player from the lobby! - <% else%> - Wait for the other captain to pick. ++ <% if @gatherer and @gatherer.captain? %> + <% if @gatherer.turn? %> + It is your turn, please pick a player from the lobby! + <% else%> + Wait for the other captain to pick. + <% end %> + <% else %> + Captains are picking the teams, please wait. Are you a panda?
+ <% elsif @gather.status == Gather::STATE_FINISHED and @gather.server %> Gather finished, join the <% if @gather.server and @gather.server.ip and @gather.server.password %> @@ -45,19 +54,16 @@ <% else %> Server <% end %> - and TS3.<% end %> - <% else %> - Captains are picking the teams, please wait. Are you a panda ?
- <% end %> +
- Maps: <%= namelink @gather.map1.map if @gather.map1 %>, <%= (namelink @gather.map2.map) if @gather.map2 %>
+ and TS3.
+ + Maps: <%= namelink @gather.map1.map if @gather.map1 %>, <%= (namelink @gather.map2.map) if @gather.map2 %>
Server: <% if @gather.server %> <%= @gather.server %> - (<%= @gather.server.ip %>:<%= @gather.server.port %> ; password = <%= if @gather.server.password then @gather.server.password else "
- <%= link_to "Admin Page", edit_gather_url() %> -
+ <%= link_to "Admin Page", edit_gather_url, class: 'admin button' %> <% end %>- Server voting -
+Server Votes
-<% @gather.gather_servers.ordered.each do |server| %> -
-
- <%= if server.votes then server.votes else "0" end%>
-
-
- <% if server.real_votes.build(:user => cuser).can_create? cuser %>
- <%= link_to shorten(server, 15),
- :controller => "votes", :action => "create",
- :vote => {:votable_id => server.id, :votable_type => "GatherServer"},
- :method => "post" %>
- <% vote_servers = true else %>
- <%= shorten server, 15 %>
- <% end %>
-
-
- <% end %>
-
- Click to vote. -
-- <%= link_to "Moar servers", :controller => :servers %> -
- <% end %> -Click to vote
+<%= link_to "More servers", { controller: :servers }, { class: 'button tiny' } %>
+ <% end %> +- Vote Maps -
+Map Votes
-+ <% @gather.gather_maps.ordered.each do |map| %> +-
+ <%= map.votes %>
+ <% if map.real_votes.build(user: cuser).can_create? cuser %>
+ <%= link_to shorten(map, 15),
+ controller: "votes", action: "create",
+ vote: { votable_id: map.id, votable_type: "GatherMap" },
+ method: "post" %>
+ <% vote_maps = true %>
+ <% else %>
+ <%= shorten map, 15 %>
+ <% end %>
+
+ <% end %>
+
- <% if vote_maps %> -- Click to vote. -
- <% end %> -Click to vote
+ <% end %> +Vote Captains
-- Vote Captains -
- -- Click to vote for captain. -
+Click to vote for captain.
<% end %> -<%= render :partial => "votes" %> - -<%= render :partial => "status" %> +<%= render partial: 'votes' %> +<%= render partial: 'status' %> diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index cf3ec61..6fc716e 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -1,3 +1,4 @@ + - ++ + <%= link_to @gather do %> + <%= @gather.category.to_s %> Gather + <% end %> + +
--
- <%= link_to raw("«« First"), @gather.first %>
- <%= link_to raw("Previous ‹‹"), @gather.previous_gather %>
-
- <%= link_to @gather do %>
- <%= @gather.category.to_s %> Gather
+
+ <%= link_to @gather.previous_gather, class: 'button tiny' do %>
+ <%= icon 'chevron-left' %> Previous
<% end %>
-
- <% if @gather.next_gather %>
- <%= link_to raw("›› Next"), @gather.next_gather%>
- <%= link_to raw("Last »»"), @gather.last %>
- <% else %>
- <%= raw("›› Next") %>
- <%= raw("Last »»") %>
+
+
+
+ <% if @gather.next_gather %>
+ <%= link_to @gather.next_gather, class: 'button tiny' do %>
+ Next <%= icon 'chevron-right' %>
<% end %>
-
-
+ <% end %>
+
<% if @gather and @gather.status != Gather::STATE_FINISHED %>
-
-
+
+
+
-
+
+
-
-
-
- Requirements
+
+
-
- Captains:
-
-
- Voice Comunication:
-
-
-
-
- Hide information
+
+
+ <%= icon 'times' %>
+ Hide information
+
<% end %>
-
+
<%= render_gather %>
- <%= render :partial => "shoutmsgs/index", :locals => {:object => @gather} %>
+ <%= render partial: 'shoutmsgs/index', locals: { object: @gather } %>
diff --git a/app/views/gathers/show.js.erb b/app/views/gathers/show.js.erb
index ad948a9..45bbce8 100644
--- a/app/views/gathers/show.js.erb
+++ b/app/views/gathers/show.js.erb
@@ -1,2 +1,2 @@
-$("div#gatherArea").children().hide();
-$("div#gatherArea").html("<%= escape_javascript(render_gather) %>");
\ No newline at end of file
+$("div#gather-area").children().hide();
+$("div#gather-area").html("<%= escape_javascript(render_gather) %>");
\ No newline at end of file
diff --git a/app/views/layouts/full.html.erb b/app/views/layouts/full.html.erb
new file mode 100644
index 0000000..8158ead
--- /dev/null
+++ b/app/views/layouts/full.html.erb
@@ -0,0 +1,27 @@
+
+
+
+ ENSL
+
+
+
+
+ <%= stylesheet_link_tag "application" %>
+ <%= javascript_include_tag "application" %>
+ <%= csrf_meta_tag %>
+
+
+
+ <%= render partial: "header" %>
+
+ <%= render partial: "navigation" %>
+
+ <%= render partial: "messages" %>
+ <%= yield %>
+ <%= render partial: "gather" %>
+
+
+ <%= render partial: "footer" %>
+
+
+
diff --git a/app/views/shoutmsgs/_index.html.erb b/app/views/shoutmsgs/_index.html.erb
index 7a15e15..ef9b41d 100644
--- a/app/views/shoutmsgs/_index.html.erb
+++ b/app/views/shoutmsgs/_index.html.erb
@@ -9,10 +9,10 @@
});
-<% shoutmsg_new = Shoutmsg.new(:shoutable_type => object.class.to_s, :shoutable_id => object.id) %>
+<% shoutmsg_new = Shoutmsg.new(shoutable_type: object.class.to_s, shoutable_id: object.id) %>
-
- <%= render :partial => "shoutmsgs/shoutmsg", :collection => object.shoutmsgs.recent.reverse, :locals => {:popup => "this"} %>
+
-<%= render :partial => "shoutmsgs/new", :locals => {:shoutmsg => shoutmsg_new, :popup => "this"} %>
+<%= render partial: "shoutmsgs/new", locals: { shoutmsg: shoutmsg_new, popup: "this" } %>
diff --git a/app/views/shoutmsgs/_new.html.erb b/app/views/shoutmsgs/_new.html.erb
index af89121..25907da 100644
--- a/app/views/shoutmsgs/_new.html.erb
+++ b/app/views/shoutmsgs/_new.html.erb
@@ -3,7 +3,7 @@
You have been muted.
<% else %>
<% scroll = shoutmsg.domain == "shoutbox" ? "" : "$('#{shoutmsg.domain}').scrollTop = $('#{shoutmsg.domain}').scrollHeight;" %>
- <%= form_for(shoutmsg, remote: true, html: { id: "new_#{shoutmsg.domain}" }) do |f| %>
+ <%= form_for(shoutmsg, remote: true, html: { id: "new_#{shoutmsg.domain}", class: 'new-shout' }) do |f| %>
<% if shoutmsg.shoutable %>
<%= f.hidden_field :shoutable_type %>
<%= f.hidden_field :shoutable_id %>
diff --git a/app/views/shoutmsgs/_shoutmsg.html.erb b/app/views/shoutmsgs/_shoutmsg.html.erb
index 89ea878..403a89b 100644
--- a/app/views/shoutmsgs/_shoutmsg.html.erb
+++ b/app/views/shoutmsgs/_shoutmsg.html.erb
@@ -1,10 +1,12 @@
<% if shoutmsg.can_destroy? cuser %>
- <%= link_to icon('times'), shoutmsg, :method => :delete %>
+ <%= link_to icon('times'), shoutmsg, method: :delete %>
<% end %>
- <%# if shoutmsg.domain != "shoutbox" %>
- [<%= shoutmsg.created_at ? shoutmsg.created_at.strftime("%H:%M") : Time.now.strftime("%H:%M") %>]
- <%# end %>
+
+
+ <%= shoutmsg.created_at ? shoutmsg.created_at.strftime("%H:%M") : Time.now.strftime("%H:%M") %>
+
+
<%= namelink shoutmsg.user %>:
<%= shoutmsg.text %>
diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb
index 3ca5627..29ad380 100644
--- a/app/views/teams/index.html.erb
+++ b/app/views/teams/index.html.erb
@@ -4,7 +4,3 @@
<%= render partial: 'list', locals: { teams: @teams } %>
-
-
diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb
index 42bd0bc..bdd4786 100644
--- a/app/views/teams/show.html.erb
+++ b/app/views/teams/show.html.erb
@@ -20,21 +20,21 @@
@@ -62,7 +64,7 @@
- Matches:
- - <%= @team.matches_finished.count %> dllayed / <%= @team.matches.count %> total
+ - <%= @team.matches_finished.count %> played / <%= @team.matches.count %> total
- Won:
- <%= @team.matches_won.count %> (<%= 100.0*@team.matches_won.count/@team.matches_finished.count %> %)
- Lost:
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 55bb571..3ebc493 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,286 +1,165 @@
-
-
+
<% if @user.errors.any? %>
-
-
+
+
+
+ <%= p.label :steam_profile, "Steam Profile URL" %>
<%= p.text_field :steam_profile %>
-
-
+
+ <%= p.label :web %>
<%= p.text_field :web %>
-
-
+
+
+ <%= p.label :achievements %>
+ <%= p.text_area :achievements, rows: 5 %>
+
-
-
+
+ <%= p.label :signature %>
+ <%= p.text_area :signature, rows: 5 %>
+
-
-
-
-
-
-
-
-
-
-
-
+
<%= p.file_field :avatar %>
-
+
+
+
+
+
+ <%= f.label :country %>
+
+ <%= country_code_select :user, :country %>
+
+
+
+ <%= p.label :town %>
+ <%= p.text_field :town %>
+
+
+ <%= f.label :time_zone %>
+
+ <%= f.time_zone_select :time_zone, ActiveSupport::TimeZone.all %>
+
+
-
+ <%= p.label :notify_news, "News item are posted" %>
<%= p.check_box :notify_news %>
-
+
-
+ <%= p.label :notify_articles, "New articles" %>
<%= p.check_box :notify_articles %>
-
+
-
+ <%= p.label :notify_movies, "New movies" %>
<%= p.check_box :notify_movies %>
-
+
-
+ <%= p.label :notify_gather, "Gather has 6 players" %>
<%= p.check_box :notify_gather %>
-
+
-
+ <%= p.label :notify_own_match, "My team's matches" %>
<%= p.check_box :notify_own_match %>
-
+
-
+ <%= p.label :notify_any_match, "New matches" %>
<%= p.check_box :notify_any_match %>
-
+
-
+ <%= p.label :notify_challenge, "New challenges" %>
<%= p.check_box :notify_challenge %>
-
+
-
+ <%= p.label :notify_pms, "Private messages" %>
<%= p.check_box :notify_pms %>
-
+
-
<%= f.submit %>
-
+
<% end %>
<% end %>
diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb
index 196f17d..7e33b10 100644
--- a/app/views/widgets/_logged.html.erb
+++ b/app/views/widgets/_logged.html.erb
@@ -3,7 +3,7 @@
-
<%= link_to edit_user_path(cuser) do %>
- <%= icon 'user' %> Profile
+ <%= icon 'user' %> Account
<% end %>
-
diff --git a/app/views/widgets/_shoutbox.html.erb b/app/views/widgets/_shoutbox.html.erb
index 23525c1..ba3fe75 100644
--- a/app/views/widgets/_shoutbox.html.erb
+++ b/app/views/widgets/_shoutbox.html.erb
@@ -1,7 +1,7 @@
-
+
<%= render :partial => "shoutmsgs/shoutmsg", :collection => Shoutmsg.recent.box, :locals => {:popup => "$('shoutbox')"} %>
diff --git a/config/deploy.rb b/config/deploy.rb
index 893cff3..a16c425 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -12,7 +12,8 @@ set :rbenv_type, :user
set :rbenv_ruby, '2.1.1'
set :dotenv_role, [:app, :web]
-set :unicorn_config_path, "config/unicorn.rb"
+set :puma_config, -> { File.join(shared_path, 'puma.rb') }
+set :puma_pid, -> { File.join(shared_path, 'tmp', 'pids', 'puma.pid') }
set :writable_dirs, %w{public tmp}
set :linked_files, %w{.env}
@@ -42,8 +43,49 @@ namespace :deploy do
end
task :restart do
- invoke 'unicorn:restart'
+ invoke 'puma:restart'
end
after :publishing, :restart
+end
+
+namespace :puma do
+ desc "Start puma"
+ task :start do
+ on roles(:app) do
+ within current_path do
+ execute :bundle, 'exec', :puma, "-C #{fetch(:puma_config)}"
+ end
+ end
+ end
+
+ desc "Restart puma"
+ task :restart do
+ on roles(:app) do
+ within current_path do
+ if valid_pid?
+ execute :kill, "-USR2 $( cat #{fetch(:puma_pid)} )"
+ else
+ execute :bundle, 'exec', :puma, "-C #{fetch(:puma_config)}"
+ end
+ end
+ end
+ end
+
+ desc "Stop puma"
+ task :stop do
+ on roles(:app) do
+ within current_path do
+ if valid_pid?
+ execute :kill, "-INT $( cat #{fetch(:puma_pid)} )"
+ else
+ warn 'Puma does not appear to be running'
+ end
+ end
+ end
+ end
+
+ def valid_pid?
+ test "[ -f #{fetch(:puma_pid)} ]" and test "kill -0 $( cat #{fetch(:puma_pid)} )"
+ end
end
\ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6a8fbf4..16d3963 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -32,5 +32,5 @@ Ensl::Application.configure do
config.cache_store = :dalli_store
# Enable threaded mode
- config.threadsafe!
+ # config.threadsafe!
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d099083..72ed1b6 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -32,7 +32,4 @@ Ensl::Application.configure do
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
-
- # Enable threaded mode
- config.threadsafe!
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7ab7f3d..19d054c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -18,6 +18,7 @@ en:
contests_update: "Contest was successfully updated."
contests_join: "Team successfully joined contest."
contests_contester_update: "Contester was successfully updated."
+ gather_create: "New Gather was started successfully."
gathers_join: "You have joined the Gather."
files_create: "File was successfully created."
files_update: "File was successfully updated."
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 0000000..e22acfa
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,39 @@
+require "dotenv"
+Dotenv.load
+
+base_path = (ENV['DEPLOY_PATH'] || Dir.pwd)
+current_path = "#{base_path}"
+shared_path = "#{base_path}"
+stderr_path = "#{shared_path}/log/puma.stderr.log"
+stdout_path = "#{shared_path}/log/puma.stdout.log"
+
+tag 'ENSL'
+
+preload_app!
+daemonize true
+directory base_path
+pidfile "#{shared_path}/tmp/pids/puma.pid"
+state_path "#{shared_path}/tmp/pids/puma.state"
+stdout_redirect stdout_path, stderr_path
+
+environment ENV['RACK_ENV'] || 'production'
+rackup DefaultRackup
+
+bind "unix://#{shared_path}#{ENV['PUMA_SOCKET']}"
+port Integer(ENV['PUMA_PORT'] || 4000)
+
+worker_timeout Integer(ENV['PUMA_TIMEOUT'] || 30)
+workers Integer(ENV['PUMA_WORKERS'] || 4)
+threads Integer(ENV['PUMA_MIN_THREADS'] || 1), Integer(ENV['PUMA_MAX_THREADS'] || 16)
+
+on_worker_boot do
+ ActiveSupport.on_load(:active_record) do
+ ActiveRecord::Base.establish_connection
+ end
+end
+
+on_restart do
+ ENV["BUNDLE_GEMFILE"] = "#{current_path}/Gemfile"
+ Dotenv.overload
+ ActiveRecord::Base.connection.disconnect!
+end
diff --git a/config/unicorn.rb b/config/unicorn.rb
deleted file mode 100644
index 75793d3..0000000
--- a/config/unicorn.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require "dotenv"
-Dotenv.load
-
-base_path = (ENV['DEPLOY_PATH'] || Dir.pwd)
-current_path = "#{base_path}/current"
-shared_path = "#{base_path}/shared"
-
-working_directory current_path
-worker_processes Integer(ENV['UNICORN_WORKERS'] || 4)
-timeout 30
-preload_app true
-
-user ENV['UNICORN_USER'], ENV['UNICORN_GROUP']
-listen Integer(ENV['UNICORN_PORT']), :tcp_nopush => true
-listen ENV['UNICORN_SOCKET'], :backlog => 64
-
-stderr_path "#{shared_path}/log/unicorn.stderr.log"
-stdout_path "#{shared_path}/log/unicorn.stdout.log"
-pid "#{shared_path}/tmp/pids/unicorn.pid"
-
-GC.respond_to?(:copy_on_write_friendly=) and GC.copy_on_write_friendly = true
-
-before_exec do |server|
- ENV["BUNDLE_GEMFILE"] = "#{current_path}/Gemfile"
- Dotenv.overload
-end
-
-before_fork do |server, worker|
- ActiveRecord::Base.connection.disconnect!
-
- old_pid = "#{server.config[:pid]}.oldbin"
- if old_pid != server.pid
- begin
- sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
- Process.kill(sig, File.read(old_pid).to_i)
- rescue Errno::ENOENT, Errno::ESRCH
- end
- end
-end
-
-after_fork do |server, worker|
- ActiveRecord::Base.establish_connection
-end
\ No newline at end of file
diff --git a/script/rails b/script/rails
index 81eab02..75bd144 100644
--- a/script/rails
+++ b/script/rails
@@ -1,5 +1,7 @@
-#!/usr/bin/env ruby.exe
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+#!/usr/bin/env ruby
+
+require 'rack/handler'
+Rack::Handler::WEBrick = Rack::Handler.get(:puma)
APP_PATH = File.expand_path('../../config/application', __FILE__)
require File.expand_path('../../config/boot', __FILE__)
Requirements
++- JavaScript enabled
+ - Read the <%= link_to "Gather Rules", article_url(Article::G_RULES) %>
+ - Remove yourself if you leave
+
+Captains
++- Vote for the best players
+ - Captain 1 = 2nd most voted
+ - Captain 2 = 1st most voted
+
+- - Javascript needs to enabled
- - Read <%= link_to "gather rules", article_url(Article::G_RULES) %>
- - Remove yourself if you leave -
Voice Comunication
++- <%= link_to "Teamspeak 3", "http://www.teamspeak.com/?page=downloads" %>
+ - Server: ensl.org
+ - Password: ns2nsl
+
+- - Vote for the best players
- - Captain 1 = 2nd most voted
- - Captain 2 = 1st most voted
-
- - <%= link_to "Teamspeak 3", "http://www.teamspeak.com/?page=downloads" %>
- - Server: ensl.org
- - Password: ns2nsl -
-- Irc:
- - <%= h @team.irc %>
+ - IRC:
+ - <%=h @team.irc %>
- Web:
- - <%= h @team.web %>
+ - <%=h @team.web %>
- Tag:
- - <%= h @team.tag %>
+ - <%=h @team.tag %>
- Country:
- - <%= h @team.country %>
+ - <%=h @team.country %>
- Founder:
- <%= namelink @team.founder %>
- Comment:
- - <%= h @team.comment %>
+ - <%=h @team.comment %>
<% if @team.recruiting %>
- Recruiting:
- - <%= h @team.recruiting %>
+ - <%=h @team.recruiting %>
<% end %>
@@ -45,8 +45,10 @@Current Members
<%= render partial: "teamers/list", locals: { teamers: @team.teamers.active.ordered.distinct, blacklist: false, comment: true } %> -Past Members
- <%= render partial: "teamers/list", locals: { teamers: @team.teamers.past.distinct, blacklist: @team.teamers.active.ordered.distinct, comment: false } %> + <% if @team.teamers.past.distinct.length > 0 %> +Past Members
+ <%= render partial: "teamers/list", locals: { teamers: @team.teamers.past.distinct, blacklist: @team.teamers.active.ordered.distinct, comment: false } %> + <% end %>Profile: <%= h @user.username %>
+Account: <%= h @user.username %>
-<%= form_for @user, :html => { :multipart => true } do |f| %> +<%= form_for @user, html: { multipart: true, id: 'profile', class: 'square' } do |f| %> <% f.fields_for :profile do |p| %>-- General
- - Contact
- - <%= t('profile.locals') %>
- - Favorites
- - Settings
- - Computer
- - Extra
- - Notify
+ - Account
+ - Profile
+ - <%= t('profile.locals') %>
+ - Notifications
- <%= pluralize(@user.errors.count, t(:error)) %> -
-+
+ <%= pluralize(@user.errors.count, t(:error)) %>
+
<% end %>
-
+ <%= f.label :username, 'Username', class: 'required' %>
<%= f.text_field :username %>
-
-
+
+ <%= f.label :raw_password, "Password" %>
<%= f.password_field :raw_password %>
-
-
-
-
-
+
+ <%= f.label :email do %>
+
+
+ <%= f.label :public_email %>
<%= f.check_box :public_email %>
-
-
+
+ <%= f.label :steamid %>
+ <%= f.text_field :steamid, html: { placeholder: 'http://steamcommunity.com/id/...' } %>
+
+
+ <%= f.label :firstname do %>
+
+
+ <%= f.label :lastname do %>
+
+
+ <%= f.label :birthdate %>
+
+ <%= date_select :user, :birthdate, order: [:year, :month, :day], default: @user.birthdate, start_year: 1950 %>
+
+
+
<% @user.errors.full_messages.each do |msg| %>- <%= msg %>
<% end %>
- <%= f.label :username, 'Username', :class => 'required' %>
+
- <%= f.label :raw_password, "Password" %>
+
- <%= f.label :firstname %> (only available to members)
-- <%= f.text_field :firstname %> -
- <%= f.label :lastname %> (only available to members)
-- <%= f.text_field :lastname %> -
- <%= f.label :steamid %>
-- <%= f.text_field :steamid %> -
- <%= f.label :birthdate %>
-- <%= date_select :user, :birthdate, :order => [:year, :month, :day], :default => @user.birthdate, :start_year => 1950 %> -
- <%= f.label :email %> (only available to admins)
+
Email
+ (only visible to admins) + <% end %> <%= f.text_field :email %> - -- <%= f.label :public_email %>
+
- <%= p.label :steam_profile, "Link to your Steam Profile" %>
+
First Name
+ (only visible to members) + <% end %> + <%= f.text_field :firstname %> +Last Name
+ (only visible to members) + <% end %> + <%= f.text_field :lastname %> +- <%= p.label :irc %>
-- <%= p.text_field :irc %> -
- <%= p.label :msn %>
-- <%= p.text_field :msn %> -
- <%= p.label :icq %>
-- <%= p.text_field :icq %> -
- <%= p.label :web %>
+
- <%= f.label :country %>
-- <%= country_code_select :user, :country %> -
- <%= p.label :town %>
-- <%= p.text_field :town %> -
- <%= f.label :time_zone %>
-- <%= f.time_zone_select :time_zone, ActiveSupport::TimeZone.all %> -
- Daylight savings will be observed automatically. -
- <%= p.label :singleplayer %>
-- <%= p.text_field :singleplayer %> -
- <%= p.label :multiplayer %>
-- <%= p.text_field :multiplayer %> -
- <%= p.label :food %>
-- <%= p.text_field :food %> -
- <%= p.label :beverage %>
-- <%= p.text_field :beverage %> -
- <%= p.label :hobby %>
-- <%= p.text_field :hobby %> -
- <%= p.label :music %>
-- <%= p.text_field :music %> -
- <%= p.label :book %>
-- <%= p.text_field :book %> -
- <%= p.label :movie %>
-- <%= p.text_field :movie %> -
- <%= p.label :tvseries %>
-- <%= p.text_field :tvseries %> -
- <%= p.label :res %>
-- <%= p.text_field :res %> -
- <%= p.label :sensitivity %>
-- <%= p.text_field :sensitivity %> -
- <%= p.label :monitor_hz %>
-- <%= p.text_field :monitor_hz %> -
- <%= p.label :scripts %>
-- <%= p.text_field :scripts %> -
- <%= p.label :cpu %>
-- <%= p.text_field :cpu %> -
- <%= p.label :gpu %>
-- <%= p.text_field :gpu %> -
- <%= p.label :ram %>
-- <%= p.text_field :ram %> -
- <%= p.label :psu %>
-- <%= p.text_field :psu %> -
- <%= p.label :motherboard %>
-- <%= p.text_field :motherboard %> -
- <%= p.label :soundcard %>
-- <%= p.text_field :soundcard %> -
- <%= p.label :hdd %>
-- <%= p.text_field :hdd %> -
- <%= p.label :case %>
-- <%= p.text_field :case %> -
- <%= p.label :monitor %>
-- <%= p.text_field :monitor %> -
- <%= p.label :mouse %>
-- <%= p.text_field :mouse %> -
- <%= p.label :mouse_pad %>
-- <%= p.text_field :mouse_pad %> -
- <%= p.label :keyboard %>
-- <%= p.text_field :keyboard %> -
- <%= p.label :head_phones %>
-- <%= p.text_field :head_phones %> -
- <%= p.label :speakers %>
-- <%= p.text_field :speakers %> -
- <%= p.label :achievements %>
- -- <%= p.text_area :achievements %> -
- <%= p.label :signature %>
- -- <%= p.text_area :signature, :rows => 5, :cols => 50 %> -
-
+
Daylight savings will be observed automatically.
+- <%= p.label :notify_news, "Notify me when news are posted" %>
+
Notify me when...
+ +- <%= p.label :notify_articles, "Notify me of new articles" %>
+
- <%= p.label :notify_movies, "Notify me of new movies" %>
+
- <%= p.label :notify_gather, "Notify me when gather has 6 players" %>
+
- <%= p.label :notify_own_match, "Notify me of my team's matches" %>
+
- <%= p.label :notify_any_match, "Notify me of any new match" %>
+
- <%= p.label :notify_challenge, "Notify me of new challenges" %>
+
- <%= p.label :notify_pms, "Notify me of private messages" %>
+
+ +
<%= t('widget.shoutbox') %>