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
fb228a67
Commit
fb228a67
authored
Aug 02, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed add user in collaobration ui
parent
96063a67
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
182 additions
and
109 deletions
+182
-109
public_new/css/collaboration.css
+164
-97
public_new/js/views/collaboration/collaboration-add-user.js
+2
-2
public_new/modal_add_user_list.html
+16
-10
No files found.
public_new/css/collaboration.css
View file @
fb228a67
This diff is collapsed.
Click to expand it.
public_new/js/views/collaboration/collaboration-add-user.js
View file @
fb228a67
...
...
@@ -149,7 +149,7 @@ CollaborationUI.refreshAllGroupForAddUserInCollaboration = function (groupID) {
CollaborationUI
.
appendChildGroups
(
result
.
childGroupList
);
//該当グループの所属ユーザを表示。
CollaborationUI
.
appendUsers
();
CollaborationUI
.
appendUsers
(
result
.
groupUserList
);
};
CollaborationUI
.
bindOnClickParentGroup
=
function
(
parentGroupID
)
{
...
...
@@ -168,7 +168,7 @@ CollaborationUI.displayRootGroupAndParentGroupIfNeeded = function (
rootGroupID
,
groupID
)
{
if
(
typeof
rootGroupID
!==
"undefined"
&&
param
GroupID
==
0
)
{
if
(
typeof
rootGroupID
!==
"undefined"
&&
root
GroupID
==
0
)
{
groupID
=
rootGroupID
;
}
...
...
public_new/modal_add_user_list.html
View file @
fb228a67
<!-- コンテンツ -->
<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 modal_collaboration_user"
role=
"document"
>
<div
class=
"modal-content"
style=
"position: fixed;width: 100%;height:100%;top: 0px;left:0;"
>
<div
class=
"modal fade add_user_modal"
id=
"addUserInCollaboration"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"addUserInCollaboration"
aria-hidden=
"true"
>
<div
class=
"modal-dialog-centered modal_collaboration_user"
role=
"document"
>
<div
class=
"modal-content"
>
<form
id=
"addUserFormInCollaboration"
action=
"chat_add_user_confirm.html"
method=
"post"
>
<!-- ユーザー検索 -->
<!-- タブ -->
...
...
@@ -9,7 +10,8 @@
<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>
<a
href=
"#"
class=
"close_btn"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
閉じる
</a>
</div>
</div>
<div
class=
"col-4 p-0"
>
...
...
@@ -20,19 +22,23 @@
</div>
<!-- .row -->
</nav>
<!-- nav -->
<div
class=
"content tabs"
>
<input
id=
"tabMyGroupOnAddUserInCollaboration"
type=
"radio"
name=
"tab_item"
checked
onclick=
"CollaborationUI.refreshMyGroupForAddUserInCollaboration();"
>
<input
id=
"tabMyGroupOnAddUserInCollaboration"
type=
"radio"
name=
"tab_item"
checked
onclick=
"CollaborationUI.refreshMyGroupForAddUserInCollaboration();"
>
<label
class=
"tab_item m-0"
for=
"tabMyGroupOnAddUserInCollaboration"
>
マイグループ
</label>
<input
id=
"tabAllGroupOnAddUserInCollaboration"
type=
"radio"
name=
"tab_item"
onclick=
"CollaborationUI.refreshAllGroupForAddUserInCollaboration('0');"
>
<input
id=
"tabAllGroupOnAddUserInCollaboration"
type=
"radio"
name=
"tab_item"
onclick=
"CollaborationUI.refreshAllGroupForAddUserInCollaboration('0');"
>
<label
class=
"tab_item m-0"
for=
"tabAllGroupOnAddUserInCollaboration"
>
全グループ
</label>
<div
class=
"tab_content"
id=
"tab1_content"
style=
"height: 100vh; overflow:scroll;"
>
<div
class=
"tab_content"
id=
"tab1_content"
>
<div
class=
"chat_list"
>
<!-- お気に入りグループ -->
<div
class=
"category"
onclick=
"CollaborationUI.toggleCategory(this);"
><div
class=
"category_name"
><span>
お気に入り
</span></div></div>
<div
class=
"category"
onclick=
"CollaborationUI.toggleCategory(this);"
>
<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"
style=
"height: 100vh; overflow:scroll;"
>
<div
class=
"tab_content"
id=
"tab2_content"
>
<div
class=
"breadcrumb"
id=
"groupPathAreaForAddUserInCollaboration"
></div>
<div
class=
"chat_list"
>
<!-- 全グループ -->
...
...
@@ -80,7 +86,7 @@
</div>
</div>
<!-- ルーム解説ボタン -->
<div
class=
"add_user_confirm_btn content"
id=
"addUserConfirmBtnInCollaboration"
style=
"position: fixed;"
>
<div
class=
"add_user_confirm_btn content"
id=
"addUserConfirmBtnInCollaboration"
>
<button
type=
"button"
name=
"button"
id=
"buttonAddUser"
style=
"bottom: 0; width: 100%;"
>
確認
<br>
<span
class=
"select_member_num"
></span><span
class=
"select_member"
>
名 選択中
</span></button>
...
...
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