From 7d156063ee3fba39752026a0607fe5d073497d95 Mon Sep 17 00:00:00 2001
From: Simon Grim <scary@tasty.sexy>
Date: Thu, 20 Aug 2015 12:47:39 +0500
Subject: [PATCH] move sent indicator to time stamp

---
 following.html           |  9 ++++-----
 home.html                | 10 ++++------
 js/twister_formatpost.js | 18 +++++++++++++++---
 tmobile.html             | 11 +++++------
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/following.html b/following.html
index 12f5462..f5f6a25 100644
--- a/following.html
+++ b/following.html
@@ -219,7 +219,7 @@
             <div class="post-info">
                 <a href="#" class="post-info-name open-profile-modal"></a>
                 <span class="post-info-tag"></span>
-                <a class="post-info-time"></a>
+                <a class="post-info-time"><span class="post-info-sent"></span> <span></span></a>
             </div>
             <p class="post-text"></p>
             <div class="post-context" style="display: none;"></div>
@@ -263,8 +263,7 @@
             <div class="post-info">
                 <a href="#" class="post-info-name open-profile-modal"></a>
                 <span class="post-info-tag"></span>
-                <span class="post-info-sent"></span>
-                <a class="post-info-time"></a>
+                <a class="post-info-time"><span></span></a>
             </div>
             <p class="post-text"></p>
         </div>
@@ -352,7 +351,7 @@
       <div class="post-info">
         <a href="#" class="post-info-name open-profile-modal"></a>
         <span class="post-info-tag">@</span>
-        <a href="#" class="post-info-time" title="">10min</a>
+        <a href="#" class="post-info-time" title=""><span></span></a>
       </div>
       <!-- o texto do post (restrição de caracteres?) -->
       <p class="post-text"></p>
@@ -367,7 +366,7 @@
     <!-- cada li é uma mensagem -->
     <li id="dm-chat-template" class="module post message">
       <div class="post-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
-      <a href="#" class="post-info-time" title="08/10/13 às 18:00">10min</a>
+      <a href="#" class="post-info-time" title="08/10/13 às 18:00"><span class="post-info-sent"></span> <span></span></a>
       <p class="post-text"></p>
     </li>
 
diff --git a/home.html b/home.html
index 82dd73e..1d4e27f 100644
--- a/home.html
+++ b/home.html
@@ -310,8 +310,7 @@
             <div class="post-info">
                 <a href="#" class="post-info-name open-profile-modal"></a>
                 <span class="post-info-tag"></span>
-                <span class="post-info-sent"></span>
-                <a class="post-info-time"></a>
+                <a class="post-info-time"><span class="post-info-sent"></span> <span></span></a>
             </div>
             <p class="post-text"></p>
             <div class="post-context" style="display: none;"></div>
@@ -355,7 +354,7 @@
             <div class="post-info">
                 <a href="#" class="post-info-name open-profile-modal"></a>
                 <span class="post-info-tag"></span>
-                <a class="post-info-time"></a>
+                <a class="post-info-time"><span></span></a>
             </div>
             <p class="post-text"></p>
         </div>
@@ -444,7 +443,7 @@
       <div class="post-info">
         <a href="#" class="post-info-name open-profile-modal"></a>
         <span class="post-info-tag">@</span>
-        <a href="#" class="post-info-time" title="">10min</a>
+        <a href="#" class="post-info-time" title=""><span></span></a>
       </div>
       <!-- o texto do post (restrição de caracteres?) -->
       <p class="post-text"></p>
@@ -459,8 +458,7 @@
     <!-- cada li é uma mensagem -->
     <li id="dm-chat-template" class="module post message">
       <div class="post-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
-      <span class="post-info-sent"></span>
-      <a href="#" class="post-info-time" title="08/10/13 às 18:00">10min</a>
+      <a href="#" class="post-info-time" title="08/10/13 às 18:00"><span class="post-info-sent"></span> <span></span></a>
       <p class="post-text"></p>
     </li>
 
diff --git a/js/twister_formatpost.js b/js/twister_formatpost.js
index d908a39..3aa20a9 100644
--- a/js/twister_formatpost.js
+++ b/js/twister_formatpost.js
@@ -44,7 +44,11 @@ function postToElem(post, kind, promoted) {
         //elem.find('.post-info-tag').text("@" + username);  // FIXME
         getAvatar(username, elem.find('.avatar'));
 
-        elem.find('.post-info-time').text(timeGmtToText(time)).attr('title', timeSincePost(time));
+        elem.find('.post-info-time')
+            .attr('title', timeSincePost(time))
+            .find('span:last')
+                .text(timeGmtToText(time))
+        ;
     }
 
     /*
@@ -253,7 +257,11 @@ function dmDataToSnippetItem(dmData, remoteUser) {
     else
         getFullname( remoteUser, dmItem.find("a.post-info-name") );
     dmItem.find(".post-text").html(htmlFormatMsg(dmData.text).html);
-    dmItem.find(".post-info-time").text(timeGmtToText(dmData.time)).attr("title",timeSincePost(dmData.time));
+    dmItem.find('.post-info-time')
+        .attr('title', timeSincePost(dmData.time))
+        .find('span:last')
+            .text(timeGmtToText(dmData.time))
+    ;
 
     return dmItem;
 }
@@ -268,7 +276,11 @@ function dmDataToConversationItem(dmData, localUser, remoteUser) {
     dmItem.removeAttr('id');
     dmItem.addClass(classDm);
     getAvatar(from, dmItem.find(".post-photo").find("img") );
-    dmItem.find(".post-info-time").text(timeGmtToText(dmData.time)).attr("title",timeSincePost(dmData.time));
+    dmItem.find('.post-info-time')
+        .attr('title', timeSincePost(dmData.time))
+        .find('span:last')
+            .text(timeGmtToText(dmData.time))
+    ;
     setPostInfoSent(from,dmData.k,dmItem.find('.post-info-sent'));
     dmItem.find('.post-text').html(htmlFormatMsg(dmData.text).html);
 
diff --git a/tmobile.html b/tmobile.html
index 45f9e7f..d9e6045 100644
--- a/tmobile.html
+++ b/tmobile.html
@@ -744,7 +744,7 @@
             <h4 class="post-info">
                 <a href="#" class="post-info-name open-profile-modal status_reply"></a>
                 <span class="post-info-tag"></span>
-                <span style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"></span>
+                <a style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"><span class="post-info-sent"></span> <span></span></a>
             </h4>
             <p class="post-text no-ellipsis"></p>
             <div class="post-context" style="display: none;"></div>
@@ -763,7 +763,7 @@
             <h4 class="post-info">
                 <a href="#" class="post-info-name open-profile-modal"></a>
                 <span class="post-info-tag"></span>
-                <span style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"></span>
+                <a style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"><span class="post-info-sent"></span> <span></span></a>
             </h4>
             <p class="post-text no-ellipsis"></p>
             <div class="post-context" style="display: none;"></div>
@@ -796,8 +796,7 @@
             <div class="post-info">
                 <a href="#" class="post-info-name open-profile-modal"></a>
                 <span class="post-info-tag"></span>
-                <span class="post-info-sent"></span>
-                <a class="post-info-time"></a>
+                <a class="post-info-time"><span></span></a>
             </div>
             <p class="post-text"></p>
         </div>
@@ -828,7 +827,7 @@
         <h4 class="post-info">
           <span class="post-info-name open-profile-modal"></span>
           <span class="post-info-tag">@</span>
-          <span style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"></span>
+          <a style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"><span></span></a>
         </h4>
         <!-- o texto do post (restrição de caracteres?) -->
         <p class="post-text"></p>
@@ -839,7 +838,7 @@
     <li id="dm-chat-template" class="module post message">
       <h4 class="post-photo">
         <img class="avatar" src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/>
-        <span style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"></span>
+        <a style='font-weight:lighter;font-size:12px;' class="post-info-time ui-li-aside"><span class="post-info-sent"></span> <span></span></a>
       </h4>
       <p class="post-text no-ellipsis"></p>
     </li>