Skip to content

HDDS-2000. Don't depend on bootstrap/jquery versions from hadoop-trun… #1339

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

Closed
wants to merge 1 commit into from
Closed

HDDS-2000. Don't depend on bootstrap/jquery versions from hadoop-trun… #1339

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
2 changes: 1 addition & 1 deletion hadoop-hdds/docs/themes/ozonedoc/layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="{{ "js/jquery.min.js" | relURL}}"></script>
<script src="{{ "js/jquery-3.4.1.min.js" | relURL}}"></script>
<script src="{{ "js/ozonedoc.js" | relURL}}"></script>
<script src="{{ "js/bootstrap.min.js" | relURL}}"></script>
7 changes: 6 additions & 1 deletion hadoop-hdds/docs/themes/ozonedoc/layouts/partials/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand hidden-xs" href="#">Apache Hadoop Ozone/HDDS documentation</a>
<a href="#" class="navbar-left" style="height: 50px; padding: 5px 5px 5px 0;">
<img src="ozone-logo-small.png" width="40"/>
</a>
<a class="navbar-brand hidden-xs" href="#">
Apache Hadoop Ozone/HDDS documentation
</a>
<a class="navbar-brand visible-xs-inline" href="#">Hadoop Ozone</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
6 changes: 3 additions & 3 deletions hadoop-hdds/docs/themes/ozonedoc/static/css/bootstrap-theme.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hadoop-hdds/docs/themes/ozonedoc/static/css/bootstrap-theme.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions hadoop-hdds/docs/themes/ozonedoc/static/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hadoop-hdds/docs/themes/ozonedoc/static/css/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions hadoop-hdds/docs/themes/ozonedoc/static/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions hadoop-hdds/docs/themes/ozonedoc/static/js/jquery-3.4.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions hadoop-hdds/docs/themes/ozonedoc/static/js/jquery.min.js
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions hadoop-hdds/framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,4 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy web resources</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<copy toDir="${project.build.directory}/classes/webapps/static">
<fileset
dir="${basedir}/../../hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static">
</fileset>
</copy>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading