Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
62d836e0
Commit
62d836e0
authored
Apr 28, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
協業UI変更
parent
d0dd14b2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
129 deletions
+8
-129
public_new/collaboration_picture.html
+2
-64
public_new/collaboration_video.html
+2
-58
public_new/css/collaboration.css
+4
-1
public_new/css/share.css
+0
-6
No files found.
public_new/collaboration_picture.html
View file @
62d836e0
...
...
@@ -27,15 +27,12 @@
<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 none"></button>-->
<!--<button type="button" name="button" class="btn menu_btn none"></button>-->
<button
type=
"button"
name=
"button"
class=
"btn exit_btn"
onclick=
"Coview_exitCollaboration();"
></button>
</div>
</div>
</div>
</header>
<!-- header -->
<!-- 拡大縮小機能 -->
<div
id=
"zoom"
></div>
<!-- コンテンツ -->
<main
id=
"collabo_main"
class=
"none"
>
<div
class=
"document_wrap"
>
...
...
@@ -62,63 +59,10 @@
<div
id=
"collaboration_overlay_user_list"
></div>
</div>
<!-- キャプチャ モーダル -->
<div
id=
"modal_collabo_capture"
></div>
<!-- プロフィールモーダル -->
<div
id=
"userProfileModalInCollaboration"
></div>
<div
id=
"modal_collabo_profile2"
></div>
<!-- ホスト変更モーダル -->
<div
id=
"modal_collabo_change_host"
></div>
<!-- ホストリクエストモーダル -->
<div
id=
"modal_collabo_host_request"
></div>
<!-- フッター -->
<footer
id=
"collabo_footer_menu"
class=
"active"
>
<button
type=
"button"
name=
"button"
class=
"footer_menu_btn"
></button>
<div
class=
"footer_menu-wrap d-flex justify-content-around h-100"
>
<div
class=
"d-flex align-items-center h-100"
>
<div
class=
"footer_menu_item"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_red"
id=
"penBtn"
>
<img
src=
"icon/icon_collabo_pen_white.png"
alt=
"ペン"
>
</div>
</a>
</div>
<div
class=
"footer_menu_item none"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_blue"
>
<img
src=
"icon/icon_collabo_place_white.png"
alt=
"場所"
>
</div>
</a>
</div>
<div
class=
"footer_menu_item"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_blue"
id=
"eraserBtn"
>
<img
src=
"icon/icon_collabo_delete_white.png"
alt=
"削除"
>
</div>
</a>
</div>
</div>
<div
class=
"d-flex align-items-center h-100 none"
>
<div
class=
"footer_menu_item"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_gray"
>
<img
src=
"icon/icon_collabo_rewind_white.png"
alt=
"戻る"
>
</div>
</a>
</div>
<div
class=
"footer_menu_item"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_gray"
>
<img
src=
"icon/icon_collabo_forward_white.png"
alt=
"進む"
>
</div>
</a>
</div>
</div>
</div>
</footer>
<!-- フッター -->
<div
id=
"footer_collabo"
></div>
<div
id=
"loadingArea"
></div>
<script
src=
"./js/libs/jquery-3.3.1.min.js"
></script>
<script
src=
"./js/libs/socket.io.js"
></script>
<script
src=
"./js/libs/moment.js"
></script>
...
...
@@ -143,14 +87,8 @@
<script
src=
"https://livetaskyell.abookcloud.com/coview_api.js"
></script>
<script
src=
"./js/share.js"
></script>
<script>
$
(
"#footer_collabo"
).
load
(
"./footer_collabo.html"
);
$
(
"#modal_collabo_host_request"
).
load
(
"./modal_collabo_host_request.html"
);
$
(
"#modal_collabo_change_host"
).
load
(
"./modal_collabo_change_host.html"
);
$
(
"#modal_collabo_capture"
).
load
(
"./modal_collabo_capture.html"
);
$
(
"#modal_collabo_profile2"
).
load
(
"./modal_collabo_profile2.html"
);
$
(
"#loadingArea"
).
load
(
"./loading.html"
);
$
(
"#collaboration_picture_overlay_menu"
).
load
(
"./collaboration_picture_overlay_menu.html"
);
$
(
"#zoom"
).
load
(
"./zoom.html"
);
let
CHAT_SERVER_URL
=
''
;
let
CMS_SERVER_URL
=
''
;
...
...
public_new/collaboration_video.html
View file @
62d836e0
...
...
@@ -26,16 +26,12 @@
<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 none"></button>-->
<!--<button type="button" name="button" class="btn menu_btn none"></button>-->
<button
type=
"button"
name=
"button"
class=
"btn exit_btn"
onclick=
"Coview_exitCollaboration();"
></button>
</div>
</div>
</div>
</header>
<!-- header -->
<!-- 拡大縮小機能 -->
<div
id=
"zoom"
></div>
<!-- コンテンツ -->
<main
id=
"collabo_main"
class=
"none"
>
<div
class=
"document_wrap"
>
...
...
@@ -52,18 +48,12 @@
</button>
</div>
<!-- ユーザー追加オーバーレイ -->
<div
id=
"add_user_list"
></div>
<!-- オーバーレイ メニュー -->
<div
id=
"collaboration_video_overlay_menu"
></div>
<!-- オーバーレイ ユーザーリスト -->
<div
id=
"overlay_user_list"
class=
"overlay noscroll"
>
<div
id=
"collaboration_overlay_user_list"
></div>
</div>
<!-- キャプチャ モーダル -->
<div
id=
"modal_collabo_capture"
></div>
<!-- プロフィールモーダル -->
<div
id=
"userProfileModalInCollaboration"
></div>
<div
id=
"modal_collabo_profile2"
></div>
...
...
@@ -71,47 +61,6 @@
<div
id=
"modal_collabo_change_host"
></div>
<!-- ホストリクエストモーダル -->
<div
id=
"modal_collabo_host_request"
></div>
<!-- フッター -->
<footer
id=
"collabo_footer_menu"
class=
"active"
>
<button
type=
"button"
name=
"button"
class=
"footer_menu_btn"
></button>
<div
class=
"footer_menu-wrap d-flex justify-content-around h-100"
>
<div
class=
"d-flex align-items-center h-100"
>
<div
class=
"footer_menu_item"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_red"
id=
"penBtn"
>
<img
src=
"icon/icon_collabo_pen_white.png"
alt=
"ペン"
>
</div>
</a>
</div>
<div
class=
"footer_menu_item none"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_blue"
>
<img
src=
"icon/icon_collabo_place_white.png"
alt=
"場所"
>
</div>
</a>
</div>
<div
class=
"footer_menu_item"
>
<a
href=
"#"
>
<div
class=
"img_wrap bg_blue"
id=
"eraserBtn"
>
<img
src=
"icon/icon_collabo_delete_white.png"
alt=
"削除"
>
</div>
</a>
</div>
</div>
<div
class=
"d-flex align-items-center h-100"
>
<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"
>
<img
src=
"icon/icon_collabo_capture.png"
alt=
"キャプチャ"
>
<span>
キャプチャ
</span>
</div>
</a>
</div>
</div>
</div>
</footer>
<!-- フッター -->
<div
id=
"footer_collabo"
></div>
<div
id=
"loadingArea"
></div>
...
...
@@ -140,14 +89,9 @@
<script
src=
"./js/share.js"
></script>
</body>
<script>
$
(
"#footer_collabo"
).
load
(
"./footer_collabo.html"
);
$
(
"#modal_collabo_host_request"
).
load
(
"./modal_collabo_host_request.html"
);
$
(
"#modal_collabo_change_host"
).
load
(
"./modal_collabo_change_host.html"
);
$
(
"#modal_collabo_capture"
).
load
(
"./modal_collabo_capture.html"
);
$
(
"#modal_collabo_profile2"
).
load
(
"./modal_collabo_profile2.html"
);
$
(
"#loadingArea"
).
load
(
"./loading.html"
);
$
(
"#collaboration_video_overlay_menu"
).
load
(
"./collaboration_video_overlay_menu.html"
);
$
(
"#zoom"
).
load
(
"./zoom.html"
);
let
CHAT_SERVER_URL
=
''
;
let
CMS_SERVER_URL
=
''
;
...
...
public_new/css/collaboration.css
View file @
62d836e0
...
...
@@ -24,7 +24,7 @@
/**************************** main *************************/
#collabo_main
{
height
:
calc
(
100vh
-
18
0px
);
height
:
calc
(
100vh
-
5
0px
);
position
:
relative
;
margin-bottom
:
120px
;
}
...
...
@@ -122,6 +122,9 @@
.btn.add_user_btn
{
background-image
:
url("../icon/icon_add_member_white.png")
;
}
.btn.exit_btn
{
background-image
:
url("../icon/icon_close.png")
;
}
.btn.menu_btn.hide
,
.btn.add_user_btn.hide
,
.btn.user_btn.hide
{
...
...
public_new/css/share.css
View file @
62d836e0
...
...
@@ -144,13 +144,7 @@
border-radius
:
5px
;
}
.coview_on_screen_btn_area
{
display
:
none
;
!important;
}
.coview_on_media_btn_back
{
top
:
70px
!important
;
}
#localVideo
{
top
:
0px
!important
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment