From 17399b17e27c4d152c64ee1f15bfb9a0e66afaaf Mon Sep 17 00:00:00 2001
From: Etzelia <etzelia@hotmail.com>
Date: Fri, 12 Oct 2018 22:26:59 -0500
Subject: [PATCH] Polish Removed page headers and relocated to the window title
 to reclaim screen real estate

---
 templates/minecraft_manager/activity.html         |  1 +
 templates/minecraft_manager/alert.html            |  1 +
 templates/minecraft_manager/alert_info.html       |  1 +
 templates/minecraft_manager/application.html      |  1 +
 templates/minecraft_manager/application_info.html |  1 +
 templates/minecraft_manager/ban.html              |  1 +
 templates/minecraft_manager/base.html             |  2 +-
 templates/minecraft_manager/bots.html             |  1 +
 templates/minecraft_manager/chat.html             |  1 +
 templates/minecraft_manager/coreprotect.html      |  1 +
 templates/minecraft_manager/dashboard.html        |  2 +-
 templates/minecraft_manager/ip.html               |  3 ++-
 templates/minecraft_manager/overview.html         |  1 +
 templates/minecraft_manager/player.html           |  1 +
 templates/minecraft_manager/player_info.html      |  1 +
 templates/minecraft_manager/reference.html        |  1 +
 templates/minecraft_manager/report.html           | 11 ++++++-----
 templates/minecraft_manager/ticket.html           |  1 +
 templates/minecraft_manager/ticket_info.html      |  1 +
 templates/minecraft_manager/warning.html          |  1 +
 templates/minecraft_manager/warning_add.html      |  1 +
 templates/minecraft_manager/warning_info.html     |  1 +
 22 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/templates/minecraft_manager/activity.html b/templates/minecraft_manager/activity.html
index 269edf4..1e909b4 100644
--- a/templates/minecraft_manager/activity.html
+++ b/templates/minecraft_manager/activity.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load template_settings %}
+{% block title %}CoreProtect Activity Monitor{% endblock %}
 {% block section %}
     <a href="{% template_settings 'COREPROTECT_ACTIVITY_URL' %}?username={{ user.username }}" target="_blank">Fullscreen</a>
     <iframe id="cpgui" width="100%" height="750px" src="{% template_settings 'COREPROTECT_ACTIVITY_URL' %}?username={{ user.username }}">Loading...</iframe>
diff --git a/templates/minecraft_manager/alert.html b/templates/minecraft_manager/alert.html
index 76dbefe..736900a 100644
--- a/templates/minecraft_manager/alert.html
+++ b/templates/minecraft_manager/alert.html
@@ -1,6 +1,7 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
 {% load static %}
+{% block title %}Alerts{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
   <table id="model-table" class="table table-hover link-table">
diff --git a/templates/minecraft_manager/alert_info.html b/templates/minecraft_manager/alert_info.html
index 62beee2..f18533a 100644
--- a/templates/minecraft_manager/alert_info.html
+++ b/templates/minecraft_manager/alert_info.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
+{% block title %}Alert Info{% endblock %}
 {% block section %}
 <div id="content">
   <h2 class="sub-header">Alert Info</h2>
diff --git a/templates/minecraft_manager/application.html b/templates/minecraft_manager/application.html
index 055cb31..e9368d5 100644
--- a/templates/minecraft_manager/application.html
+++ b/templates/minecraft_manager/application.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load static %}
+{% block title %}Applications{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
   <table id="model-table" class="table table-hover link-table">
diff --git a/templates/minecraft_manager/application_info.html b/templates/minecraft_manager/application_info.html
index ffd19a7..5b80d8e 100644
--- a/templates/minecraft_manager/application_info.html
+++ b/templates/minecraft_manager/application_info.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
+{% block title %}Application {{ application.username }}{% endblock %}
 {% block section %}
 <div id="content">
   <h2 class="sub-header">Viewing application for {{ application.username }}</h2>
diff --git a/templates/minecraft_manager/ban.html b/templates/minecraft_manager/ban.html
index 8df6330..d239861 100644
--- a/templates/minecraft_manager/ban.html
+++ b/templates/minecraft_manager/ban.html
@@ -1,4 +1,5 @@
 {% extends "minecraft_manager/dashboard.html" %}
+{% block title %}Bans{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
   <table id="model-table" class="table table-hover link-table">
diff --git a/templates/minecraft_manager/base.html b/templates/minecraft_manager/base.html
index 58496dd..10b9004 100644
--- a/templates/minecraft_manager/base.html
+++ b/templates/minecraft_manager/base.html
@@ -24,7 +24,7 @@
 
         {% block head %}{% endblock head %}
         {% template_settings 'WINDOW_TITLE' as WINDOW_TITLE %}
-        <title>{% if WINDOW_TITLE %}{{ WINDOW_TITLE }}{% else %}MCM{% endif %}</title>
+        <title>{% if WINDOW_TITLE %}{{ WINDOW_TITLE }}{% else %}MCM{% endif %} - {% block title %}{% endblock %}</title>
     </head>
 
     <body>
diff --git a/templates/minecraft_manager/bots.html b/templates/minecraft_manager/bots.html
index 486c611..6460c81 100644
--- a/templates/minecraft_manager/bots.html
+++ b/templates/minecraft_manager/bots.html
@@ -1,6 +1,7 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
 {% load getattribute %}
+{% block title %}Bots{% endblock %}
 {% block section %}
 <div id="content">
     <!-- {{ form.status }} -->
diff --git a/templates/minecraft_manager/chat.html b/templates/minecraft_manager/chat.html
index 71ff39d..1bdac8d 100644
--- a/templates/minecraft_manager/chat.html
+++ b/templates/minecraft_manager/chat.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
+{% block title %}Chat{% endblock %}
 {% block section %}
 <div id="content">
     <div class="row">
diff --git a/templates/minecraft_manager/coreprotect.html b/templates/minecraft_manager/coreprotect.html
index 89fac09..3d2478d 100644
--- a/templates/minecraft_manager/coreprotect.html
+++ b/templates/minecraft_manager/coreprotect.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load template_settings %}
+{% block title %}CoreProtect GUI{% endblock %}
 {% block section %}
     <a href="{% template_settings 'COREPROTECT_WEB_URL' %}?username={{ user.username }}" target="_blank">Fullscreen</a>
     <iframe id="cpgui" width="100%" height="750px" src="{% template_settings 'COREPROTECT_WEB_URL' %}?username={{ user.username }}">Loading...</iframe>
diff --git a/templates/minecraft_manager/dashboard.html b/templates/minecraft_manager/dashboard.html
index 1d84d0f..3890217 100644
--- a/templates/minecraft_manager/dashboard.html
+++ b/templates/minecraft_manager/dashboard.html
@@ -70,7 +70,7 @@
           </ul>
         </div>
         <div class="col-sm-9 col-md-10 main">
-          <h1 class="page-header">{{ current_app|capfirst }} {% block after_h1 %}{% endblock %}</h1>
+          {% block h1 %}{% endblock %}
           <div id="alert" class="popup"></div>
           {% block section %}{% endblock section %}
         </div>
diff --git a/templates/minecraft_manager/ip.html b/templates/minecraft_manager/ip.html
index c8e51ac..a379df1 100644
--- a/templates/minecraft_manager/ip.html
+++ b/templates/minecraft_manager/ip.html
@@ -1,6 +1,7 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load static %}
-{% block after_h1 %}{{ ip.ip }}{% endblock %}
+{% block title %}IP{% endblock %}
+{% block h1 %}<h1>{{ ip.ip }}</h1>{% endblock %}
 {% block section %}
 <div id="content">
   <table id="model-table" class="table table-striped">
diff --git a/templates/minecraft_manager/overview.html b/templates/minecraft_manager/overview.html
index 2df6f85..5cd2646 100644
--- a/templates/minecraft_manager/overview.html
+++ b/templates/minecraft_manager/overview.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load static %}
+{% block title %}Overview{% endblock %}
 {% block head %}
     <script src="{% static 'minecraft_manager/js/chart.min.js' %}"></script>
 {% endblock %}
diff --git a/templates/minecraft_manager/player.html b/templates/minecraft_manager/player.html
index 0398923..3902850 100644
--- a/templates/minecraft_manager/player.html
+++ b/templates/minecraft_manager/player.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% block section %}
+{% block title %}Players{% endblock %}
 <div id="content" hidden="hidden">
   <table id="model-table" class="table table-hover link-table">
       <thead>
diff --git a/templates/minecraft_manager/player_info.html b/templates/minecraft_manager/player_info.html
index 653eeec..0569b20 100644
--- a/templates/minecraft_manager/player_info.html
+++ b/templates/minecraft_manager/player_info.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
+{% block title %}Player {{ player.username }}{% endblock %}
 {% block section %}
 <div id="content">
   <h2 class="sub-header">Player Info ({{ player.username }})</h2>
diff --git a/templates/minecraft_manager/reference.html b/templates/minecraft_manager/reference.html
index 33fabc7..41e92d1 100644
--- a/templates/minecraft_manager/reference.html
+++ b/templates/minecraft_manager/reference.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load static %}
+{% block title %}Reference Report{% endblock %}
 {% block section %}
 <div id="content">
   <table id="model-table" class="table table-striped">
diff --git a/templates/minecraft_manager/report.html b/templates/minecraft_manager/report.html
index fa2cecd..6f5069f 100644
--- a/templates/minecraft_manager/report.html
+++ b/templates/minecraft_manager/report.html
@@ -1,16 +1,17 @@
 {% extends "minecraft_manager/dashboard.html" %}
 
-{% block after_h1 %}{% if timestamp %}- {{ timestamp }}{% endif %}{% endblock %}
+{% block h1 %}{% if timestamp %}<h2>Report Generated on {{ timestamp }}</h2>{% endif %}{% endblock %}
 
+{% block title %}Entity Report{% endblock %}
 {% block section %}
     <form>
     Report: <br/>
     <label for="player">
         <input type="radio" name="report" id="player" value="players" {% if report == 'players' %}checked{% endif %}>Players
-    </label>
+    </label>&nbsp;&nbsp;
     <label for="entity">
         <input type="radio" name="report" id="entity" value="entities" {% if report == 'entities' %}checked{% endif %}>Entities
-    </label>
+    </label>&nbsp;&nbsp;
     <label for="count">
         <input type="radio" name="report" id="count" value="counts" {% if report == 'counts' %}checked{% endif %}>Counts
     </label>
@@ -18,10 +19,10 @@
     World: <br/>
     <label for="overworld">
         <input type="radio" name="world" id="overworld" value="overworld" {% if world == 'overworld' %}checked{% endif %}>Overworld
-    </label>
+    </label>&nbsp;&nbsp;
     <label for="nether">
         <input type="radio" name="world" id="nether" value="nether" {% if world == 'nether' %}checked{% endif %}>Nether
-    </label>
+    </label>&nbsp;&nbsp;
     <label for="end">
         <input type="radio" name="world" id="end" value="end" {% if world == 'end' %}checked{% endif %}>The End
     </label>
diff --git a/templates/minecraft_manager/ticket.html b/templates/minecraft_manager/ticket.html
index f25ee73..e0694b3 100644
--- a/templates/minecraft_manager/ticket.html
+++ b/templates/minecraft_manager/ticket.html
@@ -1,4 +1,5 @@
 {% extends "minecraft_manager/dashboard.html" %}
+{% block title %}Tickets{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
   <table id="model-table" class="table table-hover link-table">
diff --git a/templates/minecraft_manager/ticket_info.html b/templates/minecraft_manager/ticket_info.html
index c45a172..0f338a4 100644
--- a/templates/minecraft_manager/ticket_info.html
+++ b/templates/minecraft_manager/ticket_info.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
+{% block title %}Ticket Info{% endblock %}
 {% block section %}
 <div id="content">
   <h2 class="sub-header">Ticket Info ({{ ticket.issuer }}) <span {% if ticket.resolved is True %}class="label label-success"{% else %}class="label label-danger"{% endif %}>{{ ticket.resolved_label }}</span></h2>
diff --git a/templates/minecraft_manager/warning.html b/templates/minecraft_manager/warning.html
index ca52581..4ee299f 100644
--- a/templates/minecraft_manager/warning.html
+++ b/templates/minecraft_manager/warning.html
@@ -1,4 +1,5 @@
 {% extends "minecraft_manager/dashboard.html" %}
+{% block title %}Warnings{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
   <table id="model-table" class="table table-hover link-table">
diff --git a/templates/minecraft_manager/warning_add.html b/templates/minecraft_manager/warning_add.html
index 354144e..4734136 100644
--- a/templates/minecraft_manager/warning_add.html
+++ b/templates/minecraft_manager/warning_add.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
+{% block title %}Add Warning{% endblock %}
 {% block section %}
 <div id="content">
   <h2 class="sub-header">New Warning</h2>
diff --git a/templates/minecraft_manager/warning_info.html b/templates/minecraft_manager/warning_info.html
index c631abb..ed9c99d 100644
--- a/templates/minecraft_manager/warning_info.html
+++ b/templates/minecraft_manager/warning_info.html
@@ -1,5 +1,6 @@
 {% extends "minecraft_manager/dashboard.html" %}
 {% load csrf_html %}
+{% block title %}Warning Info{% endblock %}
 {% block section %}
 <div id="content">
   <h2 class="sub-header">Warning Info ({{ warning.player.username }})</h2>