- redmineのチャットについて

　#36133, #36145 に対応しました。

- redmineのチャットについて
　#36133, #36145 に対応しました。
9b701f9b · Jeong Gilmo · 5b9a944b · 9b701f9b · 9b701f9b · 9b701f9b
Commit 9b701f9b authored Dec 09, 2019 by Jeong Gilmo
5 changed files
--- a/ABVJE_Launcher_Android/assets/chat/public/css/chat.css
+++ b/ABVJE_Launcher_Android/assets/chat/public/css/chat.css
@@ -123,15 +123,16 @@ img {
  -webkit-overflow-scrolling: touch;
  max-height: calc(100vh - 92px);
 }
-.srch_bar input{ border:1px solid #cdcdcd; border-width:0 0 1px 0; width:80%; padding:2px 0 4px 6px; background:none;}
-.srch_bar .input-group-addon button {
+.room_srch_bar input{ border:1px solid #cdcdcd; border-width:0 0 1px 0; width:100%; padding:2px 0 4px 6px; background:none;}
+.room_srch_bar .input-group-addon button {
  background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
  border: medium none;
  padding: 0;
  color: #707070;
  font-size: 18px;
 }
-.srch_bar .input-group-addon { margin: 0 0 0 -27px;}
+.room_srch_bar .input-group-addon { margin: 0 0 0 -27px;}
 .inbox_chat {
  overflow-y: scroll;
@@ -557,3 +558,16 @@ a.article:hover {
  white-space: pre-wrap;
  word-wrap: break-word;
 }
+.dropdown-item-checked::before {
+  position: absolute;
+  left: .4rem;
+  content: '✓';
+  font-weight: 600;
+}
+.room_srch_bar {
+  display: inline-block;
+  text-align: left;
+  width: 100%;
+}
\ No newline at end of file
--- a/ABVJE_Launcher_Android/assets/chat/public/js/chat.js
+++ b/ABVJE_Launcher_Android/assets/chat/public/js/chat.js
@@ -348,6 +348,9 @@ jQuery('#roomDeleteButton').on('click', function(e){
 // チャットルームのリストを未確認順で整列したデータを要請
 jQuery('#orderByUnread').on('click', function(event){
+  // #36145
+  jQuery('#orderByTime').removeClass('dropdown-item-checked')
+  jQuery('#orderByUnread').removeClass('dropdown-item-checked').addClass('dropdown-item-checked')
  //loadingIndicatorを表示
  showLoadingIndicator();
  event.preventDefault();
@@ -356,6 +359,9 @@ jQuery('#orderByUnread').on('click', function(event){
 // メッセージの送信時間順で整列したデータを要請
 jQuery('#orderByTime').on('click', function(event){
+  // #36145
+  jQuery('#orderByTime').removeClass('dropdown-item-checked').addClass('dropdown-item-checked')
+  jQuery('#orderByUnread').removeClass('dropdown-item-checked')
  //loadingIndicatorを表示
  showLoadingIndicator();
  event.preventDefault();
@@ -368,14 +374,15 @@ jQuery('#roomKeywordSearch').on('shown.bs.dropdown', function (e){
  jQuery('#roomKeyword').focus();
 });
-jQuery('#roomKeyword').on('input', function(event) {
+// #36145
+jQuery('#roomKeyButton').on('click', function(event) {
  // キーワード検索の値が変更し、検索を行う
-  if (!jQuery(this).val()) {
+  if (!jQuery('#roomKeyword').val()) {
    // 検索結果がない場合、チャットルームのリストを表示する
    socket.emit('getRoomList');
  } else {
    // 検索結果が有る場合、結果を表示する
-    socket.emit('roomSearch', jQuery(this).val());
+    socket.emit('roomSearch', jQuery('#roomKeyword').val());
  }
 });
@@ -1029,6 +1036,9 @@ jQuery('a[data-toggle="pill"]').on('show.bs.tab', function (e) {
      jQuery('#newRoomName').val('');
      jQuery('#userSelectionLength').text('');
      globalSelectedUserList = [];
+      // #36145
+      jQuery('#orderByTime').removeClass('dropdown-item-checked').addClass('dropdown-item-checked')
+      jQuery('#orderByUnread').removeClass('dropdown-item-checked')
      break;
    case '#pills-user':
      jQuery("#backButton").show();
@@ -1308,7 +1318,7 @@ function htmlElementTextInitialize(languageCode) {
  $("#groupPageSubtitle").text(getLocalizedString("groupPageSubtitle"))
-  $("#chatKeywordSearch").attr("placeholder", getLocalizedString("chatKeywordSearch"))
+  $("#chatKeyword").attr("placeholder", getLocalizedString("roomKeywordPlaceHolder"))
  $("#userListKeyword").attr("placeholder", getLocalizedString("userListKeyword"))
  $("#newRoomName").attr("placeholder", getLocalizedString("newRoomName"))
 }

--- a/ABVJE_Launcher_Android/assets/chat/public/newstart.html
+++ b/ABVJE_Launcher_Android/assets/chat/public/newstart.html
@@ -31,7 +31,7 @@
          <i class="fa fa-sort-amount-down"></i>
        </a>
        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="arrangeRooms">
-          <a id="orderByTime" class="dropdown-item" href="#">OrderByTime</a>
+          <a id="orderByTime" class="dropdown-item dropdown-item-checked" href="#">OrderByTime</a>
          <a id="orderByUnread" class="dropdown-item" href="#">OrderByUnread</a>
        </div>
      </li>
@@ -40,7 +40,14 @@
          <i class="fa fa-search"></i>
        </a>
        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="roomKeywordSearch">
-          <input id="roomKeyword" class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
+          <div class="room_srch_bar">
+            <div class="stylish-input-group">
+              <input id="roomKeyword" type="text" class="search-bar" placeholder="Search">
+              <span class="input-group-addon">
+                <button id="roomKeyButton" type="button"> <i class="fa fa-search" aria-hidden="true"></i> </button>
+              </span>
+            </div>
+          </div>
        </div>
      </li>
      <!-- Chat Room Icons -->
@@ -49,7 +56,7 @@
          <i class="fa fa-search"></i>
        </a>
        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="chatKeywordSearch">
-          <input id="chatKeyword" class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
+          <input id="chatKeyword" class="form-control mr-sm-2" type="search-bar" placeholder="Search" aria-label="Search">
        </div>
      </li>
      <li class="nav-item">

--- a/ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_communication_chat_list.png
+++ b/ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_communication_chat_list.png
--- a/ABVJE_UI_Android/res/layout/communication_menu_dialog.xml
+++ b/ABVJE_UI_Android/res/layout/communication_menu_dialog.xml
@@ -233,7 +233,7 @@
                android:layout_alignParentLeft="true"
                android:layout_centerVertical="true"
                android:layout_marginRight="15dp"
-                android:src="@drawable/ic_communication_push_message_list"
+                android:src="@drawable/ic_communication_chat_list"
                android:visibility="visible" />
            <TextView