From cc7493e3d3ad26cb5c892dfdcf4220ed6aced40c Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 10 Feb 2016 17:35:52 +0000
Subject: [PATCH] Multiple bugfixes

---
 app/js/locales/en-us.json         |  4 ++--
 app/less/app.less                 | 19 ++++++++++++++-----
 app/less/mobile.less              | 16 ++++++++++++++--
 app/partials/desktop/message.html |  4 ++--
 app/partials/mobile/message.html  |  5 ++---
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json
index eca49eb8..d18f7680 100644
--- a/app/js/locales/en-us.json
+++ b/app/js/locales/en-us.json
@@ -523,8 +523,8 @@
 
 	"message_forwarded_message": "Forwarded message",
 	"message_via_bot": "via {bot}",
-	"message_forwarded_message_mobile": "Forwarded from {from}, {date}",
-	"message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}, {date}",
+	"message_forwarded_message_mobile": "Forwarded from {from}",
+	"message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}",
 
 	"message_attach_audio_message": "Voice message",
 	"message_attach_audio_play": "Play",
diff --git a/app/less/app.less b/app/less/app.less
index 6b14059c..0179f307 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -1456,15 +1456,24 @@ a.im_dialog_selected {
   padding: 4px 10px;
   margin: 10px 0;
 }
+
 .im_message_author,
-.im_message_fwd_author,
-.im_message_via_author {
+.im_message_fwd_author {
   color: #3a6d99;
   font-weight: bold;
 }
-.non_osx .im_message_author,
-.non_osx .im_message_fwd_author,
-.non_osx .im_message_via_author {
+.im_message_author_via,
+.im_message_fwd_via {
+  color: #3a6d99;
+  &:hover {
+    text-decoration: none;
+    & .im_message_fwd_author {
+      text-decoration: underline;
+    }
+  }
+}
+.non_osx .im_message_author_wrap,
+.non_osx .im_message_fwd_author_wrap {
   font-size: 12px;
 }
 .im_message_author_via {
diff --git a/app/less/mobile.less b/app/less/mobile.less
index 552146c7..3732aaf7 100644
--- a/app/less/mobile.less
+++ b/app/less/mobile.less
@@ -804,6 +804,9 @@ img.im_message_video_thumb,
     font-size: 13px;
   }
 }
+.im_message_reply_body {
+  font-size: 12px;
+}
 
 .im_message_fwd_header {
   font-size: 12px;
@@ -890,11 +893,18 @@ a.im_message_from_photo {
     margin-left: -45px;
   }
 }
-.im_message_author_via {
+a.im_message_author_via {
+  color: #323232;
   display: block;
   font-size: 13px;
   font-weight: normal;
   margin-bottom: 3px;
+  .im_message_out & {
+    margin-left: 0;
+  }
+  .im_message_fwd_author {
+    color: inherit;
+  }
 }
 .im_message_author {
   display: none;
@@ -922,7 +932,6 @@ a.im_message_from_photo {
 .im_grouped_fwd_short a.im_message_author_via,
 .im_message_out a.im_message_from_photo,
 .im_message_out a.im_message_author,
-.im_message_out a.im_message_author_via,
 .im_message_body_media a.im_message_author {
   display: none;
 }
@@ -1686,6 +1695,9 @@ img.composer_user_photo {
 h4.media_modal_title_wrap {
   color: inherit;
   margin: 8px 0 11px 0;
+  white-space: nowrap;
+  text-overflow:ellipsis;
+  overflow: hidden;
 }
 .media_modal_info_wrap {
   line-height: 16px;
diff --git a/app/partials/desktop/message.html b/app/partials/desktop/message.html
index 33db091c..753aa3fc 100644
--- a/app/partials/desktop/message.html
+++ b/app/partials/desktop/message.html
@@ -45,7 +45,7 @@
       <div class="im_message_body" ng-class="::{im_message_body_media: historyMessage._ == 'message' &amp;&amp; historyMessage.media ? true : false}">
 
         <span class="im_message_author_wrap">
-          <span class="copyonly">[<span ng-bind="::historyMessage.date | time"></span>] </span><a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a><span ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via"><span class="copyonly">&nbsp;</span><span my-i18n="message_via_bot"><my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"></a></my-i18n-param></span><span class="copyonly">:</span></span>
+          <span class="copyonly">[<span ng-bind="::historyMessage.date | time"></span>] </span><a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a><a ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"><span class="copyonly">&nbsp;</span><span my-i18n="message_via_bot"><my-i18n-param name="bot"><span class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></span></my-i18n-param></span><span class="copyonly">:</span></a>
         </span>
 
 
@@ -55,7 +55,7 @@
           <span class="copyonly"><span my-i18n="message_forwarded_message"></span>:&nbsp;</span>
           <a class="im_message_fwd_photo pull-left" my-peer-photolink="::historyMessage.fwdFromID" img-class="im_message_fwd_photo"></a>
           <div class="im_message_fwd_author_wrap">
-            <a class="im_message_fwd_author" my-peer-link="historyMessage.fwdFromID"></a><span ng-if="::historyMessage.viaBotID" class="im_message_fwd_via"><span class="copyonly">&nbsp;</span><span my-i18n="message_via_bot"><my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></a></my-i18n-param></span></span><span class="copyonly">&nbsp;[</span><span class="im_message_fwd_date" ng-bind="::historyMessage.fwd_date | dateOrTime"></span><span class="copyonly">]&nbsp;</span>
+            <a class="im_message_fwd_author" my-peer-link="historyMessage.fwdFromID"></a><a ng-if="::historyMessage.viaBotID" class="im_message_fwd_via" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"><span class="copyonly">&nbsp;</span><span my-i18n="message_via_bot"><my-i18n-param name="bot"><span class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></span></my-i18n-param></span></a><span class="copyonly">&nbsp;[</span><span class="im_message_fwd_date" ng-bind="::historyMessage.fwd_date | dateOrTime"></span><span class="copyonly">]&nbsp;</span>
             <span class="im_message_views_inline" ng-if="::historyMessage.views > 0">
               <i class="icon-message-views"></i><span class="im_message_views_cnt" my-message-views="historyMessage.mid"></span>
             </span>
diff --git a/app/partials/mobile/message.html b/app/partials/mobile/message.html
index e22a4949..1a162f36 100644
--- a/app/partials/mobile/message.html
+++ b/app/partials/mobile/message.html
@@ -43,15 +43,14 @@
       <div class="im_message_body" ng-class="::{im_message_body_media: historyMessage._ == 'message' &amp;&amp; historyMessage.media && historyMessage.media._ != 'messageMediaWebPage' && !historyMessage.media.rCaption && !historyMessage.viaBotID ? true : false}">
 
         <a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a>
-        <span ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via" my-i18n="message_via_bot"><my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"></a></my-i18n-param></span>
+        <a ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via" my-i18n="message_via_bot" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"><my-i18n-param name="bot"><span class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></span></my-i18n-param></a>
 
         <a class="im_message_reply_wrap" my-reply-message="historyMessage.reply_to_msg" ng-if="::historyMessage.reply_to_mid"></a>
 
-        <div ng-if="::!!historyMessage.fwdFromID &amp;&amp; !historyMessage.media" class="im_message_fwd_header">
+        <div ng-if="::!!historyMessage.fwdFromID &amp;&amp; !historyMessage.media" class="im_message_fwd_header" ng-switch="!!historyMessage.viaBotID" my-i18n>
           <span ng-switch-when="true" my-i18n-format="message_forwarded_via_message_mobile"></span>
           <span ng-switch-default my-i18n-format="message_forwarded_message_mobile"></span>
           <my-i18n-param name="from"><a class="im_message_fwd_author" my-peer-link="historyMessage.fwdFromID" no-watch="true"></a></my-i18n-param>
-          <my-i18n-param name="date"><span class="im_message_fwd_date" ng-bind="::historyMessage.fwd_date | dateOrTime"></span></my-i18n-param>
           <my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></a></my-i18n-param>
         </div>