From 8020b06f455d08d35bed5ca3f468a8324d5b31f8 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Mon, 21 Apr 2014 19:19:03 +0100 Subject: [PATCH] Updates to matches page Tweaked layout for contest page Various styling updates --- .../stylesheets/components/_comments.scss | 41 ++-- .../stylesheets/components/_shoutbox.scss | 10 +- app/assets/stylesheets/layout/_body.scss | 1 + .../stylesheets/layout/_navigation.scss | 2 +- app/assets/stylesheets/mixins/_buttons.scss | 3 +- app/assets/stylesheets/mixins/_flashes.scss | 14 ++ app/assets/stylesheets/pages/_contests.scss | 17 ++ app/assets/stylesheets/pages/_forums.scss | 11 + app/assets/stylesheets/pages/_matches.scss | 207 +++++++++++++++++- app/assets/stylesheets/pages/_news.scss | 6 +- app/helpers/application_helper.rb | 2 +- app/models/match.rb | 4 +- app/views/comments/_new.html.erb | 2 +- app/views/comments/edit.html.erb | 26 +-- app/views/contesters/_list.html.erb | 1 - app/views/contesters/show.html.erb | 4 +- app/views/contests/show.html.erb | 62 +++--- app/views/layouts/application.html.erb | 1 + app/views/maps/_form.html.erb | 49 +++-- app/views/maps/edit.html.erb | 7 +- app/views/maps/index.html.erb | 12 +- app/views/maps/new.html.erb | 6 +- app/views/maps/show.html.erb | 40 ++-- app/views/matches/_match.html.erb | 17 +- app/views/matches/index.html.erb | 66 +++--- app/views/matches/show.html.erb | 198 ++++++++++------- app/views/posts/_form.html.erb | 4 +- app/views/posts/_post.html.erb | 2 +- app/views/teams/show.html.erb | 2 +- app/views/widgets/_highlights.html.erb | 8 +- 30 files changed, 551 insertions(+), 274 deletions(-) diff --git a/app/assets/stylesheets/components/_comments.scss b/app/assets/stylesheets/components/_comments.scss index bbdc4f7..a9ba2f1 100644 --- a/app/assets/stylesheets/components/_comments.scss +++ b/app/assets/stylesheets/components/_comments.scss @@ -1,25 +1,19 @@ +/* + Thread List +*/ + #comments-thread { @include span-columns(12); h3 { margin: 1em 0; } - - .comment-form { - @include span-columns(12); - margin-bottom: em(20); - - h5 { - margin-top: 0; - margin-bottom: 1em; - } - - .fields { - margin-bottom: em(20); - } - } } +/* + Comment +*/ + .comment { $comment-gutter: 1.4em; $comment-image-padding: .7em; @@ -100,3 +94,22 @@ } } } + +/* + Comment Form +*/ + +.comment-form { + @include span-columns(12); + margin-bottom: em(20); + + h1, + h5 { + margin-top: 0; + margin-bottom: 1em; + } + + .fields { + margin-bottom: em(20); + } +} diff --git a/app/assets/stylesheets/components/_shoutbox.scss b/app/assets/stylesheets/components/_shoutbox.scss index bc6f609..53241e1 100644 --- a/app/assets/stylesheets/components/_shoutbox.scss +++ b/app/assets/stylesheets/components/_shoutbox.scss @@ -6,12 +6,6 @@ margin-bottom: em(5); .timestamp { - font-size: em(14); - border-radius: em(3); - background: $blue; - color: white; - display: inline-block; - font-style: italic; - padding: 0 em(6); + @extend .highlight; } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/layout/_body.scss b/app/assets/stylesheets/layout/_body.scss index 556ef98..c00c71e 100644 --- a/app/assets/stylesheets/layout/_body.scss +++ b/app/assets/stylesheets/layout/_body.scss @@ -56,6 +56,7 @@ body { h1, h2, h3, h4, h5, h6 { &.fancy { + clear: both; text-align: center; position: relative; background-color: white; diff --git a/app/assets/stylesheets/layout/_navigation.scss b/app/assets/stylesheets/layout/_navigation.scss index f7f692d..f6db7c3 100644 --- a/app/assets/stylesheets/layout/_navigation.scss +++ b/app/assets/stylesheets/layout/_navigation.scss @@ -26,7 +26,7 @@ ul.navigation { > li { float: left; - width: ($max-width - em(1))/7; + width: (100%/7); border-right: em(1) solid transparent; .count { diff --git a/app/assets/stylesheets/mixins/_buttons.scss b/app/assets/stylesheets/mixins/_buttons.scss index a377896..cd51c00 100644 --- a/app/assets/stylesheets/mixins/_buttons.scss +++ b/app/assets/stylesheets/mixins/_buttons.scss @@ -24,7 +24,8 @@ } button, -a.button { +a.button, +.button { @include button; &.tiny { diff --git a/app/assets/stylesheets/mixins/_flashes.scss b/app/assets/stylesheets/mixins/_flashes.scss index 201ce22..f57e478 100644 --- a/app/assets/stylesheets/mixins/_flashes.scss +++ b/app/assets/stylesheets/mixins/_flashes.scss @@ -29,3 +29,17 @@ text-align: center; } } + +/* + Text Highlights +*/ + +.highlight { + font-size: em(14); + border-radius: em(3); + background: $blue; + color: white; + display: inline-block; + font-style: italic; + padding: 0 em(6); +} diff --git a/app/assets/stylesheets/pages/_contests.scss b/app/assets/stylesheets/pages/_contests.scss index ad2f39a..25cb5c5 100644 --- a/app/assets/stylesheets/pages/_contests.scss +++ b/app/assets/stylesheets/pages/_contests.scss @@ -71,6 +71,23 @@ table.contest { } } +div.widget.contest { + + a.button { + margin: em(20) 0 0; + text-align: center; + width: 100%; + } +} + +/* + Standings +*/ + +div.standings { + @include span-columns(12); +} + /* Brackets */ diff --git a/app/assets/stylesheets/pages/_forums.scss b/app/assets/stylesheets/pages/_forums.scss index 1ca1108..f7ec776 100644 --- a/app/assets/stylesheets/pages/_forums.scss +++ b/app/assets/stylesheets/pages/_forums.scss @@ -147,6 +147,17 @@ div#categories { @include span-columns(12); padding: em(20) 0; } + + .text { + border-radius: $base-border-radius; + background: $light-gray; + margin-top: em(20); + padding: em(20); + + fieldset { + border-color: $light-blue; + } + } } .header { diff --git a/app/assets/stylesheets/pages/_matches.scss b/app/assets/stylesheets/pages/_matches.scss index e6a2fb5..5fe69e8 100644 --- a/app/assets/stylesheets/pages/_matches.scss +++ b/app/assets/stylesheets/pages/_matches.scss @@ -21,4 +21,209 @@ table#matches { width: 10%; text-align: right; } -} \ No newline at end of file +} + +/* + Match Page +*/ + +div#match { + @include span-columns(12); + border-bottom: em(3) solid $light-gray; + + .contesters, + .details, + .referee, + .predictions, + .report { + @include span-columns(12); + } + + .contesters { + margin-bottom: em(20); + + .vs { + margin: 0 auto; + display: block; + font: 50px $montserrat; + border-radius: 50px; + background: $blue; + width: 100px; + height: 100px; + text-align: center; + line-height: 100px; + color: white; + font-style: italic; + text-transform: uppercase; + padding-right: 10px; + font-weight: bold; + } + + .team-1, + .team-2 { + max-height: 100px; + overflow: hidden; + } + + .team-1 { + @include span-columns(5); + line-height: 100px; + text-align: right; + } + + .team-2 { + @include span-columns(5); + line-height: 100px; + text-align: left; + } + + .versus { + @include span-columns(2); + position: relative; + font-weight: bold; + + &.split:before { + content: ""; + display: block; + position: absolute; + background: white; + width: 1px; + height: 100px; + margin: 0 auto; + left: 50%; + top: 0; + } + + .score-1, + .score-2 { + font: 50px $montserrat; + color: white; + width: 50%; + position: absolute; + top: 0; + text-align: center; + line-height: 100px; + font-weight: bold; + } + + .score-1 { + padding-left: 15px; + left: 0; + } + + .score-2 { + padding-right: 15px; + right: 0; + } + } + } + + .details { + margin-bottom: em(20); + text-align: center; + + .contest, + .date { + text-align: center; + } + + .date { + font-style: italic; + font-weight: normal; + } + + .contest { + margin-bottom: em(10); + } + } + + .lineups { + @include span-columns(12); + margin: em(20) 0 em(40); + + i { + color: $gold; + } + + .team-1 { + @include span-columns(6); + text-align: right; + + .flag { + margin: 0 0 0 em(10); + } + } + + .team-2 { + @include span-columns(6); + @include omega; + } + + &.shift .team-2 { + @include shift(6); + } + } + + .predictions { + text-align: center; + + h4 { + margin-bottom: 1em; + } + + input { + text-align: center; + } + + .add { + @include span-columns(12); + text-align: center; + + input { + float: none; + margin: em(20) 0 0 0; + } + } + + .team-1 { + @include span-columns(6); + text-align: right; + + .highlight { + margin-left: em(10); + } + } + + .team-2 { + @include span-columns(6); + @include omega; + text-align: left; + + .highlight { + margin-right: em(10); + } + } + } + + .report { + margin: em(20) 0; + padding-top: em(20); + border-top: em(3) solid $light-gray; + } +} + +/* + Map Page +*/ + +div#map { + + .preview { + @include span-columns(12); + text-align: center; + + img { + margin: em(20) 0; + } + } +} diff --git a/app/assets/stylesheets/pages/_news.scss b/app/assets/stylesheets/pages/_news.scss index aa272d8..6d227d4 100644 --- a/app/assets/stylesheets/pages/_news.scss +++ b/app/assets/stylesheets/pages/_news.scss @@ -16,11 +16,7 @@ div.article { margin-bottom: em(40); ul { - list-style-type: disc; - - li { - margin-left: em(20); - } + @extend ul.disc; } } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 54b89d5..5bacc5c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -49,7 +49,7 @@ module ApplicationHelper end def longdate time - printtime time, "%d %B %Y" + printtime time, "%e %B %Y" end def printtime time, format diff --git a/app/models/match.rb b/app/models/match.rb index 821f1c8..c49c468 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -158,11 +158,11 @@ class Match < ActiveRecord::Base end def team1_lineup - matchers.all(:conditions => {:contester_id => contester1_id}).collect{|matcher| matcher.user.username} * ", " + matchers.all(:conditions => {:contester_id => contester1_id}) end def team2_lineup - matchers.all(:conditions => {:contester_id => contester2_id}).collect{|matcher| matcher.user.username} * ", " + matchers.all(:conditions => {:contester_id => contester2_id}) end def get_friendly param = nil diff --git a/app/views/comments/_new.html.erb b/app/views/comments/_new.html.erb index 4faef68..5c5bcfc 100644 --- a/app/views/comments/_new.html.erb +++ b/app/views/comments/_new.html.erb @@ -1,5 +1,5 @@
-
New comment
+
New Comment
<% if cuser %> <%= form_for(@comment, remote: true) do |f| %> diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb index 0b2762a..533b368 100644 --- a/app/views/comments/edit.html.erb +++ b/app/views/comments/edit.html.erb @@ -1,23 +1,15 @@ -
-

Editing comment

+
+

Editing Comment

<%= form_for(@comment) do |f| %> -
-
    - <% @comment.errors.full_messages.each do |msg| %> -
  • <%= msg %>
    • - <% end %> -
-
+ <%= render 'shared/errors', messages: @comment.errors.full_messages %> -

- <%= f.label :text %>
- <%= f.text_area :text, :rows => 15, :cols => 60 %> -

-

+

+ <%= f.text_area :text, rows: 5 %> +
+
<%= f.submit 'Update' %> -

+
<% end %>
- -<%= link_to 'Back', :back %> + \ No newline at end of file diff --git a/app/views/contesters/_list.html.erb b/app/views/contesters/_list.html.erb index 3cdc663..ba7fef9 100644 --- a/app/views/contesters/_list.html.erb +++ b/app/views/contesters/_list.html.erb @@ -47,7 +47,6 @@ <% if cuser and cuser.admin? %> <%= link_to icon('pencil'), edit_contester_path(contester) %> <%= link_to icon('times'), contester, confirm: 'Are you sure?', method: :delete %> - <%= link_to icon('refresh'), controller: "contesters", action: "recalc", id: contester %> <% end %> <% end %> diff --git a/app/views/contesters/show.html.erb b/app/views/contesters/show.html.erb index 25ced83..38f9ce5 100644 --- a/app/views/contesters/show.html.erb +++ b/app/views/contesters/show.html.erb @@ -7,7 +7,7 @@ <% if @contester.team.logo %> <% end %>
@@ -65,8 +65,6 @@ <%= render partial: 'teamers/list', locals: { teamers: @members, blacklist: nil, comment: false } %>
-<%= link_to 'Back', @contester.contest, class: 'button' %> - <% if @contester.can_update? cuser %> <%= link_to 'Edit', edit_contester_path(@contester), class: 'button' %> <% end %> diff --git a/app/views/contests/show.html.erb b/app/views/contests/show.html.erb index 358f82c..12007f5 100644 --- a/app/views/contests/show.html.erb +++ b/app/views/contests/show.html.erb @@ -1,36 +1,42 @@ -

<%= @contest.name %>

+

+ <%= @contest.name %> +

-
-

Details

+<% content_for :sidebar do %> +
+

Contest Details

-
-
Start - End
-
- <%= 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 %>
+ <%= longdate @contest.end %> +
+
Rules
+
<%= namelink @contest.rules %>
+
Status
+
<%= @contest.statuses[@contest.status] %>
+
Default
+
Sunday: <%= Time.use_zone(timezone_offset) { @contest.default_time.strftime("%H:%M %Z") } %>
+
- <% if @contest.contest_type == Contest::TYPE_LADDER %> - <%= link_to 'Scoring', "/contests/#{@contest}/score" %> - <% end %> - <% if cuser and cuser.admin? %> - <%= link_to 'Edit', edit_contest_path(@contest) %> + <% if @contest.contest_type == Contest::TYPE_LADDER %> + <%= link_to 'Scoring', "/contests/#{@contest}/score", class: 'button' %> + <% end %> + <% if cuser and cuser.admin? %> + <%= link_to 'Edit Contest', edit_contest_path(@contest), class: 'button' %> + <% end %> +
+<% end %> + +
+ <% if @contest.contest_type == Contest::TYPE_BRACKET %> + <%= render partial: 'bracket', locals: { contest: @contest } %> + <% else %> + <%= render partial: 'normal' %> <% end %>
-<% if @contest.contest_type == Contest::TYPE_BRACKET %> - <%= render partial: 'bracket', locals: { contest: @contest } %> -<% else %> - <%= render partial: 'normal' %> -<% end %> -
  • Matches
    • @@ -47,7 +53,7 @@ <% if @contest.weeks.count > 0 %> <% @contest.weeks.ordered.each do |week| %> - <% next if week.matches.count == 0 %> + <% next if week.matches.realfinished.size == 0 %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index af4bc26..7b1be97 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,6 +21,7 @@ <%= yield %>
    <%= week.name %> Date
    +
    @@ -8,17 +8,15 @@ <% @maps.each do |map| %> - + <% end %>
    Name Download
    <%= namelink map %> <%= h map.download %> - <%= link_to 'Edit', edit_map_path(map) %> - <%= link_to 'Destroy', map, :confirm => 'Are you sure?', :method => :delete %> + <%= link_to icon('pencil'), edit_map_path(map) %> + <%= link_to icon('times'), map, confirm: 'Are you sure?', method: :delete %>
    -
    - -<%= link_to 'New map', new_map_path %> +<%= link_to 'New Map', new_map_path, class: 'button' %> diff --git a/app/views/maps/new.html.erb b/app/views/maps/new.html.erb index 0abe5b6..f704d01 100644 --- a/app/views/maps/new.html.erb +++ b/app/views/maps/new.html.erb @@ -1,5 +1,3 @@ -

    New map

    +

    New Map

    -<%= render :partial => "form" %> - -<%= link_to 'Back', maps_path %> \ No newline at end of file +<%= render partial: 'form' %> diff --git a/app/views/maps/show.html.erb b/app/views/maps/show.html.erb index 1d8e59c..6122bb5 100644 --- a/app/views/maps/show.html.erb +++ b/app/views/maps/show.html.erb @@ -1,21 +1,25 @@ -

    - <%=h @map.name %> -

    +
    +

    + <%=h @map.name %> +

    -
    -

    - Download: <%= link_to (h @map.download), (h @map.download) %> -

    - -

    - Used in contests: -

    -
      - <% @map.contests.each do |contest| %> -
    • <%= namelink contest %>
      • + <% if @map.picture.length > 0 %> +
      + <%= image_tag @map.picture %> +
      <% end %> -
    -
    -<%= link_to 'Edit', edit_map_path(@map) %> | -<%= link_to 'Back', maps_path %> + <% if @map.download.length > 0 %> + Download
    +

    <%= link_to (h @map.download), (h @map.download) %>

    + <% end %> + +

    Played in Contests

    +
      + <% @map.contests.each do |contest| %> +
    • <%= namelink contest %>
      • + <% end %> +
    + + <%= link_to 'Edit Map', edit_map_path(@map), class: 'button' %> +
    diff --git a/app/views/matches/_match.html.erb b/app/views/matches/_match.html.erb index 94d5241..c90b16a 100644 --- a/app/views/matches/_match.html.erb +++ b/app/views/matches/_match.html.erb @@ -1,4 +1,4 @@ - +
    @@ -17,11 +17,14 @@ - - - + <% end %> + + + + <% end %>
    Date and Time Contest<% if match.map1 and match.map2 %> <%= link_to match.map1, :controller => :maps, :action => :show, :id => match.map1 %>, <%= link_to match.map2, :controller => :maps, :action => :show, :id => match.map2 %> - <% end %><%= match.preds(1) %>% - <%= match.preds(2) %>%<%= link_to match, :class => "bold #{match.score_color}" do %> - <%= h match.score1 %> - <%= h match.score2 %> - <% end %>
    <%= match.preds(1) %>% - <%= match.preds(2) %>% + <%= link_to match, :class => "bold #{match.score_color}" do %> + <%= h match.score1 %> - <%= h match.score2 %> + <% end %> +
    diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 7a625d9..01d49a0 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -1,36 +1,34 @@ -

    - Matches -

    -

    - Of currently active contests -

    +

    Matches

    +

    Of currently active contests

    -
    -
    - -
    -
    -

    Upcoming Matches

    - <%= render :partial => "matches/match", :locals => {:matches => @matches.unfinished.chrono} %> -
    -
    -

    Recent Matches

    - <%= render :partial => "matches/match", :locals => {:matches => @matches.realfinished.reverse_order.chrono} %> -
    -
    -

    Your Matches (<%= if cuser then @matches.of_user(cuser).count else 0 end %>)

    - <% if cuser then %> - <%= render :partial => "matches/match", :locals => {:matches => @matches.of_user(cuser).reverse_order.chrono} %> - <% end %> -
    -
    -
    - -
    +
    + +
    +
    +

    Upcoming Matches

    + <%= render partial: "matches/match", locals: { matches: @matches.unfinished.chrono } %> +
    +
    +

    Recent Matches

    + + <%= render partial: "matches/match", locals: { matches: @matches.realfinished.reverse_order.chrono } %> +
    +
    +

    Your Matches (<%= if cuser then @matches.of_user(cuser).count else 0 end %>)

    + <% if cuser then %> + <%= render partial: "matches/match", locals: { matches: @matches.of_user(cuser).reverse_order.chrono } %> + <% end %> +
    +
    +
    + + diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 8d50daf..8907892 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -1,90 +1,118 @@ -
    -

    - <% if @match.score1 and @match.score2%> - <% if @match.score1 > @match.score2; c1 = 'green'; c2 = 'red' end %> - <% if @match.score1 < @match.score2; c1 = 'red'; c2 = 'green' end %> - <% if @match.score1 == @match.score2; c1 = 'yellow'; c2 = 'yellow' end %> - <%= namelink @match.contester1.team if @match.contester1 %> - <%= h @match.score1 %> - - - <%= h @match.score2 %> - <%= namelink @match.contester2.team if @match.contester2 %> - <% else %> - <%= namelink @match.contester1.team if @match.contester1 %> - vs - <%= namelink @match.contester2.team if @match.contester2 %> - <% end %> -

    - -

    - <%= longtime @match.match_time %> -

    - - <%= cascade @match, [:contest, :server, :hltv, :demo, :referee, [@match.contester1, "team1_lineup"], [@match.contester2, "team2_lineup"], ["Man of the Match", :motm]] %> - -

    - Maps: - <%= namelink @match.map1 %>, <%= namelink @match.map2 %> -

    - - <% if @match.hltv %> -

    - <%= link_to "Connect to HLTV", "steam://connect/#{@match.hltv.addr}" %> -

    - <% end %> - - <%# if cuser and @match.can_update? cuser, [:matchers_attributes] %> - <%# if cuser and cuser.admin? %> - - <%#= link_to "Scoring and lineup", :action => "score", :id => @match %> - - <%# end %> - - <% if cuser and @match.can_update? cuser, [:report] %> -

    - <%= link_to "Referee (Scoring, Line-Ups, Man of the match)", :controller => :matches, :action => "ref", :id => @match %> -

    - <% end %> - - <%# if cuser and @match.can_update? cuser, [:hltv] %> - - <%#= link_to "Extras", :action => "extra", :id => @match %> - - <%# end %> - -
    - -

    - Predictions (<%= @match.predictions.count %>) -

    - - <% if @newpred.can_create? cuser %> - <%= form_for @newpred do |f| %> - <%= f.hidden_field :match_id %> - <%= f.text_field :score1, :size => 1 %> - - <%= f.text_field :score2, :size => 1 %> -

    - <%= submit_tag "Save Prediction" %> -

    - <% end %> - <% else %> -

    - <%= @match.contester1.team if @match.contester1 %>: <%= @match.preds(1) %>%
    - <%= @match.contester2.team if @match.contester2 %>: <%= @match.preds(2) %>%
    -

    - <% end %> +
    +
    + <% if @match.score1 and @match.score2 %> +

    <%= namelink @match.contester1.team if @match.contester1 %>

    +
    +
    + <%= h @match.score1 %> +
    + +
    + <%= h @match.score2 %> +
    +

    <%= namelink @match.contester2.team if @match.contester2 %>

    + <% else %> +

    <%= namelink @match.contester1.team if @match.contester1 %>

    +
    + VS +
    +

    <%= namelink @match.contester2.team if @match.contester2 %>

    + <% end %> +
    - <% unless @match.report.nil? or @match.report.empty? %> -
    -

    - Report -

    - -

    - <%= raw @match.report %> -

    + <% if @match.team1_lineup.any? || @match.team2_lineup.any? %> +
    + <% if @match.team1_lineup.any? %> +
    +
      + <% @match.team1_lineup.each do |teamer| %> +
    • + <% if teamer.user == @match.motm %> + <%= icon 'star' %> + <% end %> + <%= teamer.user.username %> + <%= flag teamer.user.country %> +
      • + <% end %> +
    <% end %> - <%= add_comments @match %> + <% if @match.team2_lineup.any? %> +
    +
      + <% @match.team2_lineup.each do |teamer| %> +
    • + <%= flag teamer.user.country %> + <%= teamer.user.username %> + <% if teamer.user == @match.motm %> + <%= icon 'star' %> + <% end %> +
      • + <% end %> +
    +
    + <% end %> +
    + <% end %> + +
    +

    <%= @match.contest %>

    +
    <%= @match.match_time.strftime("%A %e %B %Y") %>
    +
    <%= Time.use_zone(timezone_offset) { @match.match_time.strftime("%H:%M %Z") } %>
    +
    + +
    +

    Predictions (<%= @match.predictions.count %>)

    + + <% if @newpred.can_create? cuser %> + <%= form_for @newpred do |f| %> + <%= f.hidden_field :match_id %> + +
    +
    + <%= f.text_field :score1, size: 1, placeholder: 0 %> +
    +
    + <%= f.text_field :score2, size: 1, placeholder: 0 %> +
    +
    + +
    + <%= submit_tag "Add Prediction", class: 'button tiny' %> +
    + <% end %> + <% else %> +
    + <%= @match.contester1.team if @match.contester1 %> +
    <%= @match.preds(1) %>%
    +
    +
    +
    <%= @match.preds(2) %>%
    + <%= @match.contester2.team if @match.contester2 %> +
    + <% end %> +
    + +
    + <%= cascade @match, [:server, :demo, :referee] %> + Maps
    + <%= namelink @match.map1 %>, <%= namelink @match.map2 %> +
    + + <% unless @match.report.nil? or @match.report.empty? %> +
    +

    Match Report

    +

    <%= @match.report.html_safe %>

    +
    + <% end %> + + <% if cuser and @match.can_update? cuser, [:report] %> +
    + <%= link_to "Referee Admin", { controller: :matches, action: 'ref', id: @match }, class: 'button' %> +
    + <% end %> +
    + +<%= add_comments @match %> diff --git a/app/views/posts/_form.html.erb b/app/views/posts/_form.html.erb index ce16632..a8addbb 100644 --- a/app/views/posts/_form.html.erb +++ b/app/views/posts/_form.html.erb @@ -8,9 +8,9 @@ <%= namelink @post.topic %>
    -
    +
    <%= f.label :text %> - <%= f.text_area :text, rows: 20 %> + <%= f.text_area :text, rows: 15 %>
    <%= f.submit 'Save Post' %> diff --git a/app/views/posts/_post.html.erb b/app/views/posts/_post.html.erb index 7c2adb9..3704ef3 100644 --- a/app/views/posts/_post.html.erb +++ b/app/views/posts/_post.html.erb @@ -18,7 +18,7 @@
    Location
    <%= post.user.from %>
    Joined
    -
    <%= post.user.joined %>
    +
    <%= longdate post.user.created_at %>
    diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb index bdd4786..0f8efc1 100644 --- a/app/views/teams/show.html.erb +++ b/app/views/teams/show.html.erb @@ -5,7 +5,7 @@ <% if @team.logo %> <% end %> diff --git a/app/views/widgets/_highlights.html.erb b/app/views/widgets/_highlights.html.erb index 21a603a..7c4b498 100644 --- a/app/views/widgets/_highlights.html.erb +++ b/app/views/widgets/_highlights.html.erb @@ -4,8 +4,8 @@
    <% if cuser and cuser.active_contests.count != 0 then %>
    - Your contests - <%= link_to "(More)", controller: :matches, matchesTab: "YourTab" %> + Your Matches + <%= link_to "More", controller: :matches, matches: 'your' %>
      <% cuser.active_contests.each do |contest| %> @@ -20,7 +20,7 @@ <% if Match.recent.count != 0 then %>
      Latest Matches - <%= link_to "More", controller: :matches, matchesTab: "RecentTab" %> + <%= link_to 'More', controller: :matches, matches: 'recent' %>
        <% Match.realfinished.reverse_order.recent.chrono.each do |match| %> @@ -39,7 +39,7 @@ <% if Match.future5.count != 0 then %>
        Upcoming matches - <%= link_to "More", controller: :matches, matchesTab: "UpcomingTab" %> + <%= link_to 'More', controller: :matches, matches: 'upcoming' %>
          <% Match.future5.chrono.each do |match| %>