From a61046d7d08bfb345b4adf40e1c46383172c790e Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@thoughtworks.com>
Date: Fri, 30 Mar 2018 11:01:08 +0530
Subject: [PATCH] snapshots: Move manual page link to the index page

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../snapshot/templates/snapshot_manage.html   | 138 +++++++++---------
 plinth/modules/snapshot/views.py              |   2 +-
 2 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/plinth/modules/snapshot/templates/snapshot_manage.html b/plinth/modules/snapshot/templates/snapshot_manage.html
index 573fdfb42..612c6a5e7 100644
--- a/plinth/modules/snapshot/templates/snapshot_manage.html
+++ b/plinth/modules/snapshot/templates/snapshot_manage.html
@@ -21,83 +21,85 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block configuration %}
-  <p>
-    <div class="row">
-      <form class="form" method="post">
-        {% csrf_token %}
-        <div class="col-xs-6 text-left">
-          <input type="submit" class="btn btn-primary" name="create"
-                 value="{% trans 'Create Snapshot' %}"/>
+{% block content %}
+  {% block configuration %}
+    <p>
+      <div class="row">
+        <form class="form" method="post">
+          {% csrf_token %}
+          <div class="col-xs-6 text-left">
+            <input type="submit" class="btn btn-primary" name="create"
+                   value="{% trans 'Create Snapshot' %}"/>
+          </div>
+        </form>
+        <div class="col-xs-6 text-right">
+          <a title="{% trans 'Delete all the snapshots' %}"
+             role="button" class="btn btn-danger"
+             {% if not has_deletable_snapshots %}
+             disabled="disabled"
+             {% else %}
+             href="{% url 'snapshot:delete-all' %}"
+             {% endif %}>
+            {% trans 'Delete All' %}
+          </a>
         </div>
-      </form>
-      <div class="col-xs-6 text-right">
-        <a title="{% trans 'Delete all the snapshots' %}"
-           role="button" class="btn btn-danger"
-           {% if not has_deletable_snapshots %}
-           disabled="disabled"
-           {% else %}
-           href="{% url 'snapshot:delete-all' %}"
-           {% endif %}>
-          {% trans 'Delete All' %}
-        </a>
       </div>
-    </div>
-  </p>
+    </p>
 
 
-  <div class="row">
-    <div class="col-lg-12">
-      <table class="table table-bordered table-condensed table-striped">
-        <thead>
-          <th>{% trans "Number" %}</th>
-          <th>{% trans "Date" %}</th>
-          <th>{% trans "Description" %}</th>
-          <th>{% trans "Rollback" %}</th>
-          <th>{% trans "Delete" %}</th>
-        </thead>
-        <tbody>
-          {% for snapshot in snapshots %}
-            {% if snapshot.description != "current" %}
-              <tr>
-                <td>
-                  {{ snapshot.number }}
-                  {% if snapshot.is_default %}
-                    <span class="label label-primary">
-                      {% trans "active" %}
-                    </span>
-                  {% endif %}
-                </td>
-                <td>{{ snapshot.date }}</td>
-                <td>{{ snapshot.description }}</td>
-                <td>
-                  <a href="{% url 'snapshot:rollback' snapshot.number %}"
-                     class="btn btn-default btn-sm" role="button"
-                     title="{% blocktrans trimmed with number=snapshot.number %}
-                           Rollback to snapshot #{{ number }}
-                     {% endblocktrans %}">
-                    <span class="glyphicon glyphicon-repeat"
-                          aria-hidden="true"></span>
-                  </a>
-                </td>
-                <td>
-                  {% if not snapshot.is_default %}
-                    <a href="{% url 'snapshot:delete' snapshot.number %}"
+    <div class="row">
+      <div class="col-lg-12">
+        <table class="table table-bordered table-condensed table-striped">
+          <thead>
+            <th>{% trans "Number" %}</th>
+            <th>{% trans "Date" %}</th>
+            <th>{% trans "Description" %}</th>
+            <th>{% trans "Rollback" %}</th>
+            <th>{% trans "Delete" %}</th>
+          </thead>
+          <tbody>
+            {% for snapshot in snapshots %}
+              {% if snapshot.description != "current" %}
+                <tr>
+                  <td>
+                    {{ snapshot.number }}
+                    {% if snapshot.is_default %}
+                      <span class="label label-primary">
+                        {% trans "active" %}
+                      </span>
+                    {% endif %}
+                  </td>
+                  <td>{{ snapshot.date }}</td>
+                  <td>{{ snapshot.description }}</td>
+                  <td>
+                    <a href="{% url 'snapshot:rollback' snapshot.number %}"
                        class="btn btn-default btn-sm" role="button"
                        title="{% blocktrans trimmed with number=snapshot.number %}
-                             Delete snapshot #{{ number }}
+                             Rollback to snapshot #{{ number }}
                        {% endblocktrans %}">
-                      <span class="glyphicon glyphicon-trash"
+                      <span class="glyphicon glyphicon-repeat"
                             aria-hidden="true"></span>
                     </a>
-                  {% endif %}
-                </td>
-              </tr>
-            {% endif %}
-          {% endfor %}
-        </tbody>
-      </table>
+                  </td>
+                  <td>
+                    {% if not snapshot.is_default %}
+                      <a href="{% url 'snapshot:delete' snapshot.number %}"
+                         class="btn btn-default btn-sm" role="button"
+                         title="{% blocktrans trimmed with number=snapshot.number %}
+                               Delete snapshot #{{ number }}
+                         {% endblocktrans %}">
+                        <span class="glyphicon glyphicon-trash"
+                              aria-hidden="true"></span>
+                      </a>
+                    {% endif %}
+                  </td>
+                </tr>
+              {% endif %}
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
     </div>
-  </div>
 
+  {% endblock %}
 {% endblock %}
diff --git a/plinth/modules/snapshot/views.py b/plinth/modules/snapshot/views.py
index e8a3c661f..4be7f4b45 100644
--- a/plinth/modules/snapshot/views.py
+++ b/plinth/modules/snapshot/views.py
@@ -60,6 +60,7 @@ def index(request):
         request, 'snapshot.html', {
             'title': snapshot_module.name,
             'description': snapshot_module.description,
+            'manual_page': snapshot_module.manual_page,
             'subsubmenu': subsubmenu,
             'form': form
         })
@@ -82,7 +83,6 @@ def manage(request):
             'snapshots': snapshots,
             'has_deletable_snapshots': has_deletable_snapshots,
             'subsubmenu': subsubmenu,
-            'manual_page': snapshot_module.manual_page,
         })