Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken link to Introduction in DjangoApp docs #705

Merged
merged 3 commits into from
Oct 14, 2019
Merged

Fix broken link to Introduction in DjangoApp docs #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10674fd
Might partly fix #256
Oct 13, 2019
030760e
Fixes #256
Oct 13, 2019
f6c0383
finally got the version hint correct
Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added doc/_static/sliders.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
'deployment_url': 'https://panel-gallery.pyviz.demo.anaconda.com/'
}

_NAV = (
_NAV = (
('Getting started', 'getting_started/index'),
('User Guide', 'user_guide/index'),
('Gallery', 'gallery/index'),
Expand All @@ -88,7 +88,6 @@
'VERSION': version,
'WEBSITE_URL': 'https://panel.pyviz.org',
'WEBSITE_SERVER': 'https://panel.pyviz.org',
'VERSION': version,
'NAV': _NAV,
'LINKS': _NAV,
'SOCIAL': (
Expand Down
4 changes: 2 additions & 2 deletions examples/user_guide/Django_Apps.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"As the core user guides including the [Introduction](Introduction.ipynb) have demonstrated, it is easy to display Panel apps in the notebook, launch them from an interactive Python prompt, and deploy them as a standalone Bokeh server app from the commandline. However, it is also often useful to embed a Panel app in large web application, such as a Django web server. Using Panel with Django requires a bit more work than for notebooks and Bokeh servers.\n",
"As the core user guides including the [Introduction](../getting_started/index.html) have demonstrated, it is easy to display Panel apps in the notebook, launch them from an interactive Python prompt, and deploy them as a standalone Bokeh server app from the commandline. However, it is also often useful to embed a Panel app in large web application, such as a Django web server. Using Panel with Django requires a bit more work than for notebooks and Bokeh servers.\n",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this have been ../getting_started/Introduction.ipynb?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(That way the link should work both in Jupyter and on the website. Otherwise, it will fail in Jupyter because the .html version is not present in a user's copy of the notebooks.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a good chance that the error in my docs build setup that I referred to here lead me to believe that I can only specify the index and not the notebook. I can push a fix, but I can't test it. It would be just exchanging the link for ../getting_started/Introduction.ipynb

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbednar #709

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have reviewed with more care sorry.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I'm not entirely sure there is a consistent way to link this since Introduction.ipynb ends up being built as part of index.html.

"\n",
"To run this example app yourself, you will first need to install django 2 (e.g. `conda install \"django=2\"`)."
]
Expand Down Expand Up @@ -34,7 +34,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"![screenshot of sliders app](../apps/django2/sliders.png)"
"![screenshot of sliders app](../_static/sliders.png)"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions panel/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
from datetime import datetime
from six import string_types
from collections import defaultdict, OrderedDict
try:
try: # python >= 3.3
from collections.abc import MutableSequence, MutableMapping
except ImportError: # support for python>3.8
except ImportError:
from collections import MutableSequence, MutableMapping

import param
Expand Down