show inbox menu item on the right

This commit is contained in:
Thibault Duplessis 2014-02-01 21:21:51 +01:00
parent 4c1c7cf748
commit 188df6f8cb
5 changed files with 12 additions and 15 deletions

View file

@ -20,7 +20,7 @@ final class SiteMenu(trans: I18nKeys) {
val tv = new Elem("tv", routes.Tv.index, I18nKey.untranslated("TV"))
val message = new Elem("message", routes.Message.inbox(page = 1), trans.inbox)
private val authenticated = List(play, game, tournament, user, team, forum, tv, message)
private val authenticated = List(play, game, tournament, user, team, forum, tv)
private val anonymous = List(play, game, tournament, user, team, forum, tv)
def all(me: Option[User]) = me.isDefined.fold(authenticated, anonymous)

View file

@ -1,4 +1,4 @@
@(me: User)(implicit ctx: Context)
@(me: User, active: Option[lila.app.ui.SiteMenu.Elem])(implicit ctx: Context)
<div class="auth">
<a
@ -20,3 +20,9 @@
}
</div>
</div>
<a title="@trans.inbox()" data-href="@routes.Message.preview" class="goto_nav message blank_if_play @{(active exists (_.code == "message")).??("current")}" href="@routes.Message.inbox(page=1)">
<span class="s16 message"></span>
@defining(messageNbUnread(ctx)) { nbUnread =>
<span id="nb_messages" class="new_messages @{ (nbUnread > 0).??("unread") }">@nbUnread</span>
}
</a>

View file

@ -54,14 +54,6 @@ data-accept-languages="@acceptLanguages.mkString(",")">
@if(!zen) {
@siteMenu.all(ctx.me).map { elem =>
@elem.code match {
case "message" => {
<a title="@elem.name()" data-href="@routes.Message.preview" class="message goto_nav blank_if_play @elem.currentClass(active)" href="@elem.route">
<span class="s16 message"></span>
@defining(messageNbUnread(ctx)) { nbUnread =>
<span id="nb_messages" class="new_messages @{ (nbUnread > 0).??("unread") }">@nbUnread</span>
}
</a>
}
case "team" if teamNbRequests(ctx) > 0 => {
@defining(teamNbRequests(ctx)) { nbr =>
<a class="goto_nav blank_if_play @elem.currentClass(active)" href="@routes.Team.requests()">
@ -107,7 +99,7 @@ data-accept-languages="@acceptLanguages.mkString(",")">
<a href="@routes.Pref.set("bg")" title="@trans.toggleBackground()" class="bgpicker">
<span></span>
</a>
@ctx.me.fold(auth.miniLogin())(auth.loggedIn(_))
@ctx.me.fold(auth.miniLogin())(auth.loggedIn(_, active))
}
</div>
@ctx.me.map { me =>

View file

@ -533,7 +533,7 @@ var storage = {
$('body').on('lichess.content_loaded', userPowertips);
$('#top a.message').powerTip({
placement: 'se',
placement: 'sw',
mouseOnToPopup: true,
closeDelay: 200
}).on({

View file

@ -1103,8 +1103,9 @@ body.offline #nb_connected_players {
#nb_connected_players {
float: left;
}
#top a.goto_nav.message {
#top a.message {
opacity: 0.7;
float: right;
}
#top .goto_nav {
border-bottom: 2px solid transparent;
@ -1528,9 +1529,7 @@ table.slist thead {
background: linear-gradient(to bottom, #efefef, #e2e2e2);
}
/* active gradient */
#top a.signin:hover,
#top a.goto_nav.active,
.button.active,
.button.active:hover,
.ui-state-active,