From f49f7102cd016a048b279e00aa62867da2cd05ca Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Fri, 3 Jul 2015 21:36:27 +0300
Subject: [PATCH] improved reply keyboard

---
 app/less/app.less            |  5 +++++
 app/partials/desktop/im.html | 41 +++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/app/less/app.less b/app/less/app.less
index 60dcae2b..e6f8c976 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -2060,6 +2060,11 @@ a.im_message_fwd_photo {
   /*font-weight: bold;*/
 }
 
+.im_send_field_wkeyboard {
+  .im_send_buttons_wrap {
+    display: none;
+  }
+}
 .reply_markup_wrap {
   margin: 5px -2px 0;
 }
diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html
index b82d54ca..a87a7b81 100644
--- a/app/partials/desktop/im.html
+++ b/app/partials/desktop/im.html
@@ -173,31 +173,34 @@
                     </div>
 
 
-                    <div class="im_send_field_wrap" ng-class="historyState.replyKeyboard._ == 'replyKeyboardMarkup' && !historyState.replyKeyboard.pFlags.hidden ? 'im_send_field_wkeyboard' : ''">
-                      <a class="composer_emoji_insert_btn"><i class="icon icon-emoji"></i></a>
+                    <div  ng-class="historyState.replyKeyboard._ == 'replyKeyboardMarkup' && !historyState.replyKeyboard.pFlags.hidden ? 'im_send_field_wkeyboard' : ''">
 
-                      <div class="im_send_dropbox_wrap" my-i18n="im_photos_drop_text"></div>
-                      <textarea ng-model="draftMessage.text" placeholder="{{'im_message_field_placeholder' | i18n}}" class="form-control im_message_field no_outline" dir="auto"></textarea>
-                    </div>
-
-                    <div class="im_send_keyboard_wrap" ng-if="historyState.replyKeyboard._ == 'replyKeyboardMarkup'">
-                      <div my-reply-markup="historyState.replyKeyboard"></div>
-                    </div>
-
-                    <div class="clearfix">
-                      <button type="submit" class="btn btn-md im_submit" my-i18n="im_submit_message"></button>
+                      <div class="im_send_field_wrap">
+                        <a class="composer_emoji_insert_btn"><i class="icon icon-emoji"></i></a>
 
-                      <div class="im_attach pull-left">
-                        <input type="file" class="im_attach_input" size="28" multiple="true" title="{{'im_attach_file_title' | i18n}}" />
-                        <i class="icon icon-paperclip"></i>
+                        <div class="im_send_dropbox_wrap" my-i18n="im_photos_drop_text"></div>
+                        <textarea ng-model="draftMessage.text" placeholder="{{'im_message_field_placeholder' | i18n}}" class="form-control im_message_field no_outline" dir="auto"></textarea>
                       </div>
 
-                      <div class="im_media_attach pull-left">
-                        <input type="file" class="im_media_attach_input" size="28" multiple="true" accept="image/*, video/*, audio/*" title="{{'im_media_attach_title' | i18n}}"/>
-                        <i class="icon icon-camera"></i>
+                      <div class="im_send_keyboard_wrap" ng-if="historyState.replyKeyboard._ == 'replyKeyboardMarkup'">
+                        <div my-reply-markup="historyState.replyKeyboard"></div>
                       </div>
 
-                      <div class="composer_emoji_panel"></div>
+                      <div class="im_send_buttons_wrap clearfix">
+                        <button type="submit" class="btn btn-md im_submit" my-i18n="im_submit_message"></button>
+
+                        <div class="im_attach pull-left">
+                          <input type="file" class="im_attach_input" size="28" multiple="true" title="{{'im_attach_file_title' | i18n}}" />
+                          <i class="icon icon-paperclip"></i>
+                        </div>
+
+                        <div class="im_media_attach pull-left">
+                          <input type="file" class="im_media_attach_input" size="28" multiple="true" accept="image/*, video/*, audio/*" title="{{'im_media_attach_title' | i18n}}"/>
+                          <i class="icon icon-camera"></i>
+                        </div>
+
+                        <div class="composer_emoji_panel"></div>
+                      </div>
 
                     </div>
                   </form>