Compare commits

...

3 Commits

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
14 changed files with 80 additions and 76 deletions

View File

@ -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

View File

@ -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"

View File

@ -5,5 +5,5 @@
"DB_USERNAME":["exec","echo -n \"$(sed --quiet \"/db_username=/s/.*=//p\" config/instance.conf)\""],
"DB_NAME" :["exec","echo -n \"$(sed --quiet \"/db_database=/s/.*=//p\" config/instance.conf)\""],
"DB_SERVER" :["exec","echo -n \"$(sed --quiet \"/db_svr_host=/s/.*=//p\" config/instance.conf)\""],
"ABOUT_PAGE":["file","config/about.template"]
"ABOUT_PAGE" :["file","config/about.template"]
}

View File

@ -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>

View File

@ -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') {

View File

@ -7,27 +7,49 @@ $navbar="boards";
?>
<!DOCTYPE html>
<html>
<head>
<title>ThreadR - Boards</title>
%STYLESHEET%
<link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
<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>
</div>
<div class="item-2">
<ul class="list">
<?php
$pdo = new PDO('mysql:host=%DB_SERVER%;dbname=%DB_NAME%', '%DB_USERNAME%', '%DB_PASSWORD%');
<head>
<title>ThreadR - Boards</title>
%STYLESHEET%
%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>
</div>
<div class="item-2">
<ul class="list">
<?php
$pdo = new PDO('mysql:host=%DB_SERVER%;dbname=%DB_NAME%', '%DB_USERNAME%', '%DB_PASSWORD%');
$error = false;
$error_message = "";
if (!$error) {
echo '<center><h2 class="beige">Public Boards</h2></center>';
$statement = $pdo->prepare("SELECT * FROM boards WHERE private='0' ORDER BY id asc");
$statement->execute();
foreach($statement->fetchAll() as $ROW) {
echo "<li><a href='%CONTENT_DIR%/board/?id=$ROW[id]'>$ROW[name]</a></li>";
}
}
if (!$result) {
$error_message = "Error: SQL error.\n" . $statement->queryString . "\n" . $statement->errorInfo()[2];
}
?>
</ul>
</div>
<div class="item-3">
<ul class="list">
<?php
if ($login) {
$error = false;
$error_message = "";
if (!$error) {
echo '<center><h2 class="beige">Public Boards</h2></center>';
$statement = $pdo->prepare("SELECT * FROM boards WHERE private='0' ORDER BY id asc");
echo '<center><h2 class="beige">Private Boards</h2></center>';
$statement = $pdo->prepare("SELECT * FROM boards WHERE private='1' ORDER BY id asc");
$statement->execute();
foreach($statement->fetchAll() as $ROW) {
echo "<li><a href='%CONTENT_DIR%/board/?id=$ROW[id]'>$ROW[name]</a></li>";
@ -36,31 +58,11 @@ $navbar="boards";
if (!$result) {
$error_message = "Error: SQL error.\n" . $statement->queryString . "\n" . $statement->errorInfo()[2];
}
?>
</ul>
</div>
<div class="item-3">
<ul class="list">
<?php
if ($login) {
$error = false;
$error_message = "";
if (!$error) {
echo '<center><h2 class="beige">Private Boards</h2></center>';
$statement = $pdo->prepare("SELECT * FROM boards WHERE private='1' ORDER BY id asc");
$statement->execute();
foreach($statement->fetchAll() as $ROW) {
echo "<li><a href='%CONTENT_DIR%/board/?id=$ROW[id]'>$ROW[name]</a></li>";
}
}
if (!$result) {
$error_message = "Error: SQL error.\n" . $statement->queryString . "\n" . $statement->errorInfo()[2];
}
}
?>
</ul>
</div>
}
?>
</ul>
</div>
%BANNER_COOKIES%
</body>
</div>
%BANNER_COOKIES%
</body>
</html>

View File

@ -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>

View File

@ -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>

View File

@ -5,25 +5,25 @@ $navbar = "logout";
?>
<!DOCTYPE html>
<html>
<head>
<title>ThreadR - Home</title>
%STYLESHEET%
<link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
%NAVBAR%
<br />
<div class="container">
<div class="item-1">
<h1>
<center>Bye! Cya around some time soon.</center>
</h1>
</div>
<div class="item-2">
<img src="%CONTENT_DIR%/img/ThreadR.svg" alt="ThreadR" height="100%" width="100%">
</div>
</div>
%BANNER_COOKIES%
</body>
</html>
<head>
<title>ThreadR - Home</title>
%STYLESHEET%
%FAVICON%
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
%NAVBAR%
<br />
<div class="container">
<div class="item-1">
<h1>
<center>Bye! Cya around some time soon.</center>
</h1>
</div>
<div class="item-2">
<img src="%CONTENT_DIR%/img/ThreadR.svg" alt="ThreadR" height="100%" width="100%">
</div>
</div>
%BANNER_COOKIES%
</body>
</html>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>