klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-07-03 11:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'external_option' into 'master'

Browse Source 
Integrate external_res variable

See merge request ae/Sith!120
This commit is contained in:
Skia 2017-10-18 15:32:06 +02:00
commit cd4b0d8e0c
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTING.md
View File

@ -25,6 +25,7 @@ Avec cette commande, tu clones le sith AE dans le dossier courant.
Maintenant, faut passer le sith en mode debug dans le fichier de settings personnalisé. Maintenant, faut passer le sith en mode debug dans le fichier de settings personnalisé.
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
Enfin, il s'agit de créer la base de donnée de test lors de la première utilisation Enfin, il s'agit de créer la base de donnée de test lors de la première utilisation

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

@ -7,15 +7,18 @@
<link rel="stylesheet" href="{{ static('core/base.css') }}"> <link rel="stylesheet" href="{{ static('core/base.css') }}">
<link rel="stylesheet" href="{{ static('core/multiple-select.css') }}"> <link rel="stylesheet" href="{{ static('core/multiple-select.css') }}">
<link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}"> <link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}">
<link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
<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') }}">
{% if settings.DEBUG %} {% if settings.EXTERNAL_RES %}
<link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}">
{% else %}
<noscript><link rel="stylesheet" href="https://use.fontawesome.com/775817bb35.css"></noscript> <noscript><link rel="stylesheet" href="https://use.fontawesome.com/775817bb35.css"></noscript>
<script src="https://use.fontawesome.com/c06c9c6980.js"></script> <script src="https://use.fontawesome.com/c06c9c6980.js"></script>
<noscript><link rel="stylesheet" type="text/css" href="static('core/js/ui/jquery-ui.min.css')"></noscript>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
{% else %}
<link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}">
<link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
{% endif %} {% endif %}
{% endblock %} {% endblock %}
</head> </head>

3
sith/settings.py
View File

@ -227,6 +227,9 @@ LOCALE_PATHS = (
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/'