From 44cedbed0e7f392cfc824f93b6b469e22e131b4e Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Sat, 27 Jul 2013 00:48:27 +0200
Subject: [PATCH] show user language

---
 app/views/user/mini.scala.html | 10 +++---
 app/views/user/show.scala.html | 57 ++++++++++++++++++----------------
 public/javascripts/big.js      |  2 +-
 public/stylesheets/common.css  |  5 +++
 4 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/app/views/user/mini.scala.html b/app/views/user/mini.scala.html
index a65190e053..319ab907a6 100644
--- a/app/views/user/mini.scala.html
+++ b/app/views/user/mini.scala.html
@@ -3,13 +3,13 @@
   <span class="user_link @isOnline(u.id).fold("online", "offline")">
     @u.elo Elo, @u.count.game @trans.games()
   </span>
+  @u.lang.map { l =>
+  @langName(l).map { name =>
+  <p class="lang s16">@name</span>
+  }
+  }
   @if(followsMe(u.id)) {
   @trans.followsYou()
   }
 </div>
-@u.lang.map { l =>
-@langName(l).map { name =>
-<span class="lang">@name</span>
-}
-}
 <div class="content relation_actions">@relation.actions(u.id)</div>
diff --git a/app/views/user/show.scala.html b/app/views/user/show.scala.html
index 664a9cb7b2..09a577ae27 100644
--- a/app/views/user/show.scala.html
+++ b/app/views/user/show.scala.html
@@ -121,36 +121,41 @@ evenMoreCss = evenMoreCss) {
       }
       }
       <div class="stats">
-        <p>@trans.memberSince() @showDate(u.createdAt)</p>
-        @u.seenAt.map { seen =>
-        <p>@trans.lastLogin() @timeago(seen)</p>
+        @u.lang.map { l =>
+        @langName(l).map { name =>
+        <p class="lang s16">@name</span>
+      }
+      }
+      <p>@trans.memberSince() @showDate(u.createdAt)</p>
+      @u.seenAt.map { seen =>
+      <p>@trans.lastLogin() @timeago(seen)</p>
+      }
+      <a href="@routes.User.opponents(u.username)">@trans.favoriteOpponents()</a>
+      <div class="teams">
+        @teamIds(u.id).sortBy(t => !myTeam(t)).map { teamId =>
+        @teamLink(teamId, ("s16 team revert-underline" + myTeam(teamId).fold(" mine", "")).some)
         }
-        <a href="@routes.User.opponents(u.username)">@trans.favoriteOpponents()</a>
-        <div class="teams">
-          @teamIds(u.id).sortBy(t => !myTeam(t)).map { teamId =>
-          @teamLink(teamId, ("s16 team revert-underline" + myTeam(teamId).fold(" mine", "")).some)
-          }
-        </div>
-      </div>
-      <div class="actions clearfix">
-        @actions
       </div>
     </div>
+    <div class="actions clearfix">
+      @actions
+    </div>
   </div>
-  @if(u.hasGames) {
-  <div class="content_box_inter clearfix">
-    @filters.list.map { f =>
-    <a class="intertab@{ (filters.current == f).??(" active") }" href="@routes.User.showFilter(u.username, f.name)">
-      @userGameFilterTitle(info, f)
-    </a>
-    }
-  </div>
-  <div class="games infinitescroll all_games">
-    @games.nextPage.map { np =>
-    <div class="pager none"><a href="@routes.User.showFilter(u.username, filters.current.name, np)">Next</a></div>
-    }
-    @game.widgets(games.currentPageResults, user = u.some, ownerLink = ctx is u)
-  </div>
+</div>
+@if(u.hasGames) {
+<div class="content_box_inter clearfix">
+  @filters.list.map { f =>
+  <a class="intertab@{ (filters.current == f).??(" active") }" href="@routes.User.showFilter(u.username, f.name)">
+    @userGameFilterTitle(info, f)
+  </a>
   }
 </div>
+<div class="games infinitescroll all_games">
+  @games.nextPage.map { np =>
+  <div class="pager none"><a href="@routes.User.showFilter(u.username, filters.current.name, np)">Next</a></div>
+  }
+  @game.widgets(games.currentPageResults, user = u.some, ownerLink = ctx is u)
+</div>
+}
+</div>
 }
diff --git a/public/javascripts/big.js b/public/javascripts/big.js
index 4aa1fea799..cfd59ebfaf 100644
--- a/public/javascripts/big.js
+++ b/public/javascripts/big.js
@@ -452,7 +452,7 @@ var storage = {
         }).on({
           powerTipPreRender: function() {
             $.ajax({
-              url: $(this).attr('href'),
+              url: $(this).attr('href') + '/mini',
               success: function(html) {
                 $('#powerTip').html(html);
               }
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index ef24872d33..25b7ecb763 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -229,6 +229,11 @@ ul.ui-autocomplete li a.ui-state-focus {
   text-align: right;
   padding: 16px 8px;
 }
+#powerTip .lang {
+  display: block;
+  height: 16px;
+  margin-top: 5px;
+}
 #powerTip:before, #hook:before {
   content:"";
   position: absolute;