X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=page.sh;h=48129c00bdfd24b20b0a9eaf4a427de5f1f221a6;hp=ef1cf4de8a72a1f45d387027ec93c8b9e26d6e16;hb=914cd668309370feff93a4219be323c1957465b0;hpb=9d7c6eae1ee756c1ba53d80e7b134fa1f3a1f0b4

diff --git a/page.sh b/page.sh
index ef1cf4d..48129c0 100755
--- a/page.sh
+++ b/page.sh
@@ -1,19 +1,34 @@
 #!/bin/zsh
 
-echo "Content-Type: text/html\n\n"
+# Copyright 2014 Paul Hänsch
+#
+# This file is part of Confetti.
+# 
+# Confetti is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Confetti is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-PAGE="$(echo "$_GET['page']" |egrep '^[a-zA-Z0-9_-]+$')"
-PAGE="${_EXEC}/ifcomponent/page_${PAGE}.sh"
-[ -x "$PAGE" ] || PAGE="${_EXEC}/ifcomponent/page_error.sh"
+echo -n "Content-Type: text/html;charset=utf-8\n\n"
 
-TITLE=$($PAGE title)
+PAGE="$(echo "$_GET[\"page\"]" |egrep '^[a-zA-Z0-9_-]+$')"
+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)"
-    echo "/?page=$link $title"
+    [ -n "$title" ] && echo "/?page=$link $title"
   done
 }
 
-. ${_EXEC}/ifcomponent/frame.sh
+. ${_EXEC}/templates/frame.html.sh