X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=c99477bc4d99c54cb6b3362d04bedc1ff0dcd862;hb=278f5b7fd6be2c7dba2c00dd78b75ad2c4366712;hp=3c5f2a1819a000277c06dc31451a2013f1335812;hpb=922181c682dc5d499eea65ae502e894e88e07f84;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index 3c5f2a1..c99477b 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/[.]/cgilite/common.css" "$_BASE/[.]/themes/default.css" $PAGE_CSS; do
+ printf '' \
+ "$(HTML "${css##*//}")"
+ done
}
theme_header(){
@@ -15,20 +18,29 @@ theme_header(){
}
theme_footer(){
- printf '' "$(wiki '[wiki]/footer/' ||echo No footer)"
+ printf '' "$(wiki '[wiki]/footer/')"
}
-theme_page(){
- local page="$1" title
- title="${page%/}"; title="${title##*/}"
+theme_pagemenu(){
+ local page="$1"
- if [ ! "$(mdfile "$page")" ]; then
- theme_error 404
- return 0
- elif ! acl_read "$page"; then
- theme_error 403
- return 0
+ if acl_write "$page"; then
+ printf '
+ '
fi
+}
+
+theme_page(){
+ 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" ""
@@ -37,19 +49,18 @@ theme_page(){
$(theme_head)
- $(HTML "${title}")
-
+ ${title}
+
$(theme_header)
- $(acl_write "$page" && printf %s \
- ''
- )
-
- $(wiki "$page" || printf 'Error while loading page
function "wiki" of index.sh returned with an error.')
-
+ $(theme_pagemenu)
+ $(if [ "$page" = '-' ]; then
+ cat
+ else
+ printf ''
+ wiki "$page"
+ printf ''
+ fi)
$(theme_footer)
@@ -60,107 +71,69 @@ theme_editor(){
local page="$1" template="$2" title
title="${page%/}"; title="${title##*/}"
- if ! acl_write "$page"; then
- theme_error 403
- return 0
- fi
-
[ "$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
}
-theme_attachments(){
+theme_revisions(){
local page="$1" title
title="${page%/}"; title="${title##*/}"
- if [ ! "$(mdfile "$page")" ]; then
- theme_error 404
- return 0
- elif ! acl_read "$page"; then
- theme_error 403
- return 0
- fi
+ "$_EXEC/macros/revisions" "$page" \
+ | theme_page - "Revisions: $title"
+}
- # Important! Web Server response including newline
- printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
+theme_attachments(){
+ local page="$1" title
+ title="${page%/}"; title="${title##*/}"
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
}