Skip to content

Commit

Permalink
Merge pull request #969 from guydavis/develop
Browse files Browse the repository at this point in the history
Merge fix for broken Datatables.js import
  • Loading branch information
guydavis authored Feb 22, 2024
2 parents d7c163a + 1d2696e commit f65f728
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion scripts/pull_3rd_party_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LEAFLET_VERSION=1.9.4
LIST="
https://cdn.datatables.net/2.0.0/css/dataTables.bootstrap5.css
https://cdn.datatables.net/2.0.0/js/dataTables.bootstrap5.js
https://cdn.datatables.net/2.0.0/js/jquery.dataTables.js
https://cdn.datatables.net/2.0.0/js/dataTables.min.js
https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.js.map
https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js
https://cdn.jsdelivr.net/npm/[email protected]/dist/chartjs-adapter-luxon.umd.min.js
Expand Down
2 changes: 1 addition & 1 deletion web/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<script src="{{ url_for('static', filename='3rd_party/bootstrap.bundle.min.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/jquery.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/jquery.dataTables.js') }}"></script>
src="{{ url_for('static', filename='3rd_party/dataTables.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/dataTables.bootstrap5.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/chart.umd.min.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion web/templates/charts/container_memory.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<script src="{{ url_for('static', filename='3rd_party/bootstrap.bundle.min.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/jquery.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/jquery.dataTables.js') }}"></script>
src="{{ url_for('static', filename='3rd_party/dataTables.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/dataTables.bootstrap5.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/chart.umd.min.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion web/templates/charts/farmed.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h2 class="text-center">{{_('Farmed Blocks')}}</h2>
<script src="{{ url_for('static', filename='3rd_party/bootstrap.bundle.min.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/jquery.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/jquery.dataTables.js') }}"></script>
src="{{ url_for('static', filename='3rd_party/dataTables.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/dataTables.bootstrap5.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/chart.umd.min.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion web/templates/charts/netspace.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<script src="{{ url_for('static', filename='3rd_party/bootstrap.bundle.min.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/jquery.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/jquery.dataTables.js') }}"></script>
src="{{ url_for('static', filename='3rd_party/dataTables.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/dataTables.bootstrap5.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/chart.umd.min.js') }}"></script>
Expand Down
2 changes: 1 addition & 1 deletion web/templates/transactions.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ <h6>{{_('Also ensure the blockchain fullnode is not Offline, by checking the Wor
<script src="{{ url_for('static', filename='3rd_party/bootstrap.bundle.min.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/jquery.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/jquery.dataTables.js') }}"></script>
src="{{ url_for('static', filename='3rd_party/dataTables.min.js') }}"></script>
<script type="text/javascript" charset="utf8"
src="{{ url_for('static', filename='3rd_party/dataTables.bootstrap5.js') }}"></script>
<script src="{{ url_for('static', filename='3rd_party/chart.umd.min.js') }}"></script>
Expand Down

0 comments on commit f65f728

Please sign in to comment.