moved common static files in common module
This commit is contained in:
parent
77b3750a3a
commit
75615694da
|
@ -49,7 +49,7 @@ public class MockSecurityConfig extends WebSecurityConfigurerAdapter {
|
||||||
.hasAnyRole(OpenOrgsConstants.VALID_ROLES)
|
.hasAnyRole(OpenOrgsConstants.VALID_ROLES)
|
||||||
.antMatchers("/registration_api/**")
|
.antMatchers("/registration_api/**")
|
||||||
.hasRole(OpenOrgsConstants.NOT_AUTORIZED_ROLE)
|
.hasRole(OpenOrgsConstants.NOT_AUTORIZED_ROLE)
|
||||||
.antMatchers("/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
|
.antMatchers("/common/**", "/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
|
||||||
.permitAll()
|
.permitAll()
|
||||||
.antMatchers("/oa_api/**")
|
.antMatchers("/oa_api/**")
|
||||||
.permitAll()
|
.permitAll()
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class OAuth2WebSecurityConfig extends WebSecurityConfigurerAdapter {
|
||||||
.hasAnyRole(OpenOrgsConstants.VALID_ROLES)
|
.hasAnyRole(OpenOrgsConstants.VALID_ROLES)
|
||||||
.antMatchers("/registration_api/**")
|
.antMatchers("/registration_api/**")
|
||||||
.hasRole(OpenOrgsConstants.NOT_AUTORIZED_ROLE)
|
.hasRole(OpenOrgsConstants.NOT_AUTORIZED_ROLE)
|
||||||
.antMatchers("/", "/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
|
.antMatchers("/", "/common/**", "/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
|
||||||
.permitAll()
|
.permitAll()
|
||||||
.antMatchers("/oa_api/**")
|
.antMatchers("/oa_api/**")
|
||||||
.hasIpAddress(openaireApiValidSubnet)
|
.hasIpAddress(openaireApiValidSubnet)
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
<meta http-equiv="Expires" content="0">
|
<meta http-equiv="Expires" content="0">
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
|
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
|
||||||
<!-- Icons CSS -->
|
<!-- Icons CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/fontawesome-all.min.css">
|
<link rel="stylesheet" href="common/css/fontawesome-all.min.css">
|
||||||
|
|
||||||
<title>Organizations Database: user already registered</title>
|
<title>Organizations Database: user already registered</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
<meta http-equiv="Expires" content="0">
|
<meta http-equiv="Expires" content="0">
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
|
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
|
||||||
<!-- Icons CSS -->
|
<!-- Icons CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/fontawesome-all.min.css">
|
<link rel="stylesheet" href="common/css/fontawesome-all.min.css">
|
||||||
|
|
||||||
<title>Organizations Database: authorization request</title>
|
<title>Organizations Database: authorization request</title>
|
||||||
</head>
|
</head>
|
||||||
|
@ -64,14 +64,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="resources/js/jquery-3.4.1.min.js"></script>
|
<script src="common/js/jquery-3.4.1.min.js"></script>
|
||||||
<script src="resources/js/popper.min.js"></script>
|
<script src="common/js/popper.min.js"></script>
|
||||||
<script src="resources/js/bootstrap.min.js"></script>
|
<script src="common/js/bootstrap.min.js"></script>
|
||||||
<script src="resources/js/jquery-3.4.1.min.js"></script>
|
<script src="common/js/jquery-3.4.1.min.js"></script>
|
||||||
<script src="resources/js/popper.min.js"></script>
|
<script src="common/js/popper.min.js"></script>
|
||||||
<script src="resources/js/bootstrap.min.js"></script>
|
<script src="common/js/bootstrap.min.js"></script>
|
||||||
<script src="resources/js/angular.min.js"></script>
|
<script src="common/js/angular.min.js"></script>
|
||||||
<script src='resources/js/checklist-model.js'></script>
|
<script src='common/js/checklist-model.js'></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
angular.module('authReqApp', ['checklist-model']).controller('authReqCtrl', function($scope, $http) {
|
angular.module('authReqApp', ['checklist-model']).controller('authReqCtrl', function($scope, $http) {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<meta http-equiv="Expires" content="0">
|
<meta http-equiv="Expires" content="0">
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
|
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
|
||||||
|
|
||||||
<title>Organizations Database: Login</title>
|
<title>Organizations Database: Login</title>
|
||||||
</head>
|
</head>
|
||||||
|
@ -64,9 +64,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="resources/js/jquery-3.4.1.min.js"></script>
|
<script src="common/js/jquery-3.4.1.min.js"></script>
|
||||||
<script src="resources/js/popper.min.js"></script>
|
<script src="common/js/popper.min.js"></script>
|
||||||
<script src="resources/js/bootstrap.min.js"></script>
|
<script src="common/js/bootstrap.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$('#tabList a').on('click', function (e) {
|
$('#tabList a').on('click', function (e) {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<meta http-equiv="Expires" content="0">
|
<meta http-equiv="Expires" content="0">
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
|
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
|
||||||
|
|
||||||
<title>Organizations Database: Login</title>
|
<title>Organizations Database: Login</title>
|
||||||
</head>
|
</head>
|
||||||
|
@ -69,9 +69,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="resources/js/jquery-3.4.1.min.js"></script>
|
<script src="common/js/jquery-3.4.1.min.js"></script>
|
||||||
<script src="resources/js/popper.min.js"></script>
|
<script src="common/js/popper.min.js"></script>
|
||||||
<script src="resources/js/bootstrap.min.js"></script>
|
<script src="common/js/bootstrap.min.js"></script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
<meta http-equiv="Expires" content="0">
|
<meta http-equiv="Expires" content="0">
|
||||||
|
|
||||||
<!-- Bootstrap CSS -->
|
<!-- Bootstrap CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
|
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
|
||||||
<!-- Icons CSS -->
|
<!-- Icons CSS -->
|
||||||
<link rel="stylesheet" href="resources/css/fontawesome-all.min.css">
|
<link rel="stylesheet" href="common/css/fontawesome-all.min.css">
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
.table > tbody > tr > td { vertical-align : middle !important; }
|
.table > tbody > tr > td { vertical-align : middle !important; }
|
||||||
|
@ -157,14 +157,15 @@ fieldset > legend { font-size : 1.2rem !important; }
|
||||||
function currentUser() { return document.getElementById('current_user').textContent; }
|
function currentUser() { return document.getElementById('current_user').textContent; }
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script src="resources/js/jquery-3.4.1.min.js"></script>
|
<script src="common/js/jquery-3.4.1.min.js"></script>
|
||||||
<script src="resources/js/popper.min.js"></script>
|
<script src="common/js/popper.min.js"></script>
|
||||||
<script src="resources/js/bootstrap.min.js"></script>
|
<script src="common/js/bootstrap.min.js"></script>
|
||||||
<script src="resources/js/angular.min.js"></script>
|
<script src="common/js/angular.min.js"></script>
|
||||||
<script src="resources/js/angular-route.min.js"></script>
|
<script src="common/js/angular-route.min.js"></script>
|
||||||
<script src='resources/js/checklist-model.js'></script>
|
<script src='common/js/checklist-model.js'></script>
|
||||||
|
<script src="common/js/spin.js"></script>
|
||||||
|
|
||||||
<script src="resources/js/organizations.js"></script>
|
<script src="resources/js/organizations.js"></script>
|
||||||
<script src="resources/js/spin.js"></script>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// Spinner show/hide methods ~ Andrea Mannocci
|
// Spinner show/hide methods ~ Andrea Mannocci
|
||||||
|
|
Before Width: | Height: | Size: 684 KiB After Width: | Height: | Size: 684 KiB |
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 141 KiB |
Before Width: | Height: | Size: 823 KiB After Width: | Height: | Size: 823 KiB |
Loading…
Reference in New Issue