From e8f742b9f924483d05b107e420f02e645e2e89fd Mon Sep 17 00:00:00 2001
From: Bartuccio Antoine <klmp200@klmp200.net>
Date: Sat, 18 May 2019 03:00:19 +0200
Subject: [PATCH] core: remove external resources once for all

---
 CONTRIBUTING.md                | 1 -
 core/templates/core/500.jinja  | 6 +-----
 core/templates/core/base.jinja | 4 ++--
 sith/settings.py               | 3 ---
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d7ae5058..6d142cb7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,6 @@ Maintenant, faut passer le sith en mode debug dans le fichier de settings person
 
 ```bash
 echo "DEBUG=True" > sith/settings_custom.py
-echo 'EXTERNAL_RES = "False"' >> sith/settings_custom.py
 echo 'SITH_URL = "localhost:8000"' >> sith/settings_custom.py
 ```
 
diff --git a/core/templates/core/500.jinja b/core/templates/core/500.jinja
index 8aa653ee..d9abc1a6 100644
--- a/core/templates/core/500.jinja
+++ b/core/templates/core/500.jinja
@@ -1,11 +1,7 @@
 {% extends "core/base.jinja" %}
 {% block head %}
 {{ super() }}
-	{% if settings.EXTERNAL_RES %}
-		<script src="https://browser.sentry-cdn.com/4.0.6/bundle.min.js" crossorigin="anonymous"></script>
-	{% else %}
-		<script src="{{ static('core/js/sentry/bundle.min.js') }}" crossorigin="anonymous"></script>
-	{% endif %}
+	<script src="{{ static('core/js/sentry/bundle.min.js') }}" crossorigin="anonymous"></script>
 {% endblock head %}
 
 {% block content %}
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 80d513c0..8ff8b2e4 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -10,8 +10,8 @@
         <link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
         <link rel="stylesheet" href="{{ scss('core/style.scss') }}">
         <link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
-        <link rel="stylesheet" href="/static/core/font-awesome/css/font-awesome.min.css">
-        <script href="/core/static/core/font-awesome/js/fontawesone.min.js"></script>
+        <link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}">
+        <script href="{{ static('core/font-awesome/js/fontawesone.min.js') }}"></script>
 
         <!-- Jquery declared here to be accessible in every django widgets -->
         <script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>
diff --git a/sith/settings.py b/sith/settings.py
index ee319665..22acf99e 100644
--- a/sith/settings.py
+++ b/sith/settings.py
@@ -227,9 +227,6 @@ LOCALE_PATHS = (os.path.join(BASE_DIR, "locale"),)
 
 PHONENUMBER_DEFAULT_REGION = "FR"
 
-# Whether to use CDNs (True) or local ressources (False) for JS and CSS
-EXTERNAL_RES = True
-
 # Medias
 MEDIA_ROOT = "./data/"
 MEDIA_URL = "/data/"