Move XMPP to separate module and present under Apps

- Remove Services section

modules/installed/services/services.py

@@ -1,17 +0,0 @@
-import cherrypy
-from modules.auth import require
-from plugin_mount import PagePlugin
-import cfg
-import util
-
-
-class Services(PagePlugin):
-    order = 9 # order of running init in PagePlugins
-    def __init__(self, *args, **kwargs):
-        PagePlugin.__init__(self, *args, **kwargs)
-        self.register_page("services")
-        self.menu = cfg.main_menu.add_item("Services", "icon-list", "/services", 90)
-
-    @cherrypy.expose
-    def index(self):
-        raise cherrypy.HTTPRedirect(cfg.server_dir + '/services/xmpp')

modules/installed/xmpp/xmpp.py

@@ -10,19 +10,21 @@ import util
 
 
 SIDE_MENU = {'title': _('XMPP'),
-             'items': [{'url': '/services/xmpp/configure',
+             'items': [{'url': '/apps/xmpp/configure',
                         'text': 'Configure XMPP Server'},
-                       {'url': '/services/xmpp/register',
+                       {'url': '/apps/xmpp/register',
                         'text': 'Register XMPP Account'}]}
 
 
 class XMPP(PagePlugin):
     """XMPP Page"""
+    order = 60
+
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
-        self.register_page('services.xmpp')
+        self.register_page('apps.xmpp')
-        cfg.html_root.services.menu.add_item('XMPP', 'icon-comment',
+        cfg.html_root.apps.menu.add_item('XMPP', 'icon-comment',
-                                             '/services/xmpp', 40)
+                                             '/apps/xmpp', 40)
 
         self.client_service = service.Service(
             'xmpp-client', _('Chat Server - client connections'),
@@ -62,10 +64,11 @@ allowed to register an account through an XMPP client'))
 
 class Configure(PagePlugin):
     """Configuration page"""
+    order = 65
 
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
-        self.register_page("services.xmpp.configure")
+        self.register_page("apps.xmpp.configure")
 
     @cherrypy.expose
     @require()
@@ -143,10 +146,11 @@ class RegisterForm(forms.Form):  # pylint: disable-msg=W0232
 
 class Register(PagePlugin):
     """User registration page"""
+    order = 65
 
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
-        self.register_page('services.xmpp.register')
+        self.register_page('apps.xmpp.register')
 
     @cherrypy.expose
     @require()

modules/services.py

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

modules/xmpp.py

@@ -1 +1 @@
-installed/services/xmpp.py
+installed/xmpp/xmpp.py