From b6478b688863fdd1139f048c2a88dc943bdf1ff3 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sat, 23 May 2020 14:00:16 -0700 Subject: [PATCH] cockpit: Promote for advanced storage/firewalld/networking ops - Talk about cockpit in networking, firewall and storage apps for advanced operations. Make it a separate section instead of just description update to provider higher emphasis. - Update cockpit description too. Closes: #1809. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/cockpit/__init__.py | 5 +++++ plinth/modules/firewall/templates/firewall.html | 7 +++++++ .../networks/templates/networks_configuration.html | 9 +++++++++ plinth/modules/storage/templates/storage.html | 8 ++++++++ 4 files changed, 29 insertions(+) diff --git a/plinth/modules/cockpit/__init__.py b/plinth/modules/cockpit/__init__.py index fe2d4da31..2d001fe4a 100644 --- a/plinth/modules/cockpit/__init__.py +++ b/plinth/modules/cockpit/__init__.py @@ -34,6 +34,11 @@ _description = [ 'are available for many advanced functions that are not usually ' 'required. A web based terminal for console operations is also ' 'available.'), box_name=_(cfg.box_name)), + format_lazy( + _('Cockpit can be used to perform advanced storage operations such as ' + 'disk partitioning and RAID management. It can also be used for ' + 'opening custom firewall ports and advanced networking such as ' + 'bonding, bridging and VLAN management.')), format_lazy( _('It can be accessed by any user on ' '{box_name} belonging to the admin group.'), diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html index b1056e7f0..e35ac2509 100644 --- a/plinth/modules/firewall/templates/firewall.html +++ b/plinth/modules/firewall/templates/firewall.html @@ -93,6 +93,13 @@

+

{%trans "Advanced" %}

+

+ {% blocktrans trimmed %} + Advanced firwall operations such as opening custom ports are provided by + the Cockpit app. + {% endblocktrans %} +

{% endif %} {% endblock %} diff --git a/plinth/modules/networks/templates/networks_configuration.html b/plinth/modules/networks/templates/networks_configuration.html index 62cbc1420..a10eb4fe2 100644 --- a/plinth/modules/networks/templates/networks_configuration.html +++ b/plinth/modules/networks/templates/networks_configuration.html @@ -45,4 +45,13 @@ {% include "network_topology_main.html" %} {% include "internet_connectivity_main.html" %} + +

{%trans "Advanced" %}

+

+ {% blocktrans trimmed %} + Advanced networking operations such as bonding, bridging and VLAN + management are provided by the Cockpit + app. + {% endblocktrans %} +

{% endblock %} diff --git a/plinth/modules/storage/templates/storage.html b/plinth/modules/storage/templates/storage.html index af4291196..91d693b77 100644 --- a/plinth/modules/storage/templates/storage.html +++ b/plinth/modules/storage/templates/storage.html @@ -88,4 +88,12 @@

{% endif %} +

{%trans "Advanced" %}

+

+ {% blocktrans trimmed %} + Advanced storage operations such as disk partitioning and RAID management + are provided by the Cockpit app. + {% endblocktrans %} +

+ {% endblock %}