Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
54430fcf
Commit
54430fcf
authored
4 years ago
by
Wolfgang Knopki
Browse files
Options
Download
Email Patches
Plain Diff
add entry point redirect after saml/SSO
parent
aa52563d
master
saml-integration
1 merge request
!4
Saml integration
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
views/partials/account.html
+2
-2
views/partials/account.html
views/partials/login.html
+4
-4
views/partials/login.html
views/partials/team.html
+1
-1
views/partials/team.html
with
7 additions
and
7 deletions
+7
-7
views/partials/account.html
+
2
-
2
View file @
54430fcf
<header
id=
"dialog-header"
class=
"header"
v-if=
"(active_view == 'account' && user)"
v-cloak
>
<div
v-cloak
class=
"header-left pull-left"
>
<a
class=
"btn btn-dark btn-md btn-round btn-icon"
href=
"/spaces"
>
<a
class=
"btn btn-dark btn-md btn-round btn-icon"
href=
"
<%= config.endpoint %>
/spaces"
>
<span
class=
"icon icon-svg icon-sd6"
></span>
</a>
<h5>
Edit Account
</h5>
</div>
<div
class=
"header-right pull-right"
>
<a
class=
"btn btn-dark btn-md btn-round btn-icon"
href=
"/spaces"
>
<a
class=
"btn btn-dark btn-md btn-round btn-icon"
href=
"
<%= config.endpoint %>
/spaces"
>
<span
class=
"icon icon-cross-0"
></span>
</a>
</div>
...
...
This diff is collapsed.
Click to expand it.
views/partials/login.html
+
4
-
4
View file @
54430fcf
<header
id=
"landing-header"
class=
"header"
v-cloak
v-if=
"(active_view == 'login' || active_view == 'signup' || active_view == 'password-reset' || active_view == 'password-confirm')"
>
<div
class=
"header-left"
>
<a
class=
"btn btn-transparent btn-nude"
href=
"
/"
><img
src=
"
/images/sd6-logo-black.svg"
width=
"190"
></a>
<a
class=
"btn btn-transparent btn-nude"
href=
"
<%= config.endpoint %>/"
><img
src=
"<%= config.endpoint %>
/images/sd6-logo-black.svg"
width=
"190"
></a>
</div>
<div
class=
"header-right pull-right"
>
<a
v-if=
"active_view != 'login'"
class=
"btn btn-md btn-dark btn-round"
href=
"/login"
><
%=
__
("
login
")
%
></a>
<a
v-if=
"active_view != 'signup'"
class=
"btn btn-md btn-dark btn-round"
href=
"/signup"
><
%=
__
("
signup
")
%
></a>
<a
v-if=
"active_view != 'login'"
class=
"btn btn-md btn-dark btn-round"
href=
"
<%= config.endpoint %>
/login"
><
%=
__
("
login
")
%
></a>
<a
v-if=
"active_view != 'signup'"
class=
"btn btn-md btn-dark btn-round"
href=
"
<%= config.endpoint %>
/signup"
><
%=
__
("
signup
")
%
></a>
</div>
</header>
...
...
@@ -36,7 +36,7 @@
<div
class=
"center alert alert-danger"
v-if=
"login_error"
>
{{login_error}}
</div>
<div
style=
"margin-top:2em"
>
<a
href=
"/password-reset"
>
Forgot Password
</a>
<a
href=
"
<%= config.endpoint %>
/password-reset"
>
Forgot Password
</a>
</div>
</form>
</div>
...
...
This diff is collapsed.
Click to expand it.
views/partials/team.html
+
1
-
1
View file @
54430fcf
<div
id=
"team"
class=
"dialog in"
style=
"padding:100px;z-index:20000;position:absolute;width:100%;min-height:100%;background-color:#fafafa"
v-if=
"active_view == 'team' && user"
v-cloak
>
<a
href=
"/spaces"
class=
"btn btn-round btn-icon btn-stroke-darken btn-md pull-right"
style=
"position:absolute;top:30px;right:30px"
><span
class=
"icon icon-cross-0"
></span></a>
<a
href=
"
<%= config.endpoint %>
/spaces"
class=
"btn btn-round btn-icon btn-stroke-darken btn-md pull-right"
style=
"position:absolute;top:30px;right:30px"
><span
class=
"icon icon-cross-0"
></span></a>
<h4>
Spacedeck Team Management
</h4>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets