Merge branch 'master' into example

Author: echarles

.travis.yml

@@ -8,9 +8,6 @@ cache:
 python:
     - 3.6
 
-sudo: required
-
-
 env:
   global:
     - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
@@ -64,7 +61,8 @@ matrix:
           env: GROUP=python
         - python: 3.7
           env: GROUP=python
-          dist: xenial  # required for Python >= 3.7 (travis-ci/travis-ci#9069)
+        - python: 3.8
+          env: GROUP=python
         - python: 3.6
           env: GROUP=docs
 

jupyter_server/serverapp.py

@@ -1675,7 +1675,7 @@ def _write_browser_open_file(self, url, fh):
 
         jinja2_env = self.web_app.settings['jinja2_env']
         template = jinja2_env.get_template('browser-open.html')
-        fh.write(template.render(open_url=url))
+        fh.write(template.render(open_url=url, base_url=self.base_url))
 
     def remove_browser_open_file(self):
         """Remove the nbserver-<pid>-open.html file created for this server.
@@ -1703,7 +1703,7 @@ def launch_browser(self):
                 self.log.critical(_("%s does not exist") % self.file_to_run)
                 self.exit(1)
 
-            relpath = os.path.relpath(self.file_to_run, self.notebook_dir)
+            relpath = os.path.relpath(self.file_to_run, self.root_dir)
             uri = url_escape(url_path_join('notebooks', *relpath.split(os.sep)))
 
             # Write a temporary file to open in the browser