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

diff --git a/themes/default.sh b/themes/default.sh
index 0b85007..3812f06 100755
--- 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"
+  <meta name="viewport" content="width=device-width">
+  '
+  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
 }
 
 theme_header(){
@@ -24,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
 }
@@ -71,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>
@@ -96,13 +99,21 @@ theme_attachments(){
   if acl_write "$page"; then
     theme_page - "Attachments: $title" <<-EOF
 	<form class=upload method=POST enctype="multipart/form-data">
+	  <h2>Upload</h2>
 	  <input type=hidden name=session_id value="$SESSION_ID">
 	  <input type=file name=file multiple>
 	  <button type=submit name=action value=upload>Upload</button>
 	</form>
 	
-	<form method=POST><ul class="attachment list">
+	<form method=POST>
+	  <h2>Attachments</h2>
 	  <input type=hidden name=session_key value="$SESSION_KEY">
+          <input checked type=radio class=tab name=attachaction value=view id=tview><label for=tview>View</label>
+          <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>
+          <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
@@ -110,11 +121,25 @@ theme_attachments(){
 	  size="${stat% *}" date="${stat#* }"
           hfile="$(HTML "${file##*/}")"
 	
-	  printf '<li><button type=submit name=delete value="%s">Delete</button><a class=name href="[attachment]/%s">%s</a>
-	          <span class=size>%s</span><span class=date>%s</span></li>' \
-	         "$hfile" "$hfile" "$hfile" "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
+	  printf '<li><input id="select_%s" type=checkbox name=select value="%s">
+	            <label class=name for="select_%s">%s</label>
+	            <input class=name name="rename_%s" value="" placeholder="%s" />
+	            <a class=name href="[attachment]/%s">%s</a>
+	            <span class=size>%s</span>
+	            <span class=date>%s</span>
+	          </li>' \
+	         "$hfile" "$hfile" "$hfile" "$hfile" \
+	         "$(slopecode "${file##*/}")" "$hfile" "$hfile" "$hfile" \
+	         "$(size_human "$size")" "$(date -d @"$date" +"%F %T")"
 	done)
-	</ul></form>
+	    </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
     theme_page - "Attachments: $title" <<-EOF
@@ -146,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"