協業ユーザ招待UI修正

public_new/css/chat.css

@@ -440,7 +440,6 @@ input[name="tab_item"] {
 .user_list .user_item a {
 .user_list .user_item a {
   color: #323743;
   color: #323743;
 }
 }
-
 /* ユーザーリストフィルター */
 /* ユーザーリストフィルター */
 #filter .user_item .img_wrap {
 #filter .user_item .img_wrap {
   position: relative;
   position: relative;

public_new/css/collaboration.css

@@ -452,6 +452,19 @@
     width: 90%;
     width: 90%;
 }
 }
 
 
+#userInGroupListForAddUserInCollaboration > ul {
+  margin-top: 0px !important;
+}
+
+#selectedUserListinCollaboration > ul {
+  margin-top: 0px !important;
+}
+
+#selectedUserListinCollaboration {
+  height: 400px;
+  overflow: scroll;
+}
+
 @charset "UTF-8";
 @charset "UTF-8";
 /**************************** tab *************************/
 /**************************** tab *************************/
 .modal-content .tabs {
 .modal-content .tabs {

public_new/js/chat-ui.js

@@ -2824,6 +2824,11 @@ CHAT_UI.confirmInviteUserListInCollaboration = function() {
     } else {
     } else {
 
 
     }
     }
+    $("#cancelAddUserBtn").off().on('click', function() {
+        console.log('cancelClick');
+        $('#modalAddUserConfirm').modal('hide');
+        $('#addUserInCollaboration').modal('show');
+    });
 
 
     $("#addUserBtn").off().on('click', function() {
     $("#addUserBtn").off().on('click', function() {
         CHAT_UI.showLoadingIndicator();
         CHAT_UI.showLoadingIndicator();

public_new/js/collaboration.js

@@ -80,6 +80,7 @@ $(function () {
       CHAT.globalSelectedUserList = [];
       CHAT.globalSelectedUserList = [];
       CHAT_UI.refreshMyGroupForAddUserInCollaboration();
       CHAT_UI.refreshMyGroupForAddUserInCollaboration();
       $('#addUserConfirmBtnInCollaboration').off().on('click', function() {
       $('#addUserConfirmBtnInCollaboration').off().on('click', function() {
+          $('#addUserInCollaboration').modal('hide');
           if (typeof(android) != "undefined") {
           if (typeof(android) != "undefined") {
               android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
               android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
           } else {
           } else {

public_new/modal_add_user_confirm.html

 <div class="modal fade add_user_confirm_modal" id="modalAddUserConfirm" tabindex="-1" role="dialog"
 <div class="modal fade add_user_confirm_modal" id="modalAddUserConfirm" tabindex="-1" role="dialog"
-     aria-labelledby="modalAddUserConfirm" aria-hidden="true">
+     aria-labelledby="modalAddUserConfirm" aria-hidden="true" style="position: fixed;">
     <div class="modal-dialog modal-dialog-centered" role="document">
     <div class="modal-dialog modal-dialog-centered" role="document">
-        <div class="modal-content">
+        <div class="modal-content" style="position: fixed;height: 600px;width: 86%;">
             <div class="modal-header border-0 pb-0">
             <div class="modal-header border-0 pb-0">
                 <span>ユーザー招待</span>
                 <span>ユーザー招待</span>
             </div>
             </div>
@@ -34,9 +34,8 @@
                     </ul>
                     </ul>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="modal-footer border-0 justify-content-center">
-                <button type="button" class="profile_favorite_btn bg_white border_gray text_blue" data-dismiss="modal"
-                        aria-label="Close">
+            <div class="modal-footer border-0 justify-content-center" style="bottom: 35px;position: fixed;width: 85.5%;background-color: white;">
+                <button type="button" id="cancelAddUserBtn" class="profile_favorite_btn bg_white border_gray text_blue cancel_add_user_btn">
                     <div class="d-flex flex-column">
                     <div class="d-flex flex-column">
                         <span>キャンセル</span>
                         <span>キャンセル</span>
                     </div>
                     </div>

public_new/modal_add_user_list.html

@@ -27,13 +27,13 @@
                     <div class="tab_content" id="tab1_content" style="height: 340px; overflow:scroll;">
                     <div class="tab_content" id="tab1_content" style="height: 340px; overflow:scroll;">
                         <div class="chat_list">
                         <div class="chat_list">
                             <!-- お気に入りグループ -->
                             <!-- お気に入りグループ -->
-                            <div class="category"><div class="category_name"><span>お気に入り</span></div></div>
+                            <div class="category" onclick="CHAT_UI.toggleCategory(this);"><div class="category_name"><span>お気に入り</span></div></div>
                             <div id="favoriteListForAddUserInCollaboration"></div>
                             <div id="favoriteListForAddUserInCollaboration"></div>
                             <div id="myGroupListForAddUserInCollaboration"></div>
                             <div id="myGroupListForAddUserInCollaboration"></div>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="tab_content" id="tab2_content" style="height: 340px; overflow:scroll;">
                     <div class="tab_content" id="tab2_content" style="height: 340px; overflow:scroll;">
-                        <div class="breadcrumb" id="groupPathAreaForAddUser"></div>
+                        <div class="breadcrumb" id="groupPathAreaForAddUserInCollaboration"></div>
                         <div class="chat_list">
                         <div class="chat_list">
                             <!-- 全グループ -->
                             <!-- 全グループ -->
                             <ul class="p-0 chat_make_room_list">
                             <ul class="p-0 chat_make_room_list">