Compare commits

..

No commits in common. "aec8caa11afbd1eb06f99625d845565751975203" and "b750e83be04057d05b8e5f6ccfe2fdbf63ff1888" have entirely different histories.

14 changed files with 76 additions and 80 deletions

View File

@ -7,7 +7,6 @@ Macros that insert templates
- `%BANNER_COOKIES%` the cookie banner (requires PHP) - `%BANNER_COOKIES%` the cookie banner (requires PHP)
### [pass1_misc.json](./pass1_misc.json) ### [pass1_misc.json](./pass1_misc.json)
Miscellaneous macros Miscellaneous macros
- `%FAVICON%` links the tab icon (HTML <head> section)
- `%STYLESHEET%` links stylesheet (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) - `%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 - `%COLOR_BEIGE%`, `%COLOR_ORANGE%`, `%COLOR_BLUE%`, `%COLOR_PINK%`, `%COLOR_CYAN%` color codes, format: #XXXXXX

View File

@ -1,5 +1,4 @@
{ {
"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\">", "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');", "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" "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_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_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)\""], "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 ThreadR - About Us
</title> </title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>

View File

@ -11,7 +11,7 @@ $id=$_GET['id'];
<head> <head>
<title>ThreadR - Boards</title> <title>ThreadR - Boards</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <link rel="icon" type="image/png" href="%CONTENT_DIR%/img/favicon-32x32.png" sizes="32x32" />
<?php <?php
if(isset($_GET['action'])) { if(isset($_GET['action'])) {
if ($_GET['action']=='submit') { if ($_GET['action']=='submit') {

View File

@ -10,16 +10,14 @@ $navbar="boards";
<head> <head>
<title>ThreadR - Boards</title> <title>ThreadR - Boards</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>
%NAVBAR% %NAVBAR%
<div class="container"> <div class="container">
<div class="item-1"> <div class="item-1">
<h1> <h1><center>ThreadR Boards</center></h1>
<center>ThreadR Boards</center>
</h1>
</div> </div>
<div class="item-2"> <div class="item-2">
<ul class="list"> <ul class="list">

View File

@ -11,7 +11,7 @@ $navbar="home";
<head> <head>
<title>ThreadR - Home</title> <title>ThreadR - Home</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>

View File

@ -11,7 +11,7 @@ if (isset($_SESSION['user_id'])){
<head> <head>
<title>ThreadR - Log In</title> <title>ThreadR - Log In</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>

View File

@ -8,7 +8,7 @@ $navbar = "logout";
<head> <head>
<title>ThreadR - Home</title> <title>ThreadR - Home</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>
@ -26,4 +26,4 @@ $navbar = "logout";
</div> </div>
%BANNER_COOKIES% %BANNER_COOKIES%
</body> </body>
</html> </html>

View File

@ -10,7 +10,7 @@ $navbar = "news";
<head> <head>
<title>ThreadR - News</title> <title>ThreadR - News</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>

View File

@ -26,7 +26,7 @@ $navbar = "profile";
<head> <head>
<title>ThreadR - Profile</title> <title>ThreadR - Profile</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>

View File

@ -9,7 +9,7 @@ $navbar = "signup";
<head> <head>
<title>ThreadR - Sign Up</title> <title>ThreadR - Sign Up</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>

View File

@ -34,7 +34,7 @@ $navbar = "verify-email";
<head> <head>
<title>ThreadR - Verification</title> <title>ThreadR - Verification</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>

View File

@ -25,7 +25,7 @@ $navbar = "home";
<head> <head>
<title>ThreadR</title> <title>ThreadR</title>
%STYLESHEET% %STYLESHEET%
%FAVICON% <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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>