show user link when writing a message to preset dest
This commit is contained in:
parent
489de9570d
commit
3c2a7693b0
|
@ -2,7 +2,7 @@ package controllers
|
|||
|
||||
import lila.app._
|
||||
import views._
|
||||
import lila.user.{ User ⇒ UserModel, Context }
|
||||
import lila.user.{ User ⇒ UserModel, UserRepo, Context }
|
||||
|
||||
import play.api._
|
||||
import play.api.mvc._
|
||||
|
@ -35,8 +35,8 @@ object Message extends LilaController {
|
|||
|
||||
def form = Auth { implicit ctx ⇒
|
||||
implicit me ⇒
|
||||
get("username") ?? Env.user.usernameOption map { username ⇒
|
||||
Ok(html.message.form(forms.thread, username))
|
||||
get("username") ?? UserRepo.named map { user ⇒
|
||||
Ok(html.message.form(forms.thread, user))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@(form: Form[_], reqUsername: Option[String] = None)(implicit ctx: Context)
|
||||
@(form: Form[_], reqUser: Option[User] = None)(implicit ctx: Context)
|
||||
|
||||
@message.layout(
|
||||
title = trans.composeMessage.str()) {
|
||||
|
@ -8,15 +8,18 @@ title = trans.composeMessage.str()) {
|
|||
<form action="@routes.Message.create()" method="post">
|
||||
<div class="field_to">
|
||||
<label for="@form("username").id">@trans.recipient():</label>
|
||||
@reqUser.map { user =>
|
||||
@userLink(user, cssClass = "inline".some)
|
||||
}.getOrElse {
|
||||
<input
|
||||
type="text"
|
||||
data-provider="@routes.User.autocomplete"
|
||||
class="autocomplete"
|
||||
required="required"
|
||||
name="@form("username").name"
|
||||
id="@form("username").id"
|
||||
value="@{ form("username").value.orElse(reqUsername) }">
|
||||
id="@form("username").id">
|
||||
@errMsg(form("username"))
|
||||
}
|
||||
</div>
|
||||
<div class="field_subject">
|
||||
<label for="@form("subject").id">@trans.subject():</label>
|
||||
|
|
|
@ -633,19 +633,21 @@ span.s16.clock {
|
|||
.user_link.black {
|
||||
background-position: 0 -256px;
|
||||
}
|
||||
.user_link.offline {
|
||||
.user_link.online,
|
||||
.user_link.offline,
|
||||
.tournament_link {
|
||||
padding-left: 20px;
|
||||
}
|
||||
.user_link.offline {
|
||||
background-position: 0 -160px;
|
||||
}
|
||||
.user_link.online {
|
||||
padding-left: 20px;
|
||||
background-position: 0 -208px;
|
||||
}
|
||||
.user_link.inline {
|
||||
display: inline-block;
|
||||
}
|
||||
.tournament_link {
|
||||
padding-left: 20px;
|
||||
background-position: 0 -304px;
|
||||
}
|
||||
div.engine_warning {
|
||||
|
|
Loading…
Reference in a new issue