Skip to content

C
chat_webview
Commit 87e22d22 by Lee Munkyeong
Options

Merge branch 'features/realease_sp3_ready_for_realease' into 'release_sp3' 

Features/realease sp3 ready for realease

See merge request !99
parents da8724be 0603f4dc
Showing with 47 additions and 32 deletions
public_new/chat_room.html
......@@ -108,10 +108,8 @@
</a>
</div>
<div class="footer_item">
<a href="collaboration_documents.html">
<img src="icon/icon_paste.png" alt="文書アイコン">
<img src="icon/icon_paste.png" alt="文書アイコン" onclick="alert(getLocalizedString('notify_not_released'));">
<p>文書</p>
</a>
</div>
<div class="footer_item">
<a href="javascript:CHAT_UI.startCollaboration(collaborationType.CAMERA);">
......@@ -125,12 +123,13 @@
<p>動画</p>
</a>
</div>
<div class="footer_item">
<!--リリース後開発予定-->
<!--<div class="footer_item">
<a href="collaboration_whiteboard.html">
<img src="icon/icon_whiteboad_gray.png" alt="ホワイトボードアイコン">
<p>ボード</p>
</a>
</div>
</div>-->
</div>
</div>
</div>
......
public_new/collaboration_documents.html
......@@ -165,7 +165,7 @@
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<script src="./js/chat-websocket.js"></script>
<script src="https://app.coview.co.kr:7443/coview_api.js"></script>
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script>
<script src="./js/share.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html");
......
public_new/collaboration_picture.html
......@@ -23,14 +23,12 @@
<header id="collabo_header">
<div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100">
ライブラリ
<span>15:20</span>
</div>
<div class="collabo_nav_r">
<div class="text-right d-flex align-items-center">
<button type="button" name="button" class="btn user_btn"></button>
<button type="button" name="button" class="btn add_user_btn"></button>
<button type="button" name="button" class="btn menu_btn"></button>
<button type="button" name="button" class="btn add_user_btn none"></button>
<button type="button" name="button" class="btn menu_btn none"></button>
</div>
</div>
</div>
......@@ -85,7 +83,7 @@
</div>
</a>
</div>
<div class="footer_menu_item">
<div class="footer_menu_item none">
<a href="#">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_place_white.png" alt="場所">
......@@ -100,7 +98,7 @@
</a>
</div>
</div>
<div class="d-flex align-items-center h-100">
<div class="d-flex align-items-center h-100 none">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_gray">
......@@ -142,7 +140,7 @@
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<script src="./js/chat-websocket.js"></script>
<script src="https://app.coview.co.kr:7443/coview_api.js"></script>
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script>
<script src="./js/share.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html");
......
public_new/collaboration_video.html
......@@ -22,14 +22,12 @@
<header id="collabo_header">
<div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100">
LIVE
<span>15:20</span>
</div>
<div class="collabo_nav_r">
<div class="text-right d-flex align-items-center">
<button type="button" name="button" class="btn user_btn"></button>
<button type="button" name="button" class="btn add_user_btn"></button>
<button type="button" name="button" class="btn menu_btn"></button>
<button type="button" name="button" class="btn add_user_btn none"></button>
<button type="button" name="button" class="btn menu_btn none"></button>
</div>
</div>
</div>
......@@ -86,7 +84,7 @@
</div>
</a>
</div>
<div class="footer_menu_item">
<div class="footer_menu_item none">
<a href="#">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_place_white.png" alt="場所">
......@@ -102,7 +100,7 @@
</div>
</div>
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<div class="footer_menu_item none">
<!-- <a href="#" data-toggle="modal" data-target="#captyaModal">-->
<a href="#">
<div class="img_wrap wide bg_blue" id="captureBtn">
......@@ -138,7 +136,7 @@
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<script src="./js/chat-websocket.js"></script>
<script src="https://app.coview.co.kr:7443/coview_api.js"></script>
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script>
<script src="./js/share.js"></script>
</body>
<script>
......
public_new/collaboration_voice.html
......@@ -24,10 +24,8 @@
<header id="collabo_header">
<div class="d-flex align-items-center h-100">
<div class="collabo_nav_l text-left w-100">
音声通話
<span>15:20</span>
</div>
<div class="collabo_nav_r">
<div class="collabo_nav_r none">
<div class="text-right d-flex align-items-center">
<button type="button" name="button" class="btn add_user_btn"></button>
<button type="button" name="button" class="btn menu_btn"></button>
......@@ -85,7 +83,7 @@
<script src="./js/language_ja.js" charset="UTF-8"></script>
<script src="./js/language_en.js" charset="UTF-8"></script>
<script src="./js/chat-websocket.js"></script>
<script src="https://app.coview.co.kr:7443/coview_api.js"></script>
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script>
<script src="./js/share.js"></script>
<script>
$("#footer_collabo").load("./footer_collabo.html");
......
public_new/footer_collabo.html
......@@ -8,7 +8,7 @@
</div>
</a>
</div>
<div class="footer_item">
<div class="footer_item none">
<a href="#">
<div class="img_wrap bg_gray" id="recordBtn">
<img src="icon/icon_record.png" alt="録音">
......
public_new/js/language_en.js
......@@ -90,5 +90,6 @@ $.lang.en = {
"saturday":"saturday",
"sunday":"sunday",
"collaboration_start":"collaboration start",
"collaboration_end":"collaboration end"
"collaboration_end":"collaboration end",
"notify_not_released" : "It will be released later."
}
public_new/js/language_ja.js
......@@ -90,5 +90,6 @@ $.lang.ja = {
"saturday":"土曜日",
"sunday":"日曜日",
"collaboration_start":"協業中",
"collaboration_end":"協業終了"
"collaboration_end":"協業終了",
"notify_not_released" : "今後リリース予定です。"
}
public_new/js/language_ko.js
......@@ -90,5 +90,6 @@ $.lang.ko = {
"saturday":"토요일",
"sunday":"일요일",
"collaboration_start":"협업중",
"collaboration_end":"협업종료"
"collaboration_end":"협업종료",
"notify_not_released" : "추후 공개예정입니다."
}
public_new/js/share.js
......@@ -8,16 +8,35 @@ $(function() {
testSTRParam : "param1",
testNUMParam : 77,
testBOOLParam : false,
coview_api_srv_addr: "https://app.coview.co.kr:7443",
coview_api_srv_addr: "https://livetaskyell.abookcloud.com",
coview_wrap_id : "coviewShare",
coview_api_key: "8dda7092c5820d663"
}
);
// special button IN Chat ui
$("#coviewShareMainBtn").on("click", function(e) {
$("#coviewShareMainBtn").on("click", function(e){
e.stopPropagation();
if ($(".coview_share_dropdown_bar").is(':visible') == true) {
if($(".coview_share_dropdown_bar").is(':visible') == true){
Coview_shareDropdownHide();
if($(".coview_share_photo_select_bubble").is(':visible') == true){
$(".coview_share_photo_select_bubble").slideUp();
}
}
else{
$(".coview_share_dropdown_bar").slideDown();
}
});
$("#coviewShareCloseButton").on("click", function(e){
coview_api.LeaveRoom();
$(".coview_share_area").hide();
});
$("body").on("click", function(){
Coview_shareDropdownHide();
if ($(".coview_share_photo_select_bubble").is(':visible') == true) {
......
public_new/zoom.html
<div class="s_ac d-flex flex-column">
<div class="s_ac d-flex flex-column none">
<div class="s_ac_c">
<a href="#">
<div class="img_wrap bg_gray">
......
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