From f41e6e0d5a0574a242e0d79c4c47d73c4397b5aa Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Fri, 16 May 2014 23:54:41 +0100 Subject: [PATCH] Fixes gather music not playing during voting phase Fixes issues with topic ordering Tweaked read/unread icon colours for forums --- .../layout/forum-category-highlight.png | Bin 5327 -> 7325 bytes .../themes/default/layout/forum-category.png | Bin 7325 -> 5327 bytes .../themes/default/components/_flashes.scss | 8 +++--- .../themes/default/pages/_forums.scss | 6 ++++- .../themes/flat/components/_flashes.scss | 24 ++++++++++++++++++ .../themes/flat/pages/_forums.scss | 5 ++++ app/controllers/forums_controller.rb | 3 +-- app/views/gathers/show.html.erb | 4 +-- spec/spec_helper.rb | 4 +-- 9 files changed, 43 insertions(+), 11 deletions(-) diff --git a/app/assets/images/themes/default/layout/forum-category-highlight.png b/app/assets/images/themes/default/layout/forum-category-highlight.png index 3a0813b68f15455b1312b2f84d56e4d249f4f039..61f4eaacd0b496270ba714683cfeab35da122d23 100644 GIT binary patch delta 6555 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 N002ovPDHLkV1n=`cF6z$ delta 4615 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 diff --git a/app/assets/images/themes/default/layout/forum-category.png b/app/assets/images/themes/default/layout/forum-category.png index 61f4eaacd0b496270ba714683cfeab35da122d23..3a0813b68f15455b1312b2f84d56e4d249f4f039 100644 GIT binary patch delta 4615 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 delta 6555 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 N002ovPDHLkV1n=`cF6z$ diff --git a/app/assets/stylesheets/themes/default/components/_flashes.scss b/app/assets/stylesheets/themes/default/components/_flashes.scss index 088fe35..3a2772a 100644 --- a/app/assets/stylesheets/themes/default/components/_flashes.scss +++ b/app/assets/stylesheets/themes/default/components/_flashes.scss @@ -75,7 +75,7 @@ div#errors { top: 0; .message { - background: image-url("#{theme-path}/layout/flash-notice-background.png"); + background: image-url("#{$theme-path}/layout/flash-notice-background.png"); position: relative; width: 730px; height: 60px; @@ -89,7 +89,7 @@ div#errors { z-index: 2; &:before { - background: image-url("#{theme-path}/layout/flash-notice-icon.png"); + background: image-url("#{$theme-path}/layout/flash-notice-icon.png"); content: ''; display: block; width: 30px; @@ -102,10 +102,10 @@ div#errors { &.warning, &.error, &.alert { - background: image-url("#{theme-path}/layout/flash-error-background.png"); + background: image-url("#{$theme-path}/layout/flash-error-background.png"); &:before { - background: image-url("#{theme-path}/layout/flash-error-icon.png"); + background: image-url("#{$theme-path}/layout/flash-error-icon.png"); } } } diff --git a/app/assets/stylesheets/themes/default/pages/_forums.scss b/app/assets/stylesheets/themes/default/pages/_forums.scss index 14b1ff2..f3b46b7 100644 --- a/app/assets/stylesheets/themes/default/pages/_forums.scss +++ b/app/assets/stylesheets/themes/default/pages/_forums.scss @@ -120,8 +120,12 @@ div#categories { border-radius: $base-border-radius; border: 0; + .read { + color: $base-font-color; + } + .unread { - color: $red; + color: $blue; } thead th { diff --git a/app/assets/stylesheets/themes/flat/components/_flashes.scss b/app/assets/stylesheets/themes/flat/components/_flashes.scss index 8729f09..4c876eb 100644 --- a/app/assets/stylesheets/themes/flat/components/_flashes.scss +++ b/app/assets/stylesheets/themes/flat/components/_flashes.scss @@ -62,4 +62,28 @@ div#errors { } } } +} + +/* + Notification Messages +*/ + + +#notification { + position: absolute; + margin: 0 auto; + left: 50%; + top: 0; + + .message { + @extend .flash; + position: relative; + width: auto; + left: -50%; + text-align: center; + font-family: $header-font-family; + color: white; + padding: 0 100px; + z-index: 2; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/themes/flat/pages/_forums.scss b/app/assets/stylesheets/themes/flat/pages/_forums.scss index a849afe..60e046a 100644 --- a/app/assets/stylesheets/themes/flat/pages/_forums.scss +++ b/app/assets/stylesheets/themes/flat/pages/_forums.scss @@ -130,6 +130,11 @@ div#categories { border-radius: $base-border-radius; border: 0; + .read { + color: $base-font-color; + font-weight: normal; + } + .unread { color: $red; } diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 1b3ba0c..890b0ae 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -11,8 +11,7 @@ class ForumsController < ApplicationController raise AccessError unless @forum.can_show? cuser @topics = Topic.where(forum_id: @forum.id) - .joins(:posts, :user, :users_who_read) - .includes(:lock) + .includes(:posts, :user, :users_who_read, :lock) .group('topics.id') .order('state DESC, posts.id DESC') .paginate(page: params[:page], per_page: 30) diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 6fc716e..7f4f160 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -8,8 +8,8 @@ type: "script", minTimeout: 5000, maxTimeout: 15000, - success: function(response) { - if (response.match(/Gather:voting/)) { + success: function(response, text, request) { + if (request.getResponseHeader('Gather') == 'voting') { if (!played) { $("#jplayer").jPlayer({ ready: function() { diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 64f1505..b52f246 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,7 +17,7 @@ Capybara.register_driver :poltergeist do |app| ) end -Capybara.javascript_driver = :poltergeist +Capybara.javascript_driver = :selenium Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } @@ -33,7 +33,7 @@ RSpec.configure do |config| config.before(:each) do if example.metadata[:type] == :feature - Capybara.current_driver = :poltergeist + Capybara.current_driver = :selenium else Capybara.use_default_driver end