Merge commit '1b5b1676f9f6869aec5cd141a9670e12ccd28b5d'

[shellwiki] / themes / default.sh
diff --git a/themes/default.sh b/themes/default.sh

index e8b5f2f62802d53bfddc51f3e0dbc215a12a2df7..541f71361ae5e24a1f4b09f61d91172c4dff5b35 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -5,9 +5,9 @@
  theme_head(){
    local IFS="$BR"
    printf '
-  <meta name="viewport" content="width=device-width"/>
+  <meta name="viewport" content="width=device-width">
    '
-  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  '<link rel="stylesheet" type="text/css" href="%s">' \
              "$(HTML "${css##*//}")"
    done
@@ -27,27 +27,27 @@ theme_pagemenu(){
    if acl_write "$page"; then
      printf  '
      <ul class="pagemenu">
-      <li><a href="./[view]">View</a></li>
-      <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>
+      <li><a href="./%%5Bview%%5D">View</a></li>
+      <li><a href="./%%5Bedit%%5D">Edit</a></li>
+      <li><a href="./%%5Battachment%%5D">Attachments</a></li>
+      <li><a href="./%%5Brevision%%5D">Revisions</a></li>
+      <li><a href="./%%5Brename%%5D">Rename</a></li>
+      <li><a href="./%%5Bmove%%5D">Move</a></li>
+      <li><a href="./%%5Bdelete%%5D">Delete</a></li>
      </ul>'
    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
         <!DOCTYPE HTML>
-       <html><head>
+       <html${LANGUAGE:+ lang=\"${LANGUAGE}\"}><head>
           $(theme_head)
           <title>${title}</title>
         </head><body id="$(HTML "${PATH_INFO}")">
@@ -171,7 +171,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"