Added separate Jupyterlab page

_data/sidebars/merlin6_sidebar.yml

@@ -47,6 +47,8 @@ entries:
     folderitems:
     - title: Jupyterhub service
       url: /merlin6/jupyterhub.html
+    - title: Jupyterlab
+      url: /merlin6/jupyterlab.html
   - title: Announcements
     folderitems:
     - title: Downtimes

pages/merlin6/04 jupyterhub/jupyterhub.md

@@ -2,7 +2,7 @@
 title: Jupyterhub on Merlin
 #tags:
 #keywords:
-last_updated: 16 July 2019
+last_updated: 31 July 2019
 #summary: ""
 sidebar: merlin6_sidebar
 permalink: /merlin6/jupyterhub.html
@@ -37,24 +37,14 @@ The service is available inside of PSI (or through a VPN connection) at
 
 
 
-## JupyterLab and Classic Notebook user interfaces
-
-Your Jupyter notebook will start up with the new **JupyterLab** user interface which has a toolbar on the
-left. You can read about its features [on the official website](https://jupyterlab.readthedocs.io/en/stable/user/interface.html).
-
-However, if you prefer the classical notebook UI or you want to use some feature which has not yet been implemented in the
-new interface, you can switch to it by using the **"Launch Classic Notebook"** command from the left sidebar of JupyterLab.
-
-{% include image.html file="jupyter-launch-classic.png" caption="Launch Classic Notebook" max-width=501 %}
-
 
 ## Jupyter software environments - running different kernels
 
 Your notebooks can run within different software environments which are offered by a number of available **Jupyter kernels**.
 
 E.g. in this test installation we provide two environments targeted at data science
-  * **datascience_py36**: contains Tensorflow, Keras, scikit-learn, and dependencies. Stable
+  * **tensorflow-1.13.1_py36**: contains Tensorflow, Keras, scikit-learn, Pandas, numby, and dependencies. Stable
-  * **keras216_py36**: also contains the Talos package. This
+  * **talos_py36**: also contains the Talos package. This
     environment is experimental and subject to updates and changes.
 
 When you create a new notebook you will be asked to specify which kernel you want to use. It is also possible to switch the kernel of a running notebook, but you will lose the state of the current kernel, so you will have to recalculate the notebook cells with this new kernel.
@@ -63,8 +53,8 @@ These environments are also available for standard work in a shell session. You
 
 ```
 module use unstable
-module load anaconda/2019.03
+module load anaconda/2019.07
-conda activate datascience_py36
+conda activate tensorflow-1.13.1_py36
 ```
 
 When the `anaconda` module has been loaded, you can list the available environments by executing
@@ -78,11 +68,7 @@ conda info -e
 
 There exist a number of useful [contributed but unofficial
 extensions](https://jupyter-contrib-nbextensions.readthedocs.io/en/latest/index.html)
-that add useful features to your notebooks. These regrettably are not
+that add useful features to your notebooks.
-yet supported from within the JupyterLab UI, but you can activate them
-through the Classic Notebook interface (see above)
-
- <!-- ([see above](##JupyterLab-and-Classic-Notebook-user-interfaces)) -->
 
 From the classic Notebook UI you can access the available extensions in a separate tab as displayed in this screenshot:
 

pages/merlin6/04 jupyterhub/jupyterlab.md

@@ -0,0 +1,28 @@
+---
+title: Jupyterlab User interface
+#tags:
+#keywords:
+last_updated: 31 July 2019
+#summary: ""
+sidebar: merlin6_sidebar
+permalink: /merlin6/jupyterlab.html
+---
+
+## Testing out Jupyterlab
+**Jupyterlab** is a new interface to interact with your Jupyter notebooks. However, it is in very active development and undergoing constant changes. You can read about its features [on the official website](https://jupyterlab.readthedocs.io/en/stable/user/interface.html).
+
+You can test it out on our server by using the following kind of URL, where *$YOUR-USER* must be replaced by your PSI username. You must already have an active session on the jupyterhub.
+
+https://merlin-jupyter.psi.ch:8000/user/$YOUR-USER/lab
+
+## Switching to the Classic Notebook user interface
+
+You can switch to the classical notebook UI by using the **"Launch Classic Notebook"** command from the left sidebar of JupyterLab.
+
+{% include image.html file="jupyter-launch-classic.png" caption="Launch Classic Notebook" max-width=501 %}
+
+## Jupyterlab does not support the older nbextensions
+
+These regrettably are not yet supported from within the JupyterLab UI,
+but you can activate them through the Classic Notebook interface (see
+above)