Merge commit '8ed7045912937148dd46554178e675df8493f46c'

[shellwiki] / themes / default.sh

diff --git a/themes/default.sh b/themes/default.sh
index 89d4fad6c12c934dc71dd2f61a89903c6592676b..c99477bc4d99c54cb6b3362d04bedc1ff0dcd862 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -3,11 +3,14 @@
 . "$_EXEC/tools.sh"
 
 theme_head(){
+  local IFS="$BR"
   printf '
   <meta name="viewport" content="width=device-width"/>
-  <link rel="stylesheet" type="text/css" href="%s/[.]/cgilite/common.css">
-  <link rel="stylesheet" type="text/css" href="%s/[.]/themes/default.css">
-  ' "$_BASE"
+  '
+  for css in "$_BASE/[.]/cgilite/common.css" "$_BASE/[.]/themes/default.css" $PAGE_CSS; do
+    printf  '<link rel="stylesheet" type="text/css" href="%s">' \
+            "$(HTML "${css##*//}")"
+  done
 }
 
 theme_header(){
@@ -28,6 +31,9 @@ theme_pagemenu(){
       <li><a href="./[edit]">Edit</a></li>
       <li><a href="./[attachment]">Attachments</a></li>
       <li><a href="./[revision]">Revisions</a></li>
+      <li><a href="./[rename]">Rename</a></li>
+      <li><a href="./[move]">Move</a></li>
+      <li><a href="./[delete]">Delete</a></li>
     </ul>'
   fi
 }
@@ -68,7 +74,7 @@ theme_editor(){
   [ "$template" ] && acl_read "$template" || template="$page"
 
   theme_page - "Editor: $title" <<-EOF
-       <form method=POST action="$(HTML "${page%/}/[edit]")">
+       <form method=POST action="$(HTML "${_BASE}${page%/}/[edit]")">
          <input type=hidden name=session_key value="${SESSION_KEY}"/>
          <textarea name=pagetext>$({ wiki_text "$page" \
                                   || wiki_text "$template"; } |HTML)</textarea>