Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Wolfgang Knopki
Spacedeck-open-SAML
Commits
bdb2e9fd
Commit
bdb2e9fd
authored
Apr 09, 2020
by
mntmn
Browse files
clean up space memberships table; clean up terminate account view
parent
7cf68c94
Changes
4
Hide whitespace changes
Inline
Side-by-side
public/stylesheets/style.css
View file @
bdb2e9fd
...
...
@@ -9647,11 +9647,6 @@ button.close {
outline
:
none
;
display
:
inline-block
;
text-align
:
left
;
-webkit-user-select
:
none
;
-moz-user-select
:
none
;
-ms-user-select
:
none
;
-o-user-select
:
none
;
user-select
:
none
;
border-radius
:
9px
;
background-color
:
#f5f5f5
!important
;
box-shadow
:
0
0
1px
1px
rgba
(
0
,
0
,
0
,
0.05
),
0
2px
7px
rgba
(
0
,
0
,
0
,
0.1
);
}
...
...
styles/modal.scss
View file @
bdb2e9fd
...
...
@@ -135,7 +135,6 @@
outline
:
none
;
display
:
inline-block
;
text-align
:
left
;
@include
user-select
(
none
);
border-radius
:
$radius
*
3
;
background-color
:
$light
!
important
;
...
...
views/partials/account.html
View file @
bdb2e9fd
...
...
@@ -149,27 +149,27 @@
</div>
<div
class=
"collapse"
v-bind:class=
"{in:account=='terminate'}"
>
<div
class=
""
>
<p>
[[__("terminate_warning")]]
</p>
<p>
[[__("terminate_warning2")]]
</p>
</div>
<div
class=
"labels-inline"
>
<h4>
Terminate Account
</h4>
<div
class=
"modal-section labels-inline"
>
<div
class=
"form-group"
>
<label
class=
"label"
>
[[__("current_password")]]
</label>
<input
v-model=
"account_remove_password"
class=
"input input-white no-b"
type=
"password"
>
</div>
<div
class=
"form-group"
>
<label
class=
"label"
>
[[__("terminate_reason")]]
</label>
<textarea
class=
"input input-white no-b"
v-model=
"account_remove_feedback"
></textarea>
<p
class=
"message"
>
[[__("terminate_reason_caption")]]
</p>
</div>
</div>
<div
class=
"modal-section labels-inline"
>
<div
class=
"center alert alert-danger"
v-if=
"account_remove_error"
>
{{account_remove_error}}
</div>
</div>
<button
class=
"btn btn-stroke-darken btn-md"
v-on:click=
"remove_account(account_remove_password, account_remove_feedback)"
>
Terminate Account
</button>
<div
class=
"modal-footer"
>
<button
class=
"btn btn-stroke-darken btn-md"
v-on:click=
"remove_account(account_remove_password, account_remove_feedback)"
>
Terminate Account
</button>
</div>
</div>
</div>
</div>
views/partials/modal/access.html
View file @
bdb2e9fd
...
...
@@ -78,21 +78,26 @@
<h4
class=
"text-left"
><span
class=
"icon icon-user-group icon-sm"
></span>
[[__("access_current_members")]]
</h4>
<table
class=
"table"
>
<tr>
<th>
Icon
</th>
<th></th>
<th>
Email / Name
</th>
<th>
Role
</th>
<th></th>
</tr>
<tr
v-for=
"member in access_settings_memberships"
v-bind:class=
"member.state"
>
<td>
<span
class=
"editor-avatar btn btn-xs btn-round btn-icon"
v-if=
"member.user"
>
{{member.user.initials}}
</span>
<span
class=
"editor-avatar btn btn-xs btn-round btn-icon icon-hourglass"
v-if=
"!member.user"
></span>
<span
class=
"editor-avatar btn btn-md btn-dark btn-icon btn-round"
v-if=
"member.user"
v-bind:style=
"background_image_style([member.user.avatar_thumb_uri])"
v-bind:class=
"{'has-avatar-image':!!member.user.avatar_thumb_uri}"
>
<span
class=
"icon icon-user"
v-if=
"!member.user.avatar_thumb_uri"
></span>
</span>
<span
class=
"editor-avatar btn btn-md btn-round btn-icon icon-hourglass"
v-if=
"!member.user"
></span>
</td>
<td>
<span
class=
"editor-
email"
v-if=
"member.state == 'active'"
>
{{member.user.
email
}}
</span>
<span
class=
"editor-email"
v-if=
"member.state == 'pending'"
>
{{member.email_invited}}
</span>
<span
class=
"editor-
name"
v-if=
"member.state == 'active'"
>
{{member.user.
nickname
}}
</span>
<span
class=
"editor-email"
v-if=
"member.state == 'pending'"
>
(
pending
)
</span>
<span
class=
"editor-
name"
v-if=
"
member.user &&
member.state == 'active'"
>
{{member.user.
nickname
}}
</span>
<span
class=
"editor-email"
v-if=
"
!member.user ||
member.state == 'pending'"
>
(pending)
</span>
<span
class=
"editor-
email"
v-if=
"
member.user &&
member.state == 'active'"
>
(
{{member.user.
email
}}
)
</span>
<span
class=
"editor-email"
v-if=
"
!member.user ||
member.state == 'pending'"
>
(
{{member.email_invited}}
)
</span>
</td>
<td>
<div
class=
"form-group"
>
...
...
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