Skip to content

Commit

Permalink
Merge pull request ipython#1346 from astraw/alternate-url-fixups
Browse files Browse the repository at this point in the history
fixups for alternate URL prefix stuff
  • Loading branch information
ellisonbg committed Jan 30, 2012
2 parents 069f64e + 58cac8d commit e3c32d5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions IPython/frontend/html/notebook/notebookapp.py
Expand Up @@ -410,13 +410,14 @@ def start(self):
ip = self.ip if self.ip else '[all ip addresses on your system]'
proto = 'https' if self.certfile else 'http'
info = self.log.info
info("The IPython Notebook is running at: %s://%s:%i" %
(proto, ip, self.port) )
info("The IPython Notebook is running at: %s://%s:%i%s" %
(proto, ip, self.port,self.base_project_url) )
info("Use Control-C to stop this server and shut down all kernels.")

if self.open_browser:
ip = self.ip or '127.0.0.1'
b = lambda : webbrowser.open("%s://%s:%i" % (proto, ip, self.port),
b = lambda : webbrowser.open("%s://%s:%i%s" % (proto, ip, self.port,
self.base_project_url),
new=2)
threading.Thread(target=b).start()
try:
Expand Down
12 changes: 6 additions & 6 deletions docs/source/interactive/htmlnotebook.txt
Expand Up @@ -364,13 +364,13 @@ The notebook dashboard (i.e. the default landing page with an overview
of all your notebooks) typically lives at a URL path of
"http://localhost:8888/". If you want to have it, and the rest of the
notebook, live under a sub-directory,
e.g. "http://localhost:8888/ipython/", you can do so with command-line
options like these:
e.g. "http://localhost:8888/ipython/", you can do so with
configuration options like these (see above for instructions about
modifying ``ipython_notebook_config.py``)::

$ ipython notebook --NotebookApp.webapp_settings="\
{'base_project_url':'/ipython/', \
'base_kernel_url':'/ipython/', \
'static_url_prefix':'/ipython/static/'}"
c.NotebookApp.base_project_url = '/ipython/'
c.NotebookApp.base_kernel_url = '/ipython/'
c.NotebookApp.webapp_settings = {'static_url_prefix':'/ipython/static/'}

.. _notebook_format:

Expand Down

0 comments on commit e3c32d5

Please sign in to comment.