X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=page.sh;h=f49968b3770e538c614a4e107f7c954a3a034d97;hp=a26e8828ee5c1ea257e91efdb13d2c242e1d542b;hb=e308373633b80056507ee9cedc5c9b7fc3a00dca;hpb=df47e7e07c175d11b2fa6464024bb2b2b8829c5c

diff --git a/page.sh b/page.sh
index a26e882..f49968b 100755
--- a/page.sh
+++ b/page.sh
@@ -3,17 +3,15 @@
 echo -n "Content-Type: text/html;charset=utf-8\n\n"
 
 PAGE="$(echo "$_GET[\"page\"]" |egrep '^[a-zA-Z0-9_-]+$')"
-PAGE="${_EXEC}/ifcomponent/page_${PAGE}.sh"
-[ -x "$PAGE" ] || PAGE="${_EXEC}/ifcomponent/page_error.sh"
-
-TITLE=$($PAGE title)
+PAGE="${_EXEC}/pages/${PAGE}.sh"
+[ -x "$PAGE" ] || PAGE="${_EXEC}/pages/error.sh"
 
 NAVIGATION() {
-  for each in "${_EXEC}/ifcomponent"/page_*.sh; do
-    link="$(echo "$each" |sed -r "s:^.*page_(.*)\.sh$:\1:")"
+  for each in "${_EXEC}"/pages/*.sh; do
+    link="$(echo "$each" |sed -r "s:^.*/([^/]*)\.sh$:\1:")"
     title="$($each title)"
     [ -n "$title" ] && echo "/?page=$link $title"
   done
 }
 
-. ${_EXEC}/ifcomponent/frame.sh
+. ${_EXEC}/templates/frame.html.sh