From 9bb0bca3251bf9d3a78fd67505bb4e9c4732ebdf Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Sat, 5 Mar 2022 10:51:22 -0600
Subject: [PATCH] Clean up some view, menu config etc.

---
 messkit/config.py             |  6 ------
 messkit/web/menus.py          | 30 +++++++-----------------------
 messkit/web/views/__init__.py | 20 ++------------------
 3 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/messkit/config.py b/messkit/config.py
index a5bb434..3fda13f 100644
--- a/messkit/config.py
+++ b/messkit/config.py
@@ -43,9 +43,3 @@ class MesskitConfig(ConfigExtension):
         config.setdefault('tailbone', 'menus', 'messkit.web.menus')
         config.setdefault('rattail', 'model', 'messkit.db.model')
         config.setdefault('rattail', 'settings', 'messkit.appsettings')
-
-        # # always try to append poser to path
-        # # TODO: location of poser dir should come from config/app/handler?
-        # poser = os.path.join(sys.prefix, 'app', 'poser')
-        # if poser not in sys.path and os.path.isdir(poser):
-        #     sys.path.append(poser)
diff --git a/messkit/web/menus.py b/messkit/web/menus.py
index d8707c3..7071c75 100644
--- a/messkit/web/menus.py
+++ b/messkit/web/menus.py
@@ -26,7 +26,6 @@ Web Menus
 
 
 def simple_menus(request):
-    url = request.route_url
 
     people_menu = {
         'title': "People",
@@ -74,54 +73,39 @@ def simple_menus(request):
         'items': [
             {
                 'title': "Users",
-                'url': url('users'),
+                'route': 'users',
                 'perm': 'users.list',
             },
-            # {
-            #     'title': "User Events",
-            #     'url': url('userevents'),
-            #     'perm': 'userevents.list',
-            # },
             {
                 'title': "Roles",
-                'url': url('roles'),
+                'route': 'roles',
                 'perm': 'roles.list',
             },
             {'type': 'sep'},
             {
                 'title': "App Settings",
-                'url': url('appsettings'),
+                'route': 'appsettings',
                 'perm': 'settings.list',
             },
             {
                 'title': "Email Settings",
-                'url': url('emailprofiles'),
+                'route': 'emailprofiles',
                 'perm': 'emailprofiles.list',
             },
             {
                 'title': "Raw Settings",
-                'url': url('settings'),
+                'route': 'settings',
                 'perm': 'settings.list',
             },
             {'type': 'sep'},
-            # {
-            #     'title': "DataSync Changes",
-            #     'url': url('datasyncchanges'),
-            #     'perm': 'datasync_changes.list',
-            # },
-            # {
-            #     'title': "Importing / Exporting",
-            #     'url': url('importing'),
-            #     'perm': 'importing.list',
-            # },
             {
                 'title': "Tables",
-                'url': url('tables'),
+                'route': 'tables',
                 'perm': 'tables.list',
             },
             {
                 'title': "Messkit Upgrades",
-                'url': url('upgrades'),
+                'route': 'upgrades',
                 'perm': 'upgrades.list',
             },
         ],
diff --git a/messkit/web/views/__init__.py b/messkit/web/views/__init__.py
index ad3fb6b..bd7ffa9 100644
--- a/messkit/web/views/__init__.py
+++ b/messkit/web/views/__init__.py
@@ -29,25 +29,9 @@ from tailbone.util import include_configured_views
 
 def includeme(config):
 
-    # core
-    config.include('tailbone.views.common')
-    config.include('tailbone.views.auth')
-    config.include('tailbone.views.menus')
-    # config.include('tailbone.views.importing')
+    config.include('tailbone.views.essentials')
+
     config.include('tailbone.views.poser')
-    config.include('tailbone.views.progress')
-
-    # config.include('tailbone.views.features')
-
     config.include('tailbone.views.reports')
 
-    # main tables
-    config.include('tailbone.views.email')
-    config.include('tailbone.views.people')
-    config.include('tailbone.views.roles')
-    config.include('tailbone.views.settings')
-    config.include('tailbone.views.tables')
-    config.include('tailbone.views.upgrades')
-    config.include('tailbone.views.users')
-
     include_configured_views(config)