From 0a516547934addd90355000eceb5e68b9ee1bf10 Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@thoughtworks.com>
Date: Wed, 13 Feb 2019 05:11:30 +0530
Subject: [PATCH] dynamicdns: Move subsubmenu below description

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 .../dynamicdns/templates/dynamicdns.html      | 45 +++++++++++--------
 .../templates/dynamicdns_configure.html       |  6 +--
 .../templates/dynamicdns_status.html          |  5 +--
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html
index ba2570028..dd252cc69 100644
--- a/plinth/modules/dynamicdns/templates/dynamicdns.html
+++ b/plinth/modules/dynamicdns/templates/dynamicdns.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "service-subsubmenu.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -19,6 +19,7 @@
 {% endcomment %}
 
 {% load i18n %}
+{% load plinth_extras %}
 
 {% block content %}
   {% block pagetitle %}
@@ -37,23 +38,31 @@
     </p>
   {% endif %}
 
-  <p>
-    {% blocktrans trimmed %}
-      If you are looking for a free dynamic DNS account, you may find
-      a free GnuDIP service at <a href='http://gnudip.datasystems24.net'
-      target='_blank'>gnudip.datasystems24.net</a> or you may find
-      free update URL based services at
-      <a href='http://freedns.afraid.org/' target='_blank'>
-      freedns.afraid.org</a>.
-    {% endblocktrans %}
-  </p>
+  {% block subsubmenu %}
+    {% if subsubmenu %}
+      {% show_subsubmenu subsubmenu %}
+    {% endif %}
+  {% endblock %}
 
-  <p>
-    {% blocktrans trimmed %}
-      If your {{ box_name }} is connected behind a NAT router, don't forget
-      to add port forwarding for standard ports, including TCP port 80 (HTTP)
-      and TCP port 443 (HTTPS).
-    {% endblocktrans %}
-  </p>
+  {% block subpage %}
+    <p>
+      {% blocktrans trimmed %}
+        If you are looking for a free dynamic DNS account, you may find
+        a free GnuDIP service at <a href='http://gnudip.datasystems24.net'
+                                    target='_blank'>gnudip.datasystems24.net</a> or you may find
+        free update URL based services at
+        <a href='http://freedns.afraid.org/' target='_blank'>
+          freedns.afraid.org</a>.
+      {% endblocktrans %}
+    </p>
+
+    <p>
+      {% blocktrans trimmed %}
+        If your {{ box_name }} is connected behind a NAT router, don't forget
+        to add port forwarding for standard ports, including TCP port 80 (HTTP)
+        and TCP port 443 (HTTPS).
+      {% endblocktrans %}
+    </p>
+  {% endblock %}
 
 {% endblock %}
diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html b/plinth/modules/dynamicdns/templates/dynamicdns_configure.html
index b56af59ac..1d5684720 100644
--- a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html
+++ b/plinth/modules/dynamicdns/templates/dynamicdns_configure.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "dynamicdns.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -22,8 +22,7 @@
 {% load i18n %}
 {% load static %}
 
-{% block content %}
-
+{% block subpage %}
   <form class="form" method="post">
     {% csrf_token %}
 
@@ -40,7 +39,6 @@
     <input type="submit" class="btn btn-primary"
            value="{% trans "Update setup" %}"/>
   </form>
-
 {% endblock %}
 
 {% block page_js %}
diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_status.html b/plinth/modules/dynamicdns/templates/dynamicdns_status.html
index b46b31b73..155c73b20 100644
--- a/plinth/modules/dynamicdns/templates/dynamicdns_status.html
+++ b/plinth/modules/dynamicdns/templates/dynamicdns_status.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "dynamicdns.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -20,8 +20,7 @@
 
 {% load i18n %}
 
-{% block content %}
-
+{% block subpage %}
   <h3>{% trans "NAT type" %}</h3>
 
   <p>