klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'markdown-editor' into 'master'

Browse Source 
Remove external resources once for all

See merge request ae/Sith!204
This commit is contained in:
Antoine Bartuccio 2019-05-18 03:41:35 +02:00
commit c26d1c423e
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTING.md
View File

@ -31,7 +31,6 @@ Maintenant, faut passer le sith en mode debug dans le fichier de settings person
```bash ```bash
echo "DEBUG=True" > sith/settings_custom.py echo "DEBUG=True" > sith/settings_custom.py
echo 'EXTERNAL_RES = "False"' >> sith/settings_custom.py
echo 'SITH_URL = "localhost:8000"' >> sith/settings_custom.py echo 'SITH_URL = "localhost:8000"' >> sith/settings_custom.py
``` ```

6
core/templates/core/500.jinja
View File

@ -1,11 +1,7 @@
{% extends "core/base.jinja" %} {% extends "core/base.jinja" %}
{% block head %} {% block head %}
{{ super() }} {{ super() }}
{% if settings.EXTERNAL_RES %} <script src="{{ static('core/js/sentry/bundle.min.js') }}" crossorigin="anonymous"></script>
<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 %}
{% endblock head %} {% endblock head %}
{% block content %} {% block content %}

4
core/templates/core/base.jinja
View File

@ -10,8 +10,8 @@
<link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}"> <link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
<link rel="stylesheet" href="{{ scss('core/style.scss') }}"> <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/js/ui/jquery-ui.min.css') }}">
<link rel="stylesheet" href="/static/core/font-awesome/css/font-awesome.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> <script href="{{ static('core/font-awesome/js/fontawesone.min.js') }}"></script>
<!-- Jquery declared here to be accessible in every django widgets --> <!-- Jquery declared here to be accessible in every django widgets -->
<script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script> <script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>

3
sith/settings.py
View File

@ -227,9 +227,6 @@ LOCALE_PATHS = (os.path.join(BASE_DIR, "locale"),)
PHONENUMBER_DEFAULT_REGION = "FR" PHONENUMBER_DEFAULT_REGION = "FR"
# Whether to use CDNs (True) or local ressources (False) for JS and CSS
EXTERNAL_RES = True
# Medias # Medias
MEDIA_ROOT = "./data/" MEDIA_ROOT = "./data/"
MEDIA_URL = "/data/" MEDIA_URL = "/data/"