X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=3812f060b7dd1ce3d7ccb4c1b277712a40a0d139;hb=71152d935975fa673d7ad4398a1757228cab8b8c;hp=6807242cd2d6dd0445e419bd72ae62dfe5834f23;hpb=32a46b9aa404d760772578be04d100ae1c9a55f7;p=shellwiki

diff --git a/themes/default.sh b/themes/default.sh
index 6807242..3812f06 100755
--- 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,13 +27,13 @@ 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
 }
@@ -112,7 +112,8 @@ theme_attachments(){
           <input         type=radio class=tab name=attachaction value=del  id=tdel ><label for=tdel >Delete</label>
           <input         type=radio class=tab name=attachaction value=move id=tmove><label for=tmove>Move</label>
           <input         type=radio class=tab name=attachaction value=ren  id=tren ><label for=tren >Rename</label>
-          <ul class="attachment list tab">
+          <div class="tab">
+	    <ul class="attachment list">
 	$(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
@@ -128,13 +129,16 @@ theme_attachments(){
 	            <span class=date>%s</span>
 	          </li>' \
 	         "$hfile" "$hfile" "$hfile" "$hfile" \
-	         "$hfile" "$hfile" "$hfile" "$hfile" \
+	         "$(slopecode "${file##*/}")" "$hfile" "$hfile" "$hfile" \
 	         "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
 	done)
-	  </ul>
-	  <button type=submit name=action value=delete>Delete</button>
-	  <button type=submit name=action value=move  >Move</button>
-	  <button type=submit name=action value=rename>Rename</button>
+	    </ul>
+	    <button type=submit name=action value=delete>Delete</button>
+	    <label for=moveto>Move To:</label>
+	    <input id="moveto" name="moveto" value="$(HTML "$page")" placeholder="page name">
+	    <button type=submit name=action value=move  >Move</button>
+	    <button type=submit name=action value=rename>Rename</button>
+	  </div>
 	</form>
 	EOF
   else
@@ -167,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"