Merge page and frameset pages into single template

asteroid.lisp

@@ -853,7 +853,8 @@
 (define-page front-page-content #@"/content" ()
   "Front page content (displayed in content frame)"
   (clip:process-to-string 
-   (load-template "front-page-content")
+   (load-template "front-page")
+   :framesetp t
    :title "ASTEROID RADIO"
    :station-name "ASTEROID RADIO"
    :status-message "🟢 LIVE - Broadcasting asteroid music for hackers"
@@ -1284,7 +1285,8 @@
 (define-page-with-limit player-content #@"/player-content" (:limit-group "public")
   "Player page content (displayed in content frame)"
   (clip:process-to-string
-   (load-template "player-content")
+   (load-template "player")
+   :framesetp t
    :title "Asteroid Radio - Web Player"
    :stream-base-url *stream-base-url*
    :default-stream-url (format nil "~a/asteroid.aac" *stream-base-url*)
@@ -1310,14 +1312,22 @@
 (define-page-with-limit about-content #@"/about-content" (:limit-group "public")
   "About page content (displayed in content frame)"
   (clip:process-to-string
-   (load-template "about-content")
+   (load-template "about")
+   :framesetp t
    :title "About - Asteroid Radio"))
 
+(define-page-with-limit status-page #@"/status" (:limit-group "public")
+  "Status page content"
+  (clip:process-to-string
+   (load-template "status")
+   :title "Status - Asteroid Radio"))
+
 ;; Status content (for frameset mode)
 (define-page-with-limit status-content #@"/status-content" (:limit-group "public")
   "Status page content (displayed in content frame)"
   (clip:process-to-string
-   (load-template "status-content")
+   (load-template "status")
+   :framesetp t
    :title "Status - Asteroid Radio"))
 
 (define-api-with-limit asteroid/status () ()

template/about.ctml

@@ -18,16 +18,32 @@
         <span>ABOUT ASTEROID RADIO</span>
         <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 50px; width: auto;">
       </h1>
+
       <nav class="nav">
-        <a href="/asteroid/">Home</a>
-        <a href="/asteroid/player">Player</a>
-        <a href="/asteroid/about">About</a>
-        <a href="/asteroid/status">Status</a>
-        <a href="/asteroid/profile" data-show-if-logged-in>Profile</a>
-        <a href="/asteroid/admin" data-show-if-admin>Admin</a>
-        <a href="/asteroid/login" data-show-if-logged-out>Login</a>
-        <a href="/asteroid/register" data-show-if-logged-out>Register</a>
-        <a href="/asteroid/logout" data-show-if-logged-in class="btn-logout">Logout</a>
+        <c:if test="(not framesetp)">
+          <c:then>
+            <a href="/asteroid/">Home</a>
+            <a href="/asteroid/player">Player</a>
+            <a href="/asteroid/about">About</a>
+            <a href="/asteroid/status">Status</a>
+            <a href="/asteroid/profile" data-show-if-logged-in>Profile</a>
+            <a href="/asteroid/admin" data-show-if-admin>Admin</a>
+            <a href="/asteroid/login" data-show-if-logged-out>Login</a>
+            <a href="/asteroid/register" data-show-if-logged-out>Register</a>
+            <a href="/asteroid/logout" data-show-if-logged-in class="btn-logout">Logout</a>
+          </c:then>
+          <c:else>
+            <a href="/asteroid/content" target="_self">Home</a>
+            <a href="/asteroid/player-content" target="_self">Player</a>
+            <a href="/asteroid/about-content" target="_self">About</a>
+            <a href="/asteroid/status-content" target="_self">Status</a>
+            <a href="/asteroid/profile" target="_self" data-show-if-logged-in>Profile</a>
+            <a href="/asteroid/admin" target="_self" data-show-if-admin>Admin</a>
+            <a href="/asteroid/login" target="_self" data-show-if-logged-out>Login</a>
+            <a href="/asteroid/register" target="_self" data-show-if-logged-out>Register</a>
+            <a href="/asteroid/logout" data-show-if-logged-in class="btn-logout">Logout</a>
+          </c:else>
+        </c:if>
       </nav>
     </header>
     <main style="max-width: 800px; margin: 0 auto; padding: 20px;">