diff --git a/app/views/mod/inquiry.scala b/app/views/mod/inquiry.scala
new file mode 100644
index 0000000000..e169894b9b
--- /dev/null
+++ b/app/views/mod/inquiry.scala
@@ -0,0 +1,168 @@
+package views.html.mod
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.common.String.html.richText
+
+import controllers.routes
+
+object inquiry {
+
+ def apply(in: lila.mod.Inquiry)(implicit ctx: Context) = {
+
+ def renderReport(r: lila.report.Report) =
+ div(cls := "doc report")(
+ r.bestAtoms(10).toList.map { atom =>
+ div(cls := "atom")(
+ h3(
+ reportScore(atom.score),
+ userIdLink(atom.by.value.some, withOnline = false),
+ " for ", strong(r.reason.name),
+ " ", momentFromNow(atom.at)
+ ),
+ p(richText(atom.simplifiedText))
+ )
+ }
+ )
+
+ def renderNote(r: lila.user.Note) =
+ div(cls := "doc note")(
+ h3("by ", userIdLink(r.from.some, withOnline = false), ", ", momentFromNow(r.date)),
+ p(richText(r.text))
+ )
+
+ def autoNextInput =
+ input(cls := "auto-next", tpe := "hidden", name := "next", value := "1")
+
+ div(id := "inquiry")(
+ i(title := "Costello the Inquiry Octopus", cls := "costello"),
+ div(cls := "meat")(
+ userLink(in.user, withBestRating = true, params = "?mod"),
+ div(cls := "docs reports")(
+ div(cls := "expendable")(
+ in.allReports.map(renderReport)
+ )
+ ),
+ div(cls := List(
+ "dropper counter history" -> true,
+ "empty" -> in.history.isEmpty
+ ))(
+ span(
+ countTag(in.history.size),
+ "Mod log"
+ ),
+ in.history.nonEmpty option div(
+ ul(
+ in.history.map { e =>
+ li(
+ userIdLink(e.mod.some, withOnline = false),
+ " ", b(e.showAction), " ", e.details, " ", momentFromNow(e.date)
+ )
+ }
+ )
+ )
+ ),
+ div(cls := List(
+ "dropper counter notes" -> true,
+ "empty" -> in.notes.isEmpty
+ ))(
+ span(
+ countTag(in.notes.size),
+ "Notes"
+ ),
+ div(
+ form(cls := "note", action := s"${routes.User.writeNote(in.user.username)}?note", method := "post")(
+ textarea(name := "text", placeholder := "Write a mod note"),
+ input(tpe := "hidden", name := "mod", value := "true"),
+ div(cls := "submission")(
+ button(tpe := "submit", cls := "button thin")("SEND")
+ )
+ ),
+ in.notes.map(renderNote)
+ )
+ )
+ ),
+ div(cls := "links")(
+ in.report.boostWith.map { userId =>
+ a(href := s"${routes.User.games(in.user.id, "search")}?players.b=${userId}")("View", br, "Games")
+ }.getOrElse {
+ in.report.bestAtomByHuman.map { atom =>
+ a(href := s"${routes.User.games(in.user.id, "search")}?players.b=$atom.by.valueuserId}")("View", br, "Games")
+ }
+ },
+ isGranted(_.Shadowban) option
+ a(href := routes.Mod.communicationPublic(in.user.id))("View", br, "Comms")
+ ),
+ div(cls := "actions")(
+ div(cls := "dropper warn")(
+ span(cls := "icon", dataIcon := "e"),
+ div(
+ lila.message.ModPreset.all.map { preset =>
+ form(method := "post", action := routes.Mod.warn(in.user.username, preset.subject))(
+ button(cls := "fbt", tpe := "submit")(preset.subject),
+ autoNextInput
+ )
+ },
+ form(method := "get", action := routes.Message.form)(
+ input(tpe := "hidden", name := "mod", value := "1"),
+ input(tpe := "hidden", name := "user", value := "@in.user.id"),
+ button(cls := "fbt", tpe := "submit")("Custom message")
+ )
+ )
+ ),
+ isGranted(_.MarkEngine) option
+ form(method := "post", action := routes.Mod.engine(in.user.username, !in.user.engine), title := "Mark as cheat")(
+ button(dataIcon := "n", cls := List(
+ "fbt icon" -> true,
+ "active" -> in.user.engine
+ ), tpe := "submit"),
+ autoNextInput
+ ),
+ isGranted(_.MarkBooster) option
+ form(method := "post", action := routes.Mod.booster(in.user.username, !in.user.booster), title := "Mark as booster or sandbagger")(
+ button(dataIcon := "9", cls := List(
+ "fbt icon" -> true,
+ "active" -> in.user.booster
+ ), tpe := "submit"),
+ autoNextInput
+ ),
+ isGranted(_.Shadowban) option
+ form(method := "post", action := routes.Mod.troll(in.user.username, !in.user.booster),
+ title := (if (in.user.troll) "Un-shadowban" else "Shadowban"),
+ button(dataIcon := "c", cls := List(
+ "fbt icon" -> true,
+ "active" -> in.user.troll
+ ), tpe := "submit"),
+ autoNextInput),
+ div(cls := "dropper more")(
+ span(cls := "icon", dataIcon := "u"),
+ div(
+ form(method := "post", action := routes.Mod.notifySlack(in.user.id))(
+ button(cls := "fbt", tpe := "submit")("Notify Slack")
+ ),
+ form(method := "post", action := routes.Report.xfiles(in.report.id))(
+ button(cls := List("fbt" -> true, "active" -> (in.report.room.key == "xfiles")), tpe := "submit")("Move to X-Files"),
+ autoNextInput
+ )
+ )
+ )
+ ),
+ div(cls := "actions close")(
+ span(cls := "switcher", title := "Automatically open next report")(
+ span(cls := "switch")(
+ input(id := "auto-next", cls := "cmn-toggle", tpe := "checkbox", checked),
+ label(`for` := "auto-next")
+ )
+ ),
+ form(action := routes.Report.process(in.report.id), method := "post", title := "Dismiss this report as processed.", cls := "process")(
+ button(tpe := "submit", dataIcon := "E", cls := "fbt"),
+ autoNextInput
+ ),
+ form(action := routes.Report.inquiry(in.report.id), method := "post", title := "Cancel the inquiry, re-instore the report", cls := "cancel")(
+ button(tpe := "submit", dataIcon := "L", cls := "fbt")
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/mod/inquiry.scala.html b/app/views/mod/inquiry.scala.html
deleted file mode 100644
index 9b9312db2a..0000000000
--- a/app/views/mod/inquiry.scala.html
+++ /dev/null
@@ -1,150 +0,0 @@
-@(in: lila.mod.Inquiry)(implicit ctx: Context)
-
-@renderReport(r: lila.report.Report) = {
-
diff --git a/app/views/mod/layout.scala.html b/app/views/mod/layout.scala.html
deleted file mode 100644
index f2c3b0fbac..0000000000
--- a/app/views/mod/layout.scala.html
+++ /dev/null
@@ -1,13 +0,0 @@
-@(title: String, active: String, moreCss: Html = emptyHtml, moreJs: Html = emptyHtml)(body: Html)(implicit ctx: Context)
-
-@modMenu = {
- @mod.menu(active)
-}
-
-@base.layout(
-title = title,
-moreJs = moreJs,
-moreCss = moreCss,
-menu = modMenu.some) {
-@body
-}.toHtml
diff --git a/app/views/mod/log.scala b/app/views/mod/log.scala
new file mode 100644
index 0000000000..b1aa126e08
--- /dev/null
+++ b/app/views/mod/log.scala
@@ -0,0 +1,50 @@
+package views.html.mod
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object log {
+
+ def apply(logs: List[lila.mod.Modlog])(implicit ctx: Context) = {
+
+ val title = "Mod logs"
+
+ views.html.base.layout(
+ title = title,
+ moreCss = cssTag("mod.misc")
+ ) {
+ main(cls := "page-menu")(
+ views.html.mod.menu("log"),
+ div(id := "modlog_table", cls := "page-menu__content box")(
+ h1(title),
+ table(cls := "slist slist-pad")(
+ thead(
+ tr(
+ th("Mod"),
+ th("Action"),
+ th("Details")
+ )
+ ),
+ tbody(
+ logs.map { log =>
+ tr(
+ td(userIdLink(log.mod.some), br, momentFromNow(log.date)),
+ td(
+ log.showAction.capitalize, " ",
+ log.user.map { u =>
+ userIdLink(u.some, params = "?mod")
+ }
+ ),
+ td(log.details)
+ )
+ }
+ )
+ )
+ )
+ )
+ }
+ }
+}
diff --git a/app/views/mod/log.scala.html b/app/views/mod/log.scala.html
deleted file mode 100644
index 6020107dbc..0000000000
--- a/app/views/mod/log.scala.html
+++ /dev/null
@@ -1,37 +0,0 @@
-@(logs: List[lila.mod.Modlog])(implicit ctx: Context)
-
-@title = @{ "Mod logs" }
-
-@layout(
-title = title,
-active = "log") {
-
-
-
-}
diff --git a/app/views/mod/menu.scala b/app/views/mod/menu.scala
new file mode 100644
index 0000000000..dfa289c864
--- /dev/null
+++ b/app/views/mod/menu.scala
@@ -0,0 +1,42 @@
+package views.html.mod
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object menu {
+
+ def apply(active: String)(implicit ctx: Context) = st.nav(cls := "page-menu__menu subnav")(
+ isGranted(_.SeeReport) option
+ a(cls := active.active("report"), href := routes.Report.list)("Reports"),
+ isGranted(_.ChatTimeout) option
+ a(cls := active.active("public-chat"), href := routes.Mod.publicChat)("Public Chats"),
+ isGranted(_.SeeReport) option
+ a(cls := active.active("gamify"), href := routes.Mod.gamify)("Hall of fame"),
+ isGranted(_.UserSearch) option
+ a(cls := active.active("search"), href := routes.Mod.search)("Search users"),
+ isGranted(_.SetEmail) option
+ a(cls := active.active("email"), href := routes.Mod.emailConfirm)("Email confirm"),
+ isGranted(_.PracticeConfig) option
+ a(cls := active.active("practice"), href := routes.Practice.config)("Practice"),
+ isGranted(_.ManageTournament) option
+ a(cls := active.active("tour"), href := routes.TournamentCrud.index(1))("Tournaments"),
+ isGranted(_.ManageEvent) option
+ a(cls := active.active("event"), href := routes.Event.manager)("Events"),
+ isGranted(_.SeeReport) option
+ a(cls := active.active("log"), href := routes.Mod.log)("Mod log"),
+ isGranted(_.SeeReport) option
+ a(cls := active.active("irwin"), href := routes.Irwin.dashboard)("Irwin dashboard"),
+ isGranted(_.Shadowban) option
+ a(cls := active.active("panic"), href := routes.Mod.chatPanic)(
+ "Chat Panic: ",
+ strong(if (isChatPanicEnabled) "ON" else "OFF")
+ ),
+ isGranted(_.Settings) option
+ a(cls := active.active("setting"), href := routes.Dev.settings)("Settings"),
+ isGranted(_.Cli) option
+ a(cls := active.active("cli"), href := routes.Dev.cli)("CLI")
+ )
+}
diff --git a/app/views/mod/menu.scala.html b/app/views/mod/menu.scala.html
deleted file mode 100644
index 688e973067..0000000000
--- a/app/views/mod/menu.scala.html
+++ /dev/null
@@ -1,43 +0,0 @@
-@(active: String)(implicit ctx: Context)
-
-@if(isGranted(_.SeeReport)) {
-
-}
diff --git a/app/views/mod/permissions.scala b/app/views/mod/permissions.scala
new file mode 100644
index 0000000000..72d043ac3e
--- /dev/null
+++ b/app/views/mod/permissions.scala
@@ -0,0 +1,45 @@
+package views.html.mod
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object permissions {
+
+ def apply(u: lila.user.User)(implicit ctx: Context) =
+ views.html.base.layout(
+ title = s"${u.username} permissions",
+ moreCss = frag(
+ cssTag("mod.communication"),
+ cssTag("form3")
+ ),
+ moreJs = embedJsUnsafe("""$(function() {
+$('button.clear').on('click', function() {
+ $('#permissions option:selected').prop('selected', false);
+});});""")
+ ) {
+ main(id := "permissions", cls := "page-small box box-pad")(
+ h1(userLink(u), " permissions"),
+ p("Use Ctrl+click to select multiple permissions"),
+ form(cls := "form3", action := routes.Mod.permissions(u.username), method := "post")(
+ select(name := "permissions[]", multiple)(
+ lila.security.Permission.allButSuperAdmin.sortBy(_.name).flatMap { p =>
+ ctx.me.exists(canGrant(_, p)) option option(
+ value := p.name,
+ u.roles.contains(p.name) option selected,
+ title := p.children.mkString(", ")
+ )(p.toString)
+ }
+ ),
+ form3.actions(
+ button(cls := "button button-red clear", tpe := "button")("Clear"),
+ button(cls := "button", tpe := "submit")("Save")
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/mod/permissions.scala.html b/app/views/mod/permissions.scala.html
deleted file mode 100644
index 7e41acb3a5..0000000000
--- a/app/views/mod/permissions.scala.html
+++ /dev/null
@@ -1,39 +0,0 @@
-@(u: User)(implicit ctx: Context)
-
-@moreCss = {
-@cssTag("mod-communication.css")
-}
-
-@moreJs = {
-@embedJs {
-$(function() {
- $('button.clear').on('click', function() {
- $('#permissions option:selected').prop('selected', false);
- });
-});
-}
-}
-
-@base.layout(
-title = u.username + " permissions",
-moreCss = moreCss,
-moreJs = moreJs) {
-
-
-}.toHtml
diff --git a/app/views/mod/publicChat.scala b/app/views/mod/publicChat.scala
new file mode 100644
index 0000000000..e8c683f1d3
--- /dev/null
+++ b/app/views/mod/publicChat.scala
@@ -0,0 +1,61 @@
+package views.html.mod
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.common.String.html.richText
+
+import controllers.routes
+
+object publicChat {
+
+ def apply(
+ tourChats: List[(lila.tournament.Tournament, lila.chat.UserChat)],
+ simulChats: List[(lila.simul.Simul, lila.chat.UserChat)]
+ )(implicit ctx: Context) =
+ views.html.base.layout(
+ title = "Public Chats",
+ moreCss = cssTag("mod.communication"),
+ moreJs = jsTag("public-chat.js")
+ ) {
+ main(cls := "page-menu")(
+ views.html.mod.menu("public-chat"),
+ div(id := "communication", cls := "page-menu__content public_chat box box-pad")(
+ h2("Tournament Chats"),
+ div(cls := "player_chats")(
+ tourChats.map {
+ case (tournament, chat) => div(cls := "game")(
+ a(cls := "title", href := routes.Tournament.show(tournament.id))(tournament.name),
+ div(cls := "chat")(
+ chat.lines.filter(_.isVisible).map { line =>
+ div(cls := "line")(
+ userIdLink(line.author.toLowerCase.some, withOnline = false, withTitle = false), " ",
+ richText(line.text)
+ )
+ }
+ )
+ )
+ }
+ ),
+ div(
+ h2("Simul Chats"),
+ div(cls := "player_chats")(
+ simulChats.map {
+ case (simul, chat) => div(cls := "game")(
+ a(cls := "title", href := routes.Simul.show(simul.id))(simul.name),
+ div(cls := "chat")(
+ chat.lines.filter(_.isVisible).map { line =>
+ div(cls := "line")(
+ userIdLink(line.author.toLowerCase.some, withOnline = false, withTitle = false), " ",
+ richText(line.text)
+ )
+ }
+ )
+ )
+ }
+ )
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/mod/publicChat.scala.html b/app/views/mod/publicChat.scala.html
deleted file mode 100644
index 70712090bf..0000000000
--- a/app/views/mod/publicChat.scala.html
+++ /dev/null
@@ -1,57 +0,0 @@
-@(tourChats : List[(lila.tournament.Tournament, lila.chat.UserChat)],
-simulChats: List[(lila.simul.Simul, lila.chat.UserChat)])(implicit ctx: Context)
-
-@mod.layout(
-title = "Public Chats",
-active = "public-chat",
-moreCss = cssTag("mod-communication.css"),
-moreJs = jsTag("public-chat.js")) {
-
-
-
Tournament Chats
-
- @tourChats.map {
- case (tournament, chat) => {
-
-
- @tournament.name
-
-
- @chat.lines.filter(_.isVisible).map { line =>
-
- @userIdLink(line.author.toLowerCase.some, withOnline = false, withTitle = false)
- @richText(line.text)
-
- }
-
-
- }
- }
-
-
-
Simul Chats
-
-
- @simulChats.map {
- case (simul, chat) => {
-
-
- @simul.name
-
-
- @chat.lines.filter(_.isVisible).map { line =>
-
- @userIdLink(line.author.toLowerCase.some, withOnline = false, withTitle = false)
- @richText(line.text)
-
- }
-
-
- }
- }
-
-
-
-
-
-}
diff --git a/app/views/mod/search.scala b/app/views/mod/search.scala
new file mode 100644
index 0000000000..b11741b308
--- /dev/null
+++ b/app/views/mod/search.scala
@@ -0,0 +1,65 @@
+package views.html.mod
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object search {
+
+ private val email = tag("email")
+ private val mark = tag("marked")
+
+ def apply(form: Form[_], users: List[lila.user.User.WithEmails])(implicit ctx: Context) =
+ views.html.base.layout(
+ title = "Search users",
+ moreCss = cssTag("mod.misc")
+ ) {
+ main(cls := "page-menu")(
+ views.html.mod.menu("search"),
+ div(cls := "mod-search page-menu__content box")(
+ h1("Search users"),
+ st.form(cls := "search box__pad", action := routes.Mod.search, method := "GET")(
+ input(name := "q", autofocus, placeholder := "Search by IP, email, or username", value := form("q").value),
+ form3.select(form("as"), lila.mod.UserSearch.asChoices)
+ ),
+ users.nonEmpty option table(cls := "slist slist-pad")(
+ thead(
+ tr(
+ th("User"),
+ th("Games"),
+ th("Marks"),
+ th("IPban"),
+ th("Closed"),
+ th("Created"),
+ th("Active")
+ )
+ ),
+ tbody(
+ users.map {
+ case lila.user.User.WithEmails(u, emails) => tr(
+ td(
+ userLink(u, withBestRating = true, params = "?mod"),
+ email(emails.list.map(_.value).mkString(", "))
+ ),
+ td(u.count.game.localize),
+ td(
+ u.engine option mark("ENGINE"),
+ u.booster option mark("BOOSTER"),
+ u.troll option mark("SHADOWBAN")
+ ),
+ td(u.ipBan option mark("IPBAN")),
+ td(u.disabled option mark("CLOSED")),
+ td(momentFromNow(u.createdAt)),
+ td(u.seenAt.map(momentFromNow(_)))
+ )
+ }
+ )
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/mod/search.scala.html b/app/views/mod/search.scala.html
deleted file mode 100644
index 34103a77a8..0000000000
--- a/app/views/mod/search.scala.html
+++ /dev/null
@@ -1,33 +0,0 @@
-@(form: Form[_], users: List[User.WithEmails])(implicit ctx: Context)
-
-@title = @{ "Search users" }
-
-@layout(
-title = title,
-active = "search") {
-
-
-
-
-
@title
-
- @userTable(users)
-
-}
diff --git a/app/views/mod/userTable.scala.html b/app/views/mod/userTable.scala.html
deleted file mode 100644
index 1399b4cf47..0000000000
--- a/app/views/mod/userTable.scala.html
+++ /dev/null
@@ -1,38 +0,0 @@
-@(users: List[User.WithEmails])(implicit ctx: Context)
-@if(users.nonEmpty) {
-
-
-
- | User |
- Games |
- Marks |
- IPban |
- Closed |
- Created |
- Active |
-
-
-
- @users.map {
- case lila.user.User.WithEmails(u, emails) => {
-
- |
- @userLink(u, withBestRating = true, params = "?mod")
- @emails.list.mkString(", ")
- |
-
- @u.count.game.localize |
-
- @if(u.engine){ENGINE}
- @if(u.booster){BOOSTER}
- @if(u.troll){SHADOWBAN}
- |
- @if(u.ipBan){IPBAN} |
- @if(u.disabled){CLOSED} |
- @momentFromNow(u.createdAt) |
- @u.seenAt.map(momentFromNow(_)) |
-
- }
- }
-
-}
diff --git a/app/views/oAuth/app/create.scala.html b/app/views/oAuth/app/create.scala.html
deleted file mode 100644
index 19aab9a3b6..0000000000
--- a/app/views/oAuth/app/create.scala.html
+++ /dev/null
@@ -1,20 +0,0 @@
-@(form: Form[_])(implicit ctx: Context)
-
-@title = @{ "New OAuth App" }
-
-@account.layout(
-title = title,
-active = "oauth.app",
-evenMoreCss = cssTag("form3.css")
-) {
-
-}.toHtml
diff --git a/app/views/oAuth/app/edit.scala.html b/app/views/oAuth/app/edit.scala.html
deleted file mode 100644
index c94745d8f7..0000000000
--- a/app/views/oAuth/app/edit.scala.html
+++ /dev/null
@@ -1,28 +0,0 @@
-@(app: lila.oauth.OAuthApp, form: Form[_])(implicit ctx: Context)
-
-@title = @{ s"Edit ${app.name}" }
-
-@account.layout(
-title = title,
-active = "oauth.app",
-evenMoreCss = cssTag("form3.css")
-) {
-
-
@title
-
-
-
- | Client ID | @app.clientId.value |
|---|
- | Client Secret | @app.clientSecret.value |
|---|
-
-
-
-
-
-}.toHtml
diff --git a/app/views/oAuth/app/form.scala b/app/views/oAuth/app/form.scala
new file mode 100644
index 0000000000..f50e089bcd
--- /dev/null
+++ b/app/views/oAuth/app/form.scala
@@ -0,0 +1,67 @@
+package views.html.oAuth.app
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object form {
+
+ def create(form: Form[_])(implicit ctx: Context) = {
+ val title = "New OAuth App"
+ views.html.account.layout(title = title, active = "oauth.app") {
+ div(cls := "account oauth box box-pad")(
+ h1(title),
+ st.form(cls := "form3", action := routes.OAuthApp.create, method := "POST")(
+ div(cls := "form-group")(
+ "Want to build something that integrates with and extends Lichess? Register a new OAuth App to get started developing on the Lichess API."
+ ),
+ inner(form)
+ )
+ )
+ }
+ }
+
+ def edit(app: lila.oauth.OAuthApp, form: Form[_])(implicit ctx: Context) = {
+ val title = s"Edit ${app.name}"
+ views.html.account.layout(title = title, active = "oauth.app") {
+ div(cls := "account oauth box box-pad")(
+ h1(title),
+ table(cls := "codes")(
+ tbody(
+ tr(th("Client ID"), td(app.clientId.value)),
+ tr(th("Client Secret"), td(app.clientSecret.value))
+ )
+ ),
+ br, br,
+ st.form(cls := "form3", action := routes.OAuthApp.update(app.clientId.value), method := "POST")(
+ div(cls := "form-group")(
+ "Here's a ",
+ a(href := "https://github.com/lichess-org/api/tree/master/example/oauth-authorization-code")(
+ "lichess OAuth app example"
+ ),
+ ", and the ", a(href := routes.Api.index)("API documentation"), "."
+ ),
+ inner(form)
+ )
+ )
+ }
+ }
+
+ private def inner(form: Form[_])(implicit ctx: Context) = frag(
+ errMsg(form),
+ form3.group(form("name"), raw("App name"))(form3.input(_)),
+ form3.group(form("description"), raw("App description"))(form3.textarea(_)()),
+ form3.split(
+ form3.group(form("homepageUri"), raw("Homepage URL"), half = true)(form3.input(_, typ = "url")),
+ form3.group(form("redirectUri"), raw("Callback URL"), half = true, help = frag("It must match the URL in your code").some)(form3.input(_, typ = "url"))
+ ),
+ form3.actions(
+ a(href := routes.OAuthApp.index)("Cancel"),
+ form3.submit(trans.apply())
+ )
+ )
+}
diff --git a/app/views/oAuth/app/inForm.scala.html b/app/views/oAuth/app/inForm.scala.html
deleted file mode 100644
index 6ebf041b2a..0000000000
--- a/app/views/oAuth/app/inForm.scala.html
+++ /dev/null
@@ -1,13 +0,0 @@
-@(form: Form[_])(implicit ctx: Context)
-@import lila.app.ui.ScalatagsTwirlForm._
-
-@form3.group(form("name"), raw("App name"))(form3.input(_))
-@form3.group(form("description"), raw("App description"))(form3.textarea(_)())
-@form3.split {
-@form3.group(form("homepageUri"), raw("Homepage URL"), half = true)(form3.input(_, typ = "url"))
-@form3.group(form("redirectUri"), raw("Callback URL"), half = true)(form3.input(_, typ = "url"))
-}
-@form3.actionsHtml {
-
Cancel
-@form3.submit(trans.apply.frag())
-}
diff --git a/app/views/oAuth/app/index.scala b/app/views/oAuth/app/index.scala
new file mode 100644
index 0000000000..f65e41bf72
--- /dev/null
+++ b/app/views/oAuth/app/index.scala
@@ -0,0 +1,49 @@
+package views.html.oAuth.app
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object index {
+
+ def apply(apps: List[lila.oauth.OAuthApp])(implicit ctx: Context) =
+ views.html.account.layout(title = "OAuth Apps", active = "oauth.app")(
+ div(cls := "account oauth box")(
+ div(cls := "box__top")(
+ h1("OAuth Apps"),
+ st.form(cls := "box__top__actions", action := routes.OAuthApp.create)(
+ button(tpe := "submit", cls := "button button-fat button-empty", title := "New app", dataIcon := "O")
+ )
+ ),
+ p(cls := "box__pad")(
+ "Want to build something that integrates with and extends Lichess? Register a new OAuth App to get started developing on the Lichess API.",
+ br, br,
+ "Here's a ",
+ a(href := "https://github.com/lichess-org/api/tree/master/example/oauth-authorization-code")("lichess OAuth app example"),
+ ", and the ", a(href := routes.Api.index)("API documentation"), "."
+ ),
+ table(cls := "slist slist-pad")(
+ apps.map { t =>
+ tr(
+ td(
+ strong(t.name), br,
+ t.description.map { em(_) }
+ ),
+ td(cls := "date")(
+ t.homepageUri, br,
+ "Created ", momentFromNow(t.createdAt)
+ ),
+ td(cls := "action")(
+ a(href := routes.OAuthApp.edit(t.clientId.value), cls := "button", title := "Edit this app", dataIcon := "m"),
+ st.form(action := routes.OAuthApp.delete(t.clientId.value), method := "POST")(
+ button(tpe := "submit", cls := "button button-empty button-red confirm", title := "Delete this app", dataIcon := "q")
+ )
+ )
+ )
+ }
+ )
+ )
+ )
+}
diff --git a/app/views/oAuth/app/index.scala.html b/app/views/oAuth/app/index.scala.html
deleted file mode 100644
index 4fb1e252e4..0000000000
--- a/app/views/oAuth/app/index.scala.html
+++ /dev/null
@@ -1,45 +0,0 @@
-@(apps: List[lila.oauth.OAuthApp])(implicit ctx: Context)
-
-@title = @{ "OAuth Apps" }
-
-@account.layout(title = title, active = "oauth.app") {
-
-
-
@title
-
-
-
- Want to build something that integrates with and extends Lichess? Register a new OAuth App to get started developing on the Lichess API.
-
- Here's a lichess OAuth app example,
- and the API documentation.
-
-
-
- @apps.map { t =>
-
-
- @t.name
- @t.description.map { desc =>
- @desc
- }
- |
-
- @t.homepageUri
- Created @momentFromNow(t.createdAt)
- |
-
-
-
- |
-
- }
-
-
-}.toHtml
diff --git a/app/views/oAuth/token/create.scala b/app/views/oAuth/token/create.scala
new file mode 100644
index 0000000000..3a1b7d198e
--- /dev/null
+++ b/app/views/oAuth/token/create.scala
@@ -0,0 +1,53 @@
+package views.html.oAuth.token
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object create {
+
+ def apply(form: Form[_], me: lila.user.User)(implicit ctx: Context) = {
+
+ val title = "New personal API access token"
+
+ views.html.account.layout(title = title, active = "oauth.token")(
+ div(cls := "account oauth box box-pad")(
+ h1(title),
+ st.form(cls := "form3", action := routes.OAuthToken.create, method := "POST")(
+ div(cls := "form-group")(
+ "Personal access tokens function like ordinary lichess OAuth access tokens. ",
+ "They can be used to authenticate to the API over Basic Authentication."
+ ),
+ form3.group(
+ form("description"),
+ raw("Token description"),
+ help = raw("For you to remember what this token is for").some
+ )(form3.input(_)),
+ br, br,
+ h2("Scopes define the access for personal tokens:"),
+ div(cls := "scopes")(
+ lila.oauth.OAuthScope.all.map { scope =>
+ val disabled = me.noBot && scope == lila.oauth.OAuthScope.Bot.Play && me.count.game > 0
+ val id = s"oauth-scope-${scope.key.replace(":", "_")}"
+ div(
+ span(
+ input(st.id := id, cls := "cmn-toggle", tpe := "checkbox", name := s"${form("scopes").name}[]", value := scope.key, disabled option st.disabled),
+ label(`for` := id)
+ ),
+ label(`for` := id, st.title := disabled.option("You already have played games!"))(scope.name)
+ )
+ }
+ ),
+ form3.actions(
+ a(href := routes.OAuthToken.index)("Cancel"),
+ form3.submit(trans.apply())
+ )
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/oAuth/token/create.scala.html b/app/views/oAuth/token/create.scala.html
deleted file mode 100644
index 0fd6f5a368..0000000000
--- a/app/views/oAuth/token/create.scala.html
+++ /dev/null
@@ -1,43 +0,0 @@
-@(form: Form[_], me: User)(implicit ctx: Context)
-@import lila.app.ui.ScalatagsTwirlForm._
-
-@title = @{ "New personal API access token" }
-
-@account.layout(
-title = title,
-active = "oauth.token",
-evenMoreCss = cssTag("form3.css")
-) {
-
-}.toHtml
diff --git a/app/views/oAuth/token/index.scala b/app/views/oAuth/token/index.scala
new file mode 100644
index 0000000000..ec8303c426
--- /dev/null
+++ b/app/views/oAuth/token/index.scala
@@ -0,0 +1,71 @@
+package views.html.oAuth.token
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object index {
+
+ def apply(tokens: List[lila.oauth.AccessToken])(implicit ctx: Context) = {
+
+ val title = "Personal API access tokens"
+
+ views.html.account.layout(title = title, active = "oauth.token")(
+ div(cls := "account oauth box")(
+ div(cls := "box__top")(
+ h1(title),
+ st.form(cls := "box-top__actions", action := routes.OAuthToken.create)(
+ button(tpe := "submit", cls := "button frameless", st.title := "New access token", dataIcon := "O")
+ )
+ ),
+ p(cls := "box__pad")(
+ "You can make OAuth requests without going through the authorization code flow.", br, br,
+ "Instead, ",
+ a(href := routes.OAuthToken.create)("generate a personal token"),
+ " that you can directly use in API requests.", br, br,
+ "Be careful, these tokens are like passwords so you should guard them carefully. ",
+ "The advantage to using a token over putting your password into a script is that a token can be revoked, ",
+ "and you can generate lots of them.", br, br,
+ "Here's a ",
+ a(href := "https://github.com/lichess-org/api/tree/master/example/oauth-personal-token")("personal token app example"),
+ " and the ",
+ a(href := routes.Api.index)("API documentation"), "."
+ ),
+ tokens.headOption.filter(_.isBrandNew).map { token =>
+ div(cls := "box__pad brand")(
+ iconTag("E")(cls := "is-green"),
+ div(
+ p("Make sure to copy your new personal access token now.", br, "You won’t be able to see it again!"),
+ code(token.id.value)
+ )
+ )
+ },
+ table(cls := "slist slist-pad")(
+ tokens.map { t =>
+ tr(
+ td(
+ strong(t.description | "Unnamed"), br,
+ em(t.scopes.map(_.name).mkString(", "))
+ ),
+ td(cls := "date")(
+ t.createdAt.map { created =>
+ frag("Created ", momentFromNow(created), br)
+ },
+ t.usedAt.map { used =>
+ frag("Last used ", momentFromNow(used))
+ }
+ ),
+ td(cls := "action")(
+ form(action := routes.OAuthToken.delete(t.id.value), method := "POST")(
+ button(tpe := "submit", cls := "button button-red button-empty confirm", st.title := "Delete this access token")("Delete")
+ )
+ )
+ )
+ }
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/oAuth/token/index.scala.html b/app/views/oAuth/token/index.scala.html
deleted file mode 100644
index 9790484e39..0000000000
--- a/app/views/oAuth/token/index.scala.html
+++ /dev/null
@@ -1,63 +0,0 @@
-@(tokens: List[lila.oauth.AccessToken])(implicit ctx: Context)
-
-@title = @{ "Personal API access tokens" }
-
-@account.layout(title = title, active = "oauth.token") {
-
-
-
@title
-
-
-
- You can make OAuth requests without going through the authorization code flow.
-
- Instead, generate a personal token that you can directly use in API requests.
-
- Be careful, these tokens are like passwords so you should guard them carefully.
- The advantage to using a token over putting your password into a script is that a token can be revoked,
- and you can generate lots of them.
-
- Here's a
- personal token app example,
- and the API documentation.
-
-
- @tokens.headOption.filter(_.isBrandNew).map { token =>
-
-
-
-
Make sure to copy your new personal access token now.
You won’t be able to see it again!
-
@token.id.value
-
-
- }
-
-
- @tokens.map { t =>
-
-
- @t.description.getOrElse("Unnamed")
- @t.scopes.map(_.name).mkString(", ")
- |
-
- @t.createdAt.map { created =>
- Created @momentFromNow(created)
- }
- @t.usedAt.map { used =>
- Last used @momentFromNow(used)
- }
- |
-
-
- |
-
- }
-
-
-}.toHtml
diff --git a/app/views/plan/badCheckout.scala b/app/views/plan/badCheckout.scala
new file mode 100644
index 0000000000..bfe2d193c3
--- /dev/null
+++ b/app/views/plan/badCheckout.scala
@@ -0,0 +1,14 @@
+package views.html.plan
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+object badCheckout {
+
+ def apply(err: String)(implicit ctx: Context) =
+ views.html.site.message("Payment can not be processed.")(
+ p("The payment didn't go through. Your card was not charged."),
+ p(err)
+ )
+}
diff --git a/app/views/plan/badCheckout.scala.html b/app/views/plan/badCheckout.scala.html
deleted file mode 100644
index 695b99a058..0000000000
--- a/app/views/plan/badCheckout.scala.html
+++ /dev/null
@@ -1,6 +0,0 @@
-@(err: String)(implicit ctx: Context)
-
-@site.message("Payment can not be processed.") {
-
The payment didn't go through. Your card was not charged.
-
@err
-}.toHtml
diff --git a/app/views/plan/features.scala b/app/views/plan/features.scala
index 8ba9d9e7ae..aac86338b5 100644
--- a/app/views/plan/features.scala
+++ b/app/views/plan/features.scala
@@ -1,8 +1,6 @@
package views
package html.plan
-import play.twirl.api.Html
-
import lila.api.Context
import lila.app.templating.Environment._
import lila.app.ui.ScalatagsTemplate._
@@ -13,15 +11,14 @@ object features {
def apply()(implicit ctx: Context) = views.html.base.layout(
title = title,
- side = side.some,
- moreCss = cssTag("features.css"),
+ moreCss = cssTag("feature"),
openGraph = lila.app.ui.OpenGraph(
title = title,
url = s"$netBaseUrl${routes.Plan.features.url}",
- description = "All of Lichess features are free for all and forever. We do it for chess!"
+ description = "All of Lichess features are free for all and forever. We do it for the chess!"
).some
) {
- div(cls := "content_box features")(
+ main(cls := "box box-pad features")(
table(
header(h1(dataIcon := "")("Website")),
tbody(
@@ -75,7 +72,7 @@ object features {
),
tr(unlimited)(
a(href := routes.Search.index(1))("Advanced search"),
- " through Lichess 900 million games"
+ " through Lichess 1.5 billion games"
),
tr(unlimited)(
a(href := routes.Video.index)("Chess video library")
@@ -112,7 +109,7 @@ object features {
a(href := routes.Tournament.home(1))("Arena tournaments")
),
tr(check)(
- "Board editor and analysis board with $engineName"
+ s"Board editor and analysis board with $engineName"
),
tr(unlimited)(
a(href := routes.Puzzle.home)("Tactics puzzles")
@@ -161,7 +158,7 @@ object features {
strong("all features are free for everybody, forever!"),
br,
"If you love Lichess, ",
- a(cls := "button", href := routes.Plan.index)("support us with a Patron account!")
+ a(cls := "button", href := routes.Plan.index)("Support us with a Patron account!")
)
)
}
@@ -182,11 +179,5 @@ object features {
private val title = "Lichess features"
- private val side: Html =
- div(cls := "features_side")(
- h2("Free chess for everyone, forever!"),
- a(href := routes.Plan.index, cls := "button")("Support Lichess")
- )
-
private val engineName = "Stockfish 10+"
}
diff --git a/app/views/plan/index.scala b/app/views/plan/index.scala
new file mode 100644
index 0000000000..f4f3f541af
--- /dev/null
+++ b/app/views/plan/index.scala
@@ -0,0 +1,262 @@
+package views.html.plan
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.pref.PrefCateg
+
+import controllers.routes
+
+object index {
+
+ def apply(
+ email: Option[lila.common.EmailAddress],
+ stripePublicKey: String,
+ patron: Option[lila.plan.Patron],
+ recentIds: List[String],
+ bestIds: List[String]
+ )(implicit ctx: Context) = {
+
+ val title = "Become a Patron of lichess.org"
+
+ views.html.base.layout(
+ title = title,
+ moreCss = cssTag("plan"),
+ moreJs = frag(
+ script(src := "https://checkout.stripe.com/checkout.js"),
+ jsTag("checkout.js"),
+ embedJsUnsafe(s"""lichess.checkout("$stripePublicKey");""")
+ ),
+ openGraph = lila.app.ui.OpenGraph(
+ title = title,
+ url = s"$netBaseUrl${routes.Plan.index.url}",
+ description = "Free chess for everyone, forever!"
+ ).some,
+ csp = defaultCsp.withStripe.some
+ ) {
+ main(cls := "page-menu plan")(
+ st.aside(cls := "page-menu__menu recent-patrons")(
+ h2("New Patrons"),
+ div(cls := "list")(
+ recentIds.map { userId =>
+ div(userIdLink(userId.some))
+ }
+ )
+ ),
+ div(cls := "page-menu__content box")(
+ patron.ifTrue(ctx.me.??(_.isPatron)).map { p =>
+ div(cls := "banner one_time_active")(
+ iconTag(patronIconChar),
+ div(
+ h1("Thank you for your donation!"),
+ if (p.isLifetime) frag(
+ "You have a ", strong("Lifetime Patron"), " account. That's pretty awesome!"
+ )
+ else p.expiresAt.map { expires =>
+ frag(
+ "You have a Patron account until ", showDate(expires), ".", br,
+ "If not renewed, you will then be downgraded to free."
+ )
+ }
+ ),
+ iconTag(patronIconChar)
+ )
+ } getOrElse div(cls := "banner moto")(
+ iconTag(patronIconChar),
+ div(
+ h1("Free chess for everyone, forever!"),
+ p("No ads, no subscriptions; but open source and passion.")
+ ),
+ iconTag(patronIconChar)
+ ),
+ div(cls := "box__pad")(
+ div(cls := "wrapper")(
+ div(cls := "text")(
+ p(
+ "We are a non‑profit association because we believe in a free, ",
+ "world-class chess experience for anyone, anywhere."
+ ),
+ p(
+ "We rely on support from people like you to make it possible. ",
+ "If you've gotten something out of Lichess, please take a second to pitch in!"
+ )
+ ),
+ div(cls := "content")(
+
+ div(
+ cls := "plan_checkout",
+ attr("data-email") := email.map(_.value),
+ attr("data-lifetime-usd") := lila.plan.Cents.lifetime.usd.toString,
+ attr("data-lifetime-cents") := lila.plan.Cents.lifetime.value
+ )(
+ raw(s"""
+
+
+
+
"""),
+
+ patron.exists(_.isLifetime) option
+ p(style := "text-align:center;margin-bottom:1em")("Make an extra donation?"),
+
+ st.group(cls := "radio buttons freq")(
+ div(
+ st.title := s"Pay ${lila.plan.Cents.lifetime.usd} once. Be a Lichess Patron forever!",
+ cls := List("lifetime-check" -> patron.exists(_.isLifetime)),
+ input(tpe := "radio", name := "freq", id := "freq_lifetime", patron.exists(_.isLifetime) option disabled, value := "lifetime"),
+ label(`for` := "freq_lifetime")("Lifetime")
+ ),
+ div(
+ st.title := "Recurring billing, renewing your Patron Wings every month.",
+ input(tpe := "radio", name := "freq", id := "freq_monthly", checked, value := "monthly"),
+ label(`for` := "freq_monthly")("Monthly")
+ ),
+ div(
+ st.title := "A single donation that grants you the Patron Wings for one month.",
+ input(tpe := "radio", name := "freq", id := "freq_onetime", checked, value := "onetime"),
+ label(`for` := "freq_onetime")("One-time")
+ )
+ ),
+ div(cls := "amount_choice")(
+ st.group(cls := "radio buttons amount")(
+ lila.plan.StripePlan.defaultAmounts.map { cents =>
+ val id = s"plan_${cents.value}"
+ div(
+ input(tpe := "radio", name := "plan",
+ st.id := id,
+ cents.usd.value == 10 option checked,
+ value := cents.value,
+ attr("data-usd") := cents.usd.toString,
+ attr("data-amount") := cents.value),
+ label(`for` := id)(cents.usd.toString)
+ )
+ },
+ div(cls := "other")(
+ input(tpe := "radio", name := "plan",
+ id := "plan_other",
+ value := "other"),
+ label(`for` := "plan_other")("Other")
+ )
+ )
+ ),
+ div(cls := "amount_fixed none")(
+ st.group(cls := "radio buttons amount")(
+ div {
+ val cents = lila.plan.Cents.lifetime
+ label(`for` := s"plan_${cents.value}")(cents.usd.toString)
+ }
+ )
+ ),
+ div(cls := "service")(
+ button(cls := "stripe button")("Credit Card"),
+ button(cls := "paypal button")("PayPal")
+ )
+ )
+ )
+ ),
+ p(cls := "small_team")(
+ "We are a small team, so your support makes a huge difference!"
+ ),
+ faq,
+ div(cls := "best_patrons")(
+ h2("The celebrated Patrons who make Lichess possible"),
+ div(cls := "list")(
+ bestIds.map { userId =>
+ div(userIdLink(userId.some))
+ }
+ )
+ )
+ )
+ )
+ )
+ }
+ }
+
+ private def faq(implicit ctx: Context) = div(cls := "faq")(
+ dl(
+ dt("Where does the money go?"),
+ dd(
+ "First of all, powerful servers.", br,
+ "Then we pay a full-time developer: ", userIdLink("thibault".some), ", the founder of Lichess.", br,
+ "See the ", a(href := "/costs", target := "_blank")("detailed cost breakdown.")
+ ),
+ dt("Is Lichess an official non-profit?"),
+ dd(
+ "Yes, here's the ", a(href := "http://www.journal-officiel.gouv.fr/association/index.php?ACTION=Rechercher&WHAT=lichess.org")(
+ "act of creation (FR)"
+ ), "."
+ )
+ ),
+ dl(
+ dt("Can I change/cancel my monthly support?"),
+ dd(
+ "Yes, at any time, from this page.", br,
+ "Or you can ", a(href := routes.Main.contact, target := "_blank")("contact Lichess support"), "."
+ ),
+ dt("Other methods of donation?"),
+ dd(
+ "We also accept ", a(href := staticUrl("doc/iban_LICHESS_ORG_00022031601.pdf"), target := "_blank")(
+ "bank transfers"
+ ), ".", br,
+ "And here's our bitcoin address: ", code("15ZA4bBki3uu3yR2ENC2WYa9baVGUZ8Cf8")
+ )
+ ),
+ dl(
+ dt("Are some features reserved to Patrons?"),
+ dd(
+ a(href := routes.Plan.features, target := "_blank")("No"), ", because ",
+ "Lichess is entirely free, forever, and for everyone. That's a promise. ",
+ "But Patrons get bragging rights with a cool new profile icon.", br,
+ "See the ", a(href := routes.Plan.features, target := "_blank")("detailed features comparison"), "."
+ )
+ )
+ )
+}
diff --git a/app/views/plan/index.scala.html b/app/views/plan/index.scala.html
deleted file mode 100644
index ca820efe39..0000000000
--- a/app/views/plan/index.scala.html
+++ /dev/null
@@ -1,241 +0,0 @@
-@(email: Option[lila.common.EmailAddress], stripePublicKey: String, patron: Option[lila.plan.Patron], recentIds: List[String], bestIds: List[String])(implicit ctx: Context)
-
-@title = @{"Become a Patron of lichess.org"}
-
-@moreJs = {
-
-@jsTag("checkout.js")
-@embedJs {
-lichess.checkout("@stripePublicKey");
-}
-}
-
-@side = {
-
-
New Patrons
-
- @recentIds.map { userId =>
-
@userIdLink(userId.some)
- }
-
-
-}
-
-@base.layout(
-title = title,
-side = side.some,
-moreCss = cssTag("plan.css"),
-moreJs = moreJs,
-openGraph = lila.app.ui.OpenGraph(
-title = title,
-url = s"$netBaseUrl${routes.Plan.index.url}",
-description = "Free chess for everyone, forever!").some,
-csp = defaultCsp.withStripe.some) {
-
- @patron.ifTrue(ctx.me.??(_.isPatron)).map { p =>
-
-
-
-
Thank you for your donation!
- @if(p.isLifetime) {
- You have a Lifetime Patron account. That's pretty awesome!
- } else {
- @p.expiresAt.map { expires =>
- You have a Patron account until @showDate(expires).
- If not renewed, you will then be downgraded to free.
- }
- }
-
-
-
- }.getOrElse {
-
-
-
-
Free chess for everyone, forever!
-
No ads, no subscriptions; but open source and passion.
-
-
-
- }
-
-
-
-
- We are a non‑profit association because we believe in a free,
- world-class chess experience for anyone, anywhere.
-
-
- We rely on support from people like you to make it possible.
- If you've gotten something out of Lichess, please take a second to pitch in!
-
-
-
-
-
-
-
-
-
-
- @if(patron.exists(_.isLifetime)) {
Make an extra donation?
}
-
-
- @defining(s"Pay ${lila.plan.Cents.lifetime.usd} once. Be a Lichess Patron forever!") { info =>
-
-
-
-
- }
- @defining("Recurring billing, renewing your Patron Wings every month.") { info =>
-
-
-
-
- }
- @defining("A single donation that grants you the Patron Wings for one month.") { info =>
-
-
-
-
- }
-
-
-
-
-
- @defining(lila.plan.Cents.lifetime) { cents =>
-
- }
-
-
-
-
-
-
-
-
-
-
-
- We are a small team, so your support will make a huge difference!
-
-
-
- - Where does the money go?
- -
- First of all, powerful servers.
- Then we pay a full-time developer: @userIdLink("thibault".some), the founder of Lichess.
- See the detailed cost breakdown.
-
- - Is Lichess an official non-profit?
- -
- Yes, here's the act of creation (FR).
-
-
-
- - Can I change/cancel my monthly support?
- -
- Yes, at any time, from this page.
- Or you can contact Lichess support.
-
- - Other methods of donation?
- -
- We also accept bank transfers.
- And here's our bitcoin address: 15ZA4bBki3uu3yR2ENC2WYa9baVGUZ8Cf8
-
-
-
- - Are some features reserved to Patrons?
- -
- No, because
- Lichess is entirely free, forever, and for everyone. That's a promise.
- But Patrons get bragging rights with a cool new profile icon.
- See the detailed features comparison.
-
-
-
-
-
The celebrated Patrons who make Lichess possible
-
- @bestIds.map { userId =>
-
- @userIdLink(userId.some)
-
- }
-
-
-
-
-}.toHtml
diff --git a/app/views/plan/indexPaypal.scala.html b/app/views/plan/indexPaypal.scala.html
deleted file mode 100644
index 938b0f5bb7..0000000000
--- a/app/views/plan/indexPaypal.scala.html
+++ /dev/null
@@ -1,14 +0,0 @@
-@(me: User, patron: lila.plan.Patron)(implicit ctx: Context)
-
-@base.layout(
-title = "Thank you for your support!",
-moreCss = cssTag("plan.css")) {
-
-
-
@userLink(me) • Lichess Patron for @pluralize("month", me.plan.months)
-
-
You are supporting Lichess with paypal.
-
If you wish to cancel your support, please contact us at contact@@lichess.org.
-
-
-}.toHtml
diff --git a/app/views/plan/indexStripe.scala b/app/views/plan/indexStripe.scala
new file mode 100644
index 0000000000..780cac5d2d
--- /dev/null
+++ b/app/views/plan/indexStripe.scala
@@ -0,0 +1,94 @@
+package views.html.plan
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object indexStripe {
+
+ private val dataForm = attr("data-form")
+
+ def apply(me: lila.user.User, patron: lila.plan.Patron, info: lila.plan.MonthlyCustomerInfo)(implicit ctx: Context) =
+ views.html.base.layout(
+ title = "Thank you for your support!",
+ moreCss = cssTag("plan"),
+ moreJs = jsTag("plan.js")
+ ) {
+ main(cls := "box box-pad plan")(
+ h1(
+ userLink(me), " • ",
+ if (patron.isLifetime) strong("Lifetime Lichess Patron")
+ else frag("Lichess Patron for ", pluralize("month", me.plan.months))
+ ),
+ table(cls := "all")(
+ tbody(
+ tr(
+ th("Current status"),
+ td(
+ "You support lichess.org with ", strong(info.subscription.plan.usd.toString), " per month.",
+ span(cls := "thanks")("Thank you very much for your help. You rock!")
+ )
+ ),
+ tr(
+ th("Next payment"),
+ td(
+ "You will be charged ", strong(info.nextInvoice.usd.toString), " on ", showDate(info.nextInvoice.dateTime), ".",
+ br,
+ a(href := s"${routes.Plan.list()}#onetime")("Make an additional donation now")
+ )
+ ),
+ tr(
+ th("Update"),
+ td(cls := "change")(
+ a(dataForm := "switch")("Change the monthly amount (", info.subscription.plan.usd.toString, ")"),
+ " or ", a(dataForm := "cancel")("cancel your support"),
+ form(cls := "switch", action := routes.Plan.switch, method := "POST")(
+ p("Decide what Lichess is worth to you:"),
+ "USD $ ",
+ input(tpe := "number", min := 1, max := 100000, step := "0.01", name := "usd", value := info.subscription.plan.usd.toString),
+ button(tpe := "submit", cls := "button")(trans.apply()),
+ a(dataForm := "switch")("Nevermind")
+ ),
+ form(cls := "cancel", action := routes.Plan.cancel, method := "POST")(
+ p("Withdraw your credit card and stop payments:"),
+ button(tpe := "submit", cls := "button button-red")("No longer support Lichess"),
+ a(dataForm := "cancel")("Nevermind :)")
+ )
+ )
+ ),
+ tr(
+ th("Payment history"),
+ td(
+ table(cls := "slist payments")(
+ thead(
+ tr(
+ th,
+ th("ID"),
+ th("Date"),
+ th("Amount")
+ )
+ ),
+ tbody(
+ info.pastInvoices.map { in =>
+ tr(
+ td(in.paid option span(dataIcon := "E", cls := "is-green text")("Paid")),
+ td(cls := "id")(in.id),
+ td(showDate(in.dateTime)),
+ td(in.usd.toString)
+ )
+ }
+ )
+ )
+ )
+ ),
+ tr(
+ th,
+ td(a(href := routes.Plan.list)("View other Lichess Patrons"))
+ )
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/plan/indexStripe.scala.html b/app/views/plan/indexStripe.scala.html
deleted file mode 100644
index cd5a2b87a9..0000000000
--- a/app/views/plan/indexStripe.scala.html
+++ /dev/null
@@ -1,86 +0,0 @@
-@(me: User, patron: lila.plan.Patron, info: lila.plan.MonthlyCustomerInfo)(implicit ctx: Context)
-
-@base.layout(
-title = "Thank you for your support!",
-moreCss = cssTag("plan.css"),
-moreJs = jsTag("plan.js")) {
-
-
-
@userLink(me) •
- @if(patron.isLifetime) {
- Lifetime Lichess Patron
- } else {
- Lichess Patron for @pluralize("month", me.plan.months)
- }
-
-
-
-}.toHtml
diff --git a/app/views/plan/thanks.scala b/app/views/plan/thanks.scala
new file mode 100644
index 0000000000..056f09770c
--- /dev/null
+++ b/app/views/plan/thanks.scala
@@ -0,0 +1,71 @@
+package views.html.plan
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object thanks {
+
+ def apply(patron: Option[lila.plan.Patron], customer: Option[lila.plan.StripeCustomer])(implicit ctx: Context) =
+ views.html.base.layout(
+ moreCss = cssTag("page"),
+ title = "Thank you for your support!"
+ ) {
+ main(cls := "page-small page box box-pad")(
+
+ h1(cls := "text", dataIcon := patronIconChar)("Thank you for your support!"),
+
+ div(cls := "body")(
+ p("Thank you for helping us build Lichess. ", strong("You rock!")),
+ p(
+ "Your transaction has been completed, ",
+ "and a receipt for your donation has been emailed to you."
+ ),
+ patron.map { pat =>
+ if (pat.payPal.??(_.renew)) p(
+ "You now have a permanent Patron account.", br,
+ ctx.me.map { me =>
+ frag("Check out your ", a(href := routes.User.show(me.username))("profile page"), "!")
+ }
+ )
+ else {
+ if (customer.??(_.renew)) frag(
+ p(
+ "Note that your ", a(href := routes.Plan.index)("Patron page"),
+ " only shows invoices for your monthly subscription."
+ ),
+ p("But worry not, we received your donation! Thanks again!")
+ )
+ else frag(
+ if (pat.isLifetime) p(
+ "You are now a lifetime Lichess Patron!", br,
+ ctx.me.map { me =>
+ frag("Check out your ", a(href := routes.User.show(me.username))("profile page"), ".")
+ }
+ )
+ else frag(
+ p(
+ "You are now a Lichess Patron for one month!", br,
+ ctx.me.map { me =>
+ frag("Check out your ", a(href := routes.User.show(me.username))("profile page"), ".")
+ }
+ ),
+ p(
+ "In one month, you will ", strong("not"), " be charged again, ",
+ "and your Lichess account will be downgraded to free."
+ ),
+ p(
+ "To get a permanent Patron account, please consider making a ",
+ a(href := routes.Plan.index)("monthly donation"), "."
+ )
+ )
+ )
+ }
+ },
+ p("Success! ", a(href := routes.Lobby.home)("Return to Lichess homepage"), ".")
+ )
+ )
+ }
+}
diff --git a/app/views/plan/thanks.scala.html b/app/views/plan/thanks.scala.html
deleted file mode 100644
index 92f09f3a03..0000000000
--- a/app/views/plan/thanks.scala.html
+++ /dev/null
@@ -1,69 +0,0 @@
-@(patron: Option[lila.plan.Patron], customer: Option[lila.plan.StripeCustomer])(implicit ctx: Context)
-
-@base.layout(
-moreCss = cssTag("page.css"),
-title = "Thank you for your support!") {
-
-
-
-
Thank you for your support!
-
-
-
-
- Thank you for helping us build Lichess. You rock!
-
-
- Your transaction has been completed,
- and a receipt for your donation has been emailed to you.
-
- @patron.map { p =>
- @if(p.payPal.??(_.renew)) {
-
- You now have a permanent Patron account.
- @ctx.me.map { me =>
- Check out your profile page!
- }
-
- } else {
- @if(customer.??(_.renew)) {
-
- Note that your Patron page only shows
- invoices for your monthly subscription.
-
-
- But worry not, we received your donation! Thanks again!
-
- } else {
- @if(p.isLifetime) {
-
- You are now a lifetime Lichess Patron!
- @ctx.me.map { me =>
- Check out your profile page.
- }
-
- } else {
-
- You are now a Lichess Patron for one month!
- @ctx.me.map { me =>
- Check out your profile page.
- }
-
-
- In one month, you will not be charged again,
- and your Lichess account will be downgraded to free.
-
-
- To get a permanent Patron account, please consider making a
- monthly donation.
-
- }
- }
- }
- }
-
- Success! Return to Lichess homepage.
-
-
-
-}.toHtml
diff --git a/app/views/practice/config.scala b/app/views/practice/config.scala
new file mode 100644
index 0000000000..25c01bac1a
--- /dev/null
+++ b/app/views/practice/config.scala
@@ -0,0 +1,56 @@
+package views.html.practice
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object config {
+
+ def apply(structure: lila.practice.PracticeStructure, form: Form[_])(implicit ctx: Context) =
+ views.html.base.layout(
+ title = "Practice structure",
+ moreCss = cssTag("mod.misc")
+ )(
+ main(cls := "page-menu")(
+ views.html.mod.menu("practice"),
+ div(cls := "practice_config page-menu__content box box-pad")(
+ h1("Practice config"),
+ div(cls := "both")(
+ st.form(action := routes.Practice.configSave, method := "POST")(
+ textarea(cls := "practice_text", name := "text")(form("text").value),
+ errMsg(form("text")),
+ button(tpe := "submit", cls := "button button-fat text", dataIcon := "E")("Save")
+ ),
+ div(cls := "preview")(
+ ol(
+ structure.sections.map { section =>
+ li(
+ h2(s"${section.name} (#${section.id})"),
+ ol(
+ section.studies.map { stud =>
+ li(
+ i(cls := s"practice icon ${stud.id}")(
+ h3(a(href := routes.Study.show(stud.id.value))(s"${stud.name} (#${stud.id})")),
+ em(stud.desc),
+ ol(
+ stud.chapters.map { cha =>
+ li(a(href := routes.Study.chapter(stud.id.value, cha.id.value))(cha.name))
+ }
+ )
+ )
+ )
+ }
+ )
+ )
+ }
+ )
+ )
+ )
+ )
+ )
+ )
+}
diff --git a/app/views/practice/config.scala.html b/app/views/practice/config.scala.html
deleted file mode 100644
index 7188ff84db..0000000000
--- a/app/views/practice/config.scala.html
+++ /dev/null
@@ -1,42 +0,0 @@
-@(structure: lila.practice.PracticeStructure, form: Form[_])(implicit ctx: Context)
-
-@mod.layout(
-title = "Practice structure",
-active = "practice",
-moreCss = cssTag("mod-practice.css")) {
-
-
-
-
-
-
- @structure.sections.map { section =>
- -
-
@section.name (#@section.id)
-
- @section.studies.map { stud =>
- -
-
-
- @stud.desc
-
- @stud.chapters.map { cha =>
- -
- @cha.name
-
- }
-
-
- }
-
-
- }
-
-
-
-
-}
diff --git a/app/views/practice/index.scala b/app/views/practice/index.scala
index 8adc1a3c79..4ca5808ea6 100644
--- a/app/views/practice/index.scala
+++ b/app/views/practice/index.scala
@@ -4,7 +4,6 @@ package practice
import lila.api.Context
import lila.app.templating.Environment._
import lila.app.ui.ScalatagsTemplate._
-import lila.common.String.html.safeJsonValue
import controllers.routes
@@ -12,25 +11,8 @@ object index {
def apply(data: lila.practice.UserPractice)(implicit ctx: Context) = views.html.base.layout(
title = "Practice chess positions",
- side = Some(
- div(id := "practice_side", cls := "side_box")(
- div(cls := "home")(
- i(cls := "fat"),
- h1("Practice"),
- h2("makes your chess perfect"),
- div(cls := "progress")(
- div(cls := "text")("Progress: ", data.progressPercent, "%"),
- div(cls := "bar", style := s"width: ${data.progressPercent}%")
- ),
- form(id := "practice_reset", cls := "actions", action := routes.Practice.reset, method := "post")(
- if (ctx.isAuth) (data.nbDoneChapters > 0) option a(cls := "do-reset")("Reset my progress")
- else a(href := routes.Auth.signup)("Sign up to save your progress")
- )
- )
- )
- ),
- moreCss = cssTag("practice.css"),
- moreJs = embedJs(s"""$$('#practice_reset .do-reset').on('click', function() {
+ moreCss = cssTag("practice.index"),
+ moreJs = embedJsUnsafe(s"""$$('.do-reset').on('click', function() {
if (confirm('You will lose your practice progress!')) this.parentNode.submit();
});"""),
openGraph = lila.app.ui.OpenGraph(
@@ -39,10 +21,23 @@ if (confirm('You will lose your practice progress!')) this.parentNode.submit();
url = s"$netBaseUrl${routes.Practice.index}"
).some
) {
- div(id := "practice_app")(
- div(cls := "sections")(
+ main(cls := "page-menu")(
+ st.aside(cls := "page-menu__menu practice-side")(
+ i(cls := "fat"),
+ h1("Practice"),
+ h2("makes your chess perfect"),
+ div(cls := "progress")(
+ div(cls := "text")("Progress: ", data.progressPercent, "%"),
+ div(cls := "bar", style := s"width: ${data.progressPercent}%")
+ ),
+ form(action := routes.Practice.reset, method := "post")(
+ if (ctx.isAuth) (data.nbDoneChapters > 0) option a(cls := "do-reset")("Reset my progress")
+ else a(href := routes.Auth.signup)("Sign up to save your progress")
+ )
+ ),
+ div(cls := "page-menu__content practice-app")(
data.structure.sections.map { section =>
- div(cls := "section")(
+ st.section(
h2(section.name),
div(cls := "studies")(
section.studies.map { stud =>
@@ -54,7 +49,7 @@ if (confirm('You will lose your practice progress!')) this.parentNode.submit();
ctx.isAuth option span(cls := "ribbon-wrapper")(
span(cls := "ribbon")(prog.done, " / ", prog.total)
),
- i(cls := s"practice icon ${stud.id}"),
+ i(cls := s"${stud.id}"),
span(cls := "text")(
h3(stud.name),
em(stud.desc)
diff --git a/app/views/practice/show.scala b/app/views/practice/show.scala
index 6cfd2db34c..f322190896 100644
--- a/app/views/practice/show.scala
+++ b/app/views/practice/show.scala
@@ -1,6 +1,8 @@
package views.html
package practice
+import play.api.libs.json.Json
+
import lila.api.Context
import lila.app.templating.Environment._
import lila.app.ui.ScalatagsTemplate._
@@ -15,24 +17,26 @@ object show {
data: lila.practice.JsonView.JsData
)(implicit ctx: Context) = views.html.base.layout(
title = us.practiceStudy.name,
- side = div(cls := "side_box study_box").toHtml.some,
- moreCss = cssTags("analyse.css", "study.css", "practice.css"),
+ moreCss = cssTag("analyse.practice"),
moreJs = frag(
analyseTag,
analyseNvuiTag,
- embedJs(s"""lichess = lichess || {}; lichess.practice = {
-practice: ${safeJsonValue(data.practice)},
-study: ${safeJsonValue(data.study)},
-data: ${safeJsonValue(data.analysis)},
-i18n: ${board.userAnalysisI18n()},
-explorer: {
-endpoint: "$explorerEndpoint",
-tablebaseEndpoint: "$tablebaseEndpoint"
-}};""")
+ embedJsUnsafe(s"""lichess=window.lichess||{};lichess.practice=${
+ safeJsonValue(Json.obj(
+ "practice" -> data.practice,
+ "study" -> data.study,
+ "data" -> data.analysis,
+ "i18n" -> board.userAnalysisI18n(),
+ "explorer" -> Json.obj(
+ "endpoint" -> explorerEndpoint,
+ "tablebaseEndpoint" -> tablebaseEndpoint
+ )
+ ))
+ }""")
),
chessground = false,
zoomable = true
) {
- div(cls := "analyse cg-512")(miniBoardContent)
+ main(cls := "analyse")
}
}
diff --git a/app/views/puzzle/bits.scala b/app/views/puzzle/bits.scala
index 1f1d953e17..49e727b871 100644
--- a/app/views/puzzle/bits.scala
+++ b/app/views/puzzle/bits.scala
@@ -1,8 +1,6 @@
package views
package html.puzzle
-import play.twirl.api.Html
-
import lila.api.Context
import lila.app.templating.Environment._
import lila.app.ui.ScalatagsTemplate._
@@ -15,13 +13,13 @@ object bits {
def daily(p: lila.puzzle.Puzzle, fen: String, lastMove: String) = a(
href := routes.Puzzle.daily(),
- cls := "mini_board parse_fen is2d",
+ cls := "mini-board cg-board-wrap parse-fen is2d",
dataColor := p.color.name,
dataFen := fen,
dataLastmove := lastMove
- )(miniBoardContent)
+ )(div(cls := "cg-board"))
- def jsI18n(implicit ctx: Context) = toJsonFrag(i18nJsObject(translations))
+ def jsI18n()(implicit ctx: Context) = i18nJsObject(translations)
private val translations = List(
trans.training,
diff --git a/app/views/puzzle/embed.scala b/app/views/puzzle/embed.scala
new file mode 100644
index 0000000000..8cf295d39c
--- /dev/null
+++ b/app/views/puzzle/embed.scala
@@ -0,0 +1,45 @@
+package views.html.puzzle
+
+import play.api.mvc.RequestHeader
+
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.app.ui.EmbedConfig
+import views.html.base.layout.{ bits => layout }
+
+import controllers.routes
+
+object embed {
+
+ import EmbedConfig.implicits._
+
+ private val dataStreamUrl = attr("data-stream-url")
+
+ def apply(daily: lila.puzzle.DailyPuzzle)(implicit config: EmbedConfig) = frag(
+ layout.doctype,
+ layout.htmlTag(config.lang)(
+ head(
+ layout.charset,
+ layout.metaCsp(basicCsp),
+ st.headTitle("lichess.org chess puzzle"),
+ layout.pieceSprite(lila.pref.PieceSet.default),
+ cssTagWithTheme("tv.embed", config.bg)
+ ),
+ body(
+ cls := s"base ${config.board}",
+ dataStreamUrl := routes.Tv.feed
+ )(
+ div(id := "daily-puzzle", cls := "embedded", title := trans.clickToSolve.txt())(
+ raw(daily.html),
+ div(cls := "vstext", style := "text-align: center; justify-content: center")(
+ trans.puzzleOfTheDay(), br,
+ daily.color.fold(trans.whitePlays, trans.blackPlays)()
+ )
+ ),
+ jQueryTag,
+ jsAt("javascripts/vendor/chessground.min.js", false),
+ jsAt("compiled/puzzle.js", false)
+ )
+ )
+ )
+}
diff --git a/app/views/puzzle/embed.scala.html b/app/views/puzzle/embed.scala.html
deleted file mode 100644
index 1c434c4eff..0000000000
--- a/app/views/puzzle/embed.scala.html
+++ /dev/null
@@ -1,33 +0,0 @@
-@(daily: lila.puzzle.DailyPuzzle)(implicit ctx: Context)
-
-
-
-
-
-
-
lichess.org training
- @ctx.currentBg match {
- case "dark" => { @cssTag("dark.css") }
- case "transp" => { @cssTag("dark.css")@cssTag("transp.css") }
- case _ => {}
- }
- @cssTag(s"piece/merida.css")
- @cssTag("common.css")
- @cssTag("board.css")
-
-
-
- @Html(daily.html)
-
- @trans.puzzleOfTheDay()
- @daily.color.fold(trans.whitePlays, trans.blackPlays)()
-
-
- @jsTag("vendor/chessground.min.js")
- @jsAt("compiled/puzzle.js")
-
-
-
diff --git a/app/views/puzzle/show.scala b/app/views/puzzle/show.scala
new file mode 100644
index 0000000000..cc60749ee2
--- /dev/null
+++ b/app/views/puzzle/show.scala
@@ -0,0 +1,53 @@
+package views.html.puzzle
+
+import play.api.libs.json.{ Json, JsObject }
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.common.String.html.safeJsonValue
+
+import controllers.routes
+
+object show {
+
+ def apply(puzzle: lila.puzzle.Puzzle, data: JsObject, pref: JsObject)(implicit ctx: Context) =
+ views.html.base.layout(
+ title = trans.training.txt(),
+ moreCss = cssTag("puzzle"),
+ moreJs = frag(
+ jsTag("vendor/sparkline.min.js"),
+ jsAt(s"compiled/lichess.puzzle${isProd ?? (".min")}.js"),
+ embedJsUnsafe(s"""
+lichess = lichess || {};
+lichess.puzzle = ${
+ safeJsonValue(Json.obj(
+ "data" -> data,
+ "pref" -> pref,
+ "i18n" -> bits.jsI18n()
+ ))
+ }""")
+ ),
+ chessground = false,
+ openGraph = lila.app.ui.OpenGraph(
+ image = cdnUrl(routes.Export.puzzlePng(puzzle.id).url).some,
+ title = s"Chess tactic #${puzzle.id} - ${puzzle.color.name.capitalize} to play",
+ url = s"$netBaseUrl${routes.Puzzle.show(puzzle.id).url}",
+ description = s"Lichess tactic trainer: " + puzzle.color.fold(
+ trans.findTheBestMoveForWhite,
+ trans.findTheBestMoveForBlack
+ ).txt() + s" Played by ${puzzle.attempts} players."
+ ).some,
+ zoomable = true
+ ) {
+ main(cls := "puzzle")(
+ st.aside(cls := "puzzle__side")(
+ div(cls := "puzzle__side__metas")(spinner)
+ ),
+ div(cls := "puzzle__board main-board")(chessgroundSvg),
+ div(cls := "puzzle__tools"),
+ div(cls := "puzzle__controls"),
+ div(cls := "puzzle__history")
+ )
+ }
+}
diff --git a/app/views/puzzle/show.scala.html b/app/views/puzzle/show.scala.html
deleted file mode 100644
index de7112ad7e..0000000000
--- a/app/views/puzzle/show.scala.html
+++ /dev/null
@@ -1,30 +0,0 @@
-@(puzzle: lila.puzzle.Puzzle, data: play.api.libs.json.JsObject, pref: play.api.libs.json.JsObject)(implicit ctx: Context)
-
-@moreJs = {
-@jsTag("vendor/sparkline.min.js")
-@jsAt(s"compiled/lichess.puzzle${isProd??(".min")}.js")
-@embedJs {
-lichess = lichess || {};
-lichess.puzzle = { data: @toJsonHtml(data), pref: @toJsonHtml(pref), i18n: @bits.jsI18n.toHtml };
-}
-}
-
-@base.layout(
-title = trans.training.txt(),
-side = Html("""
""").some,
-moreCss = cssTags("analyse.css", "puzzle.css"),
-moreJs = moreJs,
-chessground = false,
-openGraph = lila.app.ui.OpenGraph(
-image = cdnUrl(routes.Export.puzzlePng(puzzle.id).url).some,
-title = s"Chess tactic #${puzzle.id} - ${puzzle.color.name.capitalize} to play",
-url = s"$netBaseUrl${routes.Puzzle.show(puzzle.id).url}",
-description = s"Lichess tactic trainer: " + puzzle.color.fold(
-trans.findTheBestMoveForWhite,
-trans.findTheBestMoveForBlack
-).txt() + s" Played by ${puzzle.attempts} players.").some,
-zoomable = true) {
-
- @board.bits.domPreload(none).toHtml
-
-}.toHtml
diff --git a/app/views/relation/actions.scala b/app/views/relation/actions.scala
index 0cf26e8dde..e01f578b93 100644
--- a/app/views/relation/actions.scala
+++ b/app/views/relation/actions.scala
@@ -8,6 +8,8 @@ import controllers.routes
object actions {
+ private val dataHoverText = data("hover-text")
+
def apply(
userId: lila.user.User.ID,
relation: Option[lila.relation.Relation],
@@ -15,40 +17,52 @@ object actions {
blocked: Boolean,
signup: Boolean = false
)(implicit ctx: Context) =
- div(cls := "relation_actions")(
+ div(cls := "relation-actions btn-rack")(
ctx.userId map { myId =>
(myId != userId) ?? frag(
!blocked option frag(
- a(dataHint := trans.challengeToPlay.txt(), href := s"${routes.Lobby.home()}?user=$userId#friend", cls := "icon button hint--bottom")(
- iconTag("U")
+ a(
+ title := trans.challengeToPlay.txt(),
+ href := s"${routes.Lobby.home()}?user=$userId#friend",
+ cls := "btn-rack__btn",
+ dataIcon := "U"
),
- a(dataHint := trans.composeMessage.txt(), href := s"${routes.Message.form()}?user=$userId", cls := "icon button hint--bottom")(
- iconTag("c")
+ a(
+ title := trans.composeMessage.txt(),
+ href := s"${routes.Message.form()}?user=$userId",
+ cls := "btn-rack__btn",
+ dataIcon := "c"
)
),
relation match {
case None => frag(
followable && !blocked option a(
- cls := "icon button relation hint--bottom",
+ cls := "btn-rack__btn relation-button",
href := routes.Relation.follow(userId),
- dataHint := trans.follow.txt()
- )(iconTag("h")),
+ title := trans.follow.txt(),
+ dataIcon := "h"
+ ),
a(
- cls := "icon button relation hint--bottom",
+ cls := "btn-rack__btn relation-button",
href := routes.Relation.block(userId),
- dataHint := trans.block.txt()
- )(iconTag("k"))
+ title := trans.block.txt(),
+ dataIcon := "k"
+ )
+ )
+ case Some(true) => a(
+ dataIcon := "h",
+ cls := "btn-rack__btn relation-button text hover-text",
+ href := routes.Relation.unfollow(userId),
+ st.title := trans.following.txt(),
+ dataHoverText := trans.unfollow.txt()
+ )
+ case Some(false) => a(
+ dataIcon := "k",
+ cls := "btn-rack__btn relation-button text hover-text",
+ href := routes.Relation.unblock(userId),
+ st.title := trans.blocked.txt(),
+ dataHoverText := trans.unblock.txt()
)
- case Some(true) =>
- a(cls := "button relation hover_text", href := routes.Relation.unfollow(userId))(
- iconTag("h")(cls := "base text")(trans.following()),
- iconTag("h")(cls := "hover text")(trans.unfollow())
- )
- case Some(false) =>
- a(cls := "button relation hover_text", href := routes.Relation.unblock(userId))(
- iconTag("k")(cls := "base text")(trans.blocked()),
- iconTag("k")(cls := "hover text")(trans.unblock())
- )
}
)
} getOrElse {
diff --git a/app/views/relation/bits.scala b/app/views/relation/bits.scala
new file mode 100644
index 0000000000..36e705746c
--- /dev/null
+++ b/app/views/relation/bits.scala
@@ -0,0 +1,78 @@
+package views.html.relation
+
+import play.api.mvc.Call
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.common.paginator.Paginator
+import lila.relation.Related
+import lila.user.User
+
+import controllers.routes
+
+object bits {
+
+ def followers(u: User, pag: Paginator[Related], nbFollowing: Int)(implicit ctx: Context) =
+ layout(s"${u.username} • ${trans.nbFollowers.pluralSameTxt(pag.nbResults)}")(
+ div(cls := "box__top")(
+ h1(userLink(u, withOnline = false)),
+ div(cls := "actions")(
+ trans.nbFollowers.pluralSame(pag.nbResults),
+ " ", amp, " ",
+ a(href := routes.Relation.following(u.username))(trans.nbFollowing.pluralSame(nbFollowing))
+ )
+ ),
+ pagTable(pag, routes.Relation.followers(u.username))
+ )
+
+ def following(u: User, pag: Paginator[Related], nbFollowers: Int)(implicit ctx: Context) =
+ layout(s"${u.username} • ${trans.nbFollowing.pluralSameTxt(pag.nbResults)}")(
+ div(cls := "box__top")(
+ h1(userLink(u, withOnline = false)),
+ div(cls := "actions")(
+ trans.nbFollowing.pluralSame(pag.nbResults),
+ " ", amp, " ",
+ a(href := routes.Relation.followers(u.username))(trans.nbFollowers.pluralSame(nbFollowers))
+ )
+ ),
+ pagTable(pag, routes.Relation.following(u.username))
+ )
+
+ def blocks(u: User, pag: Paginator[Related])(implicit ctx: Context) =
+ layout(s"${u.username} • ${trans.blocks.pluralSameTxt(pag.nbResults)}")(
+ div(cls := "box__top")(
+ h1(userLink(u, withOnline = false)),
+ div(cls := "actions")(
+ trans.blocks.pluralSame(pag.nbResults)
+ )
+ ),
+ pagTable(pag, routes.Relation.blocks())
+ )
+
+ def layout(title: String)(content: Modifier*)(implicit ctx: Context) =
+ views.html.base.layout(
+ title = title,
+ moreCss = cssTag("relation"),
+ moreJs = infiniteScrollTag
+ ) {
+ main(cls := "box page-small")(content)
+ }
+
+ private def pagTable(pager: Paginator[Related], call: Call)(implicit ctx: Context) =
+ table(cls := "slist")(
+ if (pager.nbResults > 0)
+ tbody(cls := "infinitescroll")(
+ pagerNextTable(pager, np => addQueryParameter(call.url, "page", np)),
+ pager.currentPageResults.map { r =>
+ tr(cls := "paginated")(
+ td(userLink(r.user)),
+ td(showBestPerf(r.user)),
+ td(trans.nbGames.pluralSame(r.user.count.game)),
+ td(actions(r.user.id, relation = r.relation, followable = r.followable, blocked = false))
+ )
+ }
+ )
+ else tbody(tr(td(colspan := 2)("None found.", br)))
+ )
+}
diff --git a/app/views/relation/blocks.scala.html b/app/views/relation/blocks.scala.html
deleted file mode 100644
index cb5b04dd35..0000000000
--- a/app/views/relation/blocks.scala.html
+++ /dev/null
@@ -1,12 +0,0 @@
-@(u: User, pag: Paginator[lila.relation.Related])(implicit ctx: Context)
-
-@user.layout(title = u.username + " - " + trans.blocks.pluralSameTxt(pag.nbResults)) {
-
-
- @userLink(u, withOnline = false)
- @trans.blocks.pluralSame(pag.nbResults)
-
- @user.simpleTable(pag, routes.Relation.blocks())
-
-}
-
diff --git a/app/views/relation/followers.scala.html b/app/views/relation/followers.scala.html
deleted file mode 100644
index 5b33c5263d..0000000000
--- a/app/views/relation/followers.scala.html
+++ /dev/null
@@ -1,13 +0,0 @@
-@(u: User, pag: Paginator[lila.relation.Related], nbFollowing: Int)(implicit ctx: Context)
-
-@user.layout(title = u.username + " - " + trans.nbFollowers.pluralSameTxt(pag.nbResults)) {
-
-
- @userLink(u, withOnline = false)
- @trans.nbFollowers.pluralSame(pag.nbResults)
- &
- @trans.nbFollowing.pluralSame(nbFollowing)
-
- @user.simpleTable(pag, routes.Relation.followers(u.username))
-
-}
diff --git a/app/views/relation/following.scala.html b/app/views/relation/following.scala.html
deleted file mode 100644
index 16887c424a..0000000000
--- a/app/views/relation/following.scala.html
+++ /dev/null
@@ -1,13 +0,0 @@
-@(u: User, pag: Paginator[lila.relation.Related], nbFollowers: Int)(implicit ctx: Context)
-
-@user.layout(title = u.username + " - " + trans.nbFollowing.pluralSameTxt(pag.nbResults)) {
-
-
- @userLink(u, withOnline = false)
- @trans.nbFollowing.pluralSame(pag.nbResults)
- &
- @trans.nbFollowers.pluralSame(nbFollowers)
-
- @user.simpleTable(pag, routes.Relation.following(u.username))
-
-}
diff --git a/app/views/relation/mini.scala b/app/views/relation/mini.scala
index 339a824710..41d91a8aa1 100644
--- a/app/views/relation/mini.scala
+++ b/app/views/relation/mini.scala
@@ -14,18 +14,23 @@ object mini {
followable: Boolean,
relation: Option[lila.relation.Relation] = None
)(implicit ctx: Context) = relation match {
- case None if followable && !blocked =>
- a(cls := "relation button", href := s"${routes.Relation.follow(userId)}?mini=1")(
- iconTag("h", trans.follow())
- )
- case Some(true) =>
- a(cls := "relation button hint--bottom", dataHint := trans.unfollow.txt(), href := s"${routes.Relation.unfollow(userId)}?mini=1")(
- iconTag("h", trans.following())
- )
- case Some(false) =>
- a(cls := "relation button hint--bottom hover_text", dataHint := trans.unblock.txt(), href := s"${routes.Relation.unblock(userId)}?mini=1")(
- iconTag("k", trans.blocked())
- )
+ case None if followable && !blocked => a(
+ cls := "btn-rack__btn relation-button text",
+ dataIcon := "h",
+ href := s"${routes.Relation.follow(userId)}?mini=1"
+ )(trans.follow())
+ case Some(true) => a(
+ cls := "btn-rack__btn relation-button text",
+ title := trans.unfollow.txt(),
+ href := s"${routes.Relation.unfollow(userId)}?mini=1",
+ dataIcon := "h"
+ )(trans.following())
+ case Some(false) => a(
+ cls := "btn-rack__btn relation-button text",
+ title := trans.unblock.txt(),
+ href := s"${routes.Relation.unblock(userId)}?mini=1",
+ dataIcon := "k"
+ )(trans.blocked())
case _ => emptyFrag
}
}
diff --git a/app/views/relay/create.scala.html b/app/views/relay/create.scala.html
deleted file mode 100644
index f538bf785e..0000000000
--- a/app/views/relay/create.scala.html
+++ /dev/null
@@ -1,10 +0,0 @@
-@(form: Form[_])(implicit ctx: Context)
-
-@formLayout("New live broadcast") {
-
-
New live broadcast
-
-
-}
diff --git a/app/views/relay/edit.scala.html b/app/views/relay/edit.scala.html
deleted file mode 100644
index e6a382a258..0000000000
--- a/app/views/relay/edit.scala.html
+++ /dev/null
@@ -1,10 +0,0 @@
-@(r: lila.relay.Relay, form: Form[_])(implicit ctx: Context)
-
-@formLayout(r.name) {
-
-
Edit "@r.name"
-
-
-}
diff --git a/app/views/relay/form.scala b/app/views/relay/form.scala
new file mode 100644
index 0000000000..1bf86ed51f
--- /dev/null
+++ b/app/views/relay/form.scala
@@ -0,0 +1,55 @@
+package views.html.relay
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object form {
+
+ def create(form: Form[_])(implicit ctx: Context) =
+ layout("New live broadcast")(
+ h1("New live broadcast"),
+ inner(form, routes.Relay.create)
+ )
+
+ def edit(r: lila.relay.Relay, form: Form[_])(implicit ctx: Context) =
+ layout(r.name)(
+ h1("Edit ", r.name),
+ inner(form, routes.Relay.update(r.slug, r.id.value))
+ )
+
+ private def layout(title: String)(body: Modifier*)(implicit ctx: Context) =
+ views.html.base.layout(
+ title = title,
+ moreCss = cssTag("relay.form"),
+ moreJs = frag(
+ flatpickrTag,
+ delayFlatpickrStart
+ )
+ )(
+ main(cls := "page-small box box-pad")(body)
+ )
+
+ private def inner(form: Form[_], url: play.api.mvc.Call)(implicit ctx: Context) =
+ st.form(cls := "form3", action := url, method := "POST")(
+ form3.group(form("name"), frag("Event name"))(form3.input(_)(autofocus)),
+ form3.group(form("description"), raw("Event description"))(form3.textarea(_)(rows := 6)),
+ if (isGranted(_.Relay))
+ form3.checkbox(form("official"), raw("Official lichess broadcast"), help = raw("Feature on /broadcast - for admins only").some)
+ else form3.hidden(form("official")),
+ form3.group(form("syncUrl"), raw("Source URL"))(form3.input(_, typ = "url")),
+ form3.split(
+ form3.group(form("startsAt"), raw("Start date
UTC"), help = raw("Optional, if you know when the event starts").some, half = true)(form3.flatpickr(_)),
+ isGranted(_.Relay) option
+ form3.group(form("throttle"), raw("Throttle in seconds"), help = raw("Optional, to manually throttle requests. Min 2s, max 60s.").some, half = true)(form3.input(_, typ = "number"))
+ ),
+ form3.actions(
+ a(href := routes.Relay.index(1))(trans.cancel()),
+ form3.submit(trans.apply())
+ )
+ )
+}
diff --git a/app/views/relay/formLayout.scala.html b/app/views/relay/formLayout.scala.html
deleted file mode 100644
index ab0746ceb4..0000000000
--- a/app/views/relay/formLayout.scala.html
+++ /dev/null
@@ -1,12 +0,0 @@
-@(title: String)(body: Html)(implicit ctx: Context)
-
-@moreJs = {
-@flatpickrTag
-@delayFlatpickrStart
-}
-
-@base.layout(
-title = title,
-moreCss = cssTags("flatpickr.css", "form3.css", "relay.css"),
-moreJs = moreJs
-)(body).toHtml
diff --git a/app/views/relay/inForm.scala.html b/app/views/relay/inForm.scala.html
deleted file mode 100644
index 56b87d9c16..0000000000
--- a/app/views/relay/inForm.scala.html
+++ /dev/null
@@ -1,20 +0,0 @@
-@(form: Form[_])(implicit ctx: Context)
-@import lila.app.ui.ScalatagsTwirlForm._
-
-@form3.group(form("name"), raw("Event name"))(form3.input(_))
-@form3.group(form("description"), raw("Event description"))(form3.textarea(_)(*.rows := 6))
-
-@if(isGranted(_.Relay)) {
-@form3.checkbox(form("official"), raw("Official lichess broadcast"), help = raw("Feature on /broadcast - for admins only").some)
-} else { @form3.hidden(form("official")) }
-@form3.group(form("syncUrl"), raw("Source URL"))(form3.input(_, typ = "url"))
-@form3.split {
-@form3.group(form("startsAt"), raw("Start date
UTC"), help = raw("Optional, if you know when the event starts").some, half = true)(form3.flatpickr(_))
-@if(isGranted(_.Relay)) {
-@form3.group(form("throttle"), raw("Throttle in seconds"), help = raw("Optional, to manually throttle requests. Min 2s, max 60s.").some, half = true)(form3.input(_, typ = "number"))
-}
-}
-@form3.actionsHtml {
-
@trans.cancel()
-@form3.submit(trans.apply.frag())
-}
diff --git a/app/views/relay/index.scala b/app/views/relay/index.scala
new file mode 100644
index 0000000000..e2ea1ba35d
--- /dev/null
+++ b/app/views/relay/index.scala
@@ -0,0 +1,54 @@
+package views.html.relay
+
+import play.api.mvc.Call
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.common.paginator.Paginator
+
+import controllers.routes
+
+object index {
+
+ def apply(
+ fresh: Option[lila.relay.Relay.Fresh],
+ pager: Paginator[lila.relay.Relay.WithStudyAndLiked],
+ url: Call
+ )(implicit ctx: Context) = {
+
+ def sublist(name: String, relays: Seq[lila.relay.Relay.WithStudyAndLiked]) =
+ relays.nonEmpty option st.section(
+ h2(name),
+ div(cls := "list")(
+ relays.map(show.widget(_))
+ )
+ )
+
+ views.html.base.layout(
+ title = "Live tournament broadcasts",
+ moreCss = cssTag("relay.index"),
+ moreJs = infiniteScrollTag
+ ) {
+ main(cls := "relay-index page-small box")(
+ div(cls := "box__top")(
+ h1("Live tournament broadcasts"),
+ a(href := routes.Relay.form, cls := "new button button-empty", title := "New Broadcast", dataIcon := "O")
+ ),
+ fresh.map { f =>
+ frag(
+ sublist("Ongoing", f.started),
+ sublist("Upcoming", f.created)
+ )
+ },
+ st.section(
+ h2("Completed"),
+ div(cls := "infinitescroll")(
+ pager.currentPageResults.map { show.widget(_, "paginated") },
+ pagerNext(pager, np => addQueryParameter(url.url, "page", np))
+ )
+ )
+ )
+ }
+ }
+}
diff --git a/app/views/relay/index.scala.html b/app/views/relay/index.scala.html
deleted file mode 100644
index ef49fd6f7b..0000000000
--- a/app/views/relay/index.scala.html
+++ /dev/null
@@ -1,51 +0,0 @@
-@(fresh: Option[lila.relay.Relay.Fresh], pager: Paginator[lila.relay.Relay.WithStudyAndLiked], url: Call)(implicit ctx: Context)
-
-@sublist(name: String, relays: Seq[lila.relay.Relay.WithStudyAndLiked]) = {
-@if(relays.nonEmpty) {
-
- @name
-
- @relays.map { r =>
-
- @widget(r)
-
- }
-
-}
-}
-
-@title = @{ "Live tournament broadcasts [BETA]" }
-
-@base.layout(
-title = title,
-moreCss = cssTag("relay-list.css"),
-moreJs = infiniteScrollTag) {
-
-
- @fresh.map { f =>
- @sublist("Ongoing", f.started)
- @sublist("Upcoming", f.created)
- }
-
-
-}.toHtml
diff --git a/app/views/relay/show.scala b/app/views/relay/show.scala
index a3cb0817fa..455aacdcbe 100644
--- a/app/views/relay/show.scala
+++ b/app/views/relay/show.scala
@@ -1,6 +1,8 @@
package views.html
package relay
+import play.api.libs.json.Json
+
import lila.api.Context
import lila.app.templating.Environment._
import lila.app.ui.ScalatagsTemplate._
@@ -20,45 +22,34 @@ object show {
streams: List[lila.streamer.Stream]
)(implicit ctx: Context) = views.html.base.layout(
title = r.name,
- side = Some(frag(
- div(cls := "side_box study_box"),
- streams.map { s =>
- a(href := routes.Streamer.show(s.streamer.userId), cls := "context-streamer text side_box", dataIcon := "")(
- usernameOrId(s.streamer.userId),
- " is streaming"
- )
- }
- )),
- chat = chat.frag.some,
- underchat = Some(views.html.game.bits.watchers),
- moreCss = cssTags("analyse.css", "study.css", "relay.css", "chat.css"),
+ moreCss = cssTag("analyse.study"),
moreJs = frag(
analyseTag,
analyseNvuiTag,
- embedJs(s"""lichess = lichess || {}; lichess.relay = {
-relay: ${safeJsonValue(data.relay)},
-study: ${safeJsonValue(data.study)},
-data: ${safeJsonValue(data.analysis)},
-i18n: ${board.userAnalysisI18n()},
-tagTypes: '${lila.study.PgnTags.typesToString}',
-userId: $jsUserIdString,
-chat: ${
- chatOption.fold("null")(c => safeJsonValue(chat.json(
- c.chat,
- name = trans.chatRoom.txt(),
- timeout = c.timeout,
- writeable = ctx.userId.??(s.canChat),
- public = false,
- localMod = ctx.userId.??(s.canContribute)
- )))
- },
-explorer: {
-endpoint: "$explorerEndpoint",
-tablebaseEndpoint: "$tablebaseEndpoint"
-},
-socketUrl: "${routes.Relay.websocket(s.id.value, apiVersion.value)}",
-socketVersion: $socketVersion
-};""")
+ embedJsUnsafe(s"""lichess=window.lichess||{};lichess.relay=${
+ safeJsonValue(Json.obj(
+ "relay" -> data.relay,
+ "study" -> data.study,
+ "data" -> data.analysis,
+ "i18n" -> board.userAnalysisI18n(),
+ "tagTypes" -> lila.study.PgnTags.typesToString,
+ "userId" -> ctx.userId,
+ "chat" -> chatOption.map(c => chat.json(
+ c.chat,
+ name = trans.chatRoom.txt(),
+ timeout = c.timeout,
+ writeable = ctx.userId.??(s.canChat),
+ public = false,
+ localMod = ctx.userId.??(s.canContribute)
+ )),
+ "explorer" -> Json.obj(
+ "endpoint" -> explorerEndpoint,
+ "tablebaseEndpoint" -> tablebaseEndpoint
+ ),
+ "socketUrl" -> routes.Relay.websocket(s.id.value, apiVersion.value).url,
+ "socketVersion" -> socketVersion.value
+ ))
+ }""")
),
chessground = false,
zoomable = true,
@@ -67,9 +58,17 @@ socketVersion: $socketVersion
url = s"$netBaseUrl${routes.Relay.show(r.slug, r.id.value).url}",
description = shorten(r.description, 152)
).some
- ) {
- div(cls := "analyse cg-512")(
- board.bits.domPreload(none)
+ )(frag(
+ main(cls := "analyse"),
+ views.html.study.bits.streamers(streams)
+ ))
+
+ def widget(r: lila.relay.Relay.WithStudyAndLiked, extraCls: String = "")(implicit ctx: Context) =
+ div(cls := s"relay-widget $extraCls", dataIcon := "")(
+ a(cls := "overlay", href := routes.Relay.show(r.relay.slug, r.relay.id.value)),
+ div(
+ h3(r.relay.name),
+ p(r.relay.description)
)
- }
+ )
}
diff --git a/app/views/relay/widget.scala.html b/app/views/relay/widget.scala.html
deleted file mode 100644
index 1cd0d7e30d..0000000000
--- a/app/views/relay/widget.scala.html
+++ /dev/null
@@ -1,7 +0,0 @@
-@(r: lila.relay.Relay.WithStudyAndLiked)(implicit ctx: Context)
-
-
-
- @r.relay.name
- @r.relay.description
-
diff --git a/app/views/report/form.scala b/app/views/report/form.scala
new file mode 100644
index 0000000000..349b005e20
--- /dev/null
+++ b/app/views/report/form.scala
@@ -0,0 +1,47 @@
+package views.html.report
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.user.User
+
+import controllers.routes
+
+object form {
+
+ def apply(form: Form[_], reqUser: Option[User] = None, captcha: lila.common.Captcha)(implicit ctx: Context) =
+ views.html.base.layout(
+ title = trans.reportAUser.txt(),
+ moreCss = cssTag("form3-captcha"),
+ moreJs = captchaTag
+ ) {
+ main(cls := "page-small box box-pad report")(
+ h1(trans.reportAUser()),
+ st.form(
+ cls := "form3",
+ action := s"${routes.Report.create()}${reqUser.??(u => "?username=" + u.username)}",
+ method := "post"
+ )(
+ form3.globalError(form),
+ form3.group(form("username"), trans.user(), klass = "field_to") { f =>
+ reqUser.map { user =>
+ frag(userLink(user), form3.hidden(f, user.id.some))
+ }.getOrElse {
+ div(form3.input(f, klass = "user-autocomplete")(dataTag := "span"))
+ }
+ },
+ form3.group(form("reason"), trans.reason()) { f =>
+ form3.select(f, translatedReasonChoices, trans.whatIsIheMatter.txt().some)
+ },
+ form3.group(form("text"), trans.description(), help = trans.reportDescriptionHelp().some)(form3.textarea(_)(rows := 8)),
+ views.html.base.captcha(form, captcha),
+ form3.actions(
+ a(href := routes.Lobby.home())(trans.cancel()),
+ form3.submit(trans.send())
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/report/form.scala.html b/app/views/report/form.scala.html
deleted file mode 100644
index 271f29b6e0..0000000000
--- a/app/views/report/form.scala.html
+++ /dev/null
@@ -1,30 +0,0 @@
-@(form: Form[_], reqUser: Option[User] = None, captcha: lila.common.Captcha)(implicit ctx: Context)
-@import lila.app.ui.ScalatagsTwirlForm._
-
-@title = @{ trans.reportAUser.txt() }
-
-@base.layout(title = title, moreCss = cssTags("report.css", "form3.css")) {
-
-}.toHtml
diff --git a/app/views/report/list.scala b/app/views/report/list.scala
new file mode 100644
index 0000000000..ecc2c6788b
--- /dev/null
+++ b/app/views/report/list.scala
@@ -0,0 +1,111 @@
+package views.html.report
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.report.Report.WithSuspect
+
+import controllers.routes
+
+object list {
+
+ def apply(
+ reports: List[lila.report.Report.WithSuspect],
+ filter: String,
+ counts: lila.report.Room.Counts,
+ streamers: Int
+ )(implicit ctx: Context) = views.html.base.layout(
+ title = "Reports",
+ moreCss = cssTag("mod.report")
+ ) {
+ main(cls := "page-menu")(
+ views.html.mod.menu("report"),
+ div(id := "report_list", cls := "page-menu__content box")(
+ div(cls := "header")(
+ i(cls := "icon"),
+ span(cls := "tabs")(
+ a(
+ href := routes.Report.listWithFilter("all"),
+ cls := List("new" -> (counts.sum > 0), "active" -> (filter == "all"))
+ )(
+ countTag(counts.sum > 0 option counts.sum),
+ "All"
+ ),
+ lila.report.Room.all.map { room =>
+ a(
+ href := routes.Report.listWithFilter(room.key),
+ cls := List(
+ "new" -> counts.value.contains(room),
+ "active" -> (filter == room.key),
+ s"room-${room.key}" -> true
+ )
+ )(
+ countTag(counts.get(room)),
+ room.name
+ )
+ },
+ streamers > 0 option
+ a(href := s"${routes.Streamer.index()}?requests=1", cls := "new")(
+ countTag(streamers),
+ "Streamers"
+ )
+ )
+ ),
+ table(cls := "slist slist-pad see")(
+ thead(
+ tr(
+ th("Report"),
+ th("By"),
+ th
+ )
+ ),
+ tbody(
+ reports.map {
+ case WithSuspect(r, sus, _) if !r.isTrollOrInsult || isGranted(_.Shadowban) =>
+ tr(cls := List("new" -> r.open))(
+ td(
+ reportScore(r.score),
+ strong(r.reason.name.capitalize),
+ br,
+ userLink(sus.user, params = "?mod"),
+ br,
+ p(cls := "perfs")(showBestPerfs(sus.user, 2)),
+ views.html.user.mod.userMarks(sus.user, none)
+ ),
+ td(cls := "atoms")(
+ r.bestAtoms(3).map { atom =>
+ div(cls := "atom")(
+ span(cls := "head")(
+ reportScore(atom.score),
+ " ", userIdLink(atom.by.value.some),
+ " ", momentFromNowOnce(atom.at)
+ ),
+ p(cls := List(
+ "text" -> true,
+ "large" -> (atom.text.size > 100 || atom.text.lines.size > 3)
+ ))(shorten(atom.text, 200))
+ )
+ },
+ r.atoms.size > 3 option i(cls := "more")("And ", (r.atoms.size - 3), " more")
+ ),
+ td(
+ r.processedBy map { u =>
+ st.form(action := routes.Report.inquiry(r.id), method := "post", cls := "reopen")(
+ button(tpe := "submit", dataIcon := "G", cls := "text button button-metal")("Re-open")
+ )
+ } getOrElse st.form(action := routes.Report.inquiry(r.id), method := "post", cls := "inquiry")(
+ button(tpe := "submit", dataIcon := "G", cls := "button button-metal")
+ ),
+ st.form(action := routes.Report.process(r.id), method := "post", cls := "cancel")(
+ button(tpe := "submit", cls := "button button-thin button-empty")("Dismiss")
+ )
+ )
+ )
+ case _ => emptyFrag
+ }
+ )
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/report/list.scala.html b/app/views/report/list.scala.html
deleted file mode 100644
index c2b8c9cbcb..0000000000
--- a/app/views/report/list.scala.html
+++ /dev/null
@@ -1,87 +0,0 @@
-@(reports: List[lila.report.Report.WithSuspect], filter: String, counts: lila.report.Room.Counts, streamers: Int)(implicit ctx: Context)
-
-@import lila.report.Report.WithSuspect
-
-@title = @{ "Reports" }
-
-@tab(reports: List[WithSuspect], room: lila.report.Room) = {
-
- @counts.get(room)@room.name
-}
-
-@mod.layout(
-title = title,
-active = "report",
-moreCss = cssTag("report.css")) {
-
-
-
-
-
-
- | Report |
- By |
- |
-
-
-
- @reports.map {
- case WithSuspect(r, sus, _) if (!r.isTrollOrInsult || isGranted(_.Shadowban)) => {
-
-
- @reportScore(r.score)
- @r.reason.name.capitalize
- @userLink(sus.user, params = "?mod")
- @showBestPerfs(sus.user, 2)
- @user.mod.userMarks(sus.user, none)
- |
-
- @r.bestAtoms(3).map { atom =>
-
- @reportScore(atom.score) @userIdLink(atom.by.value.some), @momentFromNowOnce(atom.at)
-
- @shorten(atom.text, 200)
-
- |
- @r.processedBy.map { u =>
-
- }.getOrElse {
-
-
- }
- |
-
- }
- case _ => {}
- }
-
-
-
-}
diff --git a/app/views/report/thanks.scala b/app/views/report/thanks.scala
new file mode 100644
index 0000000000..b97daa5ef4
--- /dev/null
+++ b/app/views/report/thanks.scala
@@ -0,0 +1,56 @@
+package views.html.report
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.user.User
+
+import controllers.routes
+
+object thanks {
+
+ def apply(userId: String, blocked: Boolean)(implicit ctx: Context) = {
+
+ val title = "Thanks for the report"
+
+ val moreJs = embedJsUnsafe("""
+$('button.report-block').one('click', function() {
+var $button = $(this);
+$button.find('span').text('Blocking...');
+$.ajax({
+url:$button.data('action'),
+method:'post',
+success: function() {
+$button.find('span').text('Blocked!');
+}
+});
+});
+""")
+
+ views.html.base.layout(title = title, moreJs = moreJs) {
+ main(cls := "page-small box box-pad")(
+ h1(title),
+ p("The moderators will review it very soon, and take appropriate action."),
+ br, br,
+ !blocked option p(
+ "In the meantime, you can block this user: ",
+ button(
+ attr("data-action") := routes.Relation.block(userId),
+ cls := "report-block button",
+ tpe := "submit",
+ st.title := trans.block.txt()
+ )(
+ span(cls := "text", dataIcon := "k")("Block ", usernameOrId(userId))
+ )
+ ),
+ br, br,
+ p(
+ a(href := routes.Lobby.home)("Return to lichess homepage")
+ )
+ )
+
+ }
+ }
+}
diff --git a/app/views/report/thanks.scala.html b/app/views/report/thanks.scala.html
deleted file mode 100644
index 05bade1ce8..0000000000
--- a/app/views/report/thanks.scala.html
+++ /dev/null
@@ -1,39 +0,0 @@
-@(userId: String, blocked: Boolean)(implicit ctx: Context)
-
-@title = @{ "Thanks for the report" }
-
-@moreJs = {
-@embedJs {
-$('button.report-block').one('click', function() {
-var $button = $(this);
-$button.find('span').text('Blocking...');
-$.ajax({
-url:$button.data('action'),
-method:'post',
-success: function() {
-$button.find('span').text('Blocked!');
-}
-});
-});
-}
-}
-
-@base.layout(title = title, moreCss = cssTag("report.css"), moreJs = moreJs) {
-
-
-
@title
-
The moderators will review it very soon, and take appropriate action.
-
- @if(!blocked) {
- In the meantime, you can block this user:
-
-
- }
-
- Return to lichess homepage
-
-
-
-}.toHtml
diff --git a/app/views/round/bits.scala b/app/views/round/bits.scala
index ed594a36cb..bc5afaa00a 100644
--- a/app/views/round/bits.scala
+++ b/app/views/round/bits.scala
@@ -1,80 +1,143 @@
package views.html
package round
-import play.twirl.api.Html
-
+import chess.variant.{ Variant, Crazyhouse }
import lila.api.Context
import lila.app.templating.Environment._
-import lila.game.{ Game, Pov, Player }
import lila.app.ui.ScalatagsTemplate._
+import lila.game.{ Game, Pov, Player }
import controllers.routes
object bits {
def layout(
+ variant: Variant,
title: String,
- side: Option[Frag],
- chat: Option[Frag] = None,
- underchat: Option[Frag] = None,
- moreJs: Html = emptyHtml,
+ moreJs: Frag = emptyFrag,
openGraph: Option[lila.app.ui.OpenGraph] = None,
- moreCss: Html = emptyHtml,
+ moreCss: Frag = emptyFrag,
chessground: Boolean = true,
playing: Boolean = false,
robots: Boolean = false
- )(body: Html)(implicit ctx: Context) =
+ )(body: Frag)(implicit ctx: Context) =
views.html.base.layout(
title = title,
- side = side.map(_.toHtml),
- chat = chat,
- underchat = underchat,
openGraph = openGraph,
moreJs = moreJs,
- moreCss = moreCss,
+ moreCss = frag(
+ cssTag { if (variant == Crazyhouse) "round.zh" else "round" },
+ ctx.blind option cssTag("round.nvui"),
+ moreCss
+ ),
chessground = chessground,
playing = playing,
robots = robots,
- asyncJs = true,
+ deferJs = true,
zoomable = true
)(body)
- def underboard(game: Game, cross: Option[lila.game.Crosstable.WithMatchup])(implicit ctx: Context) =
- div(cls := "underboard")(
- div(cls := "center")(
- cross map { c =>
- div(cls := "crosstable")(
- views.html.game.crosstable(ctx.userId.fold(c)(c.fromPov), game.id.some)
- )
- }
- )
- )
+ def crosstable(cross: Option[lila.game.Crosstable.WithMatchup], game: Game)(implicit ctx: Context) =
+ cross map { c =>
+ views.html.game.crosstable(ctx.userId.fold(c)(c.fromPov), game.id.some)
+ }
def underchat(game: Game)(implicit ctx: Context) = frag(
- views.html.game.bits.watchers,
- isGranted(_.ViewBlurs) option frag(
+ div(
+ cls := "chat__members none",
+ aria.live := "off",
+ aria.relevant := "additions removals text"
+ )(
+ span(cls := "number")(nbsp),
+ " ",
+ trans.spectators.txt().replace(":", ""),
+ " ",
+ span(cls := "list")
+ ),
+ isGranted(_.ViewBlurs) option div(cls := "round__mod")(
game.players.filter(p => game.playerBlurPercent(p.color) > 30) map { p =>
- frag(
- br,
- span(cls := "mod blurs")(
- playerLink(p, cssClass = s"is color-icon ${p.color.name}".some, withOnline = false, mod = true),
- s"${p.blurs.nb}/${game.playerMoves(p.color)} blurs",
- strong(game.playerBlurPercent(p.color), "%")
- )
+ div(
+ playerLink(p, cssClass = s"is color-icon ${p.color.name}".some, withOnline = false, mod = true),
+ s" ${p.blurs.nb}/${game.playerMoves(p.color)} blurs ",
+ strong(game.playerBlurPercent(p.color), "%")
)
},
game.players flatMap { p => p.holdAlert.map(p ->) } map {
- case (p, h) => frag(
+ case (p, h) => div(
+ playerLink(p, cssClass = s"is color-icon ${p.color.name}".some, mod = true, withOnline = false),
+ "hold alert",
br,
- span(cls := "mod hold")(
- playerLink(p, cssClass = s"is color-icon ${p.color.name}".some, mod = true, withOnline = false),
- "hold alert",
- br,
- s"(ply: ${h.ply}, mean: ${h.mean} ms, SD: ${h.sd})"
- ),
- br
+ s"(ply: ${h.ply}, mean: ${h.mean} ms, SD: ${h.sd})"
)
}
)
)
+
+ def others(playing: List[Pov], simul: Option[lila.simul.Simul])(implicit ctx: Context) = frag(
+ h3(
+ simul.map { s =>
+ span(cls := "simul")(
+ a(href := routes.Simul.show(s.id))("SIMUL"),
+ span(cls := "win")(s.wins, " W"), " / ",
+ span(cls := "draw")(s.draws, " D"), " / ",
+ span(cls := "loss")(s.losses, " L"), " / ",
+ s.ongoing, " ongoing"
+ )
+ } getOrElse trans.currentGames(),
+ "round-toggle-autoswitch" |> { id =>
+ span(cls := "move-on switcher", st.title := trans.automaticallyProceedToNextGameAfterMoving.txt())(
+ label(`for` := id)(trans.autoSwitch()),
+ span(cls := "switch")(
+ input(st.id := id, cls := "cmn-toggle", tpe := "checkbox"),
+ label(`for` := id)
+ )
+ )
+ }
+ ),
+ div(cls := "now-playing")(
+ playing.partition(_.isMyTurn) |> {
+ case (myTurn, otherTurn) =>
+ (myTurn ++ otherTurn.take(6 - myTurn.size)) take 9 map { pov =>
+ a(href := routes.Round.player(pov.fullId), cls := pov.isMyTurn.option("my_turn"))(
+ gameFen(pov, withLink = false, withTitle = false, withLive = false),
+ span(cls := "meta")(
+ playerText(pov.opponent, withRating = false),
+ span(cls := "indicator")(
+ if (pov.isMyTurn) pov.remainingSeconds.fold[Frag](trans.yourTurn())(secondsFromNow(_, true))
+ else nbsp
+ )
+ )
+ )
+ }
+ }
+ )
+ )
+
+ private[round] def side(
+ pov: Pov,
+ data: play.api.libs.json.JsObject,
+ tour: Option[lila.tournament.TourMiniView],
+ simul: Option[lila.simul.Simul],
+ userTv: Option[lila.user.User] = None,
+ bookmarked: Boolean
+ )(implicit ctx: Context) = views.html.game.side(
+ pov,
+ (data \ "game" \ "initialFen").asOpt[String].map(chess.format.FEN),
+ tour.map(_.tour),
+ simul = simul,
+ userTv = userTv,
+ bookmarked = bookmarked
+ )
+
+ def roundAppPreload(pov: Pov, controls: Boolean)(implicit ctx: Context) =
+ div(cls := "round__app")(
+ div(cls := "round__app__board main-board")(board.bits.domPreload(pov.some)),
+ div(cls := "round__app__table"),
+ div(cls := "ruser ruser-top user-link")(i(cls := "line"), a(cls := "text")(playerText(pov.opponent))),
+ div(cls := "ruser ruser-bottom user-link")(i(cls := "line"), a(cls := "text")(playerText(pov.player))),
+ div(cls := "rclock rclock-top preload")(div(cls := "time")(nbsp)),
+ div(cls := "rclock rclock-bottom preload")(div(cls := "time")(nbsp)),
+ div(cls := "rmoves")(div(cls := "moves")),
+ controls option div(cls := "rcontrols")(i(cls := "ddloader"))
+ )
}
diff --git a/app/views/round/jsI18n.scala b/app/views/round/jsI18n.scala
index c003f6d094..8320323b31 100644
--- a/app/views/round/jsI18n.scala
+++ b/app/views/round/jsI18n.scala
@@ -2,12 +2,11 @@ package views.html.round
import lila.api.Context
import lila.app.templating.Environment._
-import lila.common.String.html.safeJsonValue
import lila.i18n.{ I18nKeys => trans }
object jsI18n {
- def apply(g: lila.game.Game)(implicit ctx: Context): String = safeJsonValue(i18nJsObject {
+ def apply(g: lila.game.Game)(implicit ctx: Context) = i18nJsObject {
baseTranslations ++ {
if (g.isCorrespondence) correspondenceTranslations
else realtimeTranslations
@@ -16,7 +15,7 @@ object jsI18n {
} ++ {
g.isTournament ?? tournamentTranslations
}
- })
+ }
private val correspondenceTranslations = Vector(
trans.oneDay,
diff --git a/app/views/round/others.scala.html b/app/views/round/others.scala.html
deleted file mode 100644
index 97d76f31f6..0000000000
--- a/app/views/round/others.scala.html
+++ /dev/null
@@ -1,42 +0,0 @@
-@(playing: List[Pov], simul: Option[lila.simul.Simul])(implicit ctx: Context)
-
- @simul.map { s =>
-
- SIMUL
- @s.wins W/
- @s.draws D/
- @s.losses L/
- @s.ongoing ongoing
-
- }.getOrElse {
- @trans.currentGames()
- }
- @defining("round-toggle-autoswitch") { id =>
-
-
-
-
-
-
-
- }
-
-@defining(playing.partition(_.isMyTurn)) {
-case (myTurn, otherTurn) => {
-@defining(myTurn ++ otherTurn.take(6 - myTurn.size)) { povs =>
-@povs.take(9).map { pov =>
-
- @gameFen(pov, withLink = false, withTitle = false, withLive = false)
-
- @playerText(pov.opponent, withRating = false)
-
- @if(pov.isMyTurn) {
- @pov.remainingSeconds.fold(trans.yourTurn())(secondsFromNow(_, true))
- } else { }
-
-
-
-}
-}
-}
-}
diff --git a/app/views/round/player.scala b/app/views/round/player.scala
index 0dfa39f188..eb427a71af 100644
--- a/app/views/round/player.scala
+++ b/app/views/round/player.scala
@@ -1,6 +1,8 @@
package views.html
package round
+import play.api.libs.json.Json
+
import lila.api.Context
import lila.app.templating.Environment._
import lila.app.ui.ScalatagsTemplate._
@@ -29,33 +31,43 @@ object player {
}
bits.layout(
+ variant = pov.game.variant,
title = s"${trans.play.txt()} ${if (ctx.pref.isZen) "ZEN" else playerText(pov.opponent)}",
- side = game.side(pov, (data \ "game" \ "initialFen").asOpt[String].map(chess.format.FEN), tour.map(_.tour), simul, bookmarked = bookmarked),
- chat = chatOption.map(_ => chat.frag),
- underchat = Some(bits underchat pov.game),
moreJs = frag(
roundNvuiTag,
roundTag,
- embedJs(s"""window.customWS=true;window.onload=function(){
-LichessRound.boot({data:${safeJsonValue(data)},i18n:${jsI18n(pov.game)},userId:$jsUserId,chat:${jsOrNull(chatJson)}
-${tour.flatMap(_.top).??(top => s",tour:${safeJsonValue(lila.tournament.JsonView.top(top, lightUser))}")}
-}, document.getElementById('lichess'))}""")
+ embedJsUnsafe(s"""lichess=window.lichess||{};customWS=true;onload=function(){
+LichessRound.boot(${
+ safeJsonValue(Json.obj(
+ "data" -> data,
+ "i18n" -> jsI18n(pov.game),
+ "userId" -> ctx.userId,
+ "chat" -> chatJson
+ ) ++ tour.flatMap(_.top).??(top => Json.obj(
+ "tour" -> lila.tournament.JsonView.top(top, lightUser)
+ )))
+ })}""")
),
- moreCss = cssTag("chat.css"),
openGraph = povOpenGraph(pov).some,
chessground = false,
playing = true
- ) {
- frag(
- div(cls := "round cg-512")(
- board.bits.domPreload(pov.some),
- bits.underboard(pov.game, cross)
+ )(
+ main(cls := "round")(
+ st.aside(cls := "round__side")(
+ bits.side(pov, data, tour, simul, bookmarked = bookmarked),
+ chatOption.map(_ => chat.frag)
),
- (playing.nonEmpty || simul.nonEmpty) option
- div(id := "now_playing", cls := List("other_games" -> true, "blindfold" -> ctx.pref.isBlindfold))(
- others(playing, simul)
- )
+ bits.roundAppPreload(pov, true),
+ div(cls := "round__underboard")(
+ bits.crosstable(cross, pov.game),
+ (playing.nonEmpty || simul.exists(_ isHost ctx.me)) option
+ div(cls := List(
+ "round__now-playing" -> true,
+ "blindfold" -> ctx.pref.isBlindfold
+ ))(bits.others(playing, simul))
+ ),
+ div(cls := "round__underchat")(bits underchat pov.game)
)
- }
+ )
}
}
diff --git a/app/views/round/watcher.scala b/app/views/round/watcher.scala
index becb90344e..f8b0c951a3 100644
--- a/app/views/round/watcher.scala
+++ b/app/views/round/watcher.scala
@@ -1,12 +1,14 @@
package views.html
package round
+import play.api.libs.json.Json
+
import lila.api.Context
import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
import lila.common.HTTPRequest
import lila.common.String.html.safeJsonValue
import lila.game.Pov
-import lila.app.ui.ScalatagsTemplate._
import controllers.routes
@@ -28,24 +30,52 @@ object watcher {
}
bits.layout(
+ variant = pov.game.variant,
title = gameVsText(pov.game, withRatings = true),
- side = game.side(pov, (data \ "game" \ "initialFen").asOpt[String].map(chess.format.FEN), tour.map(_.tour), simul = simul, userTv = userTv, bookmarked = bookmarked),
- chat = chat.frag.some,
- underchat = Some(bits underchat pov.game),
moreJs = frag(
roundNvuiTag,
roundTag,
- embedJs(s"""window.customWS = true; window.onload = function() {
-LichessRound.boot({ data: ${safeJsonValue(data)}, i18n: ${jsI18n(pov.game)}, chat: ${jsOrNull(chatJson)} }, document.getElementById('lichess'))}""")
+ embedJsUnsafe(s"""lichess=window.lichess||{};customWS=true;onload=function(){
+LichessRound.boot(${
+ safeJsonValue(Json.obj(
+ "data" -> data,
+ "i18n" -> jsI18n(pov.game),
+ "chat" -> chatJson
+ ))
+ })}""")
),
- moreCss = cssTag("chat.css"),
openGraph = povOpenGraph(pov).some,
chessground = false
- ) {
- div(cls := "round cg-512")(
- board.bits.domPreload(pov.some),
- bits.underboard(pov.game, cross)
+ )(
+ main(cls := "round")(
+ st.aside(cls := "round__side")(
+ bits.side(pov, data, tour, simul, userTv, bookmarked),
+ chatOption.map(_ => chat.frag)
+ ),
+ bits.roundAppPreload(pov, false),
+ div(cls := "round__underboard")(bits.crosstable(cross, pov.game)),
+ div(cls := "round__underchat")(bits underchat pov.game)
)
- }
+ )
}
+
+ def crawler(pov: Pov, initialFen: Option[chess.format.FEN], pgn: chess.format.pgn.Pgn)(implicit ctx: Context) =
+ bits.layout(
+ variant = pov.game.variant,
+ title = gameVsText(pov.game, withRatings = true),
+ openGraph = povOpenGraph(pov).some,
+ chessground = false
+ )(frag(
+ main(cls := "round")(
+ st.aside(cls := "round__side")(
+ game.side(pov, initialFen, none, simul = none, userTv = none, bookmarked = false),
+ div(cls := "for-crawler")(
+ h1(titleGame(pov.game)),
+ p(describePov(pov)),
+ div(cls := "pgn")(pgn.render)
+ )
+ ),
+ div(cls := "round__board main-board")(board.bits.domPreload(pov.some))
+ )
+ ))
}
diff --git a/app/views/round/watcherBot.scala.html b/app/views/round/watcherBot.scala.html
deleted file mode 100644
index 39ef54f1d9..0000000000
--- a/app/views/round/watcherBot.scala.html
+++ /dev/null
@@ -1,20 +0,0 @@
-@(pov: Pov, initialFen: Option[chess.format.FEN], pgn: chess.format.pgn.Pgn)(implicit ctx: Context)
-
-@title = @{ s"${playerText(pov.player)} vs ${playerText(pov.opponent)} in ${pov.gameId}" }
-
-@round.bits.layout(
-title = title,
-side = views.html.game.side(pov, initialFen, none, simul = none, userTv = none, bookmarked = false),
-chat = none,
-underchat = Some(views.html.game.bits.watchers),
-chessground = false,
-openGraph = povOpenGraph(pov).some) {
-
- @board.bits.domPreload(pov.some).toHtml
-
-
@titleGame(pov.game)
-
@describePov(pov)
-
@pgn.render
-
-
-}.toHtml
diff --git a/app/views/search/bits.scala b/app/views/search/bits.scala
new file mode 100644
index 0000000000..36f2c32303
--- /dev/null
+++ b/app/views/search/bits.scala
@@ -0,0 +1,168 @@
+package views.html.search
+
+import play.api.data.Form
+import org.joda.time.DateTime
+import org.joda.time.format.DateTimeFormat
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.gameSearch.{ Query, Sorting }
+
+private object bits {
+
+ private val dateFormatter = DateTimeFormat.forPattern("YYYY-MM-dd");
+ private val dateMin = "2011-01-01"
+ private def dateMinMax: List[Modifier] = List(min := dateMin, max := dateFormatter.print(DateTime.now))
+
+ def of(form: Form[_])(implicit ctx: Context) = new {
+
+ def dataReqs = List("winner", "loser", "white", "black").map { f =>
+ data(s"req-$f") := ~form("players")(f).value
+ }
+
+ def colors(hide: Boolean) =
+ chess.Color.all.map { color =>
+ tr(cls := List(s"${color.name}User user-row" -> true, "none" -> hide))(
+ th(label(`for` := form3.id(form("players")(color.name)))(color.fold(trans.white, trans.black)())),
+ td(cls := "single")(
+ st.select(id := form3.id(form("players")(color.name)), name := form("players")(color.name).name)(
+ option(cls := "blank", value := "")
+ )
+ )
+ )
+ }
+
+ def winner(hide: Boolean) = tr(cls := List("winner user-row" -> true, "none" -> hide))(
+ th(label(`for` := form3.id(form("players")("winner")))(trans.winner())),
+ td(cls := "single")(
+ st.select(id := form3.id(form("players")("winner")), name := form("players")("winner").name)(
+ option(cls := "blank", value := "")
+ )
+ )
+ )
+
+ def loser(hide: Boolean) = tr(cls := List("loser user-row" -> true, "none" -> hide))(
+ th(label(`for` := form3.id(form("players")("loser")))("Loser")),
+ td(cls := "single")(
+ st.select(id := form3.id(form("players")("loser")), name := form("players")("loser").name)(
+ option(cls := "blank", value := "")
+ )
+ )
+ )
+
+ def rating = tr(
+ th(label(trans.rating(), " ", span(cls := "help", title := "The average rating of both players")("(?)"))),
+ td(
+ div(cls := "half")("From ", form3.select(form("ratingMin"), Query.averageRatings, "".some)),
+ div(cls := "half")("To ", form3.select(form("ratingMax"), Query.averageRatings, "".some))
+ )
+ )
+
+ def hasAi = tr(
+ th(label(`for` := form3.id(form("hasAi")))(trans.opponent(), " ", span(cls := "help", title := "Whether the player's opponent was human or a computer")("(?)"))),
+ td(cls := "single opponent")(form3.select(form("hasAi"), Query.hasAis, "".some))
+ )
+
+ def aiLevel = tr(cls := "aiLevel none")(
+ th(label("A.I. level")),
+ td(
+ div(cls := "half")("From ", form3.select(form("aiLevelMin"), Query.aiLevels, "".some)),
+ div(cls := "half")("To ", form3.select(form("aiLevelMax"), Query.aiLevels, "".some))
+ )
+ )
+
+ def source = tr(
+ th(label(`for` := form3.id(form("source")))("Source")),
+ td(cls := "single")(form3.select(form("source"), Query.sources, "".some))
+ )
+
+ def perf = tr(
+ th(label(`for` := form3.id(form("perf")))(trans.variant())),
+ td(cls := "single")(form3.select(form("perf"), Query.perfs, "".some))
+ )
+
+ def mode = tr(
+ th(label(`for` := form3.id(form("mode")))(trans.mode())),
+ td(cls := "single")(form3.select(form("mode"), Query.modes, "".some))
+ )
+
+ def turns = tr(
+ th(label("Number of turns")),
+ td(
+ div(cls := "half")("From ", form3.select(form("turnsMin"), Query.turns, "".some)),
+ div(cls := "half")("To ", form3.select(form("turnsMax"), Query.turns, "".some))
+ )
+ )
+
+ def duration = tr(
+ tr(
+ th(label(trans.duration())),
+ td(
+ div(cls := "half")("From ", form3.select(form("durationMin"), Query.durations, "".some)),
+ div(cls := "half")("To ", form3.select(form("durationMax"), Query.durations, "".some))
+ )
+ )
+ )
+
+ def clockTime = tr(
+ th(label("Clock initial time")),
+ td(
+ div(cls := "half")("From ", form3.select(form("clock")("initMin"), Query.clockInits, "".some)),
+ div(cls := "half")("To ", form3.select(form("clock")("initMax"), Query.clockInits, "".some))
+ )
+ )
+
+ def clockIncrement = tr(
+ th(label("Clock increment")),
+ td(
+ div(cls := "half")("From ", form3.select(form("clock")("incMin"), Query.clockIncs, "".some)),
+ div(cls := "half")("To ", form3.select(form("clock")("incMax"), Query.clockIncs, "".some))
+ )
+ )
+
+ def status = tr(
+ th(label(`for` := form3.id(form("status")))("Result")),
+ td(cls := "single")(form3.select(form("status"), Query.statuses, "".some))
+ )
+
+ def winnerColor = tr(
+ th(label(`for` := form3.id(form("winnerColor")))("Winner color")),
+ td(cls := "single")(form3.select(form("winnerColor"), Query.winnerColors, "".some))
+ )
+
+ def date = tr(cls := "date")(
+ th(label("Date")),
+ td(
+ div(cls := "half")("From ", form3.input(form("dateMin"), "date")(dateMinMax: _*)),
+ div(cls := "half")("To ", form3.input(form("dateMax"), "date")(dateMinMax: _*))
+ )
+ )
+
+ def sort = tr(
+ th(label("Sort")),
+ td(
+ div(cls := "half")("By ", form3.select(form("sort")("field"), Sorting.fields)),
+ div(cls := "half")("Order ", form3.select(form("sort")("order"), Sorting.orders))
+ )
+ )
+
+ def analysed = {
+ val field = form("analysed")
+ tr(
+ th(label(`for` := form3.id(field))("Analysis ", span(cls := "help", title := "Only games where a computer analysis is available")("(?)"))),
+ td(cls := "single")(
+ st.input(
+ tpe := "checkbox",
+ cls := "cmn-toggle",
+ id := form3.id(field),
+ name := field.name,
+ value := "1",
+ field.value.has("1") option checked
+ ),
+ label(`for` := form3.id(field))
+ )
+ )
+ }
+ }
+}
diff --git a/app/views/search/index.scala b/app/views/search/index.scala
new file mode 100644
index 0000000000..f896f6e141
--- /dev/null
+++ b/app/views/search/index.scala
@@ -0,0 +1,97 @@
+package views.html.search
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.common.paginator.Paginator
+import lila.gameSearch.{ Query, Sorting }
+import lila.user.User
+
+import controllers.routes
+
+object index {
+
+ def apply(form: Form[_], paginator: Option[Paginator[lila.game.Game]] = None, nbGames: Int)(implicit ctx: Context) = {
+ val commons = bits of form
+ import commons._
+ views.html.base.layout(
+ title = trans.advancedSearch.txt(),
+ moreJs = frag(
+ jsTag("search.js"),
+ infiniteScrollTag
+ ),
+ moreCss = cssTag("search"),
+ openGraph = lila.app.ui.OpenGraph(
+ title = s"Search in ${nbGames.localize} chess games",
+ url = s"$netBaseUrl${routes.Search.index().url}",
+ description = s"Search in ${nbGames.localize} chess games using advanced criterions"
+ ).some
+ ) {
+ main(cls := "box page-small search")(
+ h1(trans.advancedSearch()),
+ st.form(
+ rel := "nofollow",
+ cls := "box__pad search__form",
+ action := s"${routes.Search.index()}#results",
+ method := "GET"
+ )(dataReqs)(
+ globalError(form),
+ table(
+ tr(
+ th(label(trans.players())),
+ td(cls := "usernames")(List("a", "b").map { p =>
+ div(cls := "half")(form3.input(form("players")(p))(tpe := "text"))
+ })
+ ),
+ colors(hide = true),
+ winner(hide = true),
+ loser(hide = true),
+ rating,
+ hasAi,
+ aiLevel,
+ source,
+ perf,
+ mode,
+ turns,
+ duration,
+ clockTime,
+ clockIncrement,
+ status,
+ winnerColor,
+ date,
+ sort,
+ analysed,
+ tr(
+ th,
+ td(cls := "action")(
+ button(tpe := "submit", cls := "button")(trans.search()),
+ div(cls := "wait")(
+ spinner,
+ "Searching in ", nbGames.localize, " games"
+ )
+ )
+ )
+ )
+ ),
+ div(cls := "search__result", id := "results")(
+ paginator.map { pager =>
+ val permalink = a(cls := "permalink", href := routes.Search.index(), rel := "nofollow")("Permalink")
+ if (pager.nbResults > 0) frag(
+ div(cls := "search__status box__pad")(
+ strong(pager.nbResults.localize, " games found"), " • ",
+ permalink
+ ),
+ div(cls := "search__rows")(
+ pagerNext(pager, np => routes.Search.index(np).url),
+ views.html.game.widgets(pager.currentPageResults)
+ )
+ )
+ else div(cls := "search__status box__pad")(strong("No game found"), " • ", permalink)
+ }
+ )
+ )
+ }
+ }
+}
diff --git a/app/views/search/index.scala.html b/app/views/search/index.scala.html
deleted file mode 100644
index 38404088fd..0000000000
--- a/app/views/search/index.scala.html
+++ /dev/null
@@ -1,240 +0,0 @@
-@(form: Form[_], paginator: Option[Paginator[Game]] = None, nbGames: Int)(implicit ctx: Context)
-
-@import lila.gameSearch.{ Query, Sorting }
-
-@moreCss = {
-@cssTags("search.css", "flatpickr.css")
-}
-@moreJs = {
-@nonAsyncFlatpickrTag
-@jsTag("search.js")
-@infiniteScrollTag
-}
-
-@base.layout(
-title = trans.advancedSearch.txt(),
-moreJs = moreJs,
-moreCss = moreCss,
-openGraph = lila.app.ui.OpenGraph(
-title = s"Search in ${nbGames.localize} chess games",
-url = s"$netBaseUrl${routes.Search.index().url}",
-description = s"Search in ${nbGames.localize} chess games using advanced criterions").some) {
-
-
@trans.advancedSearch()
-
-
- @paginator.map { pager =>
- @if(pager.nbResults > 0) {
-
-
@pager.nbResults.localize games found •
-
Permalink •
-
-
- } else {
-
- }
- }
-
-
-}.toHtml
diff --git a/app/views/search/user.scala b/app/views/search/user.scala
new file mode 100644
index 0000000000..07bce9ee1d
--- /dev/null
+++ b/app/views/search/user.scala
@@ -0,0 +1,59 @@
+package views.html.search
+
+import play.api.data.Form
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+import lila.gameSearch.{ Query, Sorting }
+import lila.user.User
+
+import controllers.routes
+
+object user {
+
+ def apply(u: User, form: Form[_])(implicit ctx: Context) = {
+ val commons = bits of form
+ import commons._
+ st.form(
+ rel := "nofollow",
+ cls := "search__form",
+ action := routes.User.games(u.username, "search"),
+ method := "GET"
+ )(dataReqs)(
+ table(
+ date,
+ rating,
+ turns,
+ duration,
+ clockTime,
+ clockIncrement,
+ source,
+ perf,
+ mode
+ ),
+ table(
+ hasAi,
+ aiLevel,
+ tr(cls := "opponentName")(
+ th(label(`for` := form3.id(form("players")("b")))("Opponent name")),
+ td(cls := "usernames")(
+ st.input(tpe := "hidden", value := u.id, name := "players.a"),
+ form3.input(form("players")("b"))(tpe := "text")
+ )
+ ),
+ winner(hide = false),
+ loser(hide = false),
+ colors(hide = false),
+ status,
+ winnerColor,
+ sort,
+ analysed,
+ tr(cls := "action")(
+ th,
+ td(button(cls := "button")(trans.search()))
+ )
+ )
+ )
+ }
+}
diff --git a/app/views/search/user.scala.html b/app/views/search/user.scala.html
deleted file mode 100644
index c057973d4f..0000000000
--- a/app/views/search/user.scala.html
+++ /dev/null
@@ -1,188 +0,0 @@
-@(u: User, form: Form[_])(implicit ctx: Context)
-
-@import lila.gameSearch.{ Query, Sorting }
-
-
diff --git a/app/views/setup/bits.scala b/app/views/setup/bits.scala
index c40dd9d9b2..99543f5105 100644
--- a/app/views/setup/bits.scala
+++ b/app/views/setup/bits.scala
@@ -17,18 +17,18 @@ private object bits {
div(cls := "fen_position optional_config")(
frag(
div(cls := "fen_form", dataValidateUrl := s"""${routes.Setup.validateFen()}${strict.??("?strict=1")}""")(
- a(cls := "button thin hint--bottom", dataHint := trans.boardEditor.txt(), href := url)(iconTag("m")),
- form3.input(field)(st.placeholder := trans.pasteTheFenStringHere.txt())
+ form3.input(field)(st.placeholder := trans.pasteTheFenStringHere.txt()),
+ a(cls := "button button-empty", dataIcon := "m", title := trans.boardEditor.txt(), href := url)
),
a(cls := "board_editor", href := url)(
span(cls := "preview")(
validFen.map { vf =>
div(
- cls := "mini_board parse_fen is2d",
+ cls := "mini-board cg-board-wrap parse-fen is2d",
dataColor := vf.color.name,
dataFen := vf.fen.value,
dataResizable := "1"
- )(miniBoardContent)
+ )(div(cls := "cg-board"))
}
)
)
@@ -38,7 +38,7 @@ private object bits {
def renderVariant(form: Form[_], variants: List[SelectChoice])(implicit ctx: Context) =
div(cls := "variant label_select")(
- renderLabel(form("variant"), trans.variant.frag()),
+ renderLabel(form("variant"), trans.variant()),
renderSelect(form("variant"), variants.filter {
case (id, _, _) => ctx.noBlind || lila.game.Game.blindModeVariants.exists(_.id.toString == id)
})
@@ -53,7 +53,7 @@ private object bits {
case (value, name, title) => option(
st.value := value,
st.title := title,
- selected := field.value.exists(v => compare(v, value)).option(true)
+ field.value.exists(v => compare(v, value)) option selected
)(name)
}
)
@@ -67,11 +67,11 @@ private object bits {
id := s"$prefix${field.id}_${key}",
st.name := field.name,
value := key,
- checked := field.value.has(key).option(true)
+ field.value.has(key) option checked
),
label(
- cls := List("required" -> true, "hint--top" -> hint.isDefined),
- dataHint := hint,
+ cls := "required",
+ title := hint,
`for` := s"$prefix${field.id}_$key"
)(name)
)
diff --git a/app/views/setup/filter.scala b/app/views/setup/filter.scala
index 3d0248bbf9..c9e0c22cef 100644
--- a/app/views/setup/filter.scala
+++ b/app/views/setup/filter.scala
@@ -13,8 +13,9 @@ object filter {
import bits._
- def apply(form: Form[_], filter: lila.setup.FilterConfig)(implicit ctx: Context) =
- st.form(action := routes.Setup.filter(), novalidate := true)(
+ def apply(form: Form[_], filter: lila.setup.FilterConfig)(implicit ctx: Context) = frag(
+ cssTag("lobby.setup"),
+ st.form(action := routes.Setup.filter(), novalidate)(
table(
tbody(
tr(cls := "variant")(
@@ -32,9 +33,9 @@ object filter {
ctx.me.map { me =>
tr(
td(trans.ratingRange()),
- td(cls := "rating_range_config")(
+ td(
label(cls := "range")("? - ?"),
- div(cls := "rating_range")(
+ div(cls := "rating-range")(
renderInput(form("ratingRange"))(
dataMin := RatingRange.min,
dataMax := RatingRange.max
@@ -50,10 +51,11 @@ object filter {
renderInput(form("ratingRange"))
),
div(cls := "actions")(
- button(`type` := "submit", cls := "reset button text", dataIcon := "k")(trans.reset()),
- button(`type` := "submit", cls := "submit button text", dataIcon := "E")(trans.apply())
+ button(tpe := "submit", cls := "button button-empty button-red text reset", dataIcon := "k")(trans.reset()),
+ button(tpe := "submit", cls := "button button-green text apply", dataIcon := "E")(trans.apply())
)
)
+ )
def renderCheckboxes(
form: Form[_],
@@ -75,12 +77,12 @@ object filter {
checks: List[String],
content: Frag,
hint: Option[String]
- ) = label(cls := "hover", title := hint)(
+ ) = label(title := hint)(
input(
- `type` := "checkbox",
+ tpe := "checkbox",
name := s"${form(key).name}[$index]",
st.value := value,
- checked := checks.has(value).option(true)
+ checks.has(value) option checked
)(content)
)
}
diff --git a/app/views/setup/forms.scala b/app/views/setup/forms.scala
index 9494658319..d5fe6ec0b0 100644
--- a/app/views/setup/forms.scala
+++ b/app/views/setup/forms.scala
@@ -2,7 +2,6 @@ package views.html.setup
import play.api.data.Form
import play.api.mvc.Call
-import play.twirl.api.Html
import lila.api.Context
import lila.app.templating.Environment._
@@ -20,7 +19,7 @@ object forms {
def hook(form: Form[_])(implicit ctx: Context) = layout(
form,
"hook",
- trans.createAGame.frag(),
+ trans.createAGame(),
routes.Setup.hook("uid-placeholder")
) {
frag(
@@ -31,11 +30,11 @@ object forms {
renderRadios(form("mode"), translatedModeChoices)
),
ctx.noBlind option div(cls := "optional_config")(
- div(cls := "rating_range_config slider")(
- trans.ratingRange.frag(),
+ div(cls := "rating-range-config slider")(
+ trans.ratingRange(),
": ",
span(cls := "range")("? - ?"),
- div(cls := "rating_range")(
+ div(cls := "rating-range")(
renderInput(form("ratingRange"))(
dataMin := RatingRange.min,
dataMax := RatingRange.max
@@ -48,25 +47,26 @@ object forms {
}
def ai(form: Form[_], ratings: Map[Int, Int], validFen: Option[lila.setup.ValidFen])(implicit ctx: Context) =
- layout(form, "ai", trans.playWithTheMachine.frag(), routes.Setup.ai) {
+ layout(form, "ai", trans.playWithTheMachine(), routes.Setup.ai) {
frag(
renderVariant(form, translatedAiVariantChoices),
fenInput(form("fen"), true, validFen),
renderTimeMode(form, lila.setup.AiConfig),
if (ctx.blind) frag(
- renderLabel(form("level"), trans.level.frag()),
+ renderLabel(form("level"), trans.level()),
renderSelect(form("level"), lila.setup.AiConfig.levelChoices),
blindSideChoice(form)
)
else frag(
- trans.level.frag(),
+ br,
+ trans.level(),
div(cls := "level buttons")(
div(id := "config_level")(
renderRadios(form("level"), lila.setup.AiConfig.levelChoices)
),
div(cls := "ai_info")(
ratings.toList.map {
- case (level, rating) => div(cls := s"${prefix}level_$level")(trans.aiNameLevelAiLevel.frag("A.I.", level))
+ case (level, rating) => div(cls := s"${prefix}level_$level")(trans.aiNameLevelAiLevel("A.I.", level))
}
)
)
@@ -85,7 +85,7 @@ object forms {
"friend",
(if (user.isDefined) trans.challengeToPlay else trans.playWithAFriend)(),
routes.Setup.friend(user map (_.id)),
- error.map(e => Html(e.replace("{{user}}", userIdLink(user.map(_.id)).toString)))
+ error.map(e => raw(e.replace("{{user}}", userIdLink(user.map(_.id)).toString)))
)(frag(
user.map { u =>
userLink(u, cssClass = "target".some)
@@ -101,59 +101,56 @@ object forms {
private def blindSideChoice(form: Form[_])(implicit ctx: Context) =
ctx.blind option frag(
- renderLabel(form("color"), trans.side.frag()),
+ renderLabel(form("color"), trans.side()),
renderSelect(form("color").copy(value = "random".some), translatedSideChoices)
)
private def layout(
form: Form[_],
typ: String,
- title: Frag,
+ titleF: Frag,
route: Call,
error: Option[Frag] = None
)(fields: Frag)(implicit ctx: Context) =
- div(
- cls := s"""lichess_overboard game_config${error.isDefined ?? " error"}""",
- dataRandomColorVariants,
- dataType := typ,
- dataAnon := ctx.isAnon.option("1")
- )(
- a(href := routes.Lobby.home, cls := "close icon", st.title := trans.cancel.txt(), dataIcon := "L"),
- h2(title),
- error.map { e =>
- frag(
- p(cls := "error")(e),
- br,
- a(href := routes.Lobby.home, cls := "button text", dataIcon := "L")(trans.cancel.txt())
- )
- }.getOrElse {
- st.form(action := route, method := "post", novalidate := true)(
+ div(cls := error.isDefined option "error")(
+ h2(titleF),
+ error.map { e =>
+ frag(
+ p(cls := "error")(e),
+ br,
+ a(href := routes.Lobby.home, cls := "button text", dataIcon := "L")(trans.cancel.txt())
+ )
+ }.getOrElse {
+ st.form(action := route, method := "post", novalidate,
+ dataRandomColorVariants,
+ dataType := typ,
+ dataAnon := ctx.isAnon.option("1"))(
fields,
if (ctx.blind) button(tpe := "submit")("Create the game")
- else div(cls := "color_submits")(
+ else div(cls := "color-submits")(
translatedSideChoices.map {
case (key, name, _) => button(
- disabled := typ == "hook" option true,
+ (typ == "hook") option disabled,
tpe := "submit",
- dataHint := ctx.noBlind option name,
- cls := s"button hint--bottom $key",
+ title := name,
+ cls := s"color-submits__button button button-metal $key",
st.name := "color",
value := key
)(i)
}
)
)
- },
- ctx.me.ifFalse(ctx.blind).map { me =>
- div(cls := "ratings")(
- lila.rating.PerfType.nonPuzzle.map { perfType =>
- div(cls := perfType.key)(
- trans.perfRatingX.frag(
- Html(s"""
${me.perfs(perfType.key).map(_.intRating).getOrElse("?")} ${perfType.name}""")
- )
+ },
+ ctx.me.ifFalse(ctx.blind).map { me =>
+ div(cls := "ratings")(
+ lila.rating.PerfType.nonPuzzle.map { perfType =>
+ div(cls := perfType.key)(
+ trans.perfRatingX(
+ raw(s"""
${me.perfs(perfType.key).map(_.intRating).getOrElse("?")} ${perfType.name}""")
)
- }
- )
- }
- )
+ )
+ }
+ )
+ }
+ )
}
diff --git a/app/views/simul/bits.scala b/app/views/simul/bits.scala
index ef9b844323..b86c85146e 100644
--- a/app/views/simul/bits.scala
+++ b/app/views/simul/bits.scala
@@ -5,29 +5,29 @@ import play.api.libs.json.Json
import lila.api.Context
import lila.app.templating.Environment._
import lila.app.ui.ScalatagsTemplate._
-import lila.common.String.html.safeJsonValue
import controllers.routes
object bits {
- def jsI18n()(implicit ctx: Context) = safeJsonValue(i18nJsObject(baseTranslations))
+ def link(simulId: lila.simul.Simul.ID): Frag =
+ a(href := routes.Simul.show(simulId))("Simultaneous exhibition")
+
+ def jsI18n()(implicit ctx: Context) = i18nJsObject(baseTranslations)
def notFound()(implicit ctx: Context) =
- layout(title = trans.noSimulFound.txt()) {
- div(id := "simul")(
- div(cls := "content_box small_box faq_page")(
- h1(trans.noSimulFound.frag()),
- br, br,
- trans.noSimulExplanation.frag(),
- br, br,
- a(href := routes.Simul.home())(trans.returnToSimulHomepage.frag())
+ views.html.base.layout(
+ title = trans.noSimulFound.txt()
+ ) {
+ main(cls := "page-small box box-pad")(
+ h1(trans.noSimulFound()),
+ p(trans.noSimulExplanation()),
+ p(a(href := routes.Simul.home())(trans.returnToSimulHomepage()))
)
- )
- }
+ }
def homepageSpotlight(s: lila.simul.Simul)(implicit ctx: Context) =
- a(href := routes.Simul.show(s.id), cls := "tour_spotlight little id_@s.id")(
+ a(href := routes.Simul.show(s.id), cls := "tour-spotlight little id_@s.id")(
img(cls := "img icon", src := staticUrl("images/fire-silhouette.svg")),
span(cls := "content")(
span(cls := "name")(s.name, " simul"),
@@ -40,17 +40,10 @@ object bits {
)
def allCreated(simuls: List[lila.simul.Simul]) =
- table(cls := "tournaments")(
+ table(
simuls map { simul =>
tr(
- td(cls := "name")(
- a(cls := "text", href := routes.Simul.show(simul.id))(
- simul.perfTypes map { pt =>
- span(dataIcon := pt.iconChar)
- },
- simul.fullName
- )
- ),
+ td(cls := "name")(a(href := routes.Simul.show(simul.id))(simul.fullName)),
td(userIdLink(simul.hostId.some)),
td(cls := "text", dataIcon := "p")(simul.clock.config.show),
td(cls := "text", dataIcon := "r")(simul.applicants.size),
@@ -66,26 +59,6 @@ object bits {
sim.variants.map(_.name).mkString(", ")
)
- private[simul] def layout(
- title: String,
- moreJs: Frag = emptyFrag,
- moreCss: Frag = emptyFrag,
- side: Option[Frag] = None,
- chat: Option[Frag] = None,
- underchat: Option[Frag] = None,
- chessground: Boolean = true,
- openGraph: Option[lila.app.ui.OpenGraph] = None
- )(body: Frag)(implicit ctx: Context) = views.html.base.layout(
- title = title,
- moreJs = moreJs,
- moreCss = frag(cssTag("simul.css"), moreCss),
- side = side.map(_.toHtml),
- chat = chat.map(_.toHtml),
- underchat = underchat.map(_.toHtml),
- chessground = chessground,
- openGraph = openGraph
- )(body)
-
private val baseTranslations = Vector(
trans.finished,
trans.withdraw,
diff --git a/app/views/simul/form.scala b/app/views/simul/form.scala
index 12365e780e..16606f4e03 100644
--- a/app/views/simul/form.scala
+++ b/app/views/simul/form.scala
@@ -15,35 +15,36 @@ object form {
import config._
- bits.layout(
+ views.html.base.layout(
title = trans.hostANewSimul.txt(),
- moreCss = cssTag("form3.css")
+ moreCss = cssTag("simul.form")
) {
- div(id := "simul", cls := "form")(
- div(cls := "content_box small_box simul_box")(
- h1(trans.hostANewSimul.frag()),
- st.form(cls := "form3", action := routes.Simul.create(), method := "POST")(
- br, br,
- p(trans.whenCreateSimul.frag()),
- br, br,
- globalError(form),
- form3.group(form("variant"), trans.simulVariantsHint.frag()) { f =>
- div(cls := "variants")(
- views.html.setup.filter.renderCheckboxes(form, "variants", form.value.map(_.variants.map(_.toString)).getOrElse(Nil), translatedVariantChoicesWithVariants)
- )
- },
- form3.split(
- form3.group(form("clockTime"), raw("Clock initial time"), help = trans.simulClockHint.frag().some, half = true)(form3.select(_, clockTimeChoices)),
- form3.group(form("clockIncrement"), raw("Clock increment"), half = true)(form3.select(_, clockIncrementChoices))
- ),
- form3.group(form("clockExtra"), trans.simulHostExtraTime.frag(), help = trans.simulAddExtraTime.frag().some)(
+ main(cls := "box box-pad page-small simul-form")(
+ h1(trans.hostANewSimul()),
+ st.form(cls := "form3", action := routes.Simul.create(), method := "POST")(
+ br, br,
+ p(trans.whenCreateSimul()),
+ br, br,
+ globalError(form),
+ form3.group(form("variant"), trans.simulVariantsHint()) { f =>
+ div(cls := "variants")(
+ views.html.setup.filter.renderCheckboxes(form, "variants", form.value.map(_.variants.map(_.toString)).getOrElse(Nil), translatedVariantChoicesWithVariants)
+ )
+ },
+ form3.split(
+ form3.group(form("clockTime"), raw("Clock initial time"), help = trans.simulClockHint().some, half = true)(form3.select(_, clockTimeChoices)),
+ form3.group(form("clockIncrement"), raw("Clock increment"), half = true)(form3.select(_, clockIncrementChoices))
+ ),
+ form3.split(
+ form3.group(form("clockExtra"), trans.simulHostExtraTime(), help = trans.simulAddExtraTime().some, half = true)(
form3.select(_, clockExtraChoices)
),
- form3.group(form("color"), raw("Host color for each game"))(form3.select(_, colorChoices)),
- form3.actions(
- a(href := routes.Simul.home())(trans.cancel.frag()),
- form3.submit(trans.hostANewSimul.frag(), icon = "g".some)
- )
+ form3.group(form("color"), raw("Host color for each game"), half = true)(form3.select(_, colorChoices))
+ ),
+ form3.group(form("text"), raw("Simul description"), help = frag("Anything you want to tell the participants?").some)(form3.textarea(_)(rows := 10)),
+ form3.actions(
+ a(href := routes.Simul.home())(trans.cancel()),
+ form3.submit(trans.hostANewSimul(), icon = "g".some)
)
)
)
diff --git a/app/views/simul/home.scala b/app/views/simul/home.scala
index 0313f424a3..572f9a4fb6 100644
--- a/app/views/simul/home.scala
+++ b/app/views/simul/home.scala
@@ -14,29 +14,34 @@ object home {
opens: List[lila.simul.Simul],
starteds: List[lila.simul.Simul],
finisheds: List[lila.simul.Simul]
- )(implicit ctx: Context) = bits.layout(
+ )(implicit ctx: Context) = views.html.base.layout(
+ moreCss = cssTag("simul.list"),
+ moreJs = embedJsUnsafe(s"""$$(function() {
+ lichess.StrongSocket.defaults.params.flag = 'simul';
+ lichess.pubsub.on('socket.in.reload', () => {
+ $$('.simul-list__content').load('${routes.Simul.homeReload()}', lichess.pubsub.emit('content_loaded'));
+ });
+});"""),
title = trans.simultaneousExhibitions.txt(),
- side = div(cls := "help")(
- trans.aboutSimul(),
- " ",
- a(cls := "more")(trans.more.frag(), "..."),
- div(cls := "more none")(
- img(src := staticUrl("images/fischer-simul.jpg"), alt := "Simul IRL with Bobby Fischer")(
- em("[1964] ", trans.aboutSimulImage.frag()),
- p(trans.aboutSimulRealLife.frag()),
- p(trans.aboutSimulRules.frag()),
- p(trans.aboutSimulSettings.frag())
- )
- )
- ).some,
openGraph = lila.app.ui.OpenGraph(
title = trans.simultaneousExhibitions.txt(),
url = s"$netBaseUrl${routes.Simul.home}",
description = trans.aboutSimul.txt()
).some
) {
- div(id := "simul_list", dataHref := routes.Simul.homeReload())(
- homeInner(opens, starteds, finisheds)
+ main(cls := "page-menu simul-list")(
+ st.aside(cls := "page-menu__menu simul-list__help")(
+ p(trans.aboutSimul()),
+ img(src := staticUrl("images/fischer-simul.jpg"), alt := "Simul IRL with Bobby Fischer")(
+ em("[1964] ", trans.aboutSimulImage()),
+ p(trans.aboutSimulRealLife()),
+ p(trans.aboutSimulRules()),
+ p(trans.aboutSimulSettings())
+ )
+ ),
+ div(cls := "page-menu__content simul-list__content")(
+ homeInner(opens, starteds, finisheds)
+ )
)
}
}
diff --git a/app/views/simul/homeInner.scala b/app/views/simul/homeInner.scala
index d8c14eb2fd..ffebe18eec 100644
--- a/app/views/simul/homeInner.scala
+++ b/app/views/simul/homeInner.scala
@@ -15,78 +15,65 @@ object homeInner {
starteds: List[lila.simul.Simul],
finisheds: List[lila.simul.Simul]
)(implicit ctx: Context) =
- div(cls := "content_box simul_box no_padding")(
- h1(trans.simultaneousExhibitions.frag()),
- table(cls := "slist")(
+ div(cls := "box")(
+ h1(trans.simultaneousExhibitions()),
+ table(cls := "slist slist-pad")(
thead(
tr(
- th(colspan := 2, cls := "large")(trans.createdSimuls.frag()),
- th(trans.host.frag()),
- th(trans.players.frag())
+ th(trans.createdSimuls()),
+ th(cls := "host")(trans.host()),
+ th(cls := "players")(trans.players())
)
),
tbody(
createds.map { sim =>
tr(cls := "scheduled")(
- iconTd(sim),
simTd(sim),
simHost(sim),
- td(cls := "text", dataIcon := "r")(sim.applicants.size)
+ td(cls := "players text", dataIcon := "r")(sim.applicants.size)
)
},
ctx.isAuth option tr(cls := "create")(
td(colspan := "4")(
- a(href := routes.Simul.form(), cls := "action button text")(trans.hostANewSimul.frag())
+ a(href := routes.Simul.form(), cls := "action button text")(trans.hostANewSimul())
)
)
),
starteds.nonEmpty option (frag(
thead(
tr(
- th(colspan := 2, cls := "large")(trans.eventInProgress.frag()),
- th(trans.host.frag()),
- th(trans.players.frag())
+ th(trans.eventInProgress()),
+ th(cls := "host")(trans.host()),
+ th(cls := "players")(trans.players())
)
),
starteds.map { sim =>
tr(
- iconTd(sim),
simTd(sim),
simHost(sim),
- td(cls := "text", dataIcon := "r")(sim.pairings.size)
+ td(cls := "players text", dataIcon := "r")(sim.pairings.size)
)
}
)),
thead(
tr(
- th(colspan := 2, cls := "large")(trans.finished.frag()),
- th(trans.host.frag()),
- th(trans.players.frag())
+ th(trans.finished()),
+ th(cls := "host")(trans.host()),
+ th(cls := "players")(trans.players())
)
),
tbody(
finisheds.map { sim =>
tr(
- iconTd(sim),
simTd(sim),
simHost(sim),
- td(cls := "text", dataIcon := "r")(sim.pairings.size)
+ td(cls := "players text", dataIcon := "r")(sim.pairings.size)
)
}
)
)
)
- private def iconTd(sim: lila.simul.Simul) =
- td(cls := List(
- "variant_icons" -> true,
- "rich" -> sim.variantRich
- ))(
- sim.perfTypes.map { pt =>
- span(cls := "is-gold", dataIcon := pt.iconChar)
- }
- )
-
private def simTd(sim: lila.simul.Simul)(implicit ctx: Context) =
td(cls := "header")(
a(href := routes.Simul.show(sim.id))(
diff --git a/app/views/simul/show.scala b/app/views/simul/show.scala
index aba0e95f0e..845efa2c06 100644
--- a/app/views/simul/show.scala
+++ b/app/views/simul/show.scala
@@ -17,64 +17,59 @@ object show {
data: play.api.libs.json.JsObject,
chatOption: Option[lila.chat.UserChat.Mine],
stream: Option[lila.streamer.Stream]
- )(implicit ctx: Context) = bits.layout(
+ )(implicit ctx: Context) = views.html.base.layout(
+ moreCss = cssTag("simul.show"),
title = sim.fullName,
- side = Some(frag(
- div(cls := "side_box padded")(
- div(cls := "game_infos")(
- div(cls := List(
- "variant_icons" -> true,
- "rich" -> sim.variantRich
- ))(sim.perfTypes.map { pt => span(dataIcon := pt.iconChar) }),
- span(cls := "clock")(sim.clock.config.show),
- br,
- div(cls := "setup")(
- sim.variants.map(_.name).mkString(", "),
- " • ",
- trans.casual()
- ),
- trans.simulHostExtraTime(),
- ": ",
- pluralize("minute", sim.clock.hostExtraMinutes),
- br,
- trans.hostColorX(sim.color match {
- case Some("white") => trans.white()
- case Some("black") => trans.black()
- case _ => trans.randomColor()
- })
- ),
- trans.by(usernameOrId(sim.hostId)),
- " ",
- momentFromNow(sim.createdAt)
- ),
- stream.map { s =>
- a(
- href := routes.Streamer.show(s.streamer.userId),
- cls := "context-streamer text side_box",
- dataIcon := ""
- )(usernameOrId(s.streamer.userId), " is streaming")
- }
- )),
- underchat = Some(div(
- cls := "watchers hidden",
- aria.live := "off",
- aria.relevant := "additions removals text"
- )(span(cls := "list inline_userlist"))),
- chat = views.html.chat.frag.some,
moreJs = frag(
jsAt(s"compiled/lichess.simul${isProd ?? (".min")}.js"),
- embedJs(s"""lichess.simul={
-data:${safeJsonValue(data)},
-i18n:${bits.jsI18n()},
-socketVersion:${socketVersion.value},
-userId: $jsUserIdString,
-chat: ${chatOption.fold("null")(c => safeJsonValue(views.html.chat.json(c.chat, name = trans.chatRoom.txt(), timeout = c.timeout, public = true)))}}""")
- ),
- moreCss = cssTags(List(
- "chat.css" -> true,
- "quote.css" -> sim.isCreated
- ))
+ embedJsUnsafe(s"""lichess.simul=${
+ safeJsonValue(Json.obj(
+ "data" -> data,
+ "i18n" -> bits.jsI18n(),
+ "socketVersion" -> socketVersion.value,
+ "userId" -> ctx.userId,
+ "chat" -> chatOption.map { c =>
+ views.html.chat.json(c.chat, name = trans.chatRoom.txt(), timeout = c.timeout, public = true)
+ }
+ ))
+ }""")
+ )
) {
- div(id := "simul")
+ main(cls := "simul")(
+ st.aside(cls := "simul__side")(
+ div(cls := "simul__meta")(
+ div(cls := "game-infos")(
+ div(cls := "header")(
+ iconTag("f"),
+ div(
+ span(cls := "clock")(sim.clock.config.show),
+ div(cls := "setup")(
+ sim.variants.map(_.name).mkString(", "),
+ " • ",
+ trans.casual()
+ )
+ )
+ ),
+ trans.simulHostExtraTime(),
+ ": ",
+ pluralize("minute", sim.clock.hostExtraMinutes),
+ br,
+ trans.hostColorX(sim.color match {
+ case Some("white") => trans.white()
+ case Some("black") => trans.black()
+ case _ => trans.randomColor()
+ })
+ ),
+ trans.by(usernameOrId(sim.hostId)),
+ " ",
+ momentFromNow(sim.createdAt)
+ ),
+ stream.map { s =>
+ views.html.streamer.bits.contextual(s.streamer.userId)
+ },
+ chatOption.isDefined option views.html.chat.frag
+ ),
+ div(cls := "simul__main box")(spinner)
+ )
}
}
diff --git a/app/views/site/api.scala.html b/app/views/site/bits.scala
similarity index 51%
rename from app/views/site/api.scala.html
rename to app/views/site/bits.scala
index dfe9f9e734..7f5cb65e8d 100644
--- a/app/views/site/api.scala.html
+++ b/app/views/site/bits.scala
@@ -1,5 +1,28 @@
-@()
-
+package views.html.site
+
+import lila.api.Context
+import lila.app.templating.Environment._
+import lila.app.ui.ScalatagsTemplate._
+
+import controllers.routes
+
+object bits {
+
+ def getFishnet()(implicit ctx: Context) =
+ views.html.base.layout(
+ title = "fishnet API key request",
+ csp = defaultCsp.withGoogleForm.some
+ ) {
+ main(
+ iframe(
+ src := "https://docs.google.com/forms/d/e/1FAIpQLSeSAp51tSaW9JlPGVX0o8dcScAuxGMhNOL9eEUIfARGzpITmA/viewform?embedded=true",
+ style := "width:100%;height:1400px",
+ st.frameborder := 0
+ )(spinner)
+ )
+ }
+
+ def api = raw("""
@@ -11,6 +34,7 @@
-
+
-
+