From 212b202ed56fd916656dc83b1157ccf1f495301b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Tue, 11 Aug 2015 21:26:40 +0200
Subject: [PATCH 1/2] show which patterns are allowed

---
 ipynbsrv/core/models.py                                | 10 +++++++++-
 .../web/container_snapshots/modal_create.html          |  1 +
 ipynbsrv/web/templates/web/images/modal_create.html    |  1 +
 ipynbsrv/web/templates/web/shares/modal_create.html    |  3 ++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ipynbsrv/core/models.py b/ipynbsrv/core/models.py
index 7d48146..bd959b3 100644
--- a/ipynbsrv/core/models.py
+++ b/ipynbsrv/core/models.py
@@ -772,7 +772,15 @@ class ContainerImage(models.Model):
         max_length=255,
         help_text='The primary key the backend uses to identify this image.'
     )
-    name = models.CharField(max_length=75)
+    name = models.CharField(
+        max_length=75,
+        validators=[
+            RegexValidator(
+                regex='^[A-z][\w\/]*$',
+                message='Invalid container snapshot name.'
+            )
+        ]
+    )
     description = models.TextField(blank=True, null=True)
     # TODO: document placeholders
     command = models.CharField(
diff --git a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
index d4ada7c..b87aa5e 100644
--- a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
+++ b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
@@ -14,6 +14,7 @@ <h4 class="modal-title">New Container Snapshot</h4>
                     <div class="form-group">
                         <label for="name">Name</label>
                         <input name="name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" required>
+                        <p class="help-text">Allowed pattern: ^[A-z]\w*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>
diff --git a/ipynbsrv/web/templates/web/images/modal_create.html b/ipynbsrv/web/templates/web/images/modal_create.html
index 57417a8..865e5d3 100644
--- a/ipynbsrv/web/templates/web/images/modal_create.html
+++ b/ipynbsrv/web/templates/web/images/modal_create.html
@@ -22,6 +22,7 @@ <h4 class="modal-title">New image</h4>
                     <div class="form-group">
                         <label for="img_name">Name</label>
                         <input name="img_name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" placeholder="e.g fhnw-maths " required>
+                        <p class="help-text">Allowed pattern: ^[A-z][\w\/]*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>
diff --git a/ipynbsrv/web/templates/web/shares/modal_create.html b/ipynbsrv/web/templates/web/shares/modal_create.html
index f00134f..c4bb05b 100644
--- a/ipynbsrv/web/templates/web/shares/modal_create.html
+++ b/ipynbsrv/web/templates/web/shares/modal_create.html
@@ -12,7 +12,8 @@ <h4 class="modal-title">New shared folder</h4>
                 <div class="modal-body">
                     <div class="form-group">
                         <label for="name">Name</label>
-                        <input type="text" pattern="[A-Za-z1-9_-]+" class="form-control" name="name" placeholder="maths" required>
+                        <input type="text" pattern="^[A-z]\w*$" class="form-control" name="name" placeholder="maths" required>
+                        <p class="help-block">Allowed pattern: ^[A-z]\w*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>

From 09a2e9b00f21e471b5b0afabbd3b9fe1ca338004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Tue, 11 Aug 2015 21:37:20 +0200
Subject: [PATCH 2/2] fix mkdocs

---
 docs/user-guide/mkdocs.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/user-guide/mkdocs.yml b/docs/user-guide/mkdocs.yml
index 530084f..b36c841 100644
--- a/docs/user-guide/mkdocs.yml
+++ b/docs/user-guide/mkdocs.yml
@@ -1,8 +1,7 @@
 site_name: User Guide
-theme: readthedocs
 
 docs_dir: .
-site_dir: ../../ipynbsrv/wui/static/docs/user-guide
+site_dir: ../../ipynbsrv/web/static/docs/user-guide
 
 pages:
-- [index.md, Home]
+- 'Home' : 'index.md'