# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1487482053 -32373
# Node ID a183d6e0ed5e1dc6a9436193e6fd80f2e0dec00b
# Parent  0dd65b535c9dbd306e22ad7df55cc65845a62e8a
Search board in group home revised to similar position in user home

diff -r 0dd65b535c9d -r a183d6e0ed5e s4-funcs.sh
--- a/s4-funcs.sh	Sun Feb 19 14:16:17 2017 +0859
+++ b/s4-funcs.sh	Sun Feb 19 14:27:06 2017 +0859
@@ -1590,9 +1590,15 @@
       placeholder="このユーザの書込検索"
       help="★★ $g さんの書き込みから検索します$nl$help"
       ;;
+    grp=*)
+      a=`echo "${1#grp=}"|htmlescape`
+      g=`gecos ${1#grp=}`
+      auth="<input type=\"hidden\" name=\"owner\" value=\"$a\">"
+      placeholder="このグループからの検索"
+      ;;
   esac
   cat<<-EOF
-	<div class="fr">
+	<div class="right">
 	<form action="$myname">$auth
 	<input type="text" name="kwd" value="" title="$help"
 	 placeholder=" $placeholder " width="10" accesskey="k">
@@ -2086,6 +2092,7 @@
 ## err showgroup2: grp=$grp qgrp="[$(sqlquote $grp)]"
   if isgroup "$grp"; then
     tf=$tmpd/title.$$
+    sf=$tmpd/search.$$
     bodyclass=`query "SELECT val FROM grp_s
 	       WHERE gname=$qgrp AND key='regmode';"`
     if ismember "$user" "$grp"; then
@@ -2096,13 +2103,16 @@
       ismember="" # bodyclass="group"
     fi
     bodyclass="$bodyclass grouphome"
+    echo "<div class=\"search\">`search_form grp=\"$grp\"`</div>"> $sf
     echo "グループ $grp" > $tf
+
     showgroupsub $formdir/grp.def "$grid" | \
-	_m4 -D_TITLE_="spaste(\`$tf')" \
+	_m4 -D_TITLE_="syscmd(\`cat $tf')" \
 	    -D_FORM_="syscmd(\`cat')" \
 	    -D_BODYCLASS_="$bodyclass" \
 	    -D_DUMPTABLE_="" \
-	    $htmlheader $layout/form+dump.m4.html
+	    $htmlheader $sf $layout/form+dump.m4.html
+	    # $htmlheader $layout/form+dump.m4.html
     	# $htmlheader is defined in grp()
   else				# if $grp is removed at par2table
     listgroup
@@ -2194,10 +2204,15 @@
   fi
   echo '</div></div>'
   echo '<h2>話題一覧</h2>'
-  cgi_form searchart<<EOF
-<label>`cgi_text kwd`という語を含むコメントを検索</label>
-`cgi_hidden owner $grp`
-EOF
+  thelp="1ヶ月分のまとめには上部検索窓に @month と入れてください。"
+  cat<<-EOF
+	<form class="summary" action="$myname" title="$thelp">
+	`cgi_hidden owner "$grp"`
+	`cgi_hidden kwd "@week"`
+	`cgi_hidden stage searchart`
+	`cgi_submit "一週間のまとめ"`
+	</form>
+	EOF
   cond="where a.id in (select id from blog_s where key='owner' and val=$qgrp) order by ctime desc"
   colstate="state:稼動状態:frozen=rowclass=凍結"
   DT_CHLD=article:blogid \