From 188df6f8cbadaf1c99260c2e51c34ba2c9c244e9 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Sat, 1 Feb 2014 21:21:51 +0100
Subject: [PATCH] show inbox menu item on the right

---
 app/ui/SiteMenu.scala              |  2 +-
 app/views/auth/loggedIn.scala.html |  8 +++++++-
 app/views/base/layout.scala.html   | 10 +---------
 public/javascripts/big.js          |  2 +-
 public/stylesheets/common.css      |  5 ++---
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/ui/SiteMenu.scala b/app/ui/SiteMenu.scala
index 98ab836a89..e3f485a86e 100644
--- a/app/ui/SiteMenu.scala
+++ b/app/ui/SiteMenu.scala
@@ -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)
diff --git a/app/views/auth/loggedIn.scala.html b/app/views/auth/loggedIn.scala.html
index 872492cd89..72bde13af3 100644
--- a/app/views/auth/loggedIn.scala.html
+++ b/app/views/auth/loggedIn.scala.html
@@ -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>
diff --git a/app/views/base/layout.scala.html b/app/views/base/layout.scala.html
index 7129291a4f..44a940a196 100644
--- a/app/views/base/layout.scala.html
+++ b/app/views/base/layout.scala.html
@@ -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 =>
diff --git a/public/javascripts/big.js b/public/javascripts/big.js
index 980f2966fe..12739cc9c6 100644
--- a/public/javascripts/big.js
+++ b/public/javascripts/big.js
@@ -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({
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 48f970e223..9958a0ec14 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -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,