From 25d04f117cc937e0f26f5a653eecdb5b076cece0 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Mon, 29 Jul 2013 15:02:42 +0200 Subject: [PATCH] better miniboard vs text --- app/templating/GameHelper.scala | 6 +++--- app/views/game/vstext.scala.html | 17 +++++++++++++---- public/stylesheets/common.css | 26 ++++++++++++++++++++------ 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/app/templating/GameHelper.scala b/app/templating/GameHelper.scala index 29e7047137..6ad3319b40 100644 --- a/app/templating/GameHelper.scala +++ b/app/templating/GameHelper.scala @@ -37,8 +37,8 @@ trait GameHelper { self: I18nHelper with UserHelper with AiHelper with StringHel case Mode.Rated ⇒ trans.rated.str() } - def usernameWithElo(player: Player) = - Namer.player(player)(userEnv.usernameOrAnonymous).await + def playerUsername(player: Player, withElo: Boolean = true) = + Namer.player(player, withElo)(userEnv.usernameOrAnonymous).await def playerLink( player: Player, @@ -56,7 +56,7 @@ trait GameHelper { self: I18nHelper with UserHelper with AiHelper with StringHel """%s%s""".format( userClass(userId, cssClass, withOnline), routes.User show username, - usernameWithElo(player) + ~(player.eloDiff filter (_ ⇒ withDiff) map { diff ⇒ + playerUsername(player) + ~(player.eloDiff filter (_ ⇒ withDiff) map { diff ⇒ " (%s)".format(showNumber(diff)) }), engine ?? """""" format trans.thisPlayerUsesChessComputerAssistance() diff --git a/app/views/game/vstext.scala.html b/app/views/game/vstext.scala.html index 67e001af16..9644e2bd70 100644 --- a/app/views/game/vstext.scala.html +++ b/app/views/game/vstext.scala.html @@ -1,6 +1,15 @@ -@(g: Game) +@(g: Game) -
- @usernameWithElo(g.creator) - @usernameWithElo(g.invited)
- @g.clock.map(shortClockName) +
+
+ @playerUsername(g.creator, false)
+ @g.creator.elo +
+
+ @playerUsername(g.invited, false)
+ @g.invited.elo +
+ @g.clock.map { c => +

@shortClockName(c)
+ }
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 25b7ecb763..57147d0d0c 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -1222,13 +1222,31 @@ div.game_list.realtime > div { float: left; margin: 0px 12px 12px 12px; } -div.game_list.realtime div.vstext { +div.vstext { font-size: 11.5px; - text-align: center; width: 224px; + line-height: 1.2em; + height: 2.4em; overflow: hidden; white-space: nowrap; margin-top: 5px; + position: relative; +} +div.vstext > .center { + width: 100%; + text-align: center; +} +div.vstext .left { + float: left; +} +div.vstext .right { + float: right; + text-align: right; +} +div.vstext .center { + position: absolute; + bottom: 0; + text-align: center; } div.extra_top { float: right; @@ -1743,10 +1761,6 @@ div.game_config div.color_submits button.random span { background: red url(../images/engine_small.png) top left no-repeat; border-radius: 8px 0 3px 0; } -#featured_game div.vstext { - margin-top: 0.7em; - text-align: center; -} div.undertable { width: 514px; font-size: 11.5px;