diff --git a/app/controllers/LilaController.scala b/app/controllers/LilaController.scala index 4104950e66..bd4b877de6 100644 --- a/app/controllers/LilaController.scala +++ b/app/controllers/LilaController.scala @@ -83,8 +83,10 @@ trait LilaController protected def JsonIOk(map: IO[Map[String, Any]]) = JsonOk(map.unsafePerformIO) - protected def JsIOk(js: IO[String], headers: (String, String)*) = - Ok(js.unsafePerformIO) as JAVASCRIPT withHeaders (headers: _*) + protected def JsIOk(js: IO[String], headers: (String, String)*) = JsOk(js.unsafePerformIO) + + protected def JsOk(js: String, headers: (String, String)*) = + Ok(js) as JAVASCRIPT withHeaders (headers: _*) protected def ValidOk(valid: Valid[Unit]) = valid.fold( e ⇒ BadRequest(e.shows), diff --git a/app/controllers/Main.scala b/app/controllers/Main.scala index 73ae096e47..3d57e35f22 100644 --- a/app/controllers/Main.scala +++ b/app/controllers/Main.scala @@ -45,4 +45,15 @@ object Main extends LilaController { def captchaCheck(id: String) = Open { implicit ctx ⇒ Ok(env.site.captcha get id valid ~get("solution") fold (1, 0)) } + + def embed = Open { implicit ctx ⇒ + JsOk("""document.write("");""" + .format(env.settings.NetBaseUrl, getInt("w") | 820, getInt("h") | 650), + CACHE_CONTROL -> "max-age=86400" + ) + } + + def developers = Open { implicit ctx ⇒ + Ok(views.html.site.developers()) + } } diff --git a/app/controllers/RequestGetter.scala b/app/controllers/RequestGetter.scala index 1179d9a8cd..63baff53a1 100644 --- a/app/controllers/RequestGetter.scala +++ b/app/controllers/RequestGetter.scala @@ -13,7 +13,7 @@ trait RequestGetter { req.queryString get name flatMap (_.headOption) filter (""!=) protected def getInt(name: String)(implicit ctx: Context) = - get(name)(ctx) map (_.toInt) + get(name)(ctx) flatMap parseIntOption protected def getOr(name: String, default: String)(implicit ctx: Context) = get(name)(ctx) getOrElse default diff --git a/app/core/Global.scala b/app/core/Global.scala index 5cb7b76adf..40f39fffb9 100644 --- a/app/core/Global.scala +++ b/app/core/Global.scala @@ -30,6 +30,9 @@ object Global extends GlobalSettings { else Action(NotFound("I am an AI server")).some } else { + req.queryString get "embed" flatMap (_.headOption) filter (""!=) foreach { embed ⇒ + println("[embed] %s -> %s".format(embed, req.path)) + } env.monitor.rpsProvider.countRequest() env.security.wiretap(req) env.security.firewall.requestHandler(req) orElse diff --git a/app/templating/AssetHelper.scala b/app/templating/AssetHelper.scala index 3ace722fca..c9eab6d29b 100644 --- a/app/templating/AssetHelper.scala +++ b/app/templating/AssetHelper.scala @@ -7,7 +7,7 @@ import play.api.templates.Html trait AssetHelper { - val assetVersion = 36 + val assetVersion = 37 def cssTag(name: String) = css("stylesheets/" + name) diff --git a/app/views/base/layout.scala.html b/app/views/base/layout.scala.html index 6e128ce9d0..8ab2ed6d8a 100644 --- a/app/views/base/layout.scala.html +++ b/app/views/base/layout.scala.html @@ -106,10 +106,10 @@
github.com/ornicar | email me
- @trans.learnMoreAboutLichess()
+ Developers | Facebook app
- Wiki | + Wiki | Feedback | Source Code
Monitor | diff --git a/app/views/site/developers.scala.html b/app/views/site/developers.scala.html new file mode 100644 index 0000000000..5d118d35a6 --- /dev/null +++ b/app/views/site/developers.scala.html @@ -0,0 +1,21 @@ +@()(implicit ctx: Context) + +@site.layout( +title = "Developers", +moreCss = cssTag("developers.css")) { + +
+

Developers

+ +

+ Do you have a chess website, and want to add a live chess section?
+ Add the following line to your site html: +

+ + 
<script src="http://en.lichess.org/embed.js?w=820h=650"></script>
+ +

The w and h parameters control the width and height of the chess window.

+ +

Integration example: ChessWorldWeb live chess

+
+} diff --git a/app/views/site/layout.scala.html b/app/views/site/layout.scala.html index ec2bb20add..47ca8b82c6 100644 --- a/app/views/site/layout.scala.html +++ b/app/views/site/layout.scala.html @@ -1,5 +1,6 @@ -@(title: String)(body: Html)(implicit ctx: Context) +@(title: String, moreCss: Html = Html(""))(body: Html)(implicit ctx: Context) @base.layout( title = title, -active = none)(body) +active = none, +moreCss = moreCss)(body) diff --git a/conf/routes b/conf/routes index b7fbdc371c..3f25119dfe 100644 --- a/conf/routes +++ b/conf/routes @@ -1,5 +1,6 @@ #Site GET /socket controllers.Main.websocket +GET /embed.js controllers.Main.embed # Game GET /games controllers.Game.realtime @@ -180,6 +181,7 @@ GET /monitor/status controllers.Monitor.status # Misc POST /cli controllers.Cli.command GET /captcha/$id<[\w]{8}> controllers.Main.captchaCheck(id: String) +GET /developers controllers.Main.developers # Assets GET /assets/*file controllers.Assets.at(path="/public", file) diff --git a/public/stylesheets/developers.css b/public/stylesheets/developers.css new file mode 100644 index 0000000000..9e4674ce7d --- /dev/null +++ b/public/stylesheets/developers.css @@ -0,0 +1,12 @@ +div.developers p { + font-size: 1.2em; + line-height: 1.7em; +} + +div.developers pre { + font-size: 1.2em; + font: monospace; + margin: 3em 0; + display; block; + overflow: visible; +} diff --git a/public/stylesheets/wiki.css b/public/stylesheets/wiki.css index 9ac4d27343..3a2cdbd085 100644 --- a/public/stylesheets/wiki.css +++ b/public/stylesheets/wiki.css @@ -1,9 +1,3 @@ -#wiki h1 { - font-size: 1.8em; - color: #666; - font-weight: normal; -} - #wiki .body { margin-top: 2em; text-align: left;