Skip to content

Commit

Permalink
Migrate static files to 'vendor' directory when they are not custom f…
Browse files Browse the repository at this point in the history 
…iles

This should ease future dependencies update
  • Loading branch information
@Augustin-FL
Augustin-FL committed Jan 3, 2025
1 parent 8bc81db commit eb08124
Show file tree
Hide file tree
Showing 39 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion fir_artifacts/templates/fir_artifacts/plugins/details_static.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% load static %}
<script src="{% static "fir_artifacts/js/tooltips.js" %}"></script>
<script src="{% static "js/popper.min.js" %}"></script>
<script src="{% static "vendor/popper/popper.min.js" %}"></script>
6 changes: 3 additions & 3 deletions fir_todos/templates/fir_todos/plugins/details_static.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load static %}
<script src="{% static "fir_todos/js/todos.js" %}"></script>
<script src="{% static "select/select2.min.js" %}"></script>
<link href="{% static "select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "select/select2-bootstrap.css" %}" rel="stylesheet"/>
<script src="{% static "vendor/select/select2.min.js" %}"></script>
<link href="{% static "vendor/select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2-bootstrap.css" %}" rel="stylesheet"/>
<link href="{% static "fir_todos/css/todos.css" %}" rel="stylesheet" />
2 changes: 1 addition & 1 deletion fir_todos/templates/fir_todos/plugins/followup_static.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load static %}
<script src="{% static "js/jquery.min.js" %}"></script>
<script src="{% static "vendor/jquery/jquery.min.js" %}"></script>
<script src="{% static "fir_todos/js/followup.js" %}"></script>
<link href="{% static "fir_todos/css/todos.css" %}" rel="stylesheet" />
5 changes: 0 additions & 5 deletions incidents/static/css/bootstrap-icons.min.css
View file

This file was deleted.

5 changes: 5 additions & 0 deletions incidents/static/vendor/bootstrap-icons/bootstrap-icons.min.css
View file

Large diffs are not rendered by default.

0 incidents/static/fonts/bootstrap-icons.woff → ...ootstrap-icons/fonts/bootstrap-icons.woff
View file
File renamed without changes.
0 incidents/static/fonts/bootstrap-icons.woff2 → ...otstrap-icons/fonts/bootstrap-icons.woff2
View file
File renamed without changes.
0 incidents/static/css/bootstrap.min.css → ...static/vendor/bootstrap/bootstrap.min.css
View file
File renamed without changes.
0 incidents/static/js/bootstrap.min.js → .../static/vendor/bootstrap/bootstrap.min.js
View file
File renamed without changes.
0 incidents/static/js/excellentexport.js → ...vendor/excellentexport/excellentexport.js
View file
File renamed without changes.
0 ...ic/fonts/glyphicons-halflings-regular.eot → ...yphicons/glyphicons-halflings-regular.eot
View file
File renamed without changes.
0 ...ic/fonts/glyphicons-halflings-regular.svg → ...yphicons/glyphicons-halflings-regular.svg
View file
File renamed without changes
0 ...ic/fonts/glyphicons-halflings-regular.ttf → ...yphicons/glyphicons-halflings-regular.ttf
View file
File renamed without changes.
0 ...c/fonts/glyphicons-halflings-regular.woff → ...phicons/glyphicons-halflings-regular.woff
View file
File renamed without changes.
0 incidents/static/css/jquery-ui.min.css → ...ts/static/vendor/jquery/jquery-ui.min.css
View file
File renamed without changes.
0 incidents/static/js/jquery-ui.min.js → ...nts/static/vendor/jquery/jquery-ui.min.js
View file
File renamed without changes.
0 incidents/static/js/jquery.min.js → incidents/static/vendor/jquery/jquery.min.js
View file
File renamed without changes.
0 incidents/static/momentjs/moment.min.js → ...ents/static/vendor/momentjs/moment.min.js
View file
File renamed without changes.
0 incidents/static/js/d3.v3.min.js → incidents/static/vendor/nvd3/d3.v3.min.js
View file
File renamed without changes.
0 incidents/static/css/nv.d3.min.css → incidents/static/vendor/nvd3/nv.d3.min.css
View file
File renamed without changes.
0 incidents/static/js/nv.d3.min.js → incidents/static/vendor/nvd3/nv.d3.min.js
View file
File renamed without changes.
0 incidents/static/js/popper.min.js → incidents/static/vendor/popper/popper.min.js
View file
File renamed without changes.
0 ...dents/static/select/select2-bootstrap.css → ...tatic/vendor/select/select2-bootstrap.css
View file
File renamed without changes.
0 incidents/static/select/select2-spinner.gif → .../static/vendor/select/select2-spinner.gif
View file
File renamed without changes
0 incidents/static/select/select2.css → incidents/static/vendor/select/select2.css
View file
File renamed without changes.
0 incidents/static/select/select2.min.js → ...dents/static/vendor/select/select2.min.js
View file
File renamed without changes.
0 incidents/static/select/select2.png → incidents/static/vendor/select/select2.png
View file
File renamed without changes
0 incidents/static/select/select2x2.png → incidents/static/vendor/select/select2x2.png
View file
File renamed without changes
18 changes: 9 additions & 9 deletions incidents/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@


<!-- Le styles -->
<link href="{% static "css/jquery-ui.min.css" %}" rel="stylesheet">
<link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "css/bootstrap-icons.min.css" %}" rel="stylesheet">
<link href="{% static "vendor/jquery/jquery-ui.min.css" %}" rel="stylesheet">
<link href="{% static "vendor/bootstrap/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "vendor/bootstrap-icons/bootstrap-icons.min.css" %}" rel="stylesheet">
<link href="{% static "custom_css/fir.css" %}" rel="stylesheet">
{% block custom_js_top %}{% endblock %}
{% block custom_css %}{% endblock%}
Expand Down Expand Up @@ -118,12 +118,12 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
<script src="{% static "js/jquery-ui.min.js" %}"></script>
<script type="text/javascript" src="{% static "momentjs/moment.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/bootstrap.min.js" %}"></script>
<script type="text/javascript" src="{% static "custom_js/ajax.js" %}"></script>
<script type="text/javascript" src="{% static "custom_js/auto_ajax.js" %}"></script>
<script src="{% static "vendor/jquery/jquery.min.js" %}"></script>
<script src="{% static "vendor/jquery/jquery-ui.min.js" %}"></script>
<script src="{% static "vendor/momentjs/moment.min.js" %}"></script>
<script src="{% static "vendor/bootstrap/bootstrap.min.js" %}"></script>
<script src="{% static "custom_js/ajax.js" %}"></script>
<script src="{% static "custom_js/auto_ajax.js" %}"></script>

{% block custom_js %}{% endblock %}

Expand Down
6 changes: 3 additions & 3 deletions incidents/templates/events/new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
{% load markdown %}

{% block custom_css %}
<link href="{% static "select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "select/select2-bootstrap.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2-bootstrap.css" %}" rel="stylesheet"/>


{% endblock %}

{% block custom_js %}
<script src="{% static "select/select2.min.js" %}"></script>
<script src="{% static "vendor/select/select2.min.js" %}"></script>
<script src="{% static "custom_js/new.js" %}"></script>
{% rich_edit_static %}
<script>
Expand Down
4 changes: 2 additions & 2 deletions incidents/templates/incidents/followup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<html lang="{{ LANGUAGE_CODE }}">
<head>
<link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "css/bootstrap-icons.min.css" %}" rel="stylesheet">
<link href="{% static "vendor/bootstrap/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "vendor/bootstrap-icons/bootstrap-icons.min.css" %}" rel="stylesheet">
<link href="{% static "custom_css/fir_followup.css" %}" rel="stylesheet">
{% plugin_point 'followup_static' %}
<title>{% if incident.is_incident %}{% trans "Incident" %}{%else%}{% trans "Event" %}{%endif%} followup [C{{incident.confidentiality}}] [{{incident.category}}] - {{incident.subject}}</title>
Expand Down
8 changes: 4 additions & 4 deletions incidents/templates/incidents/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<meta name="description" content="">
<meta name="author" content="">

<link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "css/bootstrap-icons.min.css" %}" rel="stylesheet">
<link href="{% static "vendor/bootstrap/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "vendor/bootstrap-icons/bootstrap-icons.min.css" %}" rel="stylesheet">
<link href="{% static "custom_css/fir.css" %}" rel="stylesheet">
<link href="{% static "custom_css/login.css" %}" rel="stylesheet">

Expand Down Expand Up @@ -56,7 +56,7 @@ <h2 class="form-signin-heading">{% trans "Sign in to FIR" %}</h2>
{% endblock %}
</div>

<script src="{% static "js/jquery.min.js" %}"></script>
<script src="{% static "js/bootstrap.min.js" %}"></script>
<script src="{% static "vendor/jquery/jquery.min.js" %}"></script>
<script src="{% static "vendor/bootstrap/bootstrap.min.js" %}"></script>
</body>
</html>
14 changes: 7 additions & 7 deletions incidents/templates/stats/attributes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ <h1>{% trans "Attributes" %}</h1>
{%endblock%}

{% block custom_js_top %}
<script src="{% static "js/d3.v3.min.js" %}"></script>
<script src="{% static "js/nv.d3.min.js" %}"></script>
<script src="{% static "vendor/nvd3/d3.v3.min.js" %}"></script>
<script src="{% static "vendor/nvd3/nv.d3.min.js" %}"></script>
{% endblock %}

{% block custom_js %}
<script src="{% static "js/excellentexport.js" %}"></script>
<script src="{% static "select/select2.min.js" %}"></script>
<script src="{% static "vendor/excellentexport/excellentexport.js" %}"></script>
<script src="{% static "vendor/select/select2.min.js" %}"></script>
<script src="{% static "custom_js/export.js" %}"></script>

<script>
Expand Down Expand Up @@ -206,9 +206,9 @@ <h1>{% trans "Attributes" %}</h1>
{% endblock %}

{% block custom_css %}
<link href="{% static "select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "select/select2-bootstrap.css" %}" rel="stylesheet"/>
<link href="{% static "css/nv.d3.min.css" %}" rel="stylesheet" />
<link href="{% static "vendor/select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2-bootstrap.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/nvd3/nv.d3.min.css" %}" rel="stylesheet" />

<style>

Expand Down
2 changes: 1 addition & 1 deletion incidents/templates/stats/major.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h1 style='float:left;margin-right:20px'>{% trans "Major incidents in last quar
{%endblock%}

{% block custom_js %}
<script src="{% static "js/excellentexport.js" %}"></script>
<script src="{% static "vendor/excellentexport/excellentexport.js" %}"></script>
<script src="{% static "custom_js/export.js" %}"></script>
{% endblock %}

Expand Down
6 changes: 3 additions & 3 deletions incidents/templates/stats/quarterly.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ <h1>{% blocktrans with bl_name=bl.name %}Incidents quarterly statistics for <br

{% block custom_js_top %}

<script src="{% static "js/d3.v3.min.js" %}"></script>
<script src="{% static "vendor/nvd3/d3.v3.min.js" %}"></script>
<script src="{% static "custom_js/stats.js" %}"></script>
<script src="{% static "js/popper.min.js" %}"></script>
<script src="{% static "vendor/popper/popper.min.js" %}"></script>

{%endblock%}

Expand Down Expand Up @@ -309,7 +309,7 @@ <h2>{% trans "Unclosed incidents older than three months" %}</h2>

{% endblock %}
{%block custom_js %}
<script src="{% static "js/excellentexport.js" %}"></script>
<script src="{% static "vendor/excellentexport/excellentexport.js" %}"></script>
<script src="{% static "custom_js/export.js" %}"></script>

<script>
Expand Down
12 changes: 6 additions & 6 deletions incidents/templates/stats/sandbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ <h1>{% trans "Sandbox" %}</h1>
{%endblock%}

{% block custom_js_top %}
<script src="{% static "js/d3.v3.min.js" %}"></script>
<script src="{% static "vendor/nvd3/d3.v3.min.js" %}"></script>
<script src="{% static "custom_js/stats.js" %}"></script>
<script src="{% static "js/popper.min.js" %}"></script>
<script src="{% static "vendor/popper/popper.min.js" %}"></script>
{% endblock%}

{% block custom_js %}
<script src="{% static "js/excellentexport.js" %}"></script>
<script src="{% static "select/select2.min.js" %}"></script>
<script src="{% static "vendor/excellentexport/excellentexport.js" %}"></script>
<script src="{% static "vendor/select/select2.min.js" %}"></script>
<script src="{% static "custom_js/export.js" %}"></script>

<script>
Expand Down Expand Up @@ -83,8 +83,8 @@ <h1>{% trans "Sandbox" %}</h1>
{% endblock%}

{% block custom_css %}
<link href="{% static "select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "select/select2-bootstrap.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2-bootstrap.css" %}" rel="stylesheet"/>

<style>

Expand Down
4 changes: 2 additions & 2 deletions incidents/templates/stats/yearly.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ <h1>{% trans "Yearly stats" %}</h1>


{% block custom_js_top %}
<script src="{% static "js/d3.v3.min.js" %}"></script>
<script src="{% static "vendor/nvd3/d3.v3.min.js" %}"></script>
<script src="{% static "custom_js/stats.js" %}"></script>
<script src="{% static "js/popper.min.js" %}"></script>
<script src="{% static "vendor/popper/popper.min.js" %}"></script>

{%endblock%}

Expand Down
4 changes: 2 additions & 2 deletions incidents/templates/stats/yearly_compare.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ <h1>{% blocktrans with current_year=year previous_year=year|add:-1 %}Comparison


{% block custom_js_top %}
<script src="{% static "js/d3.v3.min.js" %}"></script>
<script src="{% static "vendor/nvd3/d3.v3.min.js" %}"></script>
<script src="{% static "custom_js/stats.js" %}"></script>
<script src="{% static "js/popper.min.js" %}"></script>
<script src="{% static "vendor/popper/popper.min.js" %}"></script>

{%endblock%}

Expand Down
6 changes: 3 additions & 3 deletions incidents/templates/user/profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
{% load fir_plugins %}

{% block custom_css %}
<link href="{% static "select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "select/select2-bootstrap.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2.css" %}" rel="stylesheet"/>
<link href="{% static "vendor/select/select2-bootstrap.css" %}" rel="stylesheet"/>
{% endblock %}

{% block custom_js %}
<script src="{% static "select/select2.min.js" %}"></script>
<script src="{% static "vendor/select/select2.min.js" %}"></script>
{% endblock %}

{% block content %}
Expand Down

0 comments on commit eb08124

Please sign in to comment.