show themepicker everywhere

2014-05-12 13:42:39 +02:00 · 2014-05-12 13:42:39 +02:00 · c73119d57c
parent 660e416f4a
commit c73119d57c
13 changed files with 14 additions and 29 deletions
--- a/app/views/analyse/layout.scala.html
+++ b/app/views/analyse/layout.scala.html
@ -1,4 +1,4 @@
-@(title: String, goodies: Option[Html] = None, chat: Option[Html] = None, underchat: Option[Html] = None, moreCss: Html = Html(""), moreJs: Html = Html(""), themepicker: Boolean = false)(body: Html)(implicit ctx: Context)
+@(title: String, goodies: Option[Html] = None, chat: Option[Html] = None, underchat: Option[Html] = None, moreCss: Html = Html(""), moreJs: Html = Html(""))(body: Html)(implicit ctx: Context)

@base.layout(
 title = title,
@ -7,5 +7,4 @@ chat = chat,
 underchat = underchat,
 active = siteMenu.game.some,
 moreCss = moreCss,
-moreJs = moreJs,
-themepicker = themepicker)(body)
+moreJs = moreJs)(body)
--- a/app/views/analyse/replay.scala.html
+++ b/app/views/analyse/replay.scala.html
@ -41,8 +41,7 @@ goodies = views.html.game.infoBox(pov, tour, withTourStanding = false).some,
 chat = chat.map(c => base.chat(c, trans.spectatorRoom.str())),
 underchat = underchat.some,
 moreCss = moreCss,
-moreJs = moreJs,
-themepicker = true) {
+moreJs = moreJs) {
 <div class="analyse clearfix">
  <div class="board_wrap">
    <div
--- a/app/views/base/layout.scala.html
+++ b/app/views/base/layout.scala.html
@ -11,7 +11,6 @@ robots: Boolean = true,
 moreCss: Html = Html(""),
 moreJs: Html = Html(""),
 signedJs: Option[String] = None,
-themepicker: Boolean = false,
 zen: Boolean = false)(body: Html)(implicit ctx: Context)
 <!doctype html>
 <html lang="@lang.language">
@ -78,7 +77,6 @@ zen: Boolean = false)(body: Html)(implicit ctx: Context)
        @trans.nbConnectedPlayers("<strong>?</strong>")
      </div>
      <a id="reconnecting" onclick="location.reload();" data-icon="B">&nbsp;@trans.reconnecting()</a>
-      @if(themepicker) {
      <div id="themepicker"
        data-themes="@lila.pref.Theme.listString"
        data-sets="@lila.pref.PieceSet.listString">
@ -102,7 +100,6 @@ zen: Boolean = false)(body: Html)(implicit ctx: Context)
          </div>
        </div>
      </div>
-      }
      <div class="lichess_language">
        <a class="toggle" href="#">
          <span data-icon="u">&nbsp;@langName(lang)</span>
--- a/app/views/board/editor.scala.html
+++ b/app/views/board/editor.scala.html
@ -15,8 +15,7 @@
 title = trans.boardEditor.str(),
 menu = game.sideMenu(listMenu, "edit").some,
 moreJs = moreJs,
-moreCss = moreCss,
-themepicker = true) {
+moreCss = moreCss) {
 <div id="board_editor" class="content_box">
  <div id="chessboard_side">
    <div>
--- a/app/views/coordinate/home.scala.html
+++ b/app/views/coordinate/home.scala.html
@ -14,8 +14,7 @@
 title = "Coordinate training",
 moreCss = moreCss,
 moreJs = moreJs,
-active = siteMenu.puzzle.some,
-themepicker = true) {
+active = siteMenu.puzzle.some) {
 <div id="trainer" class="training init"
  data-color-pref="@ctx.pref.coordColorName"
  data-color-url="@routes.Coordinate.color()"
--- a/app/views/game/layout.scala.html
+++ b/app/views/game/layout.scala.html
@ -1,4 +1,4 @@
-@(title: String, goodies: Option[Html] = None, menu: Option[Html] = None, moreJs: Html = Html(""), moreCss: Html = Html(""), themepicker: Boolean = true)(body: Html)(implicit ctx: Context)
+@(title: String, goodies: Option[Html] = None, menu: Option[Html] = None, moreJs: Html = Html(""), moreCss: Html = Html(""))(body: Html)(implicit ctx: Context)

@base.layout(
 title = title,
@ -6,5 +6,4 @@ goodies = goodies,
 menu = menu,
 active = siteMenu.game.some,
 moreJs = moreJs,
-moreCss = moreCss,
-themepicker = themepicker)(body)
+moreCss = moreCss)(body)
--- a/app/views/game/list.scala.html
+++ b/app/views/game/list.scala.html
@ -9,8 +9,7 @@
@game.layout(
 title = title,
 moreJs = moreJs,
-menu = menu.some,
-themepicker = true) {
+menu = menu.some) {
 <div class="content_box no_padding">
  @extraTop.map { extra =>
  <div class="extra_top">@extra</div>
--- a/app/views/lobby/home.scala.html
+++ b/app/views/lobby/home.scala.html
@ -51,8 +51,7 @@ baseline = baseline.some,
 active = siteMenu.play.some,
 goodies = goodies.some,
 moreJs = moreJs,
-underchat = underchat.some,
-themepicker = true) {
+underchat = underchat.some) {
 <div id="call_boxes">
  @translationCall.map(i18n.callBox(_))
 </div>
--- a/app/views/puzzle/layout.scala.html
+++ b/app/views/puzzle/layout.scala.html
@ -18,7 +18,6 @@
 title = title,
 moreCss = moreCss,
 moreJs = moreJs,
-active = siteMenu.puzzle.some,
-themepicker = true) {
+active = siteMenu.puzzle.some) {
@body
 }
--- a/app/views/round/layout.scala.html
+++ b/app/views/round/layout.scala.html
@ -7,5 +7,4 @@ active = (active | siteMenu.play).some,
 chat = chat,
 underchat = underchat,
 robots = robots,
-signedJs = signedJs,
-themepicker = true)(body)
+signedJs = signedJs)(body)
--- a/app/views/tournament/layout.scala.html
+++ b/app/views/tournament/layout.scala.html
@ -11,7 +11,6 @@ moreJs = moreJs,
 goodies = goodies,
 chat = chat,
 active = siteMenu.tournament.some,
-themepicker = true,
 underchat = underchat) {
@body
 }
--- a/app/views/user/layout.scala.html
+++ b/app/views/user/layout.scala.html
@ -1,4 +1,4 @@
-@(title: String, goodies: Option[Html] = None, robots: Boolean = true, evenMoreJs: Html = Html(""), evenMoreCss: Html = Html(""), themepicker: Boolean = false)(body: Html)(implicit ctx: Context)
+@(title: String, goodies: Option[Html] = None, robots: Boolean = true, evenMoreJs: Html = Html(""), evenMoreCss: Html = Html(""))(body: Html)(implicit ctx: Context)

@moreCss = {
@cssTag("user-list.css")
@ -18,5 +18,4 @@ goodies = goodies,
 moreCss = moreCss,
 moreJs = moreJs,
 robots = robots,
-active = siteMenu.user.some,
-themepicker = themepicker)(body)
+active = siteMenu.user.some)(body)
--- a/app/views/user/show.scala.html
+++ b/app/views/user/show.scala.html
@ -29,8 +29,7 @@
 title = title,
 goodies = goodies.some,
 robots = false,
-evenMoreJs = evenMoreJs,
-themepicker = true) {
+evenMoreJs = evenMoreJs) {
 <div class="content_box no_padding user_show">
  <div class="content_box_top">
    @if(info.rank.map(_._1).exists(1==)) {