Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hadoop-hdds/server-scm/src/main/resources/webapps/scm/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<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/nvd3-1.8.5.min.css" rel="stylesheet">

Expand Down Expand Up @@ -63,14 +63,14 @@

</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-route-1.6.4.min.js"></script>
<script src="static/d3-3.5.17.min.js"></script>
<script src="static/nvd3-1.8.5.min.js"></script>
<script src="static/angular-nvd3-1.0.9.min.js"></script>
<script src="static/ozone.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>
</html>
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ${DATANODE_HOST} datanode

Check webui static resources
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

Start freon testing
Expand Down
6 changes: 3 additions & 3 deletions hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<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/nvd3-1.8.5.min.css" rel="stylesheet">

Expand Down Expand Up @@ -57,14 +57,14 @@
<ng-view></ng-view>
</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-route-1.6.4.min.js"></script>
<script src="static/d3-3.5.17.min.js"></script>
<script src="static/nvd3-1.8.5.min.js"></script>
<script src="static/angular-nvd3-1.0.9.min.js"></script>
<script src="static/ozone.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>
</html>
6 changes: 3 additions & 3 deletions hadoop-ozone/s3gateway/src/main/resources/browser.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="static/images/ozone.ico">
<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"
href="https://use.fontawesome.com/releases/v5.2.0/css/all.css">
<link rel="stylesheet"
Expand Down Expand Up @@ -138,8 +138,8 @@

</html>

<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://code.jquery.com/jquery-3.4.1.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://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>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/s3gateway/src/main/resources/webapps/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<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="ozone.css" rel="stylesheet">

Expand Down Expand Up @@ -74,6 +74,6 @@ <h1>S3 gateway</h1>
</p>
</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>
</html>