X-Git-Url: http://git.plutz.net/?p=busy;a=blobdiff_plain;f=Home.page;h=ba0fbe263358c2f2443585528b0c7015f27ec816;hp=6eef2296997a2da50fe28ff1b6bbfa623314fc89;hb=81cb90f37d49d9d7d70fea7575371e5f04692e87;hpb=766fa0c3db0db95dff75858caeab75e7fa3d1ef0

diff --git a/Home.page b/Home.page
index 6eef229..ba0fbe2 100644
--- a/Home.page
+++ b/Home.page
@@ -1,33 +1,83 @@
 #!/bin/zsh
+search="$(egrep -o '(^|&)(s=).+(&|$)' <<<"${QUERY_STRING}" |sed -r 's:^&?s=::;s:\+: :g;s:%:\\x:g')"
+search="$(echo -e "${search}" |sed 's:\t: :g;s:\r::g;s:\\:\\\\:g' |head -n1)"
 
-cat <<HomeEND
+cat <<WikiEND
   <div id="LEFT">
+    <form method="GET" action="/${SCRIPTNAME}" accept-charset="utf-8">
+      <input type="hidden" name="p" value="Home">
+      <input type="text" name="s" placeholder="Search"><br>
+      <input type="submit" value="Search News">
+    </form>
+    <hr>
+WikiEND
+if [ -n "$search" ]; then
+  echo "<h1>News search results for: $search</h1>"
+  for each in $(grep -ile "$search" Home/<0000000000-9999999999>_<000-999>.news); do
+    id=$(sed -r 's:^.*/::;s:.news$::' <<<$each)
+    echo "<div class='search'><a href='#news_$id'><h2>$(date -d @$(cut -d_ -f1 <<<"$id"))</h2></a>"
+    grep -C1 -ie "$search" "$each" |sed "s:$search:<b>&</b>:g;s:$:<br>:g"
+    echo '</div>'
+  done
+  echo '<hr>'
+fi
+
+cat <<HomeEND
   </div>
 
   <div id="MAIN">
     <div id="INTRO">
-      <div id="introtext">
+      <div id="introtext"><div class="wikitext">
       $([ -r "Home/intro" ] && _wiki "Home/intro")
       $($ADM && echo "<hr><a class='function' href='#' onclick='javascript:hide_screen(\"introtext\");show_screen(\"introedit\");'>Edit</a>" )
-      </div>
+      </div></div>
 HomeEND
 $ADM && cat <<HomeEND
       <div id="introedit" style="display: none;">
-        <form action="/write/introedit.cgi" method="post" accept-charset="UTF-8">
-          <textarea name="intro" rows="10">$([ -r "Home/intro" ] && cat Home/intro)</textarea><br>
+        <form action="/write/introedit.cgi?i=intro" method="post" accept-charset="UTF-8">
+          <textarea name="text" rows="10">$([ -r "Home/intro" ] && cat Home/intro)</textarea><br>
           <input type="submit">
           <a class="function" href="#" onclick="javascript:hide_screen('introedit');show_screen('introtext');">Cancel</a>
         </form>
       </div>
 HomeEND
-cat <<HomeEND
+echo '</div>'
+
+$ADM && cat <<HomeEND
+  <div class="NEWS">
+    <a id="new" class='function' href='#add' onclick='javascript:hide_screen("new");show_screen("add");'>Add News</a>
+    <div id="add" style="display: none;">
+      <form action="/write/introedit.cgi?i=news" method="post" accept-charset="UTF-8">
+        <textarea name="text" rows="10">$([ -r "$each" ] && cat $each)</textarea><br>
+        <input type="submit">
+        <a class="function" href="#new" onclick="javascript:hide_screen('add');show_screen('new');">Cancel</a>
+      </form>
     </div>
+  </div>
+HomeEND
   
-    $(stat -c '' Home/<0000000000-9999999999>-<000-999>.news && for each in $(ls -c News/<0000000000-9999999999>-<000-999>); do
-      echo '<div id="NEWS">'
-      _wiki "$each"
-      echo '</div>'
-    done)
+stat -c '' Home/<0000000000-9999999999>_<000-999>.news && for each in $(ls -c Home/<0000000000-9999999999>_<000-999>.news); do
+  info="$(sed 's:Home/::;s:.news::' <<<"$each")"
+  cat <<HomeEND
+    <div class="NEWS">
+      <div id="news_$info"><div class="wikitext">
+      $([ -r "$each" ] && _wiki "$each")
+      $($ADM && echo "<hr><a class='function' href='#edit_$info' onclick='javascript:hide_screen(\"news_$info\");show_screen(\"edit_$info\");'>Edit</a>" )
+      </div></div>
+HomeEND
+  $ADM && cat <<HomeEND
+      <div id="edit_$info" style="display: none;">
+        <form action="/write/introedit.cgi?i=$info" method="post" accept-charset="UTF-8">
+          <textarea name="text" rows="10">$([ -r "$each" ] && cat $each)</textarea><br>
+          <input type="submit">
+          <a class="function" href="#news_$info" onclick="javascript:hide_screen('edit_$info');show_screen('news_$info');">Cancel</a>
+        </form>
+      </div>
+HomeEND
+  echo '</div>'
+done
+
+cat <<HomeEND
   </div>
   <div id="RIGHT">
   </div>