deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

show perf icon in game widget

pull/119/head
Thibault Duplessis 2014-08-01 00:45:20 +02:00
parent dd16822e00
commit e77b2ee93d
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/views/game/widgets.scala.html
View File

@ -7,25 +7,25 @@
@gameFen(g, firstPlayer.color, ownerLink) @gameFen(g, firstPlayer.color, ownerLink)
<div class="infos"> <div class="infos">
@bookmark.toggle(g) @bookmark.toggle(g)
@if(g.isBeingPlayed) { <div class="perf_block" @g.perfType.map { p => data-icon="@p.iconChar"}>
<a class="link" href="@routes.Round.watcher(g.id, firstPlayer.color.name)" data-icon="v"> @trans.playingRightNow()</a>, @if(g.isBeingPlayed) {
} else { <a class="link" href="@routes.Round.watcher(g.id, firstPlayer.color.name)" data-icon="v"> @trans.playingRightNow()</a>,
@momentFormat(g.createdAt) } else {
} @momentFormat(g.createdAt)
@if(g.finishedOrAborted) { }
@gameEndStatus(g) @if(g.finishedOrAborted) {
@g.winner.map { winner => @gameEndStatus(g)
, <span class="@{ fromPlayer.map(p => (p == winner).fold("win", "loss")) }"> @g.winner.map { winner =>
@winner.color.fold(trans.whiteIsVictorious(), trans.blackIsVictorious()) , <span class="@{ fromPlayer.map(p => (p == winner).fold("win", "loss")) }">
</span> @winner.color.fold(trans.whiteIsVictorious(), trans.blackIsVictorious())
} </span>
} else { }
@g.turnColor.fold(trans.whitePlays(), trans.blackPlays()) } else {
} @g.turnColor.fold(trans.whitePlays(), trans.blackPlays())
@if(g.variant.exotic) { }
<br /> <br />
@trans.variant(): <strong>@variantLink(g.variant, variantName(g.variant))</strong> @trans.variant(): <strong>@variantLink(g.variant, variantName(g.variant))</strong>
} </div>
@g.pgnImport.flatMap(_.date).map { date => @g.pgnImport.flatMap(_.date).map { date =>
<br /> <br />
PGN Import @date PGN Import @date

3
modules/game/src/main/Game.scala
View File

@ -7,6 +7,7 @@ import com.github.nscala_time.time.Imports._
import org.joda.time.DateTime import org.joda.time.DateTime
import lila.db.ByteArray import lila.db.ByteArray
import lila.rating.PerfType
import lila.user.User import lila.user.User
case class Game( case class Game(
@ -201,6 +202,8 @@ case class Game(
def speed = chess.Speed(clock) def speed = chess.Speed(clock)
def perfType = PerfType(PerfPicker.key(this))
def started = status >= Status.Started def started = status >= Status.Started
def notStarted = !started def notStarted = !started

2
modules/game/src/main/PerfPicker.scala
View File

@ -19,6 +19,8 @@ object PerfPicker {
} }
else variant.key else variant.key
def key(game: Game): String = key(game.speed, game.variant, game.poolId)
def main(speed: Speed, variant: Variant, poolId: Option[String]): Option[Perfs => Perf] = def main(speed: Speed, variant: Variant, poolId: Option[String]): Option[Perfs => Perf] =
poolId match { poolId match {
case Some(id) => Some(_ pool id) case Some(id) => Some(_ pool id)

5
public/stylesheets/common.css
View File

@ -1319,6 +1319,11 @@ div.game_row div.infos span.win {
div.game_row div.infos span.loss { div.game_row div.infos span.loss {
color: #ac524f; color: #ac524f;
} }
div.game_row div.perf_block::before {
font-size: 30px;
float: left;
margin: 5px 8px 0 -5px;
}
div.game_row a.go_analyse { div.game_row a.go_analyse {
position: absolute; position: absolute;
bottom: 16px; bottom: 16px;