Fixes for pages

[cx.git] / cx / templates / public / base.php

diff --git a/cx/templates/public/base.php b/cx/templates/public/base.php
index 95f868116136c707500f93d9fc2c61d7044f5834..10c5cd17613bc062fe8daa59e30cb141651c94f8 100644 (file)
--- a/cx/templates/public/base.php
+++ b/cx/templates/public/base.php
@@ -13,11 +13,17 @@
        <?php endif; ?>
 
        <link rel="stylesheet" href="<?= cx_url('/design/css/style.css') ?>">
-       <link rel="alternate" type="application/rss+xml" title="bts.cx" href="<?= cx_url('/feed/') ?>" />
+       <link rel="alternate" type="application/atom+xml" title="bts.cx" href="<?= cx_url('/feed/') ?>" />
+
+       <meta property="og:site_name" content="<?= cx_site_name(); ?>">
+       <?php if (isset($cx_post_title)): ?>
+       <meta property="og:title" content="<?= $cx_post_title; ?>">
+       <?php else: ?>
+       <meta property="og:title" content="<?= cx_site_name(); ?>">
+       <?php endif; ?>
 
        <?php if (isset($cx_post_meta)): ?>
        
-       <meta property="og:title" content="<?= cx_site_name(); ?> - <?= $cx_post_title; ?>">
        <meta property="og:type" content="article" />
 
        <?php if (isset($cx_post_meta->hero_image)): ?>
@@ -31,10 +37,6 @@
        <meta name="twitter:image:alt" content="<?= $cx_post_meta->hero_image_alt; ?>">
        <?php endif; ?>
 
-       <?php /*<meta property="og:description" content="Offering tour packages for individuals or groups.">
-       <meta property="og:site_name" content="<?= cx_site_name(); ?>">
-       <meta name="twitter:image:alt" content="Alt text for image">*/ ?>
-
        <?php endif; ?>
 </head>
 
@@ -44,17 +46,17 @@
   <p>Find me <a href="https://mastodon.gamedev.place/@btsherratt" rel="me">@btsherratt</a> or on <a href="https://bts.itch.io/">itch.io</a></p>
 </header>
 
-<?php /*<nav>
+<nav>
 
 <ul role="list">
 <li><a href="<?= cx_url('/'); ?>">Home</a></li>
 
 <?php foreach (cx_pages_get() as $page): ?>
-<li><a href="<?= cx_url($page->url); ?>"><?= $page->title ?></a></li>
+<li><a href="<?= cx_url('/' . $page->slug); ?>"><?= $page->title ?></a></li>
 <?php endforeach; ?>
 </ul>
 
-</nav> */ ?>
+</nav>
 
 <?= cx_template_content(); ?>