From c2cb1f32b98212fc6a005188cb442dbfa85dc98d Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Fri, 12 Feb 2016 17:32:08 +0530
Subject: [PATCH] restore: Use new setup mechanism

---
 plinth/modules/restore/__init__.py            | 30 +++++++++++++++----
 .../restore/templates/restore_index.html      | 24 ++-------------
 plinth/modules/restore/views.py               |  6 ++--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/plinth/modules/restore/__init__.py b/plinth/modules/restore/__init__.py
index 45404a27a..dff18b3d4 100644
--- a/plinth/modules/restore/__init__.py
+++ b/plinth/modules/restore/__init__.py
@@ -22,24 +22,44 @@ Plinth module to configure reStore.
 from django.utils.translation import ugettext_lazy as _
 from plinth import action_utils, cfg
 from plinth import service as service_module
+from plinth.utils import format_lazy
 
 service = None
 
-__all__ = ['init']
+version = 1
 
 depends = ['apps']
 
+title = _('Unhosted Storage (reStore)')
+
+description = [
+    format_lazy(
+        _('reStore is a server for <a href=\'https://unhosted.org/\'>'
+          'unhosted</a> web applications.  The idea is to uncouple web '
+          'applications from data.  No matter where a web application is '
+          'served from, the data can be stored on an unhosted storage '
+          'server of user\'s choice.  With reStore, your {box_name} becomes '
+          'your unhosted storage server.'), box_name=_(cfg.box_name)),
+
+    _('You can create and edit accounts in the '
+      '<a href=\'/restore/\'>reStore web-interface</a>.')
+]
+
 
 def init():
     """Initialize the reStore module."""
     menu = cfg.main_menu.get('apps:index')
-    menu.add_urlname(_('Unhosted Storage (reStore)'), 'glyphicon-hdd',
-                     'restore:index', 750)
+    menu.add_urlname(title, 'glyphicon-hdd', 'restore:index', 750)
 
     global service
     service = service_module.Service(
-        'node-restore', _('reStore'), ['http', 'https'],
-        is_external=False, enabled=is_enabled())
+        'node-restore', title, ['http', 'https'], is_external=False,
+        enabled=is_enabled())
+
+
+def setup(helper, old_version=None):
+    """Install and configure the module."""
+    helper.install(['node-restore'])
 
 
 def is_enabled():
diff --git a/plinth/modules/restore/templates/restore_index.html b/plinth/modules/restore/templates/restore_index.html
index 8c9402ba7..4148a047c 100644
--- a/plinth/modules/restore/templates/restore_index.html
+++ b/plinth/modules/restore/templates/restore_index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "app.html" %}
 {% comment %}
 #
 # This file is part of Plinth.
@@ -21,27 +21,7 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block content %}
-
-  <h2>{% trans "Unhosted Storage (reStore)" %}</h2>
-
-  <p>
-    {% blocktrans trimmed %}
-      reStore is a server for <a href='https://unhosted.org/'>unhosted</a>
-      web applications.  The idea is to uncouple web applications from
-      data.  No matter where a web application is served from, the
-      data can be stored on an unhosted storage server of user's
-      choice.  With reStore, your {{ box_name }} becomes your
-      unhosted storage server.
-    {% endblocktrans %}
-  </p>
-
-  <p>
-    {% blocktrans trimmed %}
-      You can create and edit accounts in the
-      <a href='/restore/'>reStore web-interface</a>.
-    {% endblocktrans %}
-  </p>
+{% block configuration %}
 
   <h3>Configuration</h3>
 
diff --git a/plinth/modules/restore/views.py b/plinth/modules/restore/views.py
index e0c75fbd6..0e91904a4 100644
--- a/plinth/modules/restore/views.py
+++ b/plinth/modules/restore/views.py
@@ -24,11 +24,10 @@ from django.template.response import TemplateResponse
 from django.utils.translation import ugettext as _
 
 from .forms import ReStoreForm
-from plinth import actions, package
+from plinth import actions
 from plinth.modules import restore
 
 
-@package.required(['node-restore'])
 def index(request):
     """Serve configuration page."""
     status = get_status()
@@ -43,7 +42,8 @@ def index(request):
         form = ReStoreForm(initial=status, prefix='restore')
 
     return TemplateResponse(request, 'restore_index.html',
-                            {'title': _('Unhosted Storage (reStore)'),
+                            {'title': restore.title,
+                             'description': restore.description,
                              'status': status,
                              'form': form})