X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=001dd3caa85d1ca95825359afa8d69f47b0d3600;hb=e2ad5bc6d56a970f4c4674f5c96ba7458370d8c9;hp=e9e9d73f195466c6bfcf2433dfe0dcb8767aab60;hpb=210e62ec5d92672b5471c10a47a886d5cd6d1238;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index e9e9d73..001dd3c 100755
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -24,15 +24,17 @@ theme_pagemenu(){
if acl_write "$page"; then
printf '
'
fi
}
theme_page(){
- local page="$1" title
- title="${page%/}"; title="${title##*/}"
+ local page="$1" title="$2"
+ title="$(HTML "${title:-"${page}"}")"
# Important! Web Server response including newline
printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
@@ -41,14 +43,18 @@ theme_page(){
$(theme_head)
- $(HTML "${title}")
-
+ ${title}
+
$(theme_header)
$(theme_pagemenu)
-
- $(wiki "$page" || printf 'Error while loading page
function "wiki" of index.sh returned with an error.')
-
+ $(if [ "$page" = '-' ]; then
+ cat
+ else
+ printf ''
+ wiki "$page"
+ printf ''
+ fi)
$(theme_footer)
@@ -61,25 +67,14 @@ theme_editor(){
[ "$template" ] && acl_read "$template" || template="$page"
- # Important! Web Server response including newline
- printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
-
- cat <<-EOF
-
-
- $(theme_head)
- $(HTML "${title}")
-
- $(theme_header)
-
- $(theme_footer)
-
+ theme_page - "Editor: $title" <<-EOF
+
EOF
}
@@ -87,88 +82,52 @@ theme_revisions(){
local page="$1" title
title="${page%/}"; title="${title##*/}"
- # Important! Web Server response including newline
- printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
-
- cat <<-EOF
-
-
- $(theme_head)
- Revisions $(HTML "${title}")
-
- $(theme_header)
-
- $("$_EXEC/macros/revisions" "$page")
-
- $(theme_footer)
-
- EOF
+ "$_EXEC/macros/revisions" "$page" \
+ | theme_page - "Revisions: $title"
}
theme_attachments(){
local page="$1" title
title="${page%/}"; title="${title##*/}"
- # Important! Web Server response including newline
- printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
-
if acl_write "$page"; then
- cat <<-EOF
-
-
- $(theme_head)
- Attachments $(HTML "${title}")
-
- $(theme_header)
-
-
-
-
-
- $(theme_footer)
-
+ theme_page - "Attachments: $title" <<-EOF
+
+
+
EOF
else
- cat <<-EOF
-
-
- $(theme_head)
- Attachments $(HTML "${title}")
-
- $(theme_header)
-
-
- $(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#* }"
-
- printf '- %s
- %s%s
' \
- "$(HTML "${file##*/}")" "$(HTML "${file##*/}")" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
- done)
-
-
- $(theme_footer)
-
+ 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
' \
+ "$hfile" "$hfile" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
+ done)
+
EOF
fi
}