Skip to content

S
spring-boot-admin
Commit 3c26eb9f by Johannes Edmeier
Options

Use relative paths for login/logout

fixes #489
parent 87e12dde
Showing with 42 additions and 46 deletions
spring-boot-admin-server-ui-hystrix/yarn.lock
......@@ -1903,7 +1903,7 @@ mime@^1.3.4:
dependencies:
brace-expansion "^1.1.7"
minimist@0.0.8:
minimist@0.0.8, minimist@~0.0.1:
version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
......@@ -1911,10 +1911,6 @@ minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
minimist@~0.0.1:
version "0.0.10"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
......
spring-boot-admin-server-ui-login/src/main/resources/META-INF/spring-boot-admin-server-ui/login.html
......@@ -2,57 +2,57 @@
<html class="no-js">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Spring Boot Admin</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<link rel="shortcut icon" type="image/x-icon" href="img/favicon.png" />
<link rel="stylesheet" type="text/css" href="core.css" />
<link rel="stylesheet" type="text/css" href="login.css" />
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Spring Boot Admin</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<link rel="shortcut icon" type="image/x-icon" href="img/favicon.png"/>
<link rel="stylesheet" type="text/css" href="core.css"/>
<link rel="stylesheet" type="text/css" href="login.css"/>
</head>
<body>
<header class="navbar header--navbar desktop-only">
<header class="navbar header--navbar desktop-only">
<div class="navbar-inner">
<div class="container-fluid">
<div class="container-fluid">
<div class="spring-logo--container">
<a class="spring-logo" href="#"><span></span></a>
<div class="spring-logo--container">
<a class="spring-logo" href="#"><span></span></a>
</div>
<div class="spring-logo--container">
<a class="spring-boot-logo" href="#"><span></span></a>
</div>
</div>
<div class="spring-logo--container">
<a class="spring-boot-logo" href="#"><span></span></a>
</div>
</div>
</div>
</header>
</header>
<div class="container">
<form class="form-login" action="/login" method="post">
<h2 class="form-login-heading">Login</h2>
<div id="login-controls" class="control-group">
<input type="text" class="input-block-level" name="username" placeholder="Username">
<input type="password" class="input-block-level" name="password" placeholder="Password">
<span class="help-inline error-message">Invalid username or password!</div>
<div class="container">
<form class="form-login" action="login" method="post">
<h2 class="form-login-heading">Login</h2>
<div id="login-controls" class="control-group">
<input type="text" class="input-block-level" name="username" placeholder="Username">
<input type="password" class="input-block-level" name="password" placeholder="Password">
<span class="help-inline error-message">Invalid username or password!</div>
<input type="submit" class="btn btn-success" value="Login"></input>
</div>
</form>
</div>
</div>
</form>
</div>
<script type="text/javascript">
if (/\?error/.test(window.location.href)) {
document.getElementById("login-controls").classList.add("error")
}
</script>
<script type="text/javascript">
if (/\?error/.test(window.location.href)) {
document.getElementById("login-controls").classList.add("error")
}
</script>
<footer class="footer">
<ul class="inline">
<li><a href="https://codecentric.github.io/spring-boot-admin/@project.version@" target="_blank">Reference Guide</a></li>
<li>-</li>
<li><a href="https://github.com/codecentric/spring-boot-admin" target="_blank">Sources</a></li>
<li>-</li>
<li>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a></li>
</ul>
<ul class="inline">
<li><a href="https://codecentric.github.io/spring-boot-admin/@project.version@" target="_blank">Reference Guide</a></li>
<li>-</li>
<li><a href="https://github.com/codecentric/spring-boot-admin" target="_blank">Sources</a></li>
<li>-</li>
<li>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License 2.0</a></li>
</ul>
</footer>
</body>
......
spring-boot-admin-server-ui-login/src/main/resources/META-INF/spring-boot-admin-server-ui/login/module.js
......@@ -25,7 +25,7 @@
module.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('logout', {
template: '<form id="logout-form" action="/logout" method="post"></form>',
template: '<form id="logout-form" action="logout" method="post"></form>',
name: 'logout',
url: '/logout',
controller: 'logoutCtrl'
......@@ -39,4 +39,4 @@
order: 9999
});
}]);
} (sbaModules, angular));
}(sbaModules, angular));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment