From 9c33567a54566348145683424d3cd8ec50a67155 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sun, 26 Jan 2020 17:00:38 -0500 Subject: [PATCH] networks: Update text for router setup - Move router setup below connections - Use default style for Update button - Use box_name in templates - Add 2nd example of router IP - Minor updates to text Signed-off-by: James Valleroy --- plinth/modules/networks/forms.py | 2 +- .../networks/templates/connections_list.html | 52 ++++++----- .../router_configuration_content.html | 90 +++++++++++-------- 3 files changed, 82 insertions(+), 62 deletions(-) diff --git a/plinth/modules/networks/forms.py b/plinth/modules/networks/forms.py index a460f5a47..106645e3c 100644 --- a/plinth/modules/networks/forms.py +++ b/plinth/modules/networks/forms.py @@ -334,7 +334,7 @@ class RouterConfigurationWizardForm(forms.Form): 'support DMZ feature. All applications that provide a ' 'web interface need you to forward traffic from ports ' '80 and 443 to work. Each of the other applications ' - 'will suggest you which port(s) need to be forwarded ' + 'will suggest which port(s) need to be forwarded ' 'for that application to work.

'), box_name=cfg.box_name )) diff --git a/plinth/modules/networks/templates/connections_list.html b/plinth/modules/networks/templates/connections_list.html index a5b8319c6..14676b7d5 100644 --- a/plinth/modules/networks/templates/connections_list.html +++ b/plinth/modules/networks/templates/connections_list.html @@ -55,30 +55,6 @@ {% endblock %} {% block configuration %} -

{% trans "Freedombox Internet Connectivity" %}

-

- {% blocktrans trimmed %} - The following best describes how your Freedombox is connected in your - network. This information is used only to suggest you necessary configuration - actions. - {% endblocktrans %} -

- -

- {% blocktrans trimmed %} - Your Freedombox gets its internet from your Router via WiFi or Ethernet - cable. This is a typical home setup. - {% endblocktrans %} -

- -
- - - {% trans 'Update...' %} - -
-

{% trans "Connections" %}

@@ -144,4 +120,32 @@ {% include "connections_diagram.html" %} +

+ {% blocktrans trimmed %} + {{ box_name }} Internet Connectivity + {% endblocktrans %} +

+

+ {% blocktrans trimmed %} + The following best describes how your {{ box_name }} is connected in your + network. This information is used only to suggest necessary configuration + actions. + {% endblocktrans %} +

+ +

+ {% blocktrans trimmed %} + Your {{ box_name }} gets its internet from your Router via WiFi or + Ethernet cable. This is a typical home setup. + {% endblocktrans %} +

+ +
+ + + {% trans 'Update...' %} + +
+ {% endblock %} diff --git a/plinth/modules/networks/templates/router_configuration_content.html b/plinth/modules/networks/templates/router_configuration_content.html index da72708cb..8084823fe 100644 --- a/plinth/modules/networks/templates/router_configuration_content.html +++ b/plinth/modules/networks/templates/router_configuration_content.html @@ -21,41 +21,57 @@ {% load i18n %} {% load static %} -

{% trans "Setup FreedomBox Behind a Router" %}

-

- {% blocktrans trimmed %} - Your Freedombox gets its internet connection from your router via Wi-Fi or Ethernet cable. - This is a typical home setup. - {% endblocktrans %} -

-

- {% blocktrans trimmed %} - With this setup, any device on the internet trying to reach your Freedombox will have to - go through your router. The router will need to be configured to forward all traffic - it receives so that Freedombox provides the services. - {% endblocktrans %} -

-

- {% blocktrans trimmed %} - If you don't have control over your router, choose not to configure it. To see options, - to overcome this limitation, choose 'no public address' option in Internet connection - type selection. - {% endblocktrans %} -

+

+ {% blocktrans trimmed %} + Setup {{ box_name }} Behind a Router + {% endblocktrans %} +

-

{% trans "Choose How You Wish to Configure Your Router" %}

-

- {% blocktrans trimmed %} - You will need to login to your router's administration - console provided by the router. This may look like - http://192.168.168.0.1. - The username and password is configured by you - when you first setup the router. For many routers, this - information is printed at the back of the router. If you - don't remember the credentials or the IP address of the - router, you may decide to reset it and set it up freshly. - Lookup your router model number and search online for the - router's manual. This will provide full instructions on - how to perform this task. - {% endblocktrans %} -

+

+ {% blocktrans trimmed %} + Your {{ box_name }} gets its internet connection from your router via + Wi-Fi or Ethernet cable. This is a typical home setup. + {% endblocktrans %} +

+ +

+ {% blocktrans trimmed %} + With this setup, any device on the internet trying to reach your + {{ box_name }} will have to go through your router. The router will need + to be configured to forward all traffic it receives so that {{ box_name }} + provides the services. + {% endblocktrans %} +

+ +

+ {% blocktrans trimmed %} + If you don't have control over your router, choose not to configure it. To + see options, to overcome this limitation, choose 'no public address' option + in Internet connection type selection. + {% endblocktrans %} +

+ +

{% trans "Choose How You Wish to Configure Your Router" %}

+ +

+ {% blocktrans trimmed %} + You will need to login to your router's administration console provided by + the router. This may look like one of the following: + {% endblocktrans %} +

+ + + +

+ {% blocktrans trimmed %} + The username and password is configured by you when you first setup the + router. For many routers, this information is printed at the back of the + router. If you don't remember the credentials or the IP address of the + router, you may decide to reset it and set it up freshly. Lookup your router + model number and search online for the router's manual. This will provide + full instructions on how to perform this task. + {% endblocktrans %} +