From b6b130597c0315f46608cb4c73fb3e70824a8750 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Tue, 30 Dec 2014 15:24:03 +0100
Subject: [PATCH] fix tournament reminder style, send to all active players

---
 app/views/tournament/reminder.scala.html   |  6 ++---
 modules/tournament/src/main/Reminder.scala |  2 +-
 public/stylesheets/common.css              | 31 ++++++++--------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/app/views/tournament/reminder.scala.html b/app/views/tournament/reminder.scala.html
index f4d65600dc..4f9b1fbe87 100644
--- a/app/views/tournament/reminder.scala.html
+++ b/app/views/tournament/reminder.scala.html
@@ -1,9 +1,9 @@
 @(tour: lila.tournament.Tournament)
 
-@notification.view("tournament_reminder", cssClass = "foldable", closable = false, glow = true) {
+@notification.view("tournament_reminder", closable = false, glow = true) {
 <a data-icon="g" href="@routes.Tournament.show(tour.id)">&nbsp;@tour.name</a> in progress!
 <div class="actions">
-  <a class="withdraw trans_me" href="@routes.Tournament.withdraw(tour.id)" data-icon="b">@trans.withdraw.en()</a>
-  <a class="trans_me" href="@routes.Tournament.show(tour.id)" data-icon="G">@trans.join.en()</a>
+  <a class="withdraw trans_me text" href="@routes.Tournament.withdraw(tour.id)" data-icon="b">@trans.withdraw.en()</a>
+  <a class="trans_me text" href="@routes.Tournament.show(tour.id)" data-icon="G">@trans.join.en()</a>
 </div>
 }
diff --git a/modules/tournament/src/main/Reminder.scala b/modules/tournament/src/main/Reminder.scala
index c8612908b1..fcdca62e20 100644
--- a/modules/tournament/src/main/Reminder.scala
+++ b/modules/tournament/src/main/Reminder.scala
@@ -19,7 +19,7 @@ private[tournament] final class Reminder(
     case RemindTournaments(tours) => tours foreach { tour =>
       renderer ? RemindTournament(tour) foreach {
         case html: Html =>
-          val event = SendTos(tour.playingUserIds.toSet, Json.obj(
+          val event = SendTos(tour.activeUserIds.toSet, Json.obj(
             "t" -> "tournamentReminder",
             "d" -> Json.obj(
               "id" -> tour.id,
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 679bbb8409..15cfb2132c 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -1077,6 +1077,12 @@ body.offline #nb_connected_players {
   padding: 5px 3% 5px 3%;
   text-align: center;
 }
+#message_notifications,
+#challenge_notifications {
+  width: 240px;
+  z-index: 2;
+  left: -94px;
+}
 #message_notifications div.notification,
 #challenge_notifications div.notification {
   border-bottom: 1px solid #c0c0c0;
@@ -1087,8 +1093,6 @@ body.offline #nb_connected_players {
 #challenge_notifications div.notification:hover {
   background-color: #f0f0f0;
 }
-#message_notifications,
-#challenge_notifications,
 #notifications {
   position: absolute;
   top: -20px;
@@ -1104,22 +1108,6 @@ body.offline #nb_connected_players {
   box-shadow: 0 0 3px 0px #d85000;
   transition: box-shadow 1.5s;
 }
-#notifications > div.foldable {
-  line-height: 1.6em;
-  height: 1.5em;
-  overflow: hidden;
-}
-#notifications > div.foldable:hover {
-  line-height: inherit;
-  height: auto;
-}
-#notifications > div a.close {
-  text-decoration: none;
-  float: right;
-}
-#notifications > div a.close:hover {
-  font-weight: bold;
-}
 #message_notifications .user_link,
 #challenge_notifications .user_link,
 #message_notifications .block .title {
@@ -1133,8 +1121,7 @@ body.offline #nb_connected_players {
   text-transform: uppercase;
 }
 #message_notifications .actions,
-#challenge_notifications .actions,
-#notifications .actions {
+#challenge_notifications .actions {
   position: absolute;
   top: 5px;
   right: 5px;
@@ -1165,6 +1152,10 @@ body.offline #nb_connected_players {
 #challenge_notifications .notification:hover .actions {
   opacity: 0.7;
 }
+#notifications .actions {
+  margin-top: 5px;
+  text-align: right;
+}
 #notifications .actions a {
   margin-left: 10px;
 }