From 6c8101355d25084d134f82f548b975c07f12b5ef Mon Sep 17 00:00:00 2001
From: Nicholas <nmatlaga@gmail.com>
Date: Sat, 15 Jul 2017 21:11:24 -0400
Subject: [PATCH] cleaned up all pages, made sure each page has header

---
 .../web/website/templates/website/404.html    | 15 +++++--
 .../web/website/templates/website/500.html    | 17 ++++++--
 .../templates/website/evennia_admin.html      |  3 ++
 .../templates/website/flatpages/default.html  | 13 ++++---
 .../web/website/templates/website/index.html  |  2 +
 .../website/registration/logged_out.html      | 19 +++++++--
 .../templates/website/registration/login.html | 39 ++++++++++++-------
 .../web/website/templates/website/tbi.html    |  6 +--
 8 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/evennia/web/website/templates/website/404.html b/evennia/web/website/templates/website/404.html
index ed877eb868..f98e6522a1 100644
--- a/evennia/web/website/templates/website/404.html
+++ b/evennia/web/website/templates/website/404.html
@@ -1,15 +1,22 @@
 {% extends "base.html" %}
 
-{% block sidebar %}
-{% endblock %}
+{% block titleblock %}404 - Not Found{% endblock %}
 
 {% block header_ext %}
+<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
 {% endblock %}
 
 {% block content %}
 <div class="row">
-    <div class="col">
-        <h1>Error 404 - Page not found</h1>
+  <div class="col">
+    <div class="card">
+      <div class="card-block">
+        <h1 class="card-title">Error 404</h1>
+        <h4 class="card-subtitle">Page not found</h2>
+        <hr />
+        <p><a href="/">Back to the home page</a></p>
+      </div>
     </div>
+  </div>
 </div>
 {% endblock %}
diff --git a/evennia/web/website/templates/website/500.html b/evennia/web/website/templates/website/500.html
index d9778d9546..f40ed64725 100644
--- a/evennia/web/website/templates/website/500.html
+++ b/evennia/web/website/templates/website/500.html
@@ -1,14 +1,23 @@
 {% extends "base.html" %}
-{% block sidebar %}
-{% endblock %}
+
+{% block titleblock %}500 - Internal Server Error{% endblock %}
 
 {% block header_ext %}
+<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
 {% endblock %}
 
 {% block content %}
 <div class="row">
-    <div class="col">
-        <h1>Error 500 - A Server Error was encountered.</h1>
+  <div class="col">
+    <div class="card">
+      <div class="card-block">
+        <h1 class="card-title">Error 500</h1>
+        <h4 class="card-subtitle">Internal Server Error</h2>
+        <hr />
+        <p>If this result is unexpected, please contact the server administrator</p>
+        <p><a href="/">Back to the home page</a></p>
+      </div>
     </div>
+  </div>
 </div>
 {% endblock %}
diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html
index 04a8d64cf0..9e2df5b4a6 100644
--- a/evennia/web/website/templates/website/evennia_admin.html
+++ b/evennia/web/website/templates/website/evennia_admin.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block titleblock %}Admin{% endblock %}
+
 {% block content %}
 <div class="row">
   <div class="col">
diff --git a/evennia/web/website/templates/website/flatpages/default.html b/evennia/web/website/templates/website/flatpages/default.html
index a059acb265..5184c22deb 100644
--- a/evennia/web/website/templates/website/flatpages/default.html
+++ b/evennia/web/website/templates/website/flatpages/default.html
@@ -3,14 +3,15 @@
 {% block header_ext %}
 {% endblock %}
 
-{% block sidebar %}
-{% endblock %}
-
 {% block content %}
 <div class="row">
-    <div class="col">
-        <h1>{{flatpage.title}}</h1>
+  <div class="col">
+    <div class="card">
+      <div class="card-block">
+        <h1 class="card-title">{{flatpage.title}}</h1>
+        {{flatpage.content}}
+      </div>
     </div>
+  </div>
 </div>
-{{flatpage.content}}
 {% endblock %}
diff --git a/evennia/web/website/templates/website/index.html b/evennia/web/website/templates/website/index.html
index a30f96bce3..4dfc4959b3 100644
--- a/evennia/web/website/templates/website/index.html
+++ b/evennia/web/website/templates/website/index.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block titleblock %}Home{% endblock %}
+
 {% block header_ext %}
 {% endblock %}
 
diff --git a/evennia/web/website/templates/website/registration/logged_out.html b/evennia/web/website/templates/website/registration/logged_out.html
index c8ede170b3..ec931cd420 100644
--- a/evennia/web/website/templates/website/registration/logged_out.html
+++ b/evennia/web/website/templates/website/registration/logged_out.html
@@ -1,14 +1,25 @@
 {% extends "base.html" %}
 
-{% block titleblock %}
-Logged Out
+{% block header_ext %}
+<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
 {% endblock %}
 
+{% block titleblock %}Logged Out{% endblock %}
+
 {% block content %}
 <div class="row">
-    <div class="col">
-        <h1 id="alt-layout">Logged Out</h1>
+  <div class="col">
+    <div class="card">
+      <div class="card-block">
+        <h1 class="card-title">Logged Out</h1>
         <p>You have been logged out.</p>
+        <p>Redirecting in 2 seconds...</p>
+      </div>
     </div>
+  </div>
 </div>
+
+<script type="text/JavaScript">
+  setTimeout("location.href = '/';",2000);
+ </script>
 {% endblock %}
diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html
index 294567e83b..aad1c30fe2 100644
--- a/evennia/web/website/templates/website/registration/login.html
+++ b/evennia/web/website/templates/website/registration/login.html
@@ -5,11 +5,15 @@ Login
 {% endblock %}
 
 {% block content %}
+
 {% load addclass %}
 
 <div class="row">
-    <div class="col">
-        <h1>Login</h1>
+  <div class="col">
+    <div class="card">
+      <div class="card-block">
+        <h1 class="card-title">Login</h1>
+        <hr />
         {% if user.is_authenticated %}
         <p>You are already logged in!</p>
         {% else %}
@@ -18,21 +22,26 @@ Login
         {% endif %}
 
         <form method="post" action=".">
-            {% csrf_token %}
-            <div class="form-group">
-                <label for="id_username">Username:</label>
-                {{ form.username | addclass:"form-control" }}
-            </div>
-            <div class="form-group">
-                <label for="id_password">Password:</label>
-                {{ form.password | addclass:"form-control" }}
-            </div>
-            <div class="form-group">
-                <input class="form-control" type="submit" value="Login" />
-                <input type="hidden" name="next" value="{{ next }}" />
-            </div>
+          {% csrf_token %}
+
+          <div class="form-group">
+            <label for="id_username">Username:</label>
+            {{ form.username | addclass:"form-control" }}
+          </div>
+
+          <div class="form-group">
+            <label for="id_password">Password:</label>
+            {{ form.password | addclass:"form-control" }}
+          </div>
+
+          <div class="form-group">
+            <input class="form-control" type="submit" value="Login" />
+            <input type="hidden" name="next" value="{{ next }}" />
+          </div>
         </form>
+      </div>
     </div>
+  </div>
 </div>
 {% endif %}
 {% endblock %}
diff --git a/evennia/web/website/templates/website/tbi.html b/evennia/web/website/templates/website/tbi.html
index 802c18b952..b303a270c8 100644
--- a/evennia/web/website/templates/website/tbi.html
+++ b/evennia/web/website/templates/website/tbi.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 
-{% block header_ext %}
-{% endblock %}
+{% block titleblock %}To Be Implemented{% endblock %}
 
-{% block sidebar %}
+{% block header_ext %}
+<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
 {% endblock %}
 
 {% block content %}