From e847931cf80a6c0694e70e4924f797b009290a41 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Wed, 31 Jul 2013 12:07:50 +0200 Subject: [PATCH] complete private tournaments implementation --- app/controllers/Tournament.scala | 10 ++++------ app/views/tournament/homeInner.scala.html | 2 +- app/views/tournament/infoBox.scala.html | 11 +++++++---- .../tournament/show/createdInner.scala.html | 4 ++-- public/images/s16.png | Bin 4902 -> 3667 bytes public/stylesheets/common.css | 3 +++ public/stylesheets/tournament.css | 6 ++++++ 7 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/controllers/Tournament.scala b/app/controllers/Tournament.scala index 9bc821e66a..6ae039d333 100644 --- a/app/controllers/Tournament.scala +++ b/app/controllers/Tournament.scala @@ -108,12 +108,10 @@ object Tournament extends LilaController { _.fold(tournamentNotFound(ctx).fuccess) { tour ⇒ env.forms.joinPassword.bindFromRequest.fold( err ⇒ renderJoinPassword(tour, err) map { BadRequest(_) }, - password ⇒ FuRedirect { - env.api.join(tour, me, password.some).fold( - err ⇒ routes.Tournament.show(tour.id), - _ ⇒ routes.Tournament.show(tour.id) - ) - } + password ⇒ env.api.join(tour, me, password.some) flatFold ( + _ ⇒ renderJoinPassword(tour, env.forms.joinPassword) map { BadRequest(_) }, + _ ⇒ fuccess(Redirect(routes.Tournament.show(tour.id))) + ) ) } } diff --git a/app/views/tournament/homeInner.scala.html b/app/views/tournament/homeInner.scala.html index 7108141612..860b4a8a01 100644 --- a/app/views/tournament/homeInner.scala.html +++ b/app/views/tournament/homeInner.scala.html @@ -31,7 +31,7 @@ JOINED } else {
- +
} } diff --git a/app/views/tournament/infoBox.scala.html b/app/views/tournament/infoBox.scala.html index 8be8832ca0..b586f585d1 100644 --- a/app/views/tournament/infoBox.scala.html +++ b/app/views/tournament/infoBox.scala.html @@ -7,10 +7,13 @@ @timeago(tour.createdAt) @tour.password.map { password =>
- @trans.isPrivate() - @if(ctx.userId == tour.createdBy.some) { - (@trans.password(): @tour.password) - } + + @if(ctx.userId == tour.createdBy.some) { + @trans.password(): @tour.password + } else { + @trans.isPrivate() + } + }

@tour.clock.show, diff --git a/app/views/tournament/show/createdInner.scala.html b/app/views/tournament/show/createdInner.scala.html index 1b6f4cfbfc..586003e0e7 100644 --- a/app/views/tournament/show/createdInner.scala.html +++ b/app/views/tournament/show/createdInner.scala.html @@ -2,7 +2,7 @@

@tour.nameT @if(tour.hasPassword) { - (@trans.isPrivate()) + @trans.isPrivate() }

@form @@ -30,7 +30,7 @@ } else {
- +
} diff --git a/public/images/s16.png b/public/images/s16.png index 7439c36ff95e0180fab22471128d88a190dd0234..a19459cc169fe754b1386a1d9526d43d9305ddc0 100644 GIT binary patch literal 3667 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 YFAd%drL%OgrT_o{07*qoM6N<$f*`sjPyhe` diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 84fe532531..ca70af25b5 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -974,6 +974,9 @@ span.s16.clock { .s16.tdown { background-position: 0 -448px; } +.s16.lock { + background-position: 0 -480px; +} .user_link.white, .user_link.black, .user_link.online, .user_link.offline { line-height: 16px; display: block; diff --git a/public/stylesheets/tournament.css b/public/stylesheets/tournament.css index 8a31c20ace..a2c3ecbff0 100644 --- a/public/stylesheets/tournament.css +++ b/public/stylesheets/tournament.css @@ -101,6 +101,12 @@ padding: 3px 5px; } +.s16.lock { + display: inline-block; + height: 16px; + line-height: 16px; +} + #tournament_side { float: right; width: 246px;