diff options
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/_views/bucket/main.php | 18 | ||||
| -rw-r--r-- | src/web/_views/footer.php | 3 | ||||
| -rw-r--r-- | src/web/_views/head.php | 27 | ||||
| -rw-r--r-- | src/web/lang/common.php | 4 | ||||
| -rw-r--r-- | src/web/lib/html.php | 8 |
5 files changed, 46 insertions, 14 deletions
diff --git a/src/web/_views/bucket/main.php b/src/web/_views/bucket/main.php index aeb6cf3..b85c773 100644 --- a/src/web/_views/bucket/main.php +++ b/src/web/_views/bucket/main.php @@ -1,13 +1,13 @@ <?php /* Copyright (c) 2024 Freya Murphy */ ?> - <?php - $root='https://webring.bucketfish.me/redirect.html?to=%s&name=' . $name; - $this->view('head', $data); - if ($lightmode === 'true') { - echo $this->link_css('css/bucket_light.css'); - } else { - echo $this->link_css('css/bucket.css'); - } - ?> +<?php + $root='https://webring.bucketfish.me/redirect.html?to=%s&name=' . $name; + $this->view('head', $data); + if ($lightmode === 'true') { + echo embed_css_ext('css/bucket_light.css'); + } else { + echo embed_css_ext('css/bucket.css'); + } +?> <base target="_parent" /> </head> <body> diff --git a/src/web/_views/footer.php b/src/web/_views/footer.php index a22959e..1f1ad30 100644 --- a/src/web/_views/footer.php +++ b/src/web/_views/footer.php @@ -15,8 +15,7 @@ </div> </div> <div id="footer" role="contentinfo" aria-label="footer"> - <?=lang('license_pre')?> - <a href="https://opensource.org/license/mit/">MIT License</a> + <?=lang('license')?> <br> <?=lang('copyright')?> <?=lang('first_name')?> <?=lang('last_name')?> <?=date('Y')?> <br> diff --git a/src/web/_views/head.php b/src/web/_views/head.php index 1ca6954..8cd6f87 100644 --- a/src/web/_views/head.php +++ b/src/web/_views/head.php @@ -1,4 +1,19 @@ <?php /* Copyright (c) 2024 Freya Murphy */ ?> +<?php + /* Html cache headers */ + $current_app = ROUTER->req['app']; + $non_cached_apps = ['blog']; + + if (ENVIRONMENT == 'production' && !in_array($current_app, $non_cached_apps)) { + $cache_seconds = 300; + if ($current_app == 'bucket') { + $cache_seconds = 3600; + } + header("Cache-Control: public, max-age=$cache_seconds"); + header("Expires: " . gmdate('D, d M Y H:i:s', time() + $cache_seconds) . " UTC"); + header("Pragma: cache"); + } +?> <!DOCTYPE html> <html lang="<?=lang('lang_short')?>"> <head> @@ -21,10 +36,18 @@ <link rel="icon" type="image/png" sizes="512x512" href="<?=$this->get_url("public/icons/logo512.png", TRUE)?>"> <link rel="icon" type="image/png" sizes="640x640" href="<?=$this->get_url("public/icons/logo640.png", TRUE)?>"> <link rel="manifest" href="/manifest.json"> + <?php if ($current_app != 'bucket'): ?> + <link rel="preload" href="<?=$this->get_url("public/font/FontStuck-Extended.woff2")?>" as="font" type="font/woff2" crossorigin> + <link rel="preload" href="<?=$this->get_url("public/font/CourierNew.woff2")?>" as="font" type="font/woff2" crossorigin> + <link rel="preconnect" href="https://john.citrons.xyz"> + <?php else: ?> + <link rel="preload" href="<?=$this->get_url("public/font/Merriweather.woff2")?>" as="font" type="font/woff2" crossorigin> + <?php endif ?> <?php /* Main CSS */ - if (ROUTER->req['app'] != 'bucket') - echo $this->link_css('css/main.css'); + if (ROUTER->req['app'] != 'bucket') { + echo embed_css_ext('css/main.css'); + } /* IE 4-7 Styles */ echo ie($this->embed_css('css/ie/ie.css')); diff --git a/src/web/lang/common.php b/src/web/lang/common.php index 16e0f74..fc6401e 100644 --- a/src/web/lang/common.php +++ b/src/web/lang/common.php @@ -34,7 +34,9 @@ $lang['title_website_logo'] = 'Freya'; # misc $lang['john_title'] = 'Johnvertisement'; $lang['bucket_title'] = 'Bucket Webring'; -$lang['license_pre'] = 'This site is licensed under the'; +$lang['license'] = 'This is licensed under the + <a href="https://opensource.org/license/mit/">MIT License</a> (code) and the + <a href="https://creativecommons.org/licenses/by-sa/4.0">CC BY-SA 4.0</a> (text).'; $lang['copyright'] = 'Copyright (c)'; # footer_text diff --git a/src/web/lib/html.php b/src/web/lib/html.php new file mode 100644 index 0000000..9649bf4 --- /dev/null +++ b/src/web/lib/html.php @@ -0,0 +1,8 @@ +<?php /* Copyright (c) 2024 Freya Murphy */ + + +function embed_css_ext(string $file) { + $css = Base::embed_css($file); + $web_root = Base::get_url(''); + return str_replace("WEB_ROOT", $web_root, $css); +} |