From db6cf91b4f0e1e5625685198c42df4992d150527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Tue, 11 Aug 2015 19:18:42 +0200
Subject: [PATCH] fix typos; no tables if no record exists; group fixes; button
 fixes; user-guide link; fix dashboard containers

---
 ipynbsrv/settings.py                          |  1 +
 .../web/collaborationgroups/index.html        | 99 +++++++++----------
 .../web/collaborationgroups/manage.html       | 22 +++--
 .../web/collaborationgroups/modal_create.html |  2 +-
 ipynbsrv/web/templates/web/dashboard.html     |  3 -
 .../templates/web/notifications/index.html    |  6 +-
 .../web/notifications/modal_create.html       | 15 +--
 ipynbsrv/web/templates/web/shares/manage.html | 28 ++++--
 .../web/snippets/container_grid.html          | 17 ++--
 .../web/templates/web/snippets/navbar.html    |  4 +-
 ipynbsrv/web/views/common.py                  |  2 +-
 ipynbsrv/web/views/containers.py              |  2 +-
 12 files changed, 106 insertions(+), 95 deletions(-)

diff --git a/ipynbsrv/settings.py b/ipynbsrv/settings.py
index 7fa6c35..7b144e8 100644
--- a/ipynbsrv/settings.py
+++ b/ipynbsrv/settings.py
@@ -122,6 +122,7 @@
 LOGIN_URL = '/accounts/login'
 LOGIN_REDIRECT_URL = '/accounts/flag'
 PUBLIC_URL = '/public/'
+USER_GUIDE_URL = '/docs/user-guide/'
 
 VARS_MODULE_PATH = 'ipynbsrv.core.conf'
 
diff --git a/ipynbsrv/web/templates/web/collaborationgroups/index.html b/ipynbsrv/web/templates/web/collaborationgroups/index.html
index 9de0ebc..0abb3d3 100644
--- a/ipynbsrv/web/templates/web/collaborationgroups/index.html
+++ b/ipynbsrv/web/templates/web/collaborationgroups/index.html
@@ -13,12 +13,12 @@
     <div class="col-xs-12">
         {% include 'web/snippets/messages.html' with messages=messages only %}
 
-        <h1>My Groups</h1>
+        <h1>Groups</h1>
         <form role="form">
             <button type="button" class="btn btn-primary btn-create pull-right" data-toggle="modal" data-target="#modal-group-create">Create new</button>
         </form>
 
-        {% if groups %}
+        {% if groups and not groups|length_is:"1" %}
         <table id="groups-table" class="table table-hover table-striped js-table-smart" cellspacing="0" width="100%">
             <thead>
                 <tr>
@@ -29,56 +29,55 @@ <h1>My Groups</h1>
                 </tr>
             </thead>
             <tbody>
-        {% for group in groups %}
-        {% if not group.is_single_user_group %}
-        <tr>
-            <td><a href="/groups/manage/{{group.id}}">{{group.name}}</a></td>
-            <td>{{ group.member_count }}</td>
-            <td>{% if request.user.backend_user.id in group.admins %}<span class="label label-info">Admin</span>{% endif %}
-                {% if request.user.backend_user.id == group.creator.id %}<span class="label label-info">Creator</span>
-                {% else %} {% if request.user.backend_user.id in group.member_ids %}<span class="label label-info">Member</span>{% endif %}{% endif %}
-            </td>
-            <td>
-            {% if request.user.backend_user.id != group.creator.id and group.creator %} 
-                {% if request.user.backend_user.id in group.member_ids %}
-                <form action="{% url 'group_leave' %}" method="POST" role="form" class="form-action">
-                    {% csrf_token %}
-                    <input type="hidden" name="group_id" value="{{ group.id }}">
-                    <input type="hidden" name="user_id" value="{{ request.user.id }}">
-                    <button class="btn btn-sm btn-warning" title="Leave group?" data-toggle="confirmation" data-placement="left">
-                        <i class="glyphicon glyphicon-minus-sign" aria-hidden="true"></i>
-                    </button>
-                </form>
-                {% else %}
-                <form action="{% url 'group_join' %}" method="POST" role="form" class="form-action">
-                    {% csrf_token %}
-                    <input type="hidden" name="group_id" value="{{ group.id }}">
-                    <input type="hidden" name="user_id" value="{{ request.user.id }}">
-                    <button class="btn btn-sm btn-success" title="Join group?" data-toggle="confirmation" data-placement="left">
-                        <i class="glyphicon glyphicon-plus-sign" aria-hidden="true"></i>
-                    </button>
-                </form>
-                {% endif %}
-            {% endif %}
+            {% for group in groups %}
+                {% if not group.is_single_user_group %}
+                <tr>
+                    <td><a href="/groups/manage/{{group.id}}">{{group.name}}</a></td>
+                    <td>{{ group.member_count }}</td>
+                    <td>{% if request.user.backend_user.id in group.admins %}<span class="label label-info">Admin</span>{% endif %}
+                        {% if request.user.backend_user.id == group.creator.id %}<span class="label label-info">Creator</span>
+                        {% else %} {% if request.user.backend_user.id in group.member_ids %}<span class="label label-info">Member</span>{% endif %}{% endif %}
+                    </td>
+                    <td>
+                    {% if request.user.backend_user.id != group.creator.id and group.creator %}
+                        {% if request.user.backend_user.id in group.member_ids %}
+                        <form action="{% url 'group_leave' %}" method="POST" role="form" class="form-action">
+                            {% csrf_token %}
+                            <input type="hidden" name="group_id" value="{{ group.id }}">
+                            <input type="hidden" name="user_id" value="{{ request.user.id }}">
+                            <button class="btn btn-sm btn-warning" title="Leave group?" data-toggle="confirmation" data-placement="left">
+                                <i class="glyphicon glyphicon-minus-sign" aria-hidden="true"></i>
+                            </button>
+                        </form>
+                        {% else %}
+                        <form action="{% url 'group_join' %}" method="POST" role="form" class="form-action">
+                            {% csrf_token %}
+                            <input type="hidden" name="group_id" value="{{ group.id }}">
+                            <input type="hidden" name="user_id" value="{{ request.user.id }}">
+                            <button class="btn btn-sm btn-success" title="Join group?" data-toggle="confirmation" data-placement="left">
+                                <i class="glyphicon glyphicon-plus-sign" aria-hidden="true"></i>
+                            </button>
+                        </form>
+                        {% endif %}
+                    {% endif %}
 
-            {% if request.user.backend_user.id == group.creator.id or request.user.id in group.admins %}
-            <form action="{% url 'group_delete' %}" method="POST" role="form" class="form-action">
-                {% csrf_token %}
-                <input type="hidden" name="group_id" value="{{ group.id }}">
-                <button class="btn btn-sm btn-danger" title="Delete group?" data-toggle="confirmation" data-placement="left">
-                    <i class="glyphicon glyphicon-remove" aria-hidden="true"></i>
-                </button>
-            </form>
-            {% endif %}
-            </td>
-        </tr>
-        {% endif %}
-        {% endfor %}
-        </tbody>
+                    {% if request.user.backend_user.id == group.creator.id or request.user.id in group.admins %}
+                    <form action="{% url 'group_delete' %}" method="POST" role="form" class="form-action">
+                        {% csrf_token %}
+                        <input type="hidden" name="group_id" value="{{ group.id }}">
+                        <button class="btn btn-sm btn-danger" title="Delete group?" data-toggle="confirmation" data-placement="left">
+                            <i class="glyphicon glyphicon-remove" aria-hidden="true"></i>
+                        </button>
+                    </form>
+                    {% endif %}
+                    </td>
+                </tr>
+                {% endif %}
+            {% endfor %}
+            </tbody>
         </table>
-        
         {% else %}
-            <div class="alert alert-info">You have no groups yet.</div>
+            <div class="alert alert-info">You have no groups.</div>
         {% endif %}
 
         {% include 'web/collaborationgroups/modal_addusers.html' with csrf_token=csrf_token only %}
@@ -111,7 +110,7 @@ <h1>My Groups</h1>
     table.find('.label').click(function (e) {
         var label = $(e.target);
         search_input.val(label.text());
-	    search_input.submit();
+        search_input.submit();
     });
 
     $('[data-toggle="modal"]').click(function (e) {
diff --git a/ipynbsrv/web/templates/web/collaborationgroups/manage.html b/ipynbsrv/web/templates/web/collaborationgroups/manage.html
index 4d92d31..3f29733 100644
--- a/ipynbsrv/web/templates/web/collaborationgroups/manage.html
+++ b/ipynbsrv/web/templates/web/collaborationgroups/manage.html
@@ -42,6 +42,12 @@ <h1>Group</h1>
         {% endif %}
 
         <table class="table">
+            <thead>
+                <tr>
+                    <th style="width: 25%">Property</th>
+                    <th style="width: 75%">Value</th>
+                </tr>
+            </thead>
             <tbody>
                 <tr>
                     <td>Name:</td><td>{{ group.name }}</td>
@@ -54,13 +60,13 @@ <h1>Group</h1>
         </table>
 
         <h2>Members</h2>
-        <form role="form">
-        {% if request.user.backend_user.id in group.admins or request.user.backend_user.id == group.creator.id %}
-            <form role="form">
-            <button type="button" class="btn btn-primary btn-add pull-right" data-toggle="modal" data-target="#modal-group-addusers">Add Users</button>
-        </form>
-        {% endif %}
-        </form>
+        <div class="row" style="margin-bottom: 20px">
+            {% if request.user.backend_user.id in group.admins or request.user.backend_user.id == group.creator.id %}
+            <form role="form" class="col-xs-12">
+                <button type="button" class="btn btn-primary btn-add pull-right" data-toggle="modal" data-target="#modal-group-addusers">Add Users</button>
+            </form>
+            {% endif %}
+        </div>
         <table class="table table-hover table-striped js-table-smart" cellspacing="0" width="100%">
             <thead>
                 <tr>
@@ -87,7 +93,7 @@ <h2>Members</h2>
                     </form>
                     {% endif %}
                     {% if request.user.backend_user.id in group.admins or request.user.backend_user.id == group.creator.id %}
-                        {% if member.id != group.creator.id %} 
+                        {% if member.id != group.creator.id %}
                             <form action="{% url 'group_remove_member' %}" method="POST" role="form" class="form-action">
                                 {% csrf_token %}
                                 <input type="hidden" name="group_id" value="{{ group.id }}">
diff --git a/ipynbsrv/web/templates/web/collaborationgroups/modal_create.html b/ipynbsrv/web/templates/web/collaborationgroups/modal_create.html
index 42e9929..8c622d9 100644
--- a/ipynbsrv/web/templates/web/collaborationgroups/modal_create.html
+++ b/ipynbsrv/web/templates/web/collaborationgroups/modal_create.html
@@ -21,7 +21,7 @@ <h4 class="modal-title">New group</h4>
                         </div>
                     </div>
                 </div>
-                
+
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                     <button type="submit" class="btn btn-primary">Create</button>
diff --git a/ipynbsrv/web/templates/web/dashboard.html b/ipynbsrv/web/templates/web/dashboard.html
index c43a4dd..31f3c5c 100644
--- a/ipynbsrv/web/templates/web/dashboard.html
+++ b/ipynbsrv/web/templates/web/dashboard.html
@@ -19,9 +19,6 @@ <h1>Dashboard</h1>
         <h2>Running containers</h2>
         {% include 'web/snippets/container_grid.html' with containers=containers csrf_token=csrf_token only %}
 
-        <h2>Groups</h2>
-        blabla
-
         <h2>Recent activities</h2>
         notifications
     </div>
diff --git a/ipynbsrv/web/templates/web/notifications/index.html b/ipynbsrv/web/templates/web/notifications/index.html
index 344d6c4..7b9eaef 100644
--- a/ipynbsrv/web/templates/web/notifications/index.html
+++ b/ipynbsrv/web/templates/web/notifications/index.html
@@ -31,7 +31,7 @@ <h1>Notifications</h1>
                 </tr>
             </thead>
             <tbody>
-                {% for n in notifications %}
+            {% for n in notifications %}
                 <tr data-id="{{ n.id }}" {% if not n.read %} class="unread" {% endif %}>
                     <td>{{ n.date | date:"d.m.Y, H:i" }}</td>
                     <td>{{ n.notification.sender.username }}</td>
@@ -48,11 +48,11 @@ <h1>Notifications</h1>
                         </form>
                     </td>
                 </tr>
-                {% endfor %}
+            {% endfor %}
             </tbody>
         </table>
         {% else %}
-            <div class="alert alert-info">You have no notifications yet.</div>
+            <div class="alert alert-info">You have no notifications.</div>
         {% endif %}
 
         {% include 'web/notifications/modal_create.html' with groups=groups notification_types=notification_types containers=containers container_images=container_images shares=shares csrf_token=csrf_token only %}
diff --git a/ipynbsrv/web/templates/web/notifications/modal_create.html b/ipynbsrv/web/templates/web/notifications/modal_create.html
index 9d353bb..fe8c67d 100644
--- a/ipynbsrv/web/templates/web/notifications/modal_create.html
+++ b/ipynbsrv/web/templates/web/notifications/modal_create.html
@@ -11,18 +11,18 @@ <h4 class="modal-title">New notification</h4>
                 {% csrf_token %}
                 <div class="modal-body">
                     <div class="form-group">
-                        <label for="receiver_groups">Receiver Groups</label>
+                        <label for="receiver_groups">Receiving Group</label>
                         <select class="form-control" name="receiver_groups">
                             <option></option>
                             {% for group in groups %}
-                
-                                <option value="{{ group.id }}">{{ group.name }}</option>
-
+                                {% if not group.is_single_user_group %}
+                                    <option value="{{ group.id }}">{{ group.name }}</option>
+                                {% endif %}
                             {% endfor %}
                         </select>
                     </div>
                     <div class="form-group">
-                        <label for="type">Notification type</label>
+                        <label for="type">Notification Type</label>
                         <select class="form-control" name="notification_type">
                             <option></option>
                             {% for n1, n2 in notification_types %}
@@ -62,8 +62,9 @@ <h4 class="modal-title">New notification</h4>
                         <select class="form-control" name="group">
                             <option></option>
                             {% for g in groups %}
-                                <option value="{{ g.id }}">{{ g.name }}</option>
-
+                                {% if not group.is_single_user_group %}
+                                    <option value="{{ g.id }}">{{ g.name }}</option>
+                                {% endif %}
                             {% endfor %}
                         </select>
 
diff --git a/ipynbsrv/web/templates/web/shares/manage.html b/ipynbsrv/web/templates/web/shares/manage.html
index b596408..f047c62 100644
--- a/ipynbsrv/web/templates/web/shares/manage.html
+++ b/ipynbsrv/web/templates/web/shares/manage.html
@@ -56,16 +56,24 @@ <h1>Share</h1>
         </table>
 
         <h2>Shared with...</h2>
-        <form role="form">
-            <button type="button" class="btn btn-primary btn-adduser pull-right" data-toggle="modal" data-target="#modal-share-adduser">
-                Add user
-            </button>
-        </form>
-        <form role="form">
-            <button type="button" class="btn btn-primary btn-addgroup pull-right" data-toggle="modal" data-target="#modal-share-addgroup">
-                Add group
-            </button>
-        </form>
+        <div class="row" style="margin-bottom: 20px">
+            <form role="form" class="col-xs-12">
+                <fieldset class="pull-right">
+                    <button type="button" class="btn btn-primary btn-adduser" data-toggle="modal" data-target="#modal-share-adduser">
+                        Add user
+                    </button>
+                    {% if groups|length_is:"1" %}
+                        <button type="button" class="btn btn-primary btn-addgroup" data-toggle="modal" data-target="#modal-share-addgroup" disabled>
+                            Add group
+                        </button>
+                    {% else %}
+                    <button type="button" class="btn btn-primary btn-addgroup" data-toggle="modal" data-target="#modal-share-addgroup">
+                        Add group
+                    </button>
+                    {% endif %}
+                </fieldset>
+            </form>
+        </div>
         <table class="table table-hover table-striped js-table-smart" cellspacing="0" width="100%">
             <thead>
                 <tr>
diff --git a/ipynbsrv/web/templates/web/snippets/container_grid.html b/ipynbsrv/web/templates/web/snippets/container_grid.html
index d6cb5fb..4d05429 100644
--- a/ipynbsrv/web/templates/web/snippets/container_grid.html
+++ b/ipynbsrv/web/templates/web/snippets/container_grid.html
@@ -60,14 +60,6 @@
                                     <button type="submit"></button>
                                 </form>
                             </li>
-                            <li role="presentation">
-                                <a role="menuitem" tabindex="-1" href="javascript:document.getElementById('restart-{{ ct.id }}').getElementsByTagName('button')[0].click();">Restart</a>
-                                <form id="restart-{{ ct.id }}" action="{% url 'container_restart' %}" method="POST" role="form">
-                                    {% csrf_token %}
-                                    <input name="id" type="hidden" value="{{ ct.id }}">
-                                    <button type="submit"><button>
-                                </form>
-                            </li>
                             {% if ct.is_suspended %}
                                 <li role="presentation">
                                     <a role="menuitem" tabindex="-1" href="javascript:document.getElementById('resume-{{ ct.id }}').getElementsByTagName('button')[0].click();">Resume</a>
@@ -78,6 +70,14 @@
                                     </form>
                                 </li>
                             {% else %}
+                                <li role="presentation">
+                                    <a role="menuitem" tabindex="-1" href="javascript:document.getElementById('restart-{{ ct.id }}').getElementsByTagName('button')[0].click();">Restart</a>
+                                    <form id="restart-{{ ct.id }}" action="{% url 'container_restart' %}" method="POST" role="form">
+                                        {% csrf_token %}
+                                        <input name="id" type="hidden" value="{{ ct.id }}">
+                                        <button type="submit"><button>
+                                    </form>
+                                </li>
                                 <li role="presentation">
                                     <a role="menuitem" tabindex="-1" href="javascript:document.getElementById('suspend-{{ ct.id }}').getElementsByTagName('button')[0].click();">Suspend</a>
                                     <form id="suspend-{{ ct.id }}" action="{% url 'container_suspend' %}" method="POST" role="form">
@@ -86,7 +86,6 @@
                                         <button type="submit"><button>
                                     </form>
                                 </li>
-
                             {% endif %}
                         {% else %}
                             <li role="presentation">
diff --git a/ipynbsrv/web/templates/web/snippets/navbar.html b/ipynbsrv/web/templates/web/snippets/navbar.html
index f0de9c8..b5427da 100644
--- a/ipynbsrv/web/templates/web/snippets/navbar.html
+++ b/ipynbsrv/web/templates/web/snippets/navbar.html
@@ -22,7 +22,7 @@
                 <li><a href="/notifications">Notifications {% if new_notifications_count >= 0 %}<span id="notification_bubble">{{ new_notifications_count }}</span>{% endif %}</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li class="hidden-xs"><a href="" data-tooltip data-placement="bottom" title="User Guide" target="_blank">
+                <li class="hidden-xs"><a href="{% settings 'USER_GUIDE_URL' %}" data-tooltip data-placement="bottom" title="User Guide" target="_blank">
                     <i class="glyphicon glyphicon-question-sign" aria-hidden="true"></i>
                 </a></li>
                 <li class="hidden-xs"><a href="{% settings 'PUBLIC_URL' %}{{ request.user.get_username }}" data-tooltip data-placement="bottom" title="My publications" target="_blank">
@@ -32,7 +32,7 @@
                     <i class="glyphicon glyphicon-log-out" aria-hidden="true"></i>
                 </a></li>
                 <li class="hidden-sm hidden-md hidden-lg">
-                    <a href="" title="User Guide" target="_blank">Use Guide</a>
+                    <a href="{% settings 'USER_GUIDE_URL' %}" title="User Guide" target="_blank">Use Guide</a>
                 </li>
                 <li class="hidden-sm hidden-md hidden-lg">
                     <a href="{% settings 'PUBLIC_URL' %}{{ request.user.get_username }}" title="My publications" target="_blank">My publications</a>
diff --git a/ipynbsrv/web/views/common.py b/ipynbsrv/web/views/common.py
index ce43229..594a826 100644
--- a/ipynbsrv/web/views/common.py
+++ b/ipynbsrv/web/views/common.py
@@ -16,6 +16,6 @@ def dashboard(request):
 
     return render(request, 'web/dashboard.html', {
         'title': "Dashboard",
-        'containers': containers,
+        'containers': filter(lambda ct: ct.is_running is True, containers),
         'new_notifications_count': new_notifications_count
     })
diff --git a/ipynbsrv/web/views/containers.py b/ipynbsrv/web/views/containers.py
index 6d72bdf..73ccbbf 100644
--- a/ipynbsrv/web/views/containers.py
+++ b/ipynbsrv/web/views/containers.py
@@ -140,7 +140,7 @@ def create(request):
         try:
             # server and owner get set by the core automatically
             client.containers.post(params)
-            messages.success(request, "Image created successfully.")
+            messages.success(request, "Container created successfully.")
         except Exception as ex:
             messages.error(request, api_error_message(ex, params))