diff options
| -rwxr-xr-x[-rw-r--r--] | LICENSE | 0 | ||||
| -rwxr-xr-x | content.html | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | css/desktop/button.css | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | css/desktop/container.css | 0 | ||||
| -rwxr-xr-x | css/desktop/header.css | 19 | ||||
| -rwxr-xr-x[-rw-r--r--] | css/desktop/input.css | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | css/desktop/login.css | 0 | ||||
| -rwxr-xr-x | css/desktop/navbar.css | 27 | ||||
| -rwxr-xr-x | html/footer.html | 2 | ||||
| -rwxr-xr-x | html/header.html | 8 | ||||
| -rwxr-xr-x | html/main.html | 9 | ||||
| -rwxr-xr-x | html/navbar.html | 0 | ||||
| -rwxr-xr-x | html/stylesheets.html | 27 | ||||
| -rwxr-xr-x[-rw-r--r--] | images/logos/logo.gif | bin | 585 -> 585 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | images/logos/taya.gif | bin | 4646 -> 4646 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | php/execute.php | 0 | ||||
| -rwxr-xr-x | php/footer.php | 2 | ||||
| -rwxr-xr-x | php/header.php | 30 | ||||
| -rwxr-xr-x[-rw-r--r--] | php/index.php | 2 | ||||
| -rwxr-xr-x | php/render.php | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | signin/content.html | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | signin/index.php | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | signup/content.html | 0 | ||||
| l--------- | signup/index.php | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | signup/signup.php | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | signup/verify/content.html | 0 | ||||
| l--------- | signup/verify/index.php | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | signup/verify/verify.php | 0 |
28 files changed, 96 insertions, 46 deletions
diff --git a/content.html b/content.html index ff8feb5..e69de29 100755 --- a/content.html +++ b/content.html @@ -1 +0,0 @@ -<p>Hello, World!</p> diff --git a/css/desktop/button.css b/css/desktop/button.css index 9164f93..9164f93 100644..100755 --- a/css/desktop/button.css +++ b/css/desktop/button.css diff --git a/css/desktop/container.css b/css/desktop/container.css index ff5e766..ff5e766 100644..100755 --- a/css/desktop/container.css +++ b/css/desktop/container.css diff --git a/css/desktop/header.css b/css/desktop/header.css index 0364bfa..7b72c7c 100755 --- a/css/desktop/header.css +++ b/css/desktop/header.css @@ -42,22 +42,3 @@ .header .banner a { text-decoration: none; } - -.header .navbar { - height: 35px; - padding: 5px; - background-color: #CADCEB; - display: flex; - align-items: center; - border-bottom: 1px solid #98A5B0; - justify-content: space-between; -} - -.header .navbar a { - text-decoration: none; - color: black; -} - -.header .navbar a:hover { - text-decoration: underline; -} diff --git a/css/desktop/input.css b/css/desktop/input.css index 883e124..883e124 100644..100755 --- a/css/desktop/input.css +++ b/css/desktop/input.css diff --git a/css/desktop/login.css b/css/desktop/login.css index 257924a..257924a 100644..100755 --- a/css/desktop/login.css +++ b/css/desktop/login.css diff --git a/css/desktop/navbar.css b/css/desktop/navbar.css new file mode 100755 index 0000000..a94d539 --- /dev/null +++ b/css/desktop/navbar.css @@ -0,0 +1,27 @@ +/* + * GNUfault.org - GNUfault's website + * Copyright (C) 2026 Connor Thomson + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +.header .navbar { + height: 35px; + padding: 5px; + background-color: #CADCEB; + display: flex; + align-items: center; + border-bottom: 1px solid #98A5B0; + gap: 5px; +} diff --git a/html/footer.html b/html/footer.html index 3a15050..678e9ff 100755 --- a/html/footer.html +++ b/html/footer.html @@ -17,5 +17,5 @@ --> <div class="footer"> - <h6>© {{YEAR}} Connor Thomson. Content licensed under the <a href=https://creativecommons.org/licenses/by-sa/4.0/>Creative Commons Attribution-ShareAlike 4.0 International</a> license unless otherwise noted.</h6> + <h6>© {{year}} Connor Thomson. Content licensed under the <a href=https://creativecommons.org/licenses/by-sa/4.0/>Creative Commons Attribution-ShareAlike 4.0 International</a> license unless otherwise noted.</h6> </div> diff --git a/html/header.html b/html/header.html index 827ac18..dccb0f3 100755 --- a/html/header.html +++ b/html/header.html @@ -28,12 +28,6 @@ </div> </a> <nav class="navbar"> - <div> - <a href="/">Home</a> - </div> - <div> - <a href="/signup">Sign-up</a> - <a href="/signin">Sign-in</a> - </div> + {{navbar}} </nav> </div> diff --git a/html/main.html b/html/main.html index d4a3534..690d257 100755 --- a/html/main.html +++ b/html/main.html @@ -25,14 +25,7 @@ <link rel="icon" type="image/x-icon" href="/images/logos/taya.gif"> - <link rel="stylesheet" href="/css/{{device}}/body.css"> - <link rel="stylesheet" href="/css/{{device}}/content.css"> - <link rel="stylesheet" href="/css/{{device}}/header.css"> - <link rel="stylesheet" href="/css/{{device}}/footer.css"> - <link rel="stylesheet" href="/css/{{device}}/container.css"> - <link rel="stylesheet" href="/css/{{device}}/button.css"> - <link rel="stylesheet" href="/css/{{device}}/input.css"> - <link rel="stylesheet" href="/css/{{device}}/login.css"> + {{stylesheets}} </head> <body ontouchstart> <div class="container"> diff --git a/html/navbar.html b/html/navbar.html new file mode 100755 index 0000000..e69de29 --- /dev/null +++ b/html/navbar.html diff --git a/html/stylesheets.html b/html/stylesheets.html new file mode 100755 index 0000000..bd8c9f7 --- /dev/null +++ b/html/stylesheets.html @@ -0,0 +1,27 @@ +<!-- + -- GNUfault.org - GNUfault's website + -- Copyright (C) 2026 Connor Thomson + -- + -- This program is free software: you can redistribute it and/or modify + -- it under the terms of the GNU Affero General Public License as published by + -- the Free Software Foundation, either version 3 of the License, or + -- (at your option) any later version. + -- + -- This program is distributed in the hope that it will be useful, + -- but WITHOUT ANY WARRANTY; without even the implied warranty of + -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + -- GNU Affero General Public License for more details. + -- + -- You should have received a copy of the GNU Affero General Public License + -- along with this program. If not, see <https://www.gnu.org/licenses/>. + --> + +<link rel="stylesheet" href="/css/{{device}}/body.css"> +<link rel="stylesheet" href="/css/{{device}}/content.css"> +<link rel="stylesheet" href="/css/{{device}}/header.css"> +<link rel="stylesheet" href="/css/{{device}}/footer.css"> +<link rel="stylesheet" href="/css/{{device}}/container.css"> +<link rel="stylesheet" href="/css/{{device}}/button.css"> +<link rel="stylesheet" href="/css/{{device}}/input.css"> +<link rel="stylesheet" href="/css/{{device}}/login.css"> +<link rel="stylesheet" href="/css/{{device}}/navbar.css"> diff --git a/images/logos/logo.gif b/images/logos/logo.gif Binary files differindex 651f716..651f716 100644..100755 --- a/images/logos/logo.gif +++ b/images/logos/logo.gif diff --git a/images/logos/taya.gif b/images/logos/taya.gif Binary files differindex 4c46358..4c46358 100644..100755 --- a/images/logos/taya.gif +++ b/images/logos/taya.gif diff --git a/php/execute.php b/php/execute.php index bd8fe18..bd8fe18 100644..100755 --- a/php/execute.php +++ b/php/execute.php diff --git a/php/footer.php b/php/footer.php index 695b39f..652bf3e 100755 --- a/php/footer.php +++ b/php/footer.php @@ -22,7 +22,7 @@ require_once ROOT . '/php/replace.php'; $year = date('Y'); $targets = [ - '{{YEAR}}' => $year + '{{year}}' => $year ]; $html = replace(ROOT . '/html/footer.html', $targets); diff --git a/php/header.php b/php/header.php new file mode 100755 index 0000000..93cdbf9 --- /dev/null +++ b/php/header.php @@ -0,0 +1,30 @@ +<?php +/* + * GNUfault.org - GNUfault's website + * Copyright (C) 2026 Connor Thomson + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +require_once ROOT . '/php/replace.php'; + +$targets = [ + '{{navbar}}' => file_get_contents(ROOT . '/html/navbar.html') +]; + +$html = replace(ROOT . '/html/header.html', $targets); + +echo $html; + +?>
\ No newline at end of file diff --git a/php/index.php b/php/index.php index 2f2377d..cdf976d 100644..100755 --- a/php/index.php +++ b/php/index.php @@ -24,6 +24,6 @@ require_once ROOT . '/php/render.php'; $path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH); $file = rtrim($path, '/') . '/content.html'; -render_page(ROOT . $file); +render_content(ROOT . $file); ?> diff --git a/php/render.php b/php/render.php index eab7c82..68d1b96 100755 --- a/php/render.php +++ b/php/render.php @@ -20,14 +20,15 @@ require_once ROOT . '/php/replace.php'; require_once ROOT . '/php/execute.php'; -function render_page(string $page) { +function render_content(string $page) { $device = 'desktop'; $targets = [ - '{{header}}' => file_get_contents(ROOT . '/html/header.html'), - '{{content}}' => file_get_contents($page), - '{{footer}}' => execute(ROOT . '/php/footer.php'), - '{{device}}' => $device + '{{stylesheets}}' => file_get_contents(ROOT . '/html/stylesheets.html'), + '{{header}}' => execute(ROOT . '/php/header.php'), + '{{content}}' => file_get_contents($page), + '{{footer}}' => execute(ROOT . '/php/footer.php'), + '{{device}}' => $device ]; $main_html = replace(ROOT . '/html/main.html', $targets); diff --git a/signin/content.html b/signin/content.html index 90fcafa..90fcafa 100644..100755 --- a/signin/content.html +++ b/signin/content.html diff --git a/signin/index.php b/signin/index.php index 2f2377d..cdf976d 100644..100755 --- a/signin/index.php +++ b/signin/index.php @@ -24,6 +24,6 @@ require_once ROOT . '/php/render.php'; $path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH); $file = rtrim($path, '/') . '/content.html'; -render_page(ROOT . $file); +render_content(ROOT . $file); ?> diff --git a/signup/content.html b/signup/content.html index 83c9fe7..83c9fe7 100644..100755 --- a/signup/content.html +++ b/signup/content.html diff --git a/signup/index.php b/signup/index.php deleted file mode 120000 index 1876f97..0000000 --- a/signup/index.php +++ /dev/null @@ -1 +0,0 @@ -../php/index.php
\ No newline at end of file diff --git a/signup/signup.php b/signup/signup.php index 5ba3ca8..5ba3ca8 100644..100755 --- a/signup/signup.php +++ b/signup/signup.php diff --git a/signup/verify/content.html b/signup/verify/content.html index 2ba116b..2ba116b 100644..100755 --- a/signup/verify/content.html +++ b/signup/verify/content.html diff --git a/signup/verify/index.php b/signup/verify/index.php deleted file mode 120000 index 3e5d98e..0000000 --- a/signup/verify/index.php +++ /dev/null @@ -1 +0,0 @@ -../../php/index.php
\ No newline at end of file diff --git a/signup/verify/verify.php b/signup/verify/verify.php index e5e729f..e5e729f 100644..100755 --- a/signup/verify/verify.php +++ b/signup/verify/verify.php |
