From 1200020a0e9f534f2b23cdf750a83fdab269eb95 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 6 Dec 2017 13:55:34 +0530 Subject: [PATCH] clients: Minor styling fixes Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- data/etc/plinth/modules-enabled/api | 2 +- plinth/modules/diaspora/__init__.py | 8 ++++---- plinth/modules/matrixsynapse/__init__.py | 4 ++-- plinth/modules/transmission/__init__.py | 1 - plinth/views.py | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/data/etc/plinth/modules-enabled/api b/data/etc/plinth/modules-enabled/api index 9bf760b6d..cc16b59b3 100644 --- a/data/etc/plinth/modules-enabled/api +++ b/data/etc/plinth/modules-enabled/api @@ -1 +1 @@ -plinth.modules.api \ No newline at end of file +plinth.modules.api diff --git a/plinth/modules/diaspora/__init__.py b/plinth/modules/diaspora/__init__.py index 60453caf1..8765ed20e 100644 --- a/plinth/modules/diaspora/__init__.py +++ b/plinth/modules/diaspora/__init__.py @@ -82,10 +82,10 @@ def init(): global service setup_helper = globals()['setup_helper'] if setup_helper.get_state() != 'needs-setup': - service = service_module.Service(managed_services[0], name, ports=[ - 'http', 'https' - ], is_external=True, is_enabled=is_enabled, enable=enable, - disable=disable) + service = service_module.Service( + managed_services[0], name, ports=['http', 'https'], + is_external=True, is_enabled=is_enabled, enable=enable, + disable=disable) if is_enabled(): add_shortcut() diff --git a/plinth/modules/matrixsynapse/__init__.py b/plinth/modules/matrixsynapse/__init__.py index 163936e1d..a2034a740 100644 --- a/plinth/modules/matrixsynapse/__init__.py +++ b/plinth/modules/matrixsynapse/__init__.py @@ -58,6 +58,8 @@ description = [ 'client is recommended.') ] +clients = clients + service = None logger = logging.getLogger(__name__) @@ -65,8 +67,6 @@ logger = logging.getLogger(__name__) SERVER_NAME_PATH = "/etc/matrix-synapse/conf.d/server_name.yaml" CONFIG_FILE_PATH = '/etc/matrix-synapse/homeserver.yaml' -clients = clients - def init(): """Initialize the matrix-synapse module.""" diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py index 6af7da89e..58d302b46 100644 --- a/plinth/modules/transmission/__init__.py +++ b/plinth/modules/transmission/__init__.py @@ -26,7 +26,6 @@ from plinth import service as service_module from plinth import action_utils, actions, frontpage from plinth.menu import main_menu from plinth.modules.users import create_group, register_group - from .manifest import clients version = 2 diff --git a/plinth/views.py b/plinth/views.py index df314c902..342e1d474 100644 --- a/plinth/views.py +++ b/plinth/views.py @@ -70,10 +70,10 @@ class ServiceView(FormView): diagnostics_module_name = "" # List of paragraphs describing the service description = "" + form_class = forms.ServiceForm # Display the 'status' block of the service.html template # This block uses information from service.is_running. This method is # optional, so allow not showing this block here. - form_class = forms.ServiceForm show_status_block = True service_id = None template_name = 'service.html'