X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=e8b5f2f62802d53bfddc51f3e0dbc215a12a2df7;hb=3bcd1005c129a3423499239eb0099e4ca7b19e56;hp=8a73756030730af1e4cf7208fc4209d59a0eb21b;hpb=5b4d04c7e10daa59f4c28c541e37e37e82c4fb55;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index 8a73756..e8b5f2f 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_404
- return 0
- elif ! acl_read "$page"; then
- theme_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)
@@ -57,107 +68,94 @@ theme_page(){
}
theme_editor(){
- local page="$1" title
+ local page="$1" template="$2" title
title="${page%/}"; title="${title##*/}"
- if ! acl_write "$page"; then
- theme_403
- return 0
- fi
-
- # Important! Web Server response including newline
- printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
+ [ "$template" ] && acl_read "$template" || template="$page"
- 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_404
- return 0
- elif ! acl_read "$page"; then
- theme_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
}
@@ -179,9 +177,3 @@ theme_error(){
printf "Content-Length: 0\r\n\r\n"
fi
}
-
-theme_400(){ theme_error 400; }
-theme_403(){ theme_error 403; }
-theme_404(){ theme_error 404; }
-theme_409(){ theme_error 409; }
-theme_500(){ theme_error 500; }