diff --git a/plinth/modules/dynamicdns/__init__.py b/plinth/modules/dynamicdns/__init__.py index 613ad7c6f..11f03f8ce 100644 --- a/plinth/modules/dynamicdns/__init__.py +++ b/plinth/modules/dynamicdns/__init__.py @@ -29,7 +29,12 @@ _description = [ ' ' 'GnuDIP server. Afterwards, the server will assign your DNS name ' 'to the new IP, and if someone from the Internet asks for your DNS ' - 'name, they will get a response with your current IP address.') + 'name, they will get a response with your current IP address.'), + _('If you are looking for a free dynamic DNS account, you may find a free ' + 'GnuDIP service at ddns.freedombox.org or you may find free update ' + 'URL based services at freedns.afraid.org.'), ] app = None diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html index 0584be5cc..2edab8afc 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns.html @@ -3,28 +3,29 @@ # SPDX-License-Identifier: AGPL-3.0-or-later {% endcomment %} +{% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load static %} {% block configuration %} +
+ {% csrf_token %} -

- {% blocktrans trimmed %} - If you are looking for a free dynamic DNS account, you may find - a free GnuDIP service at ddns.freedombox.org or you may find - free update URL based services at - - freedns.afraid.org. - {% endblocktrans %} -

+ -

- {% 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 %} -

+ {{ form|bootstrap }} + +
+{% endblock %} + +{% block page_js %} + {% endblock %} diff --git a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html b/plinth/modules/dynamicdns/templates/dynamicdns_configure.html deleted file mode 100644 index 2edab8afc..000000000 --- a/plinth/modules/dynamicdns/templates/dynamicdns_configure.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "app.html" %} -{% comment %} -# SPDX-License-Identifier: AGPL-3.0-or-later -{% endcomment %} - -{% load bootstrap %} -{% load i18n %} -{% load static %} - -{% block configuration %} -
- {% csrf_token %} - - - - {{ form|bootstrap }} - - -
-{% endblock %} - -{% block page_js %} - -{% endblock %} diff --git a/plinth/modules/dynamicdns/urls.py b/plinth/modules/dynamicdns/urls.py index 5a3e0aaf8..f11cf911b 100644 --- a/plinth/modules/dynamicdns/urls.py +++ b/plinth/modules/dynamicdns/urls.py @@ -9,7 +9,6 @@ from . import views urlpatterns = [ re_path(r'^sys/dynamicdns/$', views.index, name='index'), - re_path(r'^sys/dynamicdns/configure/$', views.configure, name='configure'), re_path(r'^sys/dynamicdns/statuspage/$', views.statuspage, name='statuspage'), ] diff --git a/plinth/modules/dynamicdns/views.py b/plinth/modules/dynamicdns/views.py index e0b41a40d..ce07b173d 100644 --- a/plinth/modules/dynamicdns/views.py +++ b/plinth/modules/dynamicdns/views.py @@ -23,9 +23,6 @@ EMPTYSTRING = 'none' subsubmenu = [{ 'url': reverse_lazy('dynamicdns:index'), - 'text': gettext_lazy('About') -}, { - 'url': reverse_lazy('dynamicdns:configure'), 'text': gettext_lazy('Configure') }, { 'url': reverse_lazy('dynamicdns:statuspage'), @@ -34,16 +31,6 @@ subsubmenu = [{ def index(request): - """Serve Dynamic DNS page.""" - return TemplateResponse( - request, 'dynamicdns.html', { - 'app_info': dynamicdns.app.info, - 'title': dynamicdns.app.info.name, - 'subsubmenu': subsubmenu - }) - - -def configure(request): """Serve the configuration form.""" status = dynamicdns.get_status() form = None @@ -58,7 +45,7 @@ def configure(request): form = ConfigureForm(initial=status) return TemplateResponse( - request, 'dynamicdns_configure.html', { + request, 'dynamicdns.html', { 'title': _('Configure Dynamic DNS'), 'app_info': dynamicdns.app.info, 'form': form,