X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=themes%2Fdefault.sh;h=d82764bc7bde6b3361b07e4ea3a3af972efa6e6f;hb=64b8f2ee57759faaa38c6bf8b98b7fea14cc46c1;hp=3c803f455716d56ff6bba276a2586690945fb958;hpb=6225daa33e80bc879f27229dc32d8d5cf01f020d;p=shellwiki
diff --git a/themes/default.sh b/themes/default.sh
index 3c803f4..d82764b 100755
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -5,9 +5,9 @@
theme_head(){
local IFS="$BR"
printf '
-
+
'
- for css in "$_BASE/[.]/cgilite/common.css" "$_BASE/[.]/themes/default.css" $PAGE_CSS; do
+ for css in "$_BASE/%5B.%5D/cgilite/common.css" "$_BASE/%5B.%5D/themes/default.css" $PAGE_CSS; do
printf '' \
"$(HTML "${css##*//}")"
done
@@ -27,27 +27,27 @@ theme_pagemenu(){
if acl_write "$page"; then
printf '
'
fi
}
theme_page(){
local page="$1" title="$2"
- title="$(HTML "${title:-"${page}"}")"
+ title="$(HTML "${title:-"${PAGE_TITLE:-"${page}"}"}")"
# Important! Web Server response including newline
printf "%s\r\n" "Content-Type: text/html; charset=utf-8" ""
cat <<-EOF
-
+
$(theme_head)
${title}
@@ -68,19 +68,43 @@ theme_page(){
}
theme_editor(){
- local page="$1" template="$2" title
- title="${page%/}"; title="${title##*/}"
+ local page="$1" template="$2" title file att
+ title="$(HTML "${PAGE_TITLE:-"${page}"}")"
[ "$template" ] && acl_read "$template" || template="$page"
theme_page - "Editor: $title" <<-EOF
-
+ $(wiki "/[wiki]/editorhelp/")
+
+ $(for file in "$_EXEC/pages/${page%/:$LANGUAGE/}/#attachments"/* "$_DATA/pages/${page%/:$LANGUAGE/}/#attachments"/*; do
+ [ "$file" = "$_EXEC/pages/${page%/:$LANGUAGE/}/#attachments/${file##*/}" \
+ -a -f "$_DATA/pages/${page%/:$LANGUAGE/}/#attachments/${file##*/}" ] && continue
+ case ${file##*/} in
+ \*) continue;;
+ *.[pP][nN][gG]|*.[jJ][pP][gG]|*.[jJ][pP][eE][gG]|*.[gG][iI][fF])
+ [ "$page" != "${page%/:$LANGUAGE/}" ] && p=../ || p=''
+ att="$(HTML "${file##*/}")"
+ printf '
![](%s)
- [%s]([attachment]/%s)
- [![%s](%s)]([attachment]/%s)
' \
+ "$p" "$att" "$att" "$att" "$att" "$att" "$att" "$att"
+ ;;
+ *)
+ att="$(HTML "${file##*/}")"
+ printf '
[%s](%s)
' "$att" "$att"
+ ;;
+ esac
+ done)
+
EOF
}
@@ -129,7 +153,7 @@ theme_attachments(){
%s
' \
"$hfile" "$hfile" "$hfile" "$hfile" \
- "$hfile" "$hfile" "$hfile" "$hfile" \
+ "$(slopecode "${file##*/}")" "$hfile" "$hfile" "$hfile" \
"$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
done)
@@ -171,7 +195,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"