diff options
author | Jeremy Plsek <jplsek@iol.unh.edu> | 2019-12-20 10:50:41 -0500 |
---|---|---|
committer | Jeremy Plsek <jplsek@iol.unh.edu> | 2020-02-17 16:01:03 -0500 |
commit | d63a08e56716358ea4daa30d3050fa01df65a837 (patch) | |
tree | 10873a809c29492efcc1988cc65ccf8cf054f7e7 /src/templates/base/layout.html | |
parent | 80f9bb0bb514133363bd0a40edb8b10ddb8d3a51 (diff) |
js: use npm instead of bower
Bower is considered deprecated, so switch to npm.
- Update all dependencies
- Use npm's version of mxgraph
- Use npm's version of jquery
- Use npm's version of plotly
- Fix mxgraph to use styles and images from the correct location
- Removed random csrf token input in nav bar and use js to get csrf
token
- Remove all calendar and some resource files since they were not used
Change-Id: I30d6bd91cded9547caa4c0a5247cd9f214fe9798
Signed-off-by: Jeremy Plsek <jplsek@iol.unh.edu>
Diffstat (limited to 'src/templates/base/layout.html')
-rw-r--r-- | src/templates/base/layout.html | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/templates/base/layout.html b/src/templates/base/layout.html index eac0ac3..f35f1a7 100644 --- a/src/templates/base/layout.html +++ b/src/templates/base/layout.html @@ -13,19 +13,20 @@ <title>OPNFV Laas {{ title }}</title> <!-- Bootstrap Core CSS --> - <link href="{% static "bower_components/bootstrap/dist/css/bootstrap.min.css" %}" + <link href="{% static "node_modules/bootstrap/dist/css/bootstrap.min.css" %}" rel="stylesheet"> <!-- Custom Fonts --> - <link href="{% static "bower_components/Font-Awesome/css/all.min.css" %}" + <link href="{% static "node_modules/@fortawesome/fontawesome-free/css/all.min.css" %}" rel="stylesheet" type="text/css"> <link href="{% static "css/base.css" %}" rel="stylesheet"> <!-- Favicon --> <link rel="shortcut icon" href="{% static 'favicon.ico' %}"> - <script src="https://code.jquery.com/jquery-2.2.4.min.js" - integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script> + + <!-- jQuery --> + <script src="{% static "node_modules/jquery/dist/jquery.min.js" %}"></script> {% block extrahead %} {% endblock extrahead %} @@ -36,7 +37,6 @@ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> <![endif]--> - </head> {% block extrastyle %} @@ -46,14 +46,10 @@ {% block basecontent %} {% endblock basecontent %} -{#<!-- jQuery -->#} -{#<script src="{% static "bower_components/jquery/dist/jquery.min.js" %}"></script>#} -{#<script src="{% static "bower_components/jquery-migrate/jquery-migrate.min.js" %}"></script>#} <!-- Popper.js --> -<script src="{% static "bower_components/popper.js/dist/umd/popper.min.js" %}"></script> -{#<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script>#} +<script src="{% static "node_modules/popper.js/dist/umd/popper.min.js" %}"></script> <!-- Bootstrap Core JavaScript --> -<script src="{% static "bower_components/bootstrap/dist/js/bootstrap.min.js" %}"></script> +<script src="{% static "node_modules/bootstrap/dist/js/bootstrap.min.js" %}"></script> {% block extrajs %} {% endblock extrajs %} |