Updates all styles save for the tooltip and tracker, which are forthcoming. I just really wanted to commit all these changes.

WebHostLib/templates/check.html

@@ -3,21 +3,26 @@
 {% block head %}
     {{ super() }}
     <title>Mystery Check Result</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/uploads.css") }}" />
-    <script type="application/ecmascript" src="{{ static_autoversion("assets/uploads.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/check.css") }}" />
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/check.js") }}"></script>
 {% endblock %}
 
 {% block body %}
-    <div id="uploads-wrapper">
-        <div id="uploads" class="main-content">
+    {% include 'cloudHeader.html' %}
+    <div id="check-wrapper">
+        <div id="check" class="grass-island">
             <h3>Upload Yaml</h3>
-            <p>This page checks a .yaml file for you, to be used as options for a mystery multiworld. You can also upload a .zip with multiple YAMLs.</p>
-            <div id="uploads-form-wrapper">
-                <form id="upload-form" method="post" enctype="multipart/form-data">
+            <p>
+                This page checks a .yaml file for you, to be used as options for a mystery multiworld.
+                You can also upload a .zip with multiple YAMLs.
+            </p>
+            <div id="check-form-wrapper">
+                <form id="check-form" method="post" enctype="multipart/form-data">
                     <input id="file-input" type="file" name="file">
                 </form>
-                <button id="upload-button">Upload</button>
+                <button id="check-button">Upload</button>
             </div>
         </div>
     </div>
+    {% include 'islandFooter.html' %}
 {% endblock %}

WebHostLib/templates/checkResult.html

@@ -0,0 +1,19 @@
+{% extends 'pageWrapper.html' %}
+
+{% block head %}
+    {{ super() }}
+    <title>Upload Mystery YAML</title>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/checkResult.css") }}" />
+{% endblock %}
+
+{% block body %}
+    {% include 'cloudHeader.html' %}
+    <div id="check-result-wrapper">
+        <div id="check-result" class="grass-island">
+            {% for filename, resulttext in results.items() %}
+                <span>{{ filename }}: {{ "Looks ok" if resulttext == True else resulttext }}</span><br>
+            {% endfor %}
+        </div>
+    </div>
+    {% include 'islandFooter.html' %}
+{% endblock %}

WebHostLib/templates/checkresult.html

@@ -1,12 +0,0 @@
-{% extends 'pageWrapper.html' %}
-
-{% block head %}
-    {{ super() }}
-    <title>Upload Mystery YAML</title>
-{% endblock %}
-
-{% block body %}
-    {% for filename, resulttext in results.items() %}
-        <span>{{ filename }}: {{ "Looks ok" if resulttext == True else resulttext }}</span><br>
-    {% endfor %}
-{% endblock %}

WebHostLib/templates/generate.html

@@ -3,18 +3,19 @@
 {% block head %}
     {{ super() }}
     <title>Generate Game</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/uploads.css") }}"/>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/generate.css") }}" />
     <script type="application/ecmascript" src="{{ static_autoversion("assets/generate.js") }}"></script>
 {% endblock %}
 
 {% block body %}
-    <div id="uploads-wrapper">
-        <div id="uploads" class="main-content">
-            <h3>Upload YAML(s){% if race %} (Race Mode){% endif %}</h3>
+    {% include 'cloudHeader.html' %}
+    <div id="generate-game-wrapper">
+        <div id="generate-game" class="grass-island">
+            <h3>Generate Game{% if race %} (Race Mode){% endif %}</h3>
             <p>
                 This page accepts a yaml file containing generator options.
-                You can find a documented example at <a
-                    href="https://raw.githubusercontent.com/Berserker66/MultiWorld-Utilities/master/playerSettings.yaml">playerSettings.yaml</a>.
+                You can find a documented example at
+                <a href="https://raw.githubusercontent.com/Berserker66/MultiWorld-Utilities/master/playerSettings.yaml">playerSettings.yaml</a>.
                 This file can be saved as .yaml, edited to your liking and then supplied to the generator.
                 You can also upload a .zip with multiple YAMLs.
                 A proper menu is in the works.
@@ -31,12 +32,13 @@
                     href="https://github.com/Berserker66/MultiWorld-Utilities/releases">Client</a> to create a rom file.
                 In-Browser patching will come.
             </p>
-            <div id="uploads-form-wrapper">
-                <form id="upload-form" method="post" enctype="multipart/form-data">
+            <div id="generate-game-form-wrapper">
+                <form id="generate-game-form" method="post" enctype="multipart/form-data">
                     <input id="file-input" type="file" name="file">
                 </form>
-                <button id="upload-button">Upload</button>
+                <button id="generate-game-button">Upload</button>
             </div>
         </div>
     </div>
+    {%  include 'islandFooter.html' %}
 {% endblock %}

WebHostLib/templates/hostGame.html

@@ -3,44 +3,44 @@
 {% block head %}
     {{ super() }}
     <title>Upload Multidata</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/uploads.css") }}" />
-    <script type="application/ecmascript" src="{{ static_autoversion("assets/uploads.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/hostGame.css") }}" />
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/hostGame.js") }}"></script>
 {% endblock %}
 
 {% block body %}
     {% include 'cloudHeader.html' %}
 
-    <div id="uploads-wrapper">
-        <div id="uploads" class="grass-island">
-            <h3>Upload Multidata</h3>
+    <div id="host-game-wrapper">
+        <div id="host-game" class="grass-island {% if rooms %}wider{% endif %}">
+            <h1>Host Game</h1>
             <p>To host a game, you need to upload a .multidata file or a .zip file created by the
                 multiworld generator.</p>
-            <div id="uploads-form-wrapper">
-                <form id="upload-form" method="post" enctype="multipart/form-data">
+            <div id="host-game-form-wrapper">
+                <form id="host-game-form" method="post" enctype="multipart/form-data">
                     <input id="file-input" type="file" name="file">
                 </form>
-                <button id="upload-button">Upload</button>
+                <button id="host-game-button">Upload</button>
             </div>
 
             {% if rooms %}
-                <p>Your Rooms:</p>
-                <table id="uploads-table" class="table">
+                <h4>Your Rooms:</h4>
+                <table id="host-game-table" class="table">
                     <thead>
                         <tr>
                             <th>Seed</th>
                             <th>Room</th>
                             <th>Players</th>
-                            <th>Created</th>
-                            <th>Last Activity</th>
+                            <th>Created (UTC)</th>
+                            <th>Last Activity (UTC)</th>
 
                         </tr>
                     </thead>
                     <tbody>
                     {% for room in rooms %}
                         <tr>
-                            <td><a href="{{ url_for("view_seed", seed=room.seed.id) }}">{{ room.seed.id|suuid }}</a>
+                            <td><a href="{{ url_for("viewSeed", seed=room.seed.id) }}">{{ room.seed.id|suuid }}</a>
                             </td>
-                            <td><a href="{{ url_for("host_room", room=room.id) }}">{{ room.id|suuid }}</a></td>
+                            <td><a href="{{ url_for("hostRoom", room=room.id) }}">{{ room.id|suuid }}</a></td>
                             <td>{{ room.seed.multidata.names[0]|length }} Total:
                                 {{ room.seed.multidata.names[0]|join(", ")|truncate(256, False, " ...") }}</td>
                             <td>{{ room.creation_time.strftime("%Y-%m-%d %H:%M") }}</td>
@@ -49,11 +49,9 @@
                     {% endfor %}
                     </tbody>
                 </table>
-            {% else %}
-                <p>No rooms owned by you were found. Upload a file to get started.</p>
             {% endif %}
         </div>
     </div>
 
-    {% include 'grassFooter.html' %}
+    {% include 'islandFooter.html' %}
 {% endblock %}

WebHostLib/templates/hostRoom.html

@@ -2,17 +2,18 @@
 {% import "macros.html" as macros %}
 {% block head %}
     <title>Multiworld {{ room.id|suuid }}</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/host_room.css") }}"/>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/hostRoom.css") }}"/>
 {% endblock %}
 
 {% block body %}
+    {% include 'cloudHeader.html' %}
     <div id="host-room">
         {% if room.owner == session["_id"] %}
-            Room created from <a href="{{ url_for("view_seed", seed=room.seed.id) }}">Seed #{{ room.seed.id|suuid }}</a>
+            Room created from <a href="{{ url_for("viewSeed", seed=room.seed.id) }}">Seed #{{ room.seed.id|suuid }}</a>
             <br>
         {% endif %}
         {% if room.tracker %}
-            This room has a <a href="{{ url_for("get_tracker", tracker=room.tracker) }}">Multiworld Tracker</a> enabled.
+            This room has a <a href="{{ url_for("getTracker", tracker=room.tracker) }}">Multiworld Tracker</a> enabled.
             <br>
         {% endif %}
         This room will be closed after {{ room.timeout//60//60 }} hours of inactivity. Should you wish to continue

WebHostLib/templates/islandFooter.html

@@ -1,4 +1,5 @@
 {% block footer %}
+    <div id="island-footer-spacer"></div>
     <footer id="island-footer">
         Copyright 2020 APPlaceHolder
     </footer>

WebHostLib/templates/macros.html

@@ -1,7 +1,7 @@
 {% macro list_rooms(rooms) -%}
     <ul>
         {% for room in rooms %}
-            <li><a href="{{ url_for("host_room", room=room.id) }}">Room #{{ room.id|suuid }}</a></li>
+            <li><a href="{{ url_for("hostRoom", room=room.id) }}">Room #{{ room.id|suuid }}</a></li>
         {% endfor %}
         {{ caller() }}
     </ul>
@@ -15,4 +15,4 @@
             {% endfor %}
         </ul>
     {% endif %}
-{%- endmacro -%}
+{%- endmacro -%}

WebHostLib/templates/pageWrapper.html

@@ -6,7 +6,8 @@
     <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/cookieNotice.css") }}" />
     <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/globalStyles.css") }}" />
     <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/cloudHeader.css") }}" />
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/grassFooter.css") }}" />
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/islandFooter.css") }}" />
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/styleController.js") }}"></script>
     <script type="application/ecmascript" src="{{ static_autoversion("assets/cookieNotice.js") }}"></script>
     {% block head %}
         <title>Multiworld</title>

WebHostLib/templates/playerSettings.html

@@ -8,8 +8,9 @@
 {% endblock %}
 
 {% block body %}
-    <div id="game-settings" class="main-content">
-        <h3>Player Settings</h3>
+    {% include 'cloudHeader.html' %}
+    <div id="player-settings">
+        <h1>Player Settings</h1>
         <div id="instructions">
             This page is used to configure your player settings. You have three presets you can control, which
             you can access using the dropdown menu below. These settings will be usable when generating a
@@ -61,7 +62,7 @@
                 </tbody>
             </table>
         </div>
-        <div id="game-settings-button-row">
+        <div id="player-settings-button-row">
             <button id="reset-to-default">Reset to Defaults</button>
             <button id="export-button">Export Settings</button>
         </div>

WebHostLib/templates/tutorial.html

@@ -1,6 +1,7 @@
 {% extends 'pageWrapper.html' %}
 
 {% block head %}
+    {% include 'cloudHeader.html' %}
     <title>Setup Tutorial</title>
     <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tutorial.css") }}" />
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js"

WebHostLib/templates/viewSeed.html

@@ -3,13 +3,14 @@
 
 {% block head %}
     <title>Multiworld Seed {{ seed.id|suuid }}</title>
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/view_seed.css") }}"/>
-    <script type="application/ecmascript" src="{{ static_autoversion("assets/view_seed.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/viewSeed.css") }}"/>
+    <script type="application/ecmascript" src="{{ static_autoversion("assets/viewSeed.js") }}"></script>
 {% endblock %}
 
 {% block body %}
+    {% include 'cloudHeader.html' %}
     <div id="view-seed-wrapper">
-        <div class="main-content">
+        <div id="view-seed" class="grass-island">
             <h3>Seed Info</h3>
             {% if not seed.multidata and not seed.spoiler %}
             <h4>
@@ -82,4 +83,5 @@
             </table>
         </div>
     </div>
+    {% include 'islandFooter.html' %}
 {% endblock %}

WebHostLib/templates/waitSeed.html

@@ -4,7 +4,7 @@
 {% block head %}
     <title>Multiworld Seed {{ seed_id|suuid }} (generating...)</title>
     <meta http-equiv="refresh" content="1">
-    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/view_seed.css") }}"/>
+    <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/viewSeed.css") }}"/>
 {% endblock %}
 
 {% block body %}