From 421a0d23d31cd6f04badff5bed595b934b73f7f4 Mon Sep 17 00:00:00 2001
From: Tealk <tealk@anzah.email>
Date: Fri, 19 Mar 2021 14:39:59 +0100
Subject: [PATCH] Cleanup

---
 css/main.css |   9 +---
 template.php | 115 ++++++++++++++++++++++++---------------------------
 2 files changed, 55 insertions(+), 69 deletions(-)

diff --git a/css/main.css b/css/main.css
index 4923348..9bec61d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,6 +1,3 @@
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:400&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese");
-@import url("https://fonts.googleapis.com/css?family=Fira+Sans:400,700&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese");
-
 body {
   background: #ffffff;
   margin: 0;
@@ -36,7 +33,7 @@ a:focus {
   border-radius: 0px 0px 30px 30px;
 }
 
-#wrapper {
+main.container {
   max-width: 1024px;
   min-height: calc(100vh - 157px);
   padding-right: 15px;
@@ -210,7 +207,7 @@ article.card textarea {
   margin-left: 70px;
 }
 
-#wrapper.admin #timeline .service input[type="checkbox"] {
+main.container.admin #timeline .service input[type="checkbox"] {
   margin-right: 4px;
   margin-top: 0;
   vertical-align: middle;
@@ -254,8 +251,6 @@ article.card textarea {
   width: 100%;
   padding: 2px 5px;
   display: block;
-  transition: 125ms ease-in-out background-color;
-  background-color: gray;
 }
 
 #footerwrap .dropdown-menu a:hover {
diff --git a/template.php b/template.php
index 8adc9cf..57c1ab5 100644
--- a/template.php
+++ b/template.php
@@ -145,19 +145,10 @@ class Template
           </div>
         </nav>
       </header>
-      <?php
-      if (!$admin) {
-      ?>
-        <main id="wrapper" class="container">
-        <?php
-      } else {
-        global $user;
-        ?>
-          <main id="wrapper" class="container admin">
-          <?php
+      <main class="container <?php if ($admin) { ?>admin<?php } ?>">
+        <?php if ($admin) {
+          global $user;
         }
-          ?>
-        <?php
       }
       /**
        * Renders a toggle switch
@@ -169,16 +160,16 @@ class Template
       public static function render_toggle($toggletext, $input_name, $checked)
       {
         ?>
-          <div id="switch">
-            <label class="switch">
-              <input type="checkbox" name="<?php echo $input_name; ?>" <?php if ($checked) {
-                                                                          echo "checked";
-                                                                        } ?>>
-              <span class="slider round"></span>
-            </label>
-            <?php echo $toggletext; ?>
-          </div>
-        <?php
+        <div id="switch">
+          <label class="switch">
+            <input type="checkbox" name="<?php echo $input_name; ?>" <?php if ($checked) {
+                                                                        echo "checked";
+                                                                      } ?>>
+            <span class="slider round"></span>
+          </label>
+          <?php echo $toggletext; ?>
+        </div>
+      <?php
       }
       /**
        * Renders footer
@@ -188,48 +179,48 @@ class Template
       {
         global $negotiator;
         $lang_names = $negotiator->get_accepted_langs();
-        ?>
-          </main>
-          <footer id="footerwrap" class="sticky-bottom">
-            <div class="container">
-              <div class="row centered">
-                <div class="col-md-4 text-left"><a class="link-light" href="https://github.com/server-status-project/server-status/graphs/contributors" target="_blank">Copyright © <?php echo date("Y"); ?> Server Status Project Contributors </a><?php if (strlen(COPYRIGHT_TEXT) > 1) {
-                                                                                                                                                                                                                                                      echo " and " . COPYRIGHT_TEXT;
-                                                                                                                                                                                                                                                    } ?></div>
-                <div class="col-md-4 text-center">
-                  <div class="input-group dropup mb-3">
-                    <button type="button" class="btn btn-primary" disabled><?php echo '<img src="' . $WEB_URL . '/locale/' . $_SESSION['locale'] . '/flag.png" alt="' . $lang_names[$_SESSION['locale']] . '">' . $lang_names[$_SESSION['locale']]; ?></button>
-                    <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
-                      <span class="visually-hidden"><?php echo _("Toggle Dropdown"); ?></span>
-                    </button>
-                    <ul class="dropdown-menu">
-                      <?php
-                      foreach ($lang_names as $key => $value) {
-                        echo '<a href="?lang=' . $key . '"><img src="' . $WEB_URL . '/locale/' . $key . '/flag.png" alt="' . $value . '">' . $value . '</a>';
-                      }
-                      ?>
-                      <li>
-                        <hr class="dropdown-divider">
-                      </li>
-                      <li><a href="https://poeditor.com/join/project/37SpmJtyOm"><?php echo _("Help with translation!"); ?></a></li>
-                    </ul>
-                  </div>
-                </div>
-                <div class="col-md-4 text-right"><a class="link-light" href="<?php echo POLICY_URL; ?>"><?php echo _("Imprint & Privacy Policy"); ?></a></div>
+      ?>
+      </main>
+      <footer id="footerwrap" class="sticky-bottom">
+        <div class="container">
+          <div class="row centered">
+            <div class="col-md-4 text-left"><a class="link-light" href="https://github.com/server-status-project/server-status/graphs/contributors" target="_blank">Copyright © <?php echo date("Y"); ?> Server Status Project Contributors </a><?php if (strlen(COPYRIGHT_TEXT) > 1) {
+                                                                                                                                                                                                                                                  echo " and " . COPYRIGHT_TEXT;
+                                                                                                                                                                                                                                                } ?></div>
+            <div class="col-md-4 text-center">
+              <div class="input-group dropup mb-3">
+                <button type="button" class="btn btn-primary" disabled><?php echo '<img src="' . $WEB_URL . '/locale/' . $_SESSION['locale'] . '/flag.png" alt="' . $lang_names[$_SESSION['locale']] . '">' . $lang_names[$_SESSION['locale']]; ?></button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                  <span class="visually-hidden"><?php echo _("Toggle Dropdown"); ?></span>
+                </button>
+                <ul class="dropdown-menu">
+                  <?php
+                  foreach ($lang_names as $key => $value) {
+                    echo '<a href="?lang=' . $key . '"><img src="' . $WEB_URL . '/locale/' . $key . '/flag.png" alt="' . $value . '">' . $value . '</a>';
+                  }
+                  ?>
+                  <li>
+                    <hr class="dropdown-divider">
+                  </li>
+                  <li><a href="https://poeditor.com/join/project/37SpmJtyOm"><?php echo _("Help with translation!"); ?></a></li>
+                </ul>
               </div>
-              <!--/row -->
             </div>
-            <!--/container -->
-          </footer>
-          <script src="<?php echo WEB_URL; ?>/vendor/jquerry/jquery-3.6.0.min.js"></script>
-          <script src="<?php echo WEB_URL; ?>/vendor/jquerry/jquery.timeago.js"></script>
-          <?php if ($admin) { ?>
-            <script src="<?php echo WEB_URL; ?>/vendor/flatpickr/flatpickr.min.js"></script>
-            <script src="<?php echo WEB_URL; ?>/js/admin.js"></script>
-          <?php } ?>
-          <script src="<?php echo WEB_URL; ?>/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-          <script src="<?php echo WEB_URL; ?>/js/main.js"></script>
-          <?php if ($GOOGLE_RECAPTCHA) { ?><script src='https://www.google.com/recaptcha/api.js'></script><?php } ?>
+            <div class="col-md-4 text-right"><a class="link-light" href="<?php echo POLICY_URL; ?>"><?php echo _("Imprint & Privacy Policy"); ?></a></div>
+          </div>
+          <!--/row -->
+        </div>
+        <!--/container -->
+      </footer>
+      <script src="<?php echo WEB_URL; ?>/vendor/jquerry/jquery-3.6.0.min.js"></script>
+      <script src="<?php echo WEB_URL; ?>/vendor/jquerry/jquery.timeago.js"></script>
+      <script src="<?php echo WEB_URL; ?>/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+      <script src="<?php echo WEB_URL; ?>/js/main.js"></script>
+      <?php if ($admin) { ?>
+        <script src="<?php echo WEB_URL; ?>/vendor/flatpickr/flatpickr.min.js"></script>
+        <script src="<?php echo WEB_URL; ?>/js/admin.js"></script>
+      <?php } ?>
+      <?php if ($GOOGLE_RECAPTCHA) { ?><script src='https://www.google.com/recaptcha/api.js'></script><?php } ?>
     </body>
 
     </html>