From 05d6608c3e83fbded901443dd6274e37960a020e Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Sun, 16 Feb 2014 09:56:16 +0100
Subject: [PATCH] merged with master

---
 css/app.css           | 13 +++++++++----
 partials/im.html      |  4 ++--
 partials/message.html |  5 +++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/css/app.css b/css/app.css
index adc2fefc..b4fd5cf8 100644
--- a/css/app.css
+++ b/css/app.css
@@ -64,12 +64,16 @@ a:hover {
 .form-control::-webkit-input-placeholder {
   color: #9aa2ab;
 }
+input[type="number"]::-webkit-outer-spin-button,
+input[type="number"]::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
 
 
 .btn-tg {
   color: #ffffff;
   background-color: #6AC065;
-  /*58b152*/
   border-color: #6AC065;
 }
 
@@ -681,11 +685,12 @@ a.im_dialog:hover .im_dialog_date {
   padding: 10px 4px 0;
 }
 .im_history_panel_title h4 {
-  margin-bottom: 7px;
   font-size: 17px;
+  line-height: 20px;
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+  margin: 8px 0 6px;
 }
 .im_history_panel_title h4 small {
   color: #999;
@@ -698,11 +703,11 @@ a.im_dialog:hover .im_dialog_date {
 .im_history_panel_media_dropdown .dropdown-toggle {
   font-size: 13px;
   font-weight: normal;
-  padding-top: 4px;
+  padding-top: 5px;
   line-height: 1;
 }
 .im_history_panel_media_dropdown {
-  padding-top: 1px;
+  padding-top: 2px;
 }
 .im_history_panel_edit_link,
 .im_history_panel_return_link,
diff --git a/partials/im.html b/partials/im.html
index 6b012842..a114a6d3 100644
--- a/partials/im.html
+++ b/partials/im.html
@@ -41,7 +41,7 @@
                       <a ng-click="toggleMedia('photos')">Photos</a>
                     </li>
                     <li>
-                      <a ng-click="toggleMedia('video')">Video</a>
+                      <a ng-click="toggleMedia('video')">Videos</a>
                     </li>
                     <li>
                       <a ng-click="toggleMedia('documents')">Documents</a>
@@ -55,7 +55,7 @@
 
                 <h4 ng-if="mediaType !== false" ng-switch="mediaType">
                   <span ng-switch-when="photos"> Photos </span>
-                  <span ng-switch-when="video"> Video </span>
+                  <span ng-switch-when="video"> Videos </span>
                   <span ng-switch-when="documents"> Documents </span>
                 </h4>
 
diff --git a/partials/message.html b/partials/message.html
index 9207e87e..b53a1ec1 100644
--- a/partials/message.html
+++ b/partials/message.html
@@ -6,7 +6,7 @@
     <div class="im_service_message_wrap" ng-if="historyMessage._ == 'messageService'">
       <div class="im_service_message">
 
-        <a ng-click="openUser(historyMessage.from_id)" class="im_message_author" ng-bind-html="historyMessage.fromUser.rFirstName"></a>
+        <a ng-click="openUser(historyMessage.from_id)" class="im_message_author" ng-bind-html="historyMessage.fromUser.rFullName"></a>
 
         <span class="im_message_service" ng-switch="historyMessage.action['_']">
           <span ng-switch-when="messageActionChatCreate">
@@ -78,7 +78,8 @@
 
       <div class="im_message_body">
 
-        <a class="im_message_author" ng-click="openUser(historyMessage.from_id)" ng-bind-html="historyMessage.fromUser.rFirstName"></a>
+        <a class="im_message_author" ng-click="openUser(historyMessage.from_id)" ng-bind-html="historyMessage.fromUser.rFullName" ng-if="historyMessage.to_id.chat_id > 0"></a>
+        <a class="im_message_author" ng-click="openUser(historyMessage.from_id)" ng-bind-html="historyMessage.fromUser.rFirstName" ng-if="!historyMessage.to_id.chat_id"></a>
 
 
         <div class="im_message_fwd_header" ng-if="historyMessage._ == 'messageForwarded'">