Skip to content

C
chat_webview
Commit da8724be by Kang Donghun
Options

Merge branch 'features/release_sp3_collaboration_audio' into 'release_sp3' 

Features/release sp3 collaboration audio

See merge request !98
parents 3bcc0e4d 3730ef32
Showing with 209 additions and 219 deletions
public_new/chat_room.html
...@@ -170,7 +170,6 @@ ...@@ -170,7 +170,6 @@
String.prototype.replaceAll = function(org, dest) { String.prototype.replaceAll = function(org, dest) {
return this.split(org).join(dest); return this.split(org).join(dest);
} }
$("#loadingArea").load("./loading.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
......
public_new/collaboration_overlay_user_list.html 0 → 100644
<div class="user_list_wrap">
<div class="user_list d-flex flex-wrap">
{{#joinedUserList}}
<div class="user_item {{isHost}}">
<a href="#" data-toggle="modal" data-target="#profileModal1" onclick="CHAT_UI.makeNameCardInCollaboration({{shopMemberId}})">
<div class="img_wrap"><img src="{{profileUrl}}" alt="this.src='./img/noImage.png'" /></div>
<span class="name">{{shopMemberName}}</span>
</a>
</div>
{{/joinedUserList}}
</div>
</div>
\ No newline at end of file
public_new/collaboration_picture.html
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<link rel="stylesheet" href="./css/footer.css"> <link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/font-awesome.css"> <link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css"> <link rel="stylesheet" href="./css/share.css">
</head> </head>
<body> <body>
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
<header id="collabo_header"> <header id="collabo_header">
<div class="d-flex align-items-center h-100"> <div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100"> <div class="collabo_nav_l text-left w-100">
通話中 ライブラリ
<span>15:20</span> <span>15:20</span>
</div> </div>
<div class="collabo_nav_r"> <div class="collabo_nav_r">
...@@ -49,54 +50,24 @@ ...@@ -49,54 +50,24 @@
<button id="coviewSharePhotoCamera" class="coview_share_photo_select_bubble_in_button cam"> <button id="coviewSharePhotoCamera" class="coview_share_photo_select_bubble_in_button cam">
</button> </button>
<BR> <BR>
<button id="coviewSharePhotoGalary" class="coview_share_photo_select_bubble_in_button gal"> <button id="coviewSharePhotoGallery" class="coview_share_photo_select_bubble_in_button gal">
</button> </button>
</div> </div>
<!-- ユーザー追加オーバーレイ --> <!-- ユーザー追加オーバーレイ -->
<div id="overlay_add_user_list" class="none"> <div id="add_user_list"></div>
<nav>
<div class="row h-100 align-items-center">
<div class="col-4 pr-0">
<div class="nav-item">
<a href="#" class="close_btn">閉じる</a>
</div>
</div>
<div class="col-4 p-0">
<div class="nav-item p-0">
<h1 class="nav-ttl">ユーザー選択</h1>
</div>
</div>
<div class="col-4 pl-0">
<div class="nav-item text-right">
<a href="#" class="inv_btn">招待</a>
</div>
</div><!-- .col -->
</div><!-- .row -->
</nav><!-- nav -->
<!-- ユーザー検索 -->
<div class="search_form">
<form>
<input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a>
</form>
</div>
<!-- ユーザーリスト -->
<div id="add_user_list"></div>
</div>
<!-- オーバーレイ　メニュー --> <!-- オーバーレイ　メニュー -->
<div id="collaboration_video_overlay_menu"></div> <div id="collaboration_picture_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト --> <!-- オーバーレイ　ユーザーリスト -->
<div id="overlay_user_list" class="overlay noscroll"> <div id="overlay_user_list" class="overlay noscroll">
<div id="collabotarion_overlay_user_list"></div> <div id="collaboration_overlay_user_list"></div>
</div> </div>
<!-- キャプチャ　モーダル --> <!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div> <div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル --> <!-- プロフィールモーダル -->
<div id="modal_collabo_profile"></div> <div id="userProfileModalInCollaboration"></div>
<div id="modal_collabo_profile2"></div> <div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル --> <!-- ホスト変更モーダル -->
<div id="modal_collabo_change_host"></div> <div id="modal_collabo_change_host"></div>
...@@ -149,7 +120,7 @@ ...@@ -149,7 +120,7 @@
</footer> </footer>
<!-- フッター --> <!-- フッター -->
<div id="footer_collabo"></div> <div id="footer_collabo"></div>
<div id="loadingArea"></div>
<script src="./js/libs/jquery-3.3.1.min.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script> <script src="./js/libs/socket.io.js"></script>
<script src="./js/libs/moment.js"></script> <script src="./js/libs/moment.js"></script>
...@@ -165,6 +136,7 @@ ...@@ -165,6 +136,7 @@
<script src="./js/chat-ui.js"></script> <script src="./js/chat-ui.js"></script>
<script src="./js/chat-util.js"></script> <script src="./js/chat-util.js"></script>
<script src="./js/chat-db.js"></script> <script src="./js/chat-db.js"></script>
<script src="./js/loading.js"></script>
<script src="./js/language.js"></script> <script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script> <script src="./js/language_ko.js" charset="UTF-8"></script>
<script src="./js/language_ja.js" charset="UTF-8"></script> <script src="./js/language_ja.js" charset="UTF-8"></script>
...@@ -176,11 +148,10 @@ ...@@ -176,11 +148,10 @@
$("#footer_collabo").load("./footer_collabo.html"); $("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.html"); $("#modal_collabo_host_request").load("./modal_collabo_host_request.html");
$("#modal_collabo_change_host").load("./modal_collabo_change_host.html"); $("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#modal_collabo_profile").load("./modal_collabo_profile.html");
$("#modal_collabo_capture").load("./modal_collabo_capture.html"); $("#modal_collabo_capture").load("./modal_collabo_capture.html");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html"); $("#loadingArea").load("./loading.html");
$("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html");
$("#zoom").load("./zoom.html"); $("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
...@@ -218,5 +189,4 @@ ...@@ -218,5 +189,4 @@
}; };
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
public_new/collaboration_video.html
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<header id="collabo_header"> <header id="collabo_header">
<div class="d-flex align-items-center h-100"> <div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100"> <div class="collabo_nav_l text-left w-100">
通話中 LIVE
<span>15:20</span> <span>15:20</span>
</div> </div>
<div class="collabo_nav_r"> <div class="collabo_nav_r">
...@@ -50,54 +50,24 @@ ...@@ -50,54 +50,24 @@
<button id="coviewSharePhotoCamera" class="coview_share_photo_select_bubble_in_button cam"> <button id="coviewSharePhotoCamera" class="coview_share_photo_select_bubble_in_button cam">
</button> </button>
<BR> <BR>
<button id="coviewSharePhotoGalary" class="coview_share_photo_select_bubble_in_button gal"> <button id="coviewSharePhotoGallery" class="coview_share_photo_select_bubble_in_button gal">
</button> </button>
</div> </div>
<!-- ユーザー追加オーバーレイ --> <!-- ユーザー追加オーバーレイ -->
<div id="overlay_add_user_list" class="none"> <div id="add_user_list"></div>
<nav>
<div class="row h-100 align-items-center">
<div class="col-4 pr-0">
<div class="nav-item">
<a href="#" class="close_btn">閉じる</a>
</div>
</div>
<div class="col-4 p-0">
<div class="nav-item p-0">
<h1 class="nav-ttl">ユーザー選択</h1>
</div>
</div>
<div class="col-4 pl-0">
<div class="nav-item text-right">
<a href="#" class="inv_btn">招待</a>
</div>
</div><!-- .col -->
</div><!-- .row -->
</nav><!-- nav -->
<!-- ユーザー検索 -->
<div class="search_form">
<form>
<input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a>
</form>
</div>
<!-- ユーザーリスト -->
<div id="add_user_list"></div>
</div>
<!-- オーバーレイ　メニュー --> <!-- オーバーレイ　メニュー -->
<div id="collaboration_picture_overlay_menu"></div> <div id="collaboration_video_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト --> <!-- オーバーレイ　ユーザーリスト -->
<div id="overlay_user_list" class="overlay noscroll"> <div id="overlay_user_list" class="overlay noscroll">
<div id="collabotarion_overlay_user_list"></div> <div id="collaboration_overlay_user_list"></div>
</div> </div>
<!-- キャプチャ　モーダル --> <!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div> <div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル --> <!-- プロフィールモーダル -->
<div id="modal_collabo_profile"></div> <div id="userProfileModalInCollaboration"></div>
<div id="modal_collabo_profile2"></div> <div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル --> <!-- ホスト変更モーダル -->
<div id="modal_collabo_change_host"></div> <div id="modal_collabo_change_host"></div>
...@@ -146,7 +116,7 @@ ...@@ -146,7 +116,7 @@
</footer> </footer>
<!-- フッター --> <!-- フッター -->
<div id="footer_collabo"></div> <div id="footer_collabo"></div>
<div id="loadingArea"></div>
<script src="./js/libs/jquery-3.3.1.min.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script> <script src="./js/libs/socket.io.js"></script>
<script src="./js/libs/moment.js"></script> <script src="./js/libs/moment.js"></script>
...@@ -161,6 +131,7 @@ ...@@ -161,6 +131,7 @@
<script src="./js/chat.js"></script> <script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script> <script src="./js/chat-ui.js"></script>
<script src="./js/chat-util.js"></script> <script src="./js/chat-util.js"></script>
<script src="./js/loading.js"></script>
<script src="./js/chat-db.js"></script> <script src="./js/chat-db.js"></script>
<script src="./js/language.js"></script> <script src="./js/language.js"></script>
<script src="./js/language_ko.js" charset="UTF-8"></script> <script src="./js/language_ko.js" charset="UTF-8"></script>
...@@ -174,11 +145,10 @@ ...@@ -174,11 +145,10 @@
$("#footer_collabo").load("./footer_collabo.html"); $("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.html"); $("#modal_collabo_host_request").load("./modal_collabo_host_request.html");
$("#modal_collabo_change_host").load("./modal_collabo_change_host.html"); $("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#modal_collabo_profile").load("./modal_collabo_profile.html");
$("#modal_collabo_capture").load("./modal_collabo_capture.html"); $("#modal_collabo_capture").load("./modal_collabo_capture.html");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html"); $("#loadingArea").load("./loading.html");
$("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html");
$("#zoom").load("./zoom.html"); $("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
......
public_new/collaboration_voice.html
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
<link href="./fontawesome/css/all.css" rel="stylesheet"> <link href="./fontawesome/css/all.css" rel="stylesheet">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
<link rel="stylesheet" href="./css/common.css"> <link rel="stylesheet" href="./css/common.css">
<link rel="stylesheet" href="./css/contact.css">
<link rel="stylesheet" href="./css/collaboration.css"> <link rel="stylesheet" href="./css/collaboration.css">
<link rel="stylesheet" href="./css/footer.css"> <link rel="stylesheet" href="./css/footer.css">
<link rel="stylesheet" href="./css/loading.css">
<link rel="stylesheet" href="./css/font-awesome.css"> <link rel="stylesheet" href="./css/font-awesome.css">
<link rel="stylesheet" href="./css/share.css"> <link rel="stylesheet" href="./css/share.css">
</head> </head>
...@@ -22,7 +24,7 @@ ...@@ -22,7 +24,7 @@
<header id="collabo_header"> <header id="collabo_header">
<div class="d-flex align-items-center h-100"> <div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100"> <div class="collabo_nav_l text-left w-100">
通話中 音声通話
<span>15:20</span> <span>15:20</span>
</div> </div>
<div class="collabo_nav_r"> <div class="collabo_nav_r">
...@@ -35,57 +37,24 @@ ...@@ -35,57 +37,24 @@
</header><!-- header --> </header><!-- header -->
<!-- コンテンツ --> <!-- コンテンツ -->
<main id="collabo_main"> <main id="collabo_main" class="none">
<div class="document_wrap"> <div class="document_wrap">
<div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;"> <div class="coview_share_body coview_share_area" id="coviewShare" style="z-index: 1;">
</div> </div>
</div> </div>
<!-- <div id="collabotarion_overlay_user_list"></div>-->
</main> </main>
<!-- ユーザー追加オーバーレイ -->
<div id="overlay_add_user_list" class="none">
<nav>
<div class="row h-100 align-items-center">
<div class="col-4 pr-0">
<div class="nav-item">
<a href="#" class="close_btn">閉じる</a>
</div>
</div>
<div class="col-4 p-0">
<div class="nav-item p-0">
<h1 class="nav-ttl">ユーザー選択</h1>
</div>
</div>
<div class="col-4 pl-0">
<div class="nav-item text-right">
<a href="#" class="inv_btn">招待</a>
</div>
</div><!-- .col -->
</div><!-- .row -->
</nav><!-- nav -->
<!-- ユーザー検索 -->
<div class="search_form">
<form>
<input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a>
</form>
</div>
<!-- ユーザーリスト -->
<div id="add_user_list"></div>
</div>
<!-- オーバーレイ　メニュー --> <!-- オーバーレイ　メニュー -->
<div id="collaboration_voice_overlay_menu"></div> <div id="collaboration_voice_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト -->
<!-- キャプチャ　モーダル --> <div id="overlay_user_list" class="overlay slidein" style="z-index: 3;">
<div id="modal_collabo_capture"></div> <div id="collaboration_overlay_user_list"></div>
</div>
<!-- プロフィールモーダル --> <!-- プロフィールモーダル -->
<div id="modal_collabo_profile"></div> <div id="userProfileModalInCollaboration"></div>
<div id="modal_collabo_profile2"></div> <div id="modal_collabo_profile2"></div>
<div id="add_user_list" ></div>
<!-- ホスト変更モーダル --> <!-- ホスト変更モーダル -->
<div id="modal_collabo_change_host"></div> <div id="modal_collabo_change_host"></div>
...@@ -94,7 +63,7 @@ ...@@ -94,7 +63,7 @@
<!-- フッター --> <!-- フッター -->
<div id="footer_collabo"></div> <div id="footer_collabo"></div>
<div id="loadingArea"></div>
<script src="./js/libs/jquery-3.3.1.min.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script> <script src="./js/libs/socket.io.js"></script>
<script src="./js/libs/moment.js"></script> <script src="./js/libs/moment.js"></script>
...@@ -106,6 +75,7 @@ ...@@ -106,6 +75,7 @@
<script src="./js/constant.js"></script> <script src="./js/constant.js"></script>
<script src="./js/collaboration.js"></script> <script src="./js/collaboration.js"></script>
<script src="./js/common.js"></script> <script src="./js/common.js"></script>
<script src="./js/loading.js"></script>
<script src="./js/chat.js"></script> <script src="./js/chat.js"></script>
<script src="./js/chat-ui.js"></script> <script src="./js/chat-ui.js"></script>
<script src="./js/chat-util.js"></script> <script src="./js/chat-util.js"></script>
...@@ -121,12 +91,10 @@ ...@@ -121,12 +91,10 @@
$("#footer_collabo").load("./footer_collabo.html"); $("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.html"); $("#modal_collabo_host_request").load("./modal_collabo_host_request.html");
$("#modal_collabo_change_host").load("./modal_collabo_change_host.html"); $("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#modal_collabo_profile").load("./modal_collabo_profile.html");
$("#modal_collabo_capture").load("./modal_collabo_capture.html"); $("#modal_collabo_capture").load("./modal_collabo_capture.html");
$("#collabotarion_overlay_user_list").load("./collabotarion_overlay_user_list.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html"); $("#loadingArea").load("./loading.html");
$("#zoom").load("./zoom.html"); $("#collaboration_voice_overlay_menu").load("./collaboration_voice_overlay_menu.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
...@@ -160,6 +128,7 @@ ...@@ -160,6 +128,7 @@
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() { socket.emit('join', CHAT.globalLoginParameter, function() {
}); });
}; };
</script> </script>
</body> </body>
......
public_new/collabotarion_overlay_user_list.html deleted 100644 → 0
<div class="user_list_wrap">
<div class="user_list d-flex flex-wrap">
<div class="user_item host">
<a href="#" data-toggle="modal" data-target="#profileModal1">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前</span>
</a>
</div>
<div class="user_item">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前</span>
</a>
</div>
<div class="user_item">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前名前名前名前名前名前名前名前名前</span>
</a>
</div>
<div class="user_item host">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前名前名前名前名前名前名前名前名前</span>
</a>
</div>
<div class="user_item">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前名前名前名前名前名前名前名前名前</span>
</a>
</div>
<div class="user_item">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前名前名前名前名前名前名前名前名前</span>
</a>
</div>
<div class="user_item">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前名前名前名前名前名前名前名前名前</span>
</a>
</div>
<div class="user_item">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前名前名前名前名前名前名前名前名前</span>
</a>
</div>
<div class="user_item">
<a href="#" data-toggle="modal" data-target="#profileModal2">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
<span class="name">名前名前名前</span>
</a>
</div>
</div>
</div>
\ No newline at end of file
public_new/css/chat.css
...@@ -41,6 +41,11 @@ input[name="tab_item"] { ...@@ -41,6 +41,11 @@ input[name="tab_item"] {
display: block; display: block;
} }
#tabMyGroupOnAddUserInCollaboration:checked ~ #tab1_content,
#tabAllGroupOnAddUserInCollaboration:checked ~ #tab2_content{
display: block;
}
#tabMyGroupOnAddUser:checked ~ #tab1_content, #tabMyGroupOnAddUser:checked ~ #tab1_content,
#tabAllGroupOnAddUser:checked ~ #tab2_content{ #tabAllGroupOnAddUser:checked ~ #tab2_content{
display: block; display: block;
......
public_new/css/collaboration.css
...@@ -34,10 +34,12 @@ ...@@ -34,10 +34,12 @@
height: 100%; height: 100%;
background: #525252; background: #525252;
} }
#collabo_main .user_list, #collabo_main .user_list_collabo,
#overlay_user_list .user_list { #overlay_user_list .user_list_collabo {
background: #525252; background: #525252;
padding-bottom: 120px; padding-bottom: 120px;
overflow: auto;
height: inherit;
} }
#collabo_main .user_list .img_wrap, #collabo_main .user_list .img_wrap,
#overlay_user_list .user_list .img_wrap { #overlay_user_list .user_list .img_wrap {
...@@ -86,7 +88,7 @@ ...@@ -86,7 +88,7 @@
height: 64px; height: 64px;
} }
.user_item { .user_item {
width: calc(50% - 5px); width: calc(50% - 20px);
position: relative; position: relative;
text-align: center; text-align: center;
border: 1px solid white; border: 1px solid white;
...@@ -96,6 +98,7 @@ ...@@ -96,6 +98,7 @@
line-height: calc(100vh / 3); line-height: calc(100vh / 3);
overflow: hidden; overflow: hidden;
} }
.user_item a { .user_item a {
display: block; display: block;
height: 100%; height: 100%;
...@@ -134,6 +137,10 @@ ...@@ -134,6 +137,10 @@
background: #525252; background: #525252;
height: 100vh; height: 100vh;
} }
#add_user_list{
width: 90%;
height: 90%;
}
.fixed { .fixed {
position: fixed; position: fixed;
} }
...@@ -179,8 +186,8 @@ ...@@ -179,8 +186,8 @@
z-index: 100; z-index: 100;
top: 0; top: 0;
background: white; background: white;
height: 100%; height: 70%;
width: 100%; width: 80%;
max-width: 1280px; max-width: 1280px;
} }
#add_user_list .user_list li { #add_user_list .user_list li {
...@@ -423,3 +430,16 @@ ...@@ -423,3 +430,16 @@
width: 30px; width: 30px;
} }
} }
.nav-modal-add-user {
position: absolute;
}
#buttonAddUser {
position: inherit;
}
.add_user_modal{
width: 80%;
height: 70%;
}
public_new/js/chat-db.js
...@@ -322,6 +322,15 @@ CHAT_DB.getContentList = function() { ...@@ -322,6 +322,15 @@ CHAT_DB.getContentList = function() {
} }
}; };
CHAT_DB.getUserListByLoginId = function(loginIdList) {
console.log(loginIdList);
if (CHAT_UTIL.isIOS()) {
//TODO ローカルDBからダウンロード済のコンテンツを取得
} else if (CHAT_UTIL.isAndroid()) {
return JSON.parse(android.getUserListByLoginId(loginIdList.join(",")));
}
}
CHAT_DB.getCollaborationJoinFlg = function() { CHAT_DB.getCollaborationJoinFlg = function() {
// Androidは実装不要 // Androidは実装不要
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
......
public_new/js/collaboration.js
...@@ -76,18 +76,8 @@ $(function () { ...@@ -76,18 +76,8 @@ $(function () {
// ユーザー招待メンバー検索 // ユーザー招待メンバー検索
$(".add_user_btn").click(function () { $(".add_user_btn").click(function () {
CHAT_UI.showLoadingIndicator();
CHAT_UI.refreshMyGroupForAddUserInCollaboration();
$("#overlay_add_user_list").removeClass("none");
$.ajax({
url: "collaboration_overlay_add_user_list.html",
type: "POST",
datatype: "html",
}).done(function (data) {
$("#add_user_list").html(data);
});
}); });
$('#penBtn').click(function () { $('#penBtn').click(function () {
......
public_new/modal_add_user_list.html 0 → 100644
<!-- コンテンツ -->
<div class="modal fade add_user_modal" id="addUserInCollaboration" tabindex="-1" role="dialog" aria-labelledby="addUserInCollaboration" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<form id="addUserFormInCollaboration" action="chat_add_user_confirm.html" method="post">
<!-- ユーザー検索 -->
<!-- タブ -->
<div class="content tabs">
<nav class="nav-modal-add-user">
<div class="row h-100 align-items-center">
<div class="col-4 pr-0">
<div class="nav-item">
<a href="#" class="close_btn" class="close" data-dismiss="modal" aria-label="Close">閉じる</a>
</div>
</div>
<div class="col-4 p-0">
<div class="nav-item p-0">
<h1 class="nav-ttl">ユーザー選択</h1>
</div>
</div>
</div><!-- .row -->
</nav><!-- nav -->
<input id="tabMyGroupOnAddUserInCollaboration" type="radio" name="tab_item" checked>
<label class="tab_item" for="tabMyGroupOnAddUserInCollaboration">マイグループ</label>
<input id="tabAllGroupOnAddUserInCollaboration" type="radio" name="tab_item">
<label class="tab_item" for="tabAllGroupOnAddUserInCollaboration">全グループ</label>
<div class="tab_content" id="tab1_content">
<div class="chat_list">
<!-- お気に入りグループ -->
<div class="category"><div class="category_name"><span>お気に入り</span></div></div>
<div id="favoriteListForAddUserInCollaboration"></div>
<div id="myGroupListForAddUserInCollaboration"></div>
</div>
</div>
<div class="tab_content" id="tab2_content">
<div class="breadcrumb" id="groupPathAreaForAddUser"></div>
<div class="chat_list">
<!-- 全グループ -->
<ul class="p-0 chat_make_room_list">
<li class="d-flex align-items-center" id="rootGroupAreaInCollaboration">
<a href="#" class="w-100" id="rootGroupBtnForAddUserInCollaboration">
<div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l">
<div class="thumbnail">
<img src="icon/icon_prev_top.png" alt="トップグループに戻る" />
</div>
</div>
<div class="chat_item_m px-0">
<div class="d-flex flex-column">
<div class="chat_item_t">
<span class="chat_item_ttl">トップグループに戻る</span>
</div>
</div>
</div>
</div>
</a>
</li>
<li class="d-flex align-items-center" id="parentGroupAreaInCollaboration">
<a href="#" class="w-100" id="parentGroupBtnForAddUserInCollaboration">
<div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l">
<div class="thumbnail">
<img src="icon/icon_prev.png" alt="上位グループに戻る" />
</div>
</div>
<div class="chat_item_m px-0">
<div class="d-flex flex-column">
<div class="chat_item_t">
<span class="chat_item_ttl">上位グループに戻る</span>
</div>
</div>
</div>
</div>
</a>
</li>
<div id="childGroupListAreaForAddUserInCollaboration"></div>
<div id="userInGroupListForAddUserInCollaboration"></div>
</ul>
</div>
</div>
</div>
<!-- ルーム解説ボタン -->
<div class="make_room_confirm_btn content" id="addUserConfirmBtnInCollaboration">
<button type="button" name="button" id="buttonAddUser">
確認<br>
<span class="select_member_num"></span><span class="select_member">名 選択中</span></button>
</div>
</form>
</div>
</div>
</div>
public_new/modal_collabo_change_host.html
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<span>キャンセル</span> <span>キャンセル</span>
</div> </div>
</button> </button>
<button type="button" class="profile_chat_btn border-0 bg_blue text_white"> <button type="button" onclick="Coview_changeHost({{shopMemberId}});" class="profile_chat_btn border-0 bg_blue text_white">
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<span>引き渡し</span> <span>引き渡し</span>
</div> </div>
......
public_new/modal_collabo_profile.html
<div class="modal fade profile_modal w_50" id="profileModal1" tabindex="-1" role="dialog" <div class="modal fade profile_modal w_50" id="userNameCardInCollaboration" tabindex="-1" role="dialog"
aria-labelledby="profileModal1" aria-hidden="true"> aria-labelledby="userNameCardInCollaboration" aria-hidden="true">
<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">
<div class="modal-header border-0"> <div class="modal-header border-0">
<div class="profile_desc d-flex flex-row"> <div class="profile_desc d-flex flex-row">
<img src="img/noImage.png" alt="プロフィール画像"> <img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/>
<div class="profile_name"><span>名前　名前</span></div> <div class="profile_name"><span>{{name}}</span></div>
</div> </div>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p> {{#groupPathList}}
グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループグループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ名グループ <li onclick="CHAT_UI.refreshAllGroupSearch({{groupId}});"><b>{{groupPath}}</b></li>
</p> {{/groupPathList}}
</div> </div>
<div class="modal-footer border-0 justify-content-center"> <div class="modal-footer border-0 justify-content-center">
<button type="button" class="border-0 bg_navy text_white"> {{#isFavorite}}
<button type="button" class="border-0 bg_navy" onclick="CHAT_UI.removeFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_profile_favorite.png" alt="お気に入り"> <img src="icon/icon_profile_favorite.png" alt="お気に入り">
...@@ -25,8 +26,20 @@ ...@@ -25,8 +26,20 @@
<span>お気に入り解除</span> <span>お気に入り解除</span>
</div> </div>
</button> </button>
<button type="button" class="ch_host_btn border-0 bg_blue text_white" data-toggle="modal" {{/isFavorite}}
data-target="#changeHostModal" value="#profileModal1"> {{^isFavorite}}
<button type="button" class="border-0 bg_navy" onclick="CHAT_UI.insertFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
<div class="d-flex flex-column">
<div class="img_wrap">
<img src="icon/icon_profile_favorite_white.png" alt="お気に入り">
</div>
<span>お気に入り登録</span>
</div>
</button>
{{/isFavorite}}
<!-- {{^isHost}}-->
<button type="button" class="ch_host_btn border-0 bg_grey text_white" data-toggle="modal"
data-target="#changeHostModal" value="#profileModal1" disabled>
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_change_host.png" alt="ホスト変更"> <img src="icon/icon_change_host.png" alt="ホスト変更">
...@@ -34,6 +47,7 @@ ...@@ -34,6 +47,7 @@
<span>ホスト変更</span> <span>ホスト変更</span>
</div> </div>
</button> </button>
<!-- {{/isHost}}-->
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment