From 792b52a77c9e90080068909eeed791243f18dcf8 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 15 Aug 2019 01:06:10 +0200
Subject: [PATCH] Add Sites/Pages listing to admin, as per #1744

---
 evennia/settings_default.py                   |  4 +-
 .../templates/website/evennia_admin.html      | 88 +++++++++++++------
 2 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 2d5d96cfb2..6c69eabcac 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -763,8 +763,8 @@ STAFF_CONTACT_EMAIL = None
 # Absolute path to the directory that holds file uploads from web apps.
 # Example: "/home/media/media.lawrence.com"
 MEDIA_ROOT = os.path.join(GAME_DIR, "web", "media")
-# It's safe to dis-regard this, as it's a Django feature we only half use as a
-# dependency, not actually what it's primarily meant for.
+# If using Sites/Pages from the web admin, this value must be set to the
+# database-id of the Site (domain) we want to use with this game's Pages.
 SITE_ID = 1
 # The age for sessions.
 # Default: 1209600 (2 weeks, in seconds)
diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html
index e01aee2380..4d52266ee9 100644
--- a/evennia/web/website/templates/website/evennia_admin.html
+++ b/evennia/web/website/templates/website/evennia_admin.html
@@ -9,40 +9,70 @@
       <div class="card-body">
         <h1 class="card-title">Admin</h1>
         <p class="card-text">
-          Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game.
+          The Evennia admin page allows for modifying database entities using a
+          graphical interface.
+        </p>
+        <hr />
+
+        <h3>Game entities</h3>
+
+
+        <p class="card-text">
+          <h4><a href="{% url "admin:accounts_accountdb_changelist" %}">Accounts</a></h4>
+          Accounts can have several characters under them. A user's login and
+          password information can be changed here.
+        </p>
+
+        <p class="card-text">
+          <h4><a href="{% url "admin:objects_objectdb_changelist" %}">Objects</a></h4>
+          Objects include everything with an in-game location, from characters
+          to rooms, exits, swords and monsters.
+        </p>
+
+        <p class="card-text">
+          <h4><a href="{% url "admin:scripts_scriptdb_changelist" %}">Scripts</a></h4>
+          Scripts are meta objects used to store game information and state,
+          handle special functionality or perform timed actions. They have no
+          in-game location.
+        </p>
+
+        <p class="card-text">
+          <h4><a href="{% url "admin:comms_channeldb_changelist" %}">Channels</a></h4>
+          Channels are used to redirect and organize player communications.
+        </p>
+
+        <p class="card-text">
+          <h4><a href="{% url "admin:help_helpentry_changelist" %}">Help Topics</a></h4>
+          Extend the automatic command-help with custom help topics.
+        </p>
+
+        <hr />
+
+        <h3>Extra website pages</h3>
+
+        <p class="card-text">
+        <h4><a href="{% url "admin:sites_site_changelist" %}">Sites (domains)</a></h4>
+        Configure domain name for your pages. For local-only testing, create a
+        domain named <I>localhost:4001</I>. Then manually add
+        <strong>SITE_ID=&lt;id&gt;</strong> to your settings, where &lt;id&gt;
+        is the database-id of the domain you created (the &lt;id&gt; can be
+        found from the url of the domain in the admin, so
+        <I>/admin/sites/site/3/change</I> means that &lt;id&gt; is 3).
+        </p>
+
+        <p class="card-text">
+        <h4><a href="{% url "admin:flatpages_flatpage_changelist" %}">Pages</a></h4>
+          Create, edit and publish new web pages without needing to know how to
+          code. Select the domain specified by <strong>SITE_ID</strong> above.
         </p>
 
         <hr />
 
         <p class="card-text">
-          <h2><a href="{% url "admin:accounts_accountdb_changelist" %}">Accounts</a></h2>
-          Accounts can have several characters under them. A user's login and password information can be changed here.
-        </p>
-
-        <p class="card-text">
-          <h2><a href="{% url "admin:objects_objectdb_changelist" %}">Objects</a></h2>
-          Objects include everything from characters to rooms to exits.
-        </p>
-
-        <p class="card-text">
-          <h2><a href="{% url "admin:scripts_scriptdb_changelist" %}">Scripts</a></h2>
-          Scripts are meta objects used to store game information, handle special functionality or perform timed actions.
-        </p>
-
-        <p class="card-text">
-          <h2><a href="{% url "admin:comms_channeldb_changelist" %}">Channels</a></h2>
-          Channels are used for player communications.
-        </p>
-
-        <p class="card-text">
-          <h2><a href="{% url "admin:help_helpentry_changelist" %}">Help Topics</a></h2>
-          Help entries are custom entries added to the player help system.
-        </p>
-        <hr />
-
-        <p class="card-text">
-          If you are an advanced user who needs access to the raw Django Admin, it is available <a href="{% url "django_admin" %}">here</a>.
-          You can make this the default my changing <code>EVENNIA_ADMIN</code> to <code>False</code> in <code>settings.py</code> and reload.
+          If you are an advanced user who needs access to the raw Django Admin,
+          it is available <a href="{% url "django_admin" %}">here</a>.  You can
+          make this the default by changing <code>EVENNIA_ADMIN</code> to
+          <code>False</code> in <code>settings.py</code> and reload.
         </p>
       </div>
     </div>