Updates to fix Django examples with Bokeh 2.0.2 (#1290)

* Updates to fix Django examples with Bokeh 2.0.2

* Update docs

examples/apps/django2/project/settings.py

@@ -36,7 +36,6 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'django.contrib.staticfiles',
     # These are required to connect bokeh
     'channels',
     'bokeh.server.django',
@@ -122,7 +121,3 @@
 STATIC_URL = '/static/'
 
 STATICFILES_DIRS = [bokehjsdir()]
-
-# Ensure that bokeh resources are loaded from CDN
-# (loading from server broken as of Bokeh 2.0.1 so only CDN and INLINE will work)
-settings.resources = 'cdn'

examples/apps/django2/project/urls.py

@@ -14,7 +14,7 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 
-from bokeh.server.django import autoload
+from bokeh.server.django import autoload, static_extensions
 from django.apps import apps
 from django.contrib import admin
 from django.urls import path, include
@@ -33,4 +33,5 @@
     autoload("sliders", sliders_app.app),
 ]
 
+urlpatterns += static_extensions()
 urlpatterns += staticfiles_urlpatterns()

examples/apps/django_multi_apps/django_multi_apps/settings.py

@@ -36,7 +36,6 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'django.contrib.staticfiles',
     # local
     'channels',
     'bokeh.server.django',
@@ -129,7 +128,3 @@
 STATICFILES_DIRS = [bokehjsdir()]
 
 COLOR_MAP = 'Paired'
-
-# Ensure that bokeh resources are loaded from CDN
-# (loading from server broken as of Bokeh 2.0.1 so only CDN and INLINE will work)
-settings.resources = 'cdn'

examples/apps/django_multi_apps/django_multi_apps/urls.py

@@ -14,7 +14,7 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 
-from bokeh.server.django import autoload
+from bokeh.server.django import autoload, static_extensions
 from django.apps import apps
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -42,6 +42,7 @@
     autoload("stockscreener", stockscreener_app.app),
 ]
 
+urlpatterns += static_extensions()
 urlpatterns += staticfiles_urlpatterns()
 
 # Set the themes

examples/user_guide/Django_Apps.ipynb

@@ -82,10 +82,10 @@
     "]\n",
     "```\n",
     "\n",
-    "and lastly add the app(s) we want to add to the `urls.py` file:\n",
+    "and lastly add the app(s) and `static_extensions()` to the `urlpatterns` in the `urls.py` file:\n",
     "\n",
     "```\n",
-    "from bokeh.server.django import autoload\n",
+    "from bokeh.server.django import autoload, static_extensions\n",
     "from django.apps import apps\n",
     "from django.contrib import admin\n",
     "from django.urls import path, include\n",
@@ -104,6 +104,7 @@
     "    autoload(\"sliders\", sliders_app.app),\n",
     "]\n",
     "\n",
+    "urlpatterns += static_extensions()\n",
     "urlpatterns += staticfiles_urlpatterns()\n",
     "```\n",
     "\n",