X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=Wiki.page;h=9e135ad1ae1bee697e693724458aa593f667aa2e;hb=7799a762ca2dfbd022f7f8425fc207c8211e3ef7;hp=5effa39776e13d0c6c3e8ef2564ecebc523b760f;hpb=62c3d9c54dec22772956bea9f2ec482c891e511e;p=busy

diff --git a/Wiki.page b/Wiki.page
index 5effa39..9e135ad 100755
--- a/Wiki.page
+++ b/Wiki.page
@@ -21,24 +21,31 @@ else
   lock="$(cut -d: -f1 "$lock")"
 fi
 
-if [ -n "$edit" -a -r "Wiki/$edit" ]; then
+if [ -n "$edit" -a -r "Wiki/${edit}${rev}" ]; then
   title="$(egrep -x 'title=.+' "Wiki/$edit.meta" |cut -d= -f2- || echo '(Untitled)')"
   cat <<WikiEND
-    <form class="edit" action="write/scriptedit.cgi?i=$edit" method="post" accept-charset="UTF-8">
-      <div id="RIGHT"></div>
+    <form class="edit" action="write/wikiedit.cgi?i=$edit" method="post" accept-charset="UTF-8">
       <div id="LEFT">
 	Editing <b>$title</b><br>
-        <input type="submit">
+        <input type="submit" value="Submit">
         <input type="submit" name="cancel" value="Cancel">
 	<hr>
       </div>
       <div id="MAIN">
 	<div class="wiki">
           <h1>$title</h1>
-          <textarea name="page" rows=30 cols=40>$(cat "Wiki/$edit")</textarea>
+          <textarea name="page" rows=30 cols=40>$(cat "Wiki/${edit}${rev}")</textarea>
         </div>
       </div>
     </form>
+    <div id="RIGHT">
+    $(stat -c '' Wiki/${edit}.comment.<0000000000-9999999999>_<000-999> && for each in $(ls -c Wiki/${edit}.comment.<0000000000-9999999999>_<000-999>); do
+      author=$(grep -m1 '^author=' "$each" |cut -d= -f2-)
+      echo "<div class='comment'><h1>$author wrote:</h1><div class='wikitext'>"
+      tail -n+2 $each |_wiki
+      echo '</div></div>'
+    done)
+    </div>
 WikiEND
 
 elif [ -n "$info" -a -r "Wiki/${info}${rev}" ]; then
@@ -60,8 +67,9 @@ elif [ -n "$info" -a -r "Wiki/${info}${rev}" ]; then
   	rno=$(($rno+1))
         done) <a class='rev' href='?p=Wiki&amp;i=$info'>Latest</a><br>
       <hr>
-      $($LOGIN && [ -z "$rev" ] && if [ -z "$lock" ]; then
-  	  echo "<a class='function' href='write/lock.cgi?p=Wiki&amp;e=$info'>edit this page</a>"
+      $($LOGIN && if [ -z "$lock" ]; then
+          [ -z "$rev" ] && echo "<a class='function' href='write/lock.cgi?p=Wiki&amp;e=$info'>edit this page</a>"
+	  [ -n "$rev" ] && echo "Click <a class='function' href='write/lock.cgi?p=Wiki&amp;e=${info}&amp;r=${rev:s/.//}'>edit</a> to derive a new page revision from this one."
         else
   	  echo "<b>This page is currently being edited by $lock</b><a class='function' href='write/lock.cgi?p=Wiki&amp;e=$info'>edit anyway</a>"
         fi
@@ -81,10 +89,10 @@ elif [ -n "$info" -a -r "Wiki/${info}${rev}" ]; then
       <hr>
     </div>
     <div id="MAIN">
-      <div class="wiki">
+      <div class="wiki"><div class="wikitext">
         <h1>$title</h1>
         $(_wiki Wiki/"${info}${rev}")
-      </div>
+      </div></div>
     </div>
 WikiEND
 
@@ -95,16 +103,16 @@ $LOGIN && cat <<WikiEND
         <form action="/write/wikimeta.cgi?i=$info" method="post" accept-charset="UTF-8">
           <b>Comment:</b><br>
           <textarea name="comm" rows="6" style="width:99%;"></textarea><br>
-          <input type="submit">
+          <input type="submit" value="Submit">
           <a class="function" href="#" onclick="javascript:hide_screen('comment');show_screen('comment_button');">Cancel</a>
         </form>
       </div>
 WikiEND
   stat -c '' Wiki/${info}.comment.<0000000000-9999999999>_<000-999> && for each in $(ls -c Wiki/${info}.comment.<0000000000-9999999999>_<000-999>); do
     author=$(grep -m1 '^author=' "$each" |cut -d= -f2-)
-    echo "<div class="comment"><h1>$author wrote:</h1>"
-    tail -n-1 $each
-    echo '</div>'
+    echo "<div class='comment'><h1>$author wrote:</h1><div class='wikitext'>"
+    tail -n+2 $each |_wiki
+    echo '</div></div>'
   done
   echo '</div>'
   
@@ -119,7 +127,7 @@ elif [ -z "$info" ]; then
       <hr>
 WikiEND
   if [ -n "$search" ]; then
-    echo "<h1>Search results for: $search</h1>"
+    echo "<h1>Wiki search results for: $search</h1>"
     for each in $(grep -ile "$search" Wiki/<0000000000-9999999999>_<000-999>); do
       echo "<div class='search'><a href='?p=Wiki&amp;i=${each:t}'><h2>$(grep '^title=' "$each.meta" |cut -d= -f2-)</h2></a>"
       grep -C1 -ie "$search" "$each" |sed "s:$search:<b>&</b>:g;s:$:<br>:g"
@@ -136,7 +144,7 @@ WikiEND
 	<input type="text" name="title" placeholder="Fill in a title"><br>
         <b>Description:</b><br>
         <textarea name="desc" rows="6" ></textarea><br>
-        <input type="submit">
+        <input type="submit" value="Submit">
         <a class="function" href="#" onclick="javascript:hide_screen('add_page');show_screen('addp_button');">Cancel</a>
       </form>
     </div>
@@ -155,7 +163,7 @@ WikiEND
         <a name="$info" href="/?p=Wiki&amp;i=$info"><h1>$title</h1></a>
         $description<br><br>
         <a class="function" href="/?p=Wiki&amp;i=$info">View</a> 
-        $($LOGIN && echo "<a class='function' href='#' onclick=\"javascript:show_screen('change_$info');hide_screen('display_$info');\">Change Title</a>")
+        $($LOGIN && echo "<a class='function' href='#' onclick=\"javascript:show_screen('change_$info');hide_screen('display_$info');\">Change Info</a>")
       </div>
 WikiEND
     $LOGIN && cat <<WikiEND
@@ -164,7 +172,7 @@ WikiEND
 	  <b>Title:</b> <input type="text" name="title" value="$title"><br>
 	  <b>Description:</b><br>
 	  <textarea name="desc" rows="6" style="width:100%;">$description</textarea><br>
-	  <input type="submit">
+	  <input type="submit" value="Submit">
           <a class="function" href="#" onclick="javascript:hide_screen('change_$info');show_screen('display_$info');">Cancel</a>
 	</form>
       </div>