moved favicon to a macro, fixed broken formatting wherever I found it

fixed indent
added favicon macro
2021-10-29 05:05:38 +02:00 · 2021-10-29 04:54:48 +02:00 · 2021-10-29 04:54:12 +02:00
14 changed files with 80 additions and 76 deletions
--- a/macros/README.md
+++ b/macros/README.md
@ -7,6 +7,7 @@ Macros that insert templates
 - `%BANNER_COOKIES%`    the cookie banner (requires PHP)
 ### [pass1_misc.json](./pass1_misc.json)
 Miscellaneous macros
+- `%FAVICON%`           links the tab icon (HTML <head> section)
 - `%STYLESHEET%`        links stylesheet (HTML <head> section)
 - `%PLEAZE_NO_CACHE%`   tell the browser not to cache this page (PHP, before any data is sent to the client)
 - `%COLOR_BEIGE%`, `%COLOR_ORANGE%`, `%COLOR_BLUE%`, `%COLOR_PINK%`, `%COLOR_CYAN%` color codes, format: #XXXXXX
--- a/macros/pass1_misc.json
+++ b/macros/pass1_misc.json
@ -1,4 +1,5 @@
 {
+"FAVICON":"<link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />",
 "STYLESHEET":"<link rel=\"stylesheet\" type=\"text\/css\" href=\"%CONTENT_DIR%\/style.css\">",
 "PLEAZE_NO_CACHE":"header('Cache-Control: no-cache, no-store, must-revalidate');header('Pragma: no-cache');header('Expires: 0');",
 "COLOR_BEIGE":"#fef6e4", "COLOR_ORANGE":"#f3d2c1", "COLOR_BLUE":"#001858", "COLOR_PINK":"#f582ae", "COLOR_CYAN":"#8bd3dd"
--- a/src/about/index.php
+++ b/src/about/index.php
@ -12,7 +12,7 @@ $navbar="about";
      ThreadR - About Us
    </title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/board/index.php
+++ b/src/board/index.php
@ -11,7 +11,7 @@ $id=$_GET['id'];
  <head>
    <title>ThreadR - Boards</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <?php
    if(isset($_GET['action'])) {
      if ($_GET['action']=='submit') {
--- a/src/boards/index.php
+++ b/src/boards/index.php
@ -10,14 +10,16 @@ $navbar="boards";
  <head>
    <title>ThreadR - Boards</title>
    %STYLESHEET%
-        <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
    %NAVBAR%
    <div class="container">
      <div class="item-1">
-          <h1><center>ThreadR Boards</center></h1>
+        <h1>
+          <center>ThreadR Boards</center>
+        </h1>
      </div>
      <div class="item-2">
        <ul class="list">
--- a/src/index.php
+++ b/src/index.php
@ -11,7 +11,7 @@ $navbar="home";
  <head>
    <title>ThreadR - Home</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/login/index.php
+++ b/src/login/index.php
@ -11,7 +11,7 @@ if (isset($_SESSION['user_id'])){
  <head>
    <title>ThreadR - Log In</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/logout/index.php
+++ b/src/logout/index.php
@ -8,7 +8,7 @@ $navbar = "logout";
  <head>
    <title>ThreadR - Home</title>
    %STYLESHEET%
-        <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/news/index.php
+++ b/src/news/index.php
@ -10,7 +10,7 @@ $navbar = "news";
  <head>
    <title>ThreadR - News</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/profile/index.php
+++ b/src/profile/index.php
@ -26,7 +26,7 @@ $navbar = "profile";
  <head>
    <title>ThreadR - Profile</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/signup/index.php
+++ b/src/signup/index.php
@ -9,7 +9,7 @@ $navbar = "signup";
  <head>
    <title>ThreadR - Sign Up</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/signup/verify-email/index.php
+++ b/src/signup/verify-email/index.php
@ -34,7 +34,7 @@ $navbar = "verify-email";
  <head>
    <title>ThreadR - Verification</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
--- a/src/userhome/index.php
+++ b/src/userhome/index.php
@ -25,7 +25,7 @@ $navbar = "home";
  <head>
    <title>ThreadR</title>
    %STYLESHEET%
-    <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
+    %FAVICON%
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
Author	SHA1	Message	Date
BodgeMaster	aec8caa11a	moved favicon to a macro, fixed broken formatting wherever I found it	2021-10-29 05:05:38 +02:00
BodgeMaster	2f6b6d09de	fixed indent	2021-10-29 04:54:48 +02:00
BodgeMaster	be97370acb	added favicon macro	2021-10-29 04:54:12 +02:00