Browse Source

Fix assets inclusion

Jocelyn Delande 9 years ago
parent
commit
e6b9a30280
33 changed files with 18 additions and 8 deletions
  1. 9 7
      wifiwithme/apps/contribmap/templates/base.html
  2. 9 1
      wifiwithme/settings/base.py
  3. 0 0
      wifiwithme/static/bootstrap/config.json
  4. 0 0
      wifiwithme/static/bootstrap/css/bootstrap-theme.css
  5. 0 0
      wifiwithme/static/bootstrap/css/bootstrap-theme.css.map
  6. 0 0
      wifiwithme/static/bootstrap/css/bootstrap-theme.min.css
  7. 0 0
      wifiwithme/static/bootstrap/css/bootstrap.css
  8. 0 0
      wifiwithme/static/bootstrap/css/bootstrap.css.map
  9. 0 0
      wifiwithme/static/bootstrap/css/bootstrap.min.css
  10. 0 0
      wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.eot
  11. 0 0
      wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.svg
  12. 0 0
      wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
  13. 0 0
      wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.woff
  14. 0 0
      wifiwithme/static/bootstrap/js/bootstrap.js
  15. 0 0
      wifiwithme/static/bootstrap/js/bootstrap.min.js
  16. 0 0
      wifiwithme/static/bootstrap/js/npm.js
  17. 0 0
      wifiwithme/static/form.js
  18. 0 0
      wifiwithme/static/img/background_main.jpg
  19. 0 0
      wifiwithme/static/img/background_main_767.jpg
  20. 0 0
      wifiwithme/static/img/background_main_991.jpg
  21. 0 0
      wifiwithme/static/jquery/jquery-1.11.0.min.js
  22. 0 0
      wifiwithme/static/leaflet-semicircle/LICENSE
  23. 0 0
      wifiwithme/static/leaflet-semicircle/semicircle.js
  24. 0 0
      wifiwithme/static/leaflet/images/marker-icon-2x.png
  25. 0 0
      wifiwithme/static/leaflet/images/marker-icon-green.png
  26. 0 0
      wifiwithme/static/leaflet/images/marker-icon-red.png
  27. 0 0
      wifiwithme/static/leaflet/images/marker-icon-yellow.png
  28. 0 0
      wifiwithme/static/leaflet/images/marker-icon.png
  29. 0 0
      wifiwithme/static/leaflet/images/marker-shadow.png
  30. 0 0
      wifiwithme/static/leaflet/leaflet.css
  31. 0 0
      wifiwithme/static/leaflet/leaflet.js
  32. 0 0
      wifiwithme/static/main.css
  33. 0 0
      wifiwithme/static/map.js

+ 9 - 7
wifiwithme/apps/contribmap/templates/base.html

@@ -1,3 +1,5 @@
+{% load staticfiles %}
+
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -5,20 +7,20 @@
     <title>FAImaison − contribution à l'expérimentation wifi</title>
 
     <!-- jQuery -->
-    <script src="assets/jquery/jquery-1.11.0.min.js" type="text/javascript"></script>
+    <script src="{% static 'jquery/jquery-1.11.0.min.js' %}" type="text/javascript"></script>
 
     <!-- Bootstrap -->
-    <script src="assets/bootstrap/js/bootstrap.js"></script>
-    <link href="assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <script src="{% static 'bootstrap/js/bootstrap.js' %}"></script>
+    <link href="{% static 'bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
 
     <!-- Leaflet -->
-    <link rel="stylesheet" type="text/css" media="all" href="assets/leaflet/leaflet.css" />
-    <script src="assets/leaflet/leaflet.js" type="text/javascript"></script>
+    <link rel="stylesheet" type="text/css" media="all" href="{% static 'leaflet/leaflet.css' %}" />
+    <script src="{% static 'leaflet/leaflet.js' %}" type="text/javascript"></script>
     <!-- Leaflet-semicircle -->
-    <script src="assets/leaflet-semicircle/semicircle.js" type="text/javascript"></script>
+    <script src="{% static 'leaflet-semicircle/semicircle.js' %}" type="text/javascript"></script>
 
     <!-- Custom -->
-    <link rel="stylesheet" type="text/css" media="all" href="assets/main.css" />
+    <link rel="stylesheet" type="text/css" media="all" href="{% static 'main.css' %}" />
 
 
   </head>

+ 9 - 1
wifiwithme/settings/base.py

@@ -117,7 +117,15 @@ USE_L10N = True
 USE_TZ = True
 
 
+## URL Prefixing
+
+URL_PREFIX='/'
+
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_URL = URL_PREFIX + 'assets/'
+
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, "static"),
+]

assets/bootstrap/config.json → wifiwithme/static/bootstrap/config.json


assets/bootstrap/css/bootstrap-theme.css → wifiwithme/static/bootstrap/css/bootstrap-theme.css


assets/bootstrap/css/bootstrap-theme.css.map → wifiwithme/static/bootstrap/css/bootstrap-theme.css.map


assets/bootstrap/css/bootstrap-theme.min.css → wifiwithme/static/bootstrap/css/bootstrap-theme.min.css


assets/bootstrap/css/bootstrap.css → wifiwithme/static/bootstrap/css/bootstrap.css


assets/bootstrap/css/bootstrap.css.map → wifiwithme/static/bootstrap/css/bootstrap.css.map


assets/bootstrap/css/bootstrap.min.css → wifiwithme/static/bootstrap/css/bootstrap.min.css


assets/bootstrap/fonts/glyphicons-halflings-regular.eot → wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.eot


assets/bootstrap/fonts/glyphicons-halflings-regular.svg → wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.svg


assets/bootstrap/fonts/glyphicons-halflings-regular.ttf → wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.ttf


assets/bootstrap/fonts/glyphicons-halflings-regular.woff → wifiwithme/static/bootstrap/fonts/glyphicons-halflings-regular.woff


assets/bootstrap/js/bootstrap.js → wifiwithme/static/bootstrap/js/bootstrap.js


assets/bootstrap/js/bootstrap.min.js → wifiwithme/static/bootstrap/js/bootstrap.min.js


assets/bootstrap/js/npm.js → wifiwithme/static/bootstrap/js/npm.js


assets/form.js → wifiwithme/static/form.js


assets/img/background_main.jpg → wifiwithme/static/img/background_main.jpg


assets/img/background_main_767.jpg → wifiwithme/static/img/background_main_767.jpg


assets/img/background_main_991.jpg → wifiwithme/static/img/background_main_991.jpg


assets/jquery/jquery-1.11.0.min.js → wifiwithme/static/jquery/jquery-1.11.0.min.js


assets/leaflet-semicircle/LICENSE → wifiwithme/static/leaflet-semicircle/LICENSE


assets/leaflet-semicircle/semicircle.js → wifiwithme/static/leaflet-semicircle/semicircle.js


assets/leaflet/images/marker-icon-2x.png → wifiwithme/static/leaflet/images/marker-icon-2x.png


assets/leaflet/images/marker-icon-green.png → wifiwithme/static/leaflet/images/marker-icon-green.png


assets/leaflet/images/marker-icon-red.png → wifiwithme/static/leaflet/images/marker-icon-red.png


assets/leaflet/images/marker-icon-yellow.png → wifiwithme/static/leaflet/images/marker-icon-yellow.png


assets/leaflet/images/marker-icon.png → wifiwithme/static/leaflet/images/marker-icon.png


assets/leaflet/images/marker-shadow.png → wifiwithme/static/leaflet/images/marker-shadow.png


assets/leaflet/leaflet.css → wifiwithme/static/leaflet/leaflet.css


assets/leaflet/leaflet.js → wifiwithme/static/leaflet/leaflet.js


assets/main.css → wifiwithme/static/main.css


assets/map.js → wifiwithme/static/map.js