Skip to content

Commit

Permalink
move to cdn js and css delivery
Browse files Browse the repository at this point in the history
  • Loading branch information
ivukotic committed Nov 8, 2024
1 parent 58a5c43 commit 7dd937a
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 31,127 deletions.
7 changes: 0 additions & 7 deletions portal/static/css/bootstrap.min.css

This file was deleted.

6 changes: 0 additions & 6 deletions portal/static/css/fontawesome.all.min.css

This file was deleted.

755 changes: 0 additions & 755 deletions portal/static/css/jexcel.css

This file was deleted.

1 change: 0 additions & 1 deletion portal/static/css/jquery.dataTables.min.css

This file was deleted.

2,837 changes: 0 additions & 2,837 deletions portal/static/css/jsuites.css

This file was deleted.

7 changes: 0 additions & 7 deletions portal/static/js/bootstrap.bundle.min.js

This file was deleted.

14,970 changes: 0 additions & 14,970 deletions portal/static/js/jexcel.js

This file was deleted.

2 changes: 0 additions & 2 deletions portal/static/js/jquery-3.6.0.min.js

This file was deleted.

192 changes: 0 additions & 192 deletions portal/static/js/jquery.dataTables.min.js

This file was deleted.

4 changes: 0 additions & 4 deletions portal/static/js/jquery.validate.min.js

This file was deleted.

12,333 changes: 0 additions & 12,333 deletions portal/static/js/jsuites.js

This file was deleted.

32 changes: 23 additions & 9 deletions portal/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,29 @@
<meta charset="UTF-8">
<meta name="description" content="ATLAS Analysis Facility at UChicago">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" type="image/vnd.microsoft.icon" href="{{ url_for('static', filename='img/atlas-favicon.ico') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/fontawesome.all.min.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/jquery.dataTables.min.css') }}">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
integrity="sha512-Kc323vGBEqzTmouAECnVceyQqyqdsSiqLQISBL29aUW4U/M7pSPA/gEUZQqv1cwx4OnYxTxve5UMg5GT6L4JJg=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/2.1.8/css/dataTables.dataTables.min.css">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css2?family=Open+Sans">
<script type="text/javascript" src="{{ url_for('static', filename='js/jquery-3.6.0.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.bundle.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/jquery.validate.min.js') }}"></script>

<script src="https://code.jquery.com/jquery-3.7.1.min.js"
integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo="
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
crossorigin="anonymous"></script>
<script type="text/javascript" src="https://cdn.datatables.net/2.1.8/js/dataTables.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.21.0/jquery.validate.min.js"
integrity="sha512-KFHXdr2oObHKI9w4Hv1XPKc898mE4kgYx58oqsc/JqqdLMDI4YjOLzom+EMlW8HFUd0QfjfAvxSL6sEq/a42fQ=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>

{% block assets %} {% endblock %}
</head>

Expand Down Expand Up @@ -113,7 +126,8 @@
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="https://atlas-kibana.mwt2.org:5601/s/analysis-facility/app/dashboards?auth_provider_hint=anonymous1#/view/8bb58440-6145-11ed-afcf-d91dad577662?_g=()&_a=()">Dashboard</a>
<a class="nav-link"
href="https://atlas-kibana.mwt2.org:5601/s/analysis-facility/app/dashboards?auth_provider_hint=anonymous1#/view/8bb58440-6145-11ed-afcf-d91dad577662?_g=()&_a=()">Dashboard</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('about') }}">About</a>
Expand Down Expand Up @@ -178,4 +192,4 @@
});
</script>

</html>
</html>
16 changes: 12 additions & 4 deletions portal/templates/users.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@
{% block title %} User info {% endblock %}

{% block assets %}
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/jexcel.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/jsuites.css') }}">
<script type="text/javascript" src="{{ url_for('static', filename='js/jexcel.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/jsuites.js') }}"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jexcel/4.6.1/jexcel.min.css"
integrity="sha512-zOuPgiv3SH9SHCF0STTxwwmpyR1bZyr3NLe5FZJQN3WDLJAZXvEJ2ja7xQPyRUUcsyYS9ZnXcRhUq5W0ys2LjA=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jsuites/5.7.1/jsuites.min.css"
integrity="sha512-OpLahQb2MZobRdrvEWQPzZ14Nnb/To6WbKIV0LzlU9/Jc/Dxi12K61DdgjJzOM3LyGBRnBs5jJm+mD95xoFDOA=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/jexcel/4.6.1/jexcel.min.js"
integrity="sha512-TFb0BBBoMRJZ4nFqwtuJv7E+eAttxt0LaKobnfH9U79r2AM7qxBpi7hO7O+XlSxGP9NbI1F8UBSowK9dVmQd2Q=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jsuites/5.7.1/jsuites.min.js"
integrity="sha512-bELJ/gF8lBHU+vwLrGGyrVsnxzA4BmgtA3wC8tQXHCROOTt1hjITGaDoy55xkcwUk4Y04IdEUnaBT+I28FjV6g=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Material+Icons" />
{% endblock %}

Expand Down

0 comments on commit 7dd937a

Please sign in to comment.