Polish

Removed page headers and relocated to the window title to reclaim screen real estate
2018-10-12 22:26:59 -05:00 · 2018-10-12 22:26:59 -05:00 · 17399b17e2
parent 28841c58d6
commit 17399b17e2
22 changed files with 28 additions and 8 deletions
--- 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>
--- 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">
--- 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>
--- 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">
--- 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>
--- 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">
--- 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>
--- 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 }} -->
--- 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">
--- 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>
--- 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>
--- 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">
--- 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 %}
--- 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>
--- 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>
--- 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">
--- 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>
--- 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">
--- 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>
--- 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">
--- 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>
--- 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>