From 05861cf5a7b02a6bec6fca4399efd5db31ebc376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Tue, 11 Aug 2015 21:43:06 +0200
Subject: [PATCH 1/3] fix pattern help

---
 .../web/templates/web/container_snapshots/modal_create.html     | 2 +-
 ipynbsrv/web/templates/web/containers/modal_create.html         | 1 +
 ipynbsrv/web/templates/web/images/modal_create.html             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
index b87aa5e..8a0b991 100644
--- a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
+++ b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
@@ -14,7 +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>
+                        <p class="help-block">Allowed pattern: ^[A-z]\w*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>
diff --git a/ipynbsrv/web/templates/web/containers/modal_create.html b/ipynbsrv/web/templates/web/containers/modal_create.html
index 32c2f7c..f006c04 100644
--- a/ipynbsrv/web/templates/web/containers/modal_create.html
+++ b/ipynbsrv/web/templates/web/containers/modal_create.html
@@ -13,6 +13,7 @@ <h4 class="modal-title">New container</h4>
                     <div class="form-group">
                         <label for="name">Name</label>
                         <input name="name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" placeholder="e.g IPython Notebook" required>
+                        <p class="help-block">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 865e5d3..bf3fd51 100644
--- a/ipynbsrv/web/templates/web/images/modal_create.html
+++ b/ipynbsrv/web/templates/web/images/modal_create.html
@@ -22,7 +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>
+                        <p class="help-block">Allowed pattern: ^[A-z][\w\/]*$</p>
                     </div>
                     <div class="form-group">
                         <label for="description">Description</label>

From 8475cf1c454a60183aff7c8175d7e8f2b9609617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Tue, 11 Aug 2015 21:46:32 +0200
Subject: [PATCH 2/3] fix pattern not same as in models

---
 .../web/templates/web/container_snapshots/modal_create.html     | 2 +-
 ipynbsrv/web/templates/web/containers/modal_create.html         | 2 +-
 ipynbsrv/web/templates/web/images/modal_create.html             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
index 8a0b991..d6647b2 100644
--- a/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
+++ b/ipynbsrv/web/templates/web/container_snapshots/modal_create.html
@@ -13,7 +13,7 @@ <h4 class="modal-title">New Container Snapshot</h4>
                     <input name="ct_id" type="hidden" class="form-control" value="{{ container.id }}">
                     <div class="form-group">
                         <label for="name">Name</label>
-                        <input name="name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" required>
+                        <input name="name" type="text" pattern="^[A-z]\w*$" class="form-control" required>
                         <p class="help-block">Allowed pattern: ^[A-z]\w*$</p>
                     </div>
                     <div class="form-group">
diff --git a/ipynbsrv/web/templates/web/containers/modal_create.html b/ipynbsrv/web/templates/web/containers/modal_create.html
index f006c04..7f40fcd 100644
--- a/ipynbsrv/web/templates/web/containers/modal_create.html
+++ b/ipynbsrv/web/templates/web/containers/modal_create.html
@@ -12,7 +12,7 @@ <h4 class="modal-title">New container</h4>
                  <div class="modal-body">
                     <div class="form-group">
                         <label for="name">Name</label>
-                        <input name="name" type="text" pattern="[A-Za-z1-9_-]+" class="form-control" placeholder="e.g IPython Notebook" required>
+                        <input name="name" type="text" pattern="^[A-z]\w*$" class="form-control" placeholder="e.g IPython Notebook" required>
                         <p class="help-block">Allowed pattern: ^[A-z]\w*$</p>
                     </div>
                     <div class="form-group">
diff --git a/ipynbsrv/web/templates/web/images/modal_create.html b/ipynbsrv/web/templates/web/images/modal_create.html
index bf3fd51..3fe3b8a 100644
--- a/ipynbsrv/web/templates/web/images/modal_create.html
+++ b/ipynbsrv/web/templates/web/images/modal_create.html
@@ -21,7 +21,7 @@ <h4 class="modal-title">New image</h4>
                     </div>
                     <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>
+                        <input name="img_name" type="text" pattern="^[A-z][\w\/]*$" class="form-control" placeholder="e.g fhnw-maths " required>
                         <p class="help-block">Allowed pattern: ^[A-z][\w\/]*$</p>
                     </div>
                     <div class="form-group">

From 4dee0f70bf59222ed3e4e22249db5a8e6667e57f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Tue, 11 Aug 2015 21:57:35 +0200
Subject: [PATCH 3/3] fix cloning producing an invalid image name

---
 ipynbsrv/core/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipynbsrv/core/models.py b/ipynbsrv/core/models.py
index bd959b3..ade260d 100644
--- a/ipynbsrv/core/models.py
+++ b/ipynbsrv/core/models.py
@@ -776,7 +776,7 @@ class ContainerImage(models.Model):
         max_length=75,
         validators=[
             RegexValidator(
-                regex='^[A-z][\w\/]*$',
+                regex='^[A-z][\w\/-]*$',
                 message='Invalid container snapshot name.'
             )
         ]