From 54430fcfe8c11a2c3120ab38acce5a8d66f1ac68 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Tue, 20 Oct 2020 14:52:17 +0200 Subject: [PATCH] add entry point redirect after saml/SSO --- views/partials/account.html | 4 ++-- views/partials/login.html | 8 ++++---- views/partials/team.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/views/partials/account.html b/views/partials/account.html index ebffe75..bbdf760 100644 --- a/views/partials/account.html +++ b/views/partials/account.html @@ -1,13 +1,13 @@ <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> diff --git a/views/partials/login.html b/views/partials/login.html index f2c8b7b..e95fb35 100644 --- a/views/partials/login.html +++ b/views/partials/login.html @@ -1,11 +1,11 @@ <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> diff --git a/views/partials/team.html b/views/partials/team.html index 398f010..69bc874 100644 --- a/views/partials/team.html +++ b/views/partials/team.html @@ -1,6 +1,6 @@ <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> -- GitLab