snapshots: Place the subsubmenu below the description

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Joseph Nuthalapati 2018-11-30 17:08:14 +05:30 committed by James Valleroy
parent 3c68a52056
commit 7ee3c96abc
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
4 changed files with 75 additions and 12 deletions

View File

@ -1,4 +1,4 @@
{% extends "simple_service.html" %}
{% extends "service-subsubmenu.html" %}
{% comment %}
#
# This file is part of FreedomBox.
@ -22,7 +22,6 @@
{% load i18n %}
{% block configuration %}
<form class="form-horizontal" method="post">
{% csrf_token %}
<h3>{% trans "Configuration" %}</h3>
@ -30,5 +29,4 @@
<input type="submit" class="btn btn-primary" name="update"
value="{% trans "Update setup" %}"/>
</form>
{% endblock %}

View File

@ -1,4 +1,4 @@
{% extends "simple_service.html" %}
{% extends "service-subsubmenu.html" %}
{% comment %}
#
# This file is part of FreedomBox.
@ -21,8 +21,7 @@
{% load bootstrap %}
{% load i18n %}
{% block content %}
{% block configuration %}
{% block configuration %}
<form class="form" method="post">
<div class="button-table">
@ -83,7 +82,6 @@
</div>
</form>
{% endblock %}
{% endblock %}
{% block page_js %}
<script>

View File

@ -81,11 +81,15 @@ def manage(request):
has_deletable_snapshots = any(
[snapshot for snapshot in snapshots[1:] if not snapshot['is_default']])
return TemplateResponse(request, 'snapshot_manage.html', {
'snapshots': snapshots,
'has_deletable_snapshots': has_deletable_snapshots,
'subsubmenu': subsubmenu,
})
return TemplateResponse(
request, 'snapshot_manage.html', {
'title': snapshot_module.name,
'description': snapshot_module.description,
'manual_page': snapshot_module.manual_page,
'snapshots': snapshots,
'has_deletable_snapshots': has_deletable_snapshots,
'subsubmenu': subsubmenu,
})
def update_configuration(request, old_status, new_status):

View File

@ -0,0 +1,63 @@
{% extends "base.html" %}
{% comment %}
#
# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
{% endcomment %}
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load static %}
{% block container %}
<div id="container-wrapper" class="container thumbnail">
{% block content_row %}
{% include 'messages.html' %}
{% block content %}
{% block pagetitle %}
<h2>{{ title }}</h2>
{% endblock %}
{% for paragraph in description %}
<p>{{ paragraph|safe }}</p>
{% endfor %}
{% if manual_page %}
<p class="manual-page">
<a href="{% url 'help:manual-page' manual_page %}">
{% trans 'Learn more...' %}
</a>
</p>
{% endif %}
{% block subsubmenu %}
{% if subsubmenu %}
{% show_subsubmenu subsubmenu %}
{% endif %}
{% endblock %}
{% block configuration %}
{% endblock %}
{% endblock %}
{% endblock %}
</div>
{% endblock %}