Move Tor to separate module and present under Apps

- Remove Privacy section

modules/installed/privacy/privacy.py

@@ -1,19 +0,0 @@
-import cherrypy
-from gettext import gettext as _
-from plugin_mount import PagePlugin
-from modules.auth import require
-import cfg
-import util
-
-
-class Privacy(PagePlugin):
-    order = 20 # order of running init in PagePlugins
-    def __init__(self, *args, **kwargs):
-        PagePlugin.__init__(self, *args, **kwargs)
-        self.register_page("privacy")
-        self.menu = cfg.main_menu.add_item("Privacy", "icon-eye-open", "/privacy", 12)
-
-    @cherrypy.expose
-    def index(self):
-        return util.render_template(template='privacy_config',
-                                    title=_('Privacy Control Panel'))

modules/installed/privacy/templates/privacy_config.html

@@ -1,46 +0,0 @@
-{% extends "login_nav.html" %}
-{% comment %}
-#
-# This file is part of Plinth.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-{% endcomment %}
-
-{% block main_block %}
-
-<p>Privacy controls are not yet implemented.  This page is a
-placeholder and a promise: privacy is important enough that it is a
-founding consideration, not an afterthought.</p>
-
-{% endblock %}
-
-{% block sidebar_right_block %}
-
-<div class="well sidebar-nav">
-  <h3>Statement of Principles</h3>
-
-  <p>When we say your privacy is important, it's not just an empty
-  pleasantry.  We really mean it.  Your privacy control panel should
-  give you fine-grained control over exactly who can access your {{
-  cfg.product_name }} and the information on it.</p>
-
-  <p>Your personal information should not leave this box without your
-  knowledge and direction.  And if companies or government wants this
-  information, they have to ask <strong>you</strong> for it.  This
-  gives you a chance to refuse and also tells you who wants your
-  data.</p>
-</div>
-
-{% endblock %}

modules/installed/tor/tor.py

@@ -29,11 +29,12 @@ import util
 
 
 class tor(PagePlugin):
-    order = 30 # order of running init in PagePlugins
+    order = 60  # order of running init in PagePlugins
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
-        self.register_page("privacy.tor")
-        cfg.html_root.privacy.menu.add_item("Tor", "icon-eye-close", "/privacy/tor", 30)
+        self.register_page("apps.tor")
+        cfg.html_root.apps.menu.add_item("Tor", "icon-eye-close", "/apps/tor",
+                                         30)
 
     @cherrypy.expose
     @require()

modules/privacy.py

@@ -1 +0,0 @@
-installed/privacy/privacy.py

modules/tor.py

@@ -1 +1 @@
-installed/privacy/tor.py
+installed/tor/tor.py