Commit d90c5699 by Kim Peace

Merge branch 'bug/#44044_caturep_button_on_change_collaboration' into debug/console_logs

parents 1c81cd72 6db82ab5
<div id="overlay_menu" class="overlay fixed">
<div class="overlay_menu_wrap">
<div class="overlay_menu h-100 d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap">
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
<div id="overlay_menu" class="overlay fixed">
<div class="overlay_menu_wrap">
<div class="overlay_menu h-100 d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap">
<div class="item collaboration_contents picture_contents video_contents document_contents board_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_headset.svg" alt="音声共有">
</div>
<span>音声共有</span>
</a>
</div>
<div class="item collaboration_contents picture_contents voice_contents document_contents board_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.VIDEO);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item collaboration_contents video_contents voice_contents document_contents board_contents">
<a href="javascript:coview_api.ChangeCollaboration('image');"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item collaboration_contents video_contents voice_contents picture_contents board_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.DOCUMENT);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item collaboration_contents video_contents voice_contents picture_contents document_contents">
<a href="javascript:changeCollaboration(COLLABORATION_TYPE.BOARD);"
class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
<div id="overlay_menu" class="fixed hide">
<div class="overlay_menu_wrap">
<div class="overlay_menu d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu">
<div class="item rounded-circle shadow m-2 item01">
<a href="javascript:coview_api.ChangeCollaboration('audio');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_headset.svg" alt="音声共有">
</div>
<span>音声共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item02">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item03">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item04">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
<div id="overlay_menu" class="fixed hide">
<div class="overlay_menu_wrap">
<div class="overlay_menu d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu">
<div class="item rounded-circle shadow m-2 item01">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item02">
<a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item03">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
<div class="item rounded-circle shadow m-2 item04">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
</div>
<span>落書き</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
<div id="overlay_menu" class="overlay fixed">
<div class="overlay_menu_wrap">
<div class="overlay_menu h-100 d-flex justify-content-center align-items-center">
<div class="menu_wrap">
<div class="menu d-flex flex-row flex-wrap">
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('audio');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_headset.svg" alt="音声共有">
</div>
<span>音声共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('video');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_videocam.svg" alt="動画共有">
</div>
<span>動画共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('image');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_picture.svg" alt="写真共有">
</div>
<span>写真共有</span>
</a>
</div>
<div class="item">
<a href="javascript:coview_api.ChangeCollaboration('docs');" class="d-flex flex-column align-items-center">
<div class="img_wrap">
<img src="icon/icon_collabo_document.svg" alt="文書共有">
</div>
<span>文書共有</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
......@@ -332,7 +332,7 @@ CollaborationFeature.updateHost = function () {
CollaborationUI.showHostMark(g_isMainManUsername);
$("#remoteVideoNameSpan").addClass("hide");
$(".remoteVideoNameSpan").addClass("none");
};
CollaborationUI.showHostButtons = function () {
......
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