X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=3812f060b7dd1ce3d7ccb4c1b277712a40a0d139;hb=71152d935975fa673d7ad4398a1757228cab8b8c;hp=1f8d285d4eb9a241601dde074f0fbd80fcb66800;hpb=9f4240c2867a03627e7b1615790255f1bbf7e568;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index 1f8d285..3812f06 100755
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -3,11 +3,14 @@
. "$_EXEC/tools.sh"
theme_head(){
+ local IFS="$BR"
printf '
-
-
-
- ' "$_BASE"
+
+ '
+ for css in "$_BASE/%5B.%5D/cgilite/common.css" "$_BASE/%5B.%5D/themes/default.css" $PAGE_CSS; do
+ printf '' \
+ "$(HTML "${css##*//}")"
+ done
}
theme_header(){
@@ -24,18 +27,20 @@ theme_pagemenu(){
if acl_write "$page"; then
printf '
'
fi
}
theme_page(){
- local page="$1" title="$2" id="$3"
+ local page="$1" title="$2"
title="$(HTML "${title:-"${page}"}")"
- id="$(HTML "${id:-"${page}"}")"
# Important! Web Server response including newline
printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
@@ -45,7 +50,7 @@ theme_page(){
$(theme_head)
${title}
-
+
$(theme_header)
$(theme_pagemenu)
@@ -68,8 +73,8 @@ theme_editor(){
[ "$template" ] && acl_read "$template" || template="$page"
- theme_page - "Editor: $title" "${page}[edit]" <<-EOF
-
-
EOF
else
- theme_page - "Attachments: $title" "${page}[attachment]" <<-EOF
+ theme_page - "Attachments: $title" <<-EOF
$(for file in "$_EXEC/pages/$page/#attachments"/* "$_DATA/pages/$page/#attachments"/*; do
[ "$file" = "$_EXEC/pages/$page/#attachments/${file##*/}" \
-a -f "$_DATA/pages/$page/#attachments/${file##*/}" ] && continue
stat="$(stat -c '%s %Y' -- "$file" 2>&-)" || continue
size="${stat% *}" date="${stat#* }"
+ hfile="$(HTML "${file##*/}")"
printf '- %s
%s%s
' \
- "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
+ "$hfile" "$hfile" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
done)
EOF
@@ -143,7 +171,7 @@ theme_error(){
500) printf "%s\r\n" "Status: 500 Internal Server Error";;
esac
- if [ "$(mdfile "/[wiki]/$errno/")" ]; then
+ if mdfile "/[wiki]/$errno/" >&-; then
theme_page "/[wiki]/$errno/"
else
printf "Content-Length: 0\r\n\r\n"