Quotes for simuls

kraktus · Jan 8, 2016 · ec31317 · ec31317
1 parent 68b98b7
commit ec31317
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/modules/simul/src/main/JsonView.scala b/modules/simul/src/main/JsonView.scala
@@ -6,6 +6,7 @@ import lila.common.LightUser
 import lila.common.PimpedJson._
 import lila.game.{ Game, GameRepo }
 import lila.user.{ User, UserRepo }
+import lila.quote.Quote.quoteWriter
 
 final class JsonView(
  getLightUser: String => Option[LightUser]) {
@@ -30,7 +31,8 @@ final class JsonView(
  "pairings" -> simul.pairings.sortBy(-_.player.rating).map(pairingJson(games, simul.hostId)),
  "isCreated" -> simul.isCreated,
  "isRunning" -> simul.isRunning,
- "isFinished" -> simul.isFinished)
+ "isFinished" -> simul.isFinished,
+ "quote" -> lila.quote.Quote.one(simul.id))
  }
 
  private def variantJson(speed: chess.Speed)(v: chess.variant.Variant) = Json.obj(

diff --git a/project/Build.scala b/project/Build.scala
@@ -207,7 +207,7 @@ object ApplicationBuild extends Build {
  )
 
  lazy val simul = project("simul", Seq(
- common, hub, socket, chess, game, round, chat, memo)).settings(
+ common, hub, socket, chess, game, round, chat, memo, quote)).settings(
  libraryDependencies ++= provided(play.api, RM, PRM)
  )
 

diff --git a/public/stylesheets/simul.css b/public/stylesheets/simul.css
@@ -93,6 +93,10 @@
 #simul .half.accepted tr.me {
  border-right: 10px solid #d59120;
 }
+#simul .pull-quote {
+ margin-top: 30px;
+ width: 300px;
+}
 #simul .title_tag {
  float: right;
  font-size: 20px;

diff --git a/public/stylesheets/tournament.css b/public/stylesheets/tournament.css
@@ -332,6 +332,7 @@ ol.scheduled_tournaments a {
  padding: 3px 5px;
 }
 #tournament .pull-quote {
+ margin-top: 30px;
  width: 300px;
 }
 .setup {

diff --git a/ui/simul/src/view/created.js b/ui/simul/src/view/created.js
@@ -134,6 +134,10 @@ module.exports = function(ctrl) {
  })))
  ])
  ),
+ m('blockquote.pull-quote', [
+ m('p', ctrl.data.quote.text),
+ m('footer', ctrl.data.quote.author)
+ ]),
  m('div.join_choice', ctrl.data.variants.map(function(variant) {
  return m('a.button', {
  'data-variant': variant.key

diff --git a/ui/tournament/src/view/created.js b/ui/tournament/src/view/created.js
@@ -32,8 +32,6 @@ module.exports = {
  startingMoment(ctrl.data),
  util.title(ctrl),
  arena.standing(ctrl, pag, 'created'),
- m('br'),
- m('br'),
  m('blockquote.pull-quote', [
  m('p', ctrl.data.quote.text),
  m('footer', ctrl.data.quote.author)