Commit c26d1c42 authored by Sli's avatar Sli

Merge branch 'markdown-editor' into 'master'

Remove external resources once for all

See merge request !204
parents 8ebf5af3 e8f742b9
Pipeline #1763 passed with stage
in 14 minutes and 16 seconds
......@@ -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
```
......
{% 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 %}
......
......@@ -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>
......
......@@ -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/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment