From 45ea5a7cb53acb0f97fb3315566459b0955c24f9 Mon Sep 17 00:00:00 2001
From: Kelketek <kelketek@gmail.com>
Date: Sun, 29 Sep 2013 13:30:25 -0500
Subject: [PATCH] Admin pages load now, but they ain't always pretty.

---
 src/comms/admin.py                 | 27 +++------------------------
 src/web/templates/admin/index.html |  4 ++--
 src/web/utils/general_context.py   |  4 ++--
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/comms/admin.py b/src/comms/admin.py
index aa680b7cd5..6de3c14710 100644
--- a/src/comms/admin.py
+++ b/src/comms/admin.py
@@ -37,7 +37,7 @@ class ExternalChannelConnectionInline(admin.StackedInline):
 class ChannelAdmin(admin.ModelAdmin):
     inlines = (PlayerChannelConnectionInline, ExternalChannelConnectionInline)
 
-    list_display = ('id', 'db_key', 'db_desc', 'db_aliases', 'db_keep_log', 'db_lock_storage')
+    list_display = ('id', 'db_key', 'db_lock_storage')
     list_display_links = ("id", 'db_key')
     ordering = ["db_key"]
     search_fields = ['id', 'db_key', 'db_aliases']
@@ -45,28 +45,7 @@ class ChannelAdmin(admin.ModelAdmin):
     save_on_top = True
     list_select_related = True
     fieldsets = (
-        (None, {'fields':(('db_key', 'db_aliases', 'db_desc'),'db_lock_storage', 'db_keep_log')}),
+        (None, {'fields':(('db_key',),'db_lock_storage',)}),
         )
 
-admin.site.register(ChannelDB, ChannelAdmin)
-
-# class PlayerChannelConnectionAdmin(admin.ModelAdmin):
-#     list_display = ('db_channel', 'db_player')
-#     list_display_links = ("db_player", 'db_channel')
-#     ordering = ["db_channel"]
-#     search_fields = ['db_channel', 'db_player']
-#     save_as = True
-#     save_on_top = True
-#     list_select_related = True
-# admin.site.register(PlayerChannelConnection, PlayerChannelConnectionAdmin)
-
-# class ExternalChannelConnectionAdmin(admin.ModelAdmin):
-#     list_display = ('db_channel', 'db_external_key', 'db_external_config')
-#     list_display_links = ("db_channel", 'db_external_key', 'db_external_config')
-#     ordering = ["db_channel"]
-#     search_fields = ['db_channel', 'db_external_key']
-#     save_as = True
-#     save_on_top = True
-#     list_select_related = True
-# admin.site.register(ExternalChannelConnection, ExternalChannelConnectionAdmin)
-
+admin.site.register(ChannelDB, ChannelAdmin)
\ No newline at end of file
diff --git a/src/web/templates/admin/index.html b/src/web/templates/admin/index.html
index c9c52dafe4..a7487cd49d 100644
--- a/src/web/templates/admin/index.html
+++ b/src/web/templates/admin/index.html
@@ -18,7 +18,7 @@
 
         {% if app.name in evennia_userapps %}
 
-        {% if app.name == 'Auth' %}
+        {% if app.name == 'Players' %}
         <h2>Admin</h2> 
         <p><i>Players are the out-of-character representation of a
         game account. A Player can potentially control any number of
@@ -30,7 +30,7 @@
         <caption><a href="{{ app.app_url }}" class="section">{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}</a></caption>
         {% for model in app.models %}
             <tr>
-            {% if model.name == "Users" %}      
+            {% if model.name == "Players" %}
               {% if model.perms.change %}
                   <th scope="row"><a href="{{ model.admin_url }}">Player</a></th>
               {% else %}
diff --git a/src/web/utils/general_context.py b/src/web/utils/general_context.py
index f63dc40588..2b9304e94a 100644
--- a/src/web/utils/general_context.py
+++ b/src/web/utils/general_context.py
@@ -22,7 +22,7 @@ SERVER_VERSION = get_evennia_version()
 # Setup lists of the most relevant apps so 
 # the adminsite becomes more readable. 
 
-USER_RELATED = ['Players', 'Auth']
+PLAYER_RELATED = ['Players']
 GAME_ENTITIES = ['Objects', 'Scripts', 'Comms', 'Help']
 GAME_SETUP = ['Permissions', 'Config']
 CONNECTIONS = ['Irc', 'Imc2']
@@ -39,7 +39,7 @@ def general_context(request):
     return {
         'game_name': GAME_NAME,
         'game_slogan': SERVER_VERSION,
-        'evennia_userapps': USER_RELATED,
+        'evennia_userapps': PLAYER_RELATED,
         'evennia_entityapps': GAME_ENTITIES,
         'evennia_setupapps': GAME_SETUP,
         'evennia_connectapps': CONNECTIONS,