big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-1999. Basic acceptance test and SCM/OM web UI broken by Bootstrap upgrade (#1327)

Browse Source
This commit is contained in:
Doroszlai, Attila 2019-08-21 21:16:14 +02:00 committed by Bharat Viswanadham
parent 217e74816c
commit 2ae7f444bd
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdds/server-scm/src/main/resources/webapps/scm/index.html
View File

@ -26,7 +26,7 @@
<title>HDFS Storage Container Manager</title> <title>HDFS Storage Container Manager</title>
<link href="static/bootstrap-3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="static/bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet">
<link href="static/hadoop.css" rel="stylesheet"> <link href="static/hadoop.css" rel="stylesheet">
<link href="static/nvd3-1.8.5.min.css" rel="stylesheet"> <link href="static/nvd3-1.8.5.min.css" rel="stylesheet">
@ -63,7 +63,7 @@
</div><!-- /.container --> </div><!-- /.container -->
<script src="static/jquery-3.3.1.min.js"></script> <script src="static/jquery-3.4.1.min.js"></script>
<script src="static/angular-1.6.4.min.js"></script> <script src="static/angular-1.6.4.min.js"></script>
<script src="static/angular-route-1.6.4.min.js"></script> <script src="static/angular-route-1.6.4.min.js"></script>
<script src="static/d3-3.5.17.min.js"></script> <script src="static/d3-3.5.17.min.js"></script>
@ -71,6 +71,6 @@
<script src="static/angular-nvd3-1.0.9.min.js"></script> <script src="static/angular-nvd3-1.0.9.min.js"></script>
<script src="static/ozone.js"></script> <script src="static/ozone.js"></script>
<script src="scm.js"></script> <script src="scm.js"></script>
<script src="static/bootstrap-3.3.7/js/bootstrap.min.js"></script> <script src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

2
hadoop-ozone/dist/src/main/smoketest/basic/basic.robot vendored
View File

@ -26,7 +26,7 @@ ${DATANODE_HOST} datanode
Check webui static resources Check webui static resources
Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit HTTP user Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit HTTP user
${result} = Execute curl --negotiate -u : -s -I http://scm:9876/static/bootstrap-3.3.7/js/bootstrap.min.js ${result} = Execute curl --negotiate -u : -s -I http://scm:9876/static/bootstrap-3.4.1/js/bootstrap.min.js
Should contain ${result} 200 Should contain ${result} 200
Start freon testing Start freon testing

6
hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/index.html
View File

@ -26,7 +26,7 @@
<title>Ozone Manager</title> <title>Ozone Manager</title>
<link href="static/bootstrap-3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="static/bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet">
<link href="static/hadoop.css" rel="stylesheet"> <link href="static/hadoop.css" rel="stylesheet">
<link href="static/nvd3-1.8.5.min.css" rel="stylesheet"> <link href="static/nvd3-1.8.5.min.css" rel="stylesheet">
@ -57,7 +57,7 @@
<ng-view></ng-view> <ng-view></ng-view>
</div><!-- /.container --> </div><!-- /.container -->
<script src="static/jquery-3.3.1.min.js"></script> <script src="static/jquery-3.4.1.min.js"></script>
<script src="static/angular-1.6.4.min.js"></script> <script src="static/angular-1.6.4.min.js"></script>
<script src="static/angular-route-1.6.4.min.js"></script> <script src="static/angular-route-1.6.4.min.js"></script>
<script src="static/d3-3.5.17.min.js"></script> <script src="static/d3-3.5.17.min.js"></script>
@ -65,6 +65,6 @@
<script src="static/angular-nvd3-1.0.9.min.js"></script> <script src="static/angular-nvd3-1.0.9.min.js"></script>
<script src="static/ozone.js"></script> <script src="static/ozone.js"></script>
<script src="ozoneManager.js"></script> <script src="ozoneManager.js"></script>
<script src="static/bootstrap-3.3.7/js/bootstrap.min.js"></script> <script src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

6
hadoop-ozone/s3gateway/src/main/resources/browser.html
View File

@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="static/images/ozone.ico"> <link rel="shortcut icon" href="static/images/ozone.ico">
<link rel="stylesheet" <link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<link rel="stylesheet" <link rel="stylesheet"
href="https://use.fontawesome.com/releases/v5.2.0/css/all.css"> href="https://use.fontawesome.com/releases/v5.2.0/css/all.css">
<link rel="stylesheet" <link rel="stylesheet"
@ -138,8 +138,8 @@
</html> </html>
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"></script>
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.207.0.min.js"></script> <script src="https://sdk.amazonaws.com/js/aws-sdk-2.207.0.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.0/moment.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.0/moment.min.js"></script>

4
hadoop-ozone/s3gateway/src/main/resources/webapps/static/index.html
View File

@ -26,7 +26,7 @@
<title>S3 gateway -- Apache Hadoop Ozone</title> <title>S3 gateway -- Apache Hadoop Ozone</title>
<link href="bootstrap-3.3.7/css/bootstrap.min.css" rel="stylesheet"> <link href="bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet">
<link href="hadoop.css" rel="stylesheet"> <link href="hadoop.css" rel="stylesheet">
<link href="ozone.css" rel="stylesheet"> <link href="ozone.css" rel="stylesheet">
@ -74,6 +74,6 @@ <h1>S3 gateway</h1>
</p> </p>
</div><!-- /.container --> </div><!-- /.container -->
<script src="static/bootstrap-3.3.7/js/bootstrap.min.js"></script> <script src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>