removed debug marks
[confetti] / page.sh
diff --git a/page.sh b/page.sh
index a26e882..f49968b 100755 (executable)
--- 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