# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1590104224 -32400
# Node ID 2c5ddb0b5f4c1b6be2c7c122e0322e278ad76aba
# Parent  fdd9c98f0888a4332a24c7159951ea79b655c82e
Add more shortcuts and baloon help messages

diff -r fdd9c98f0888 -r 2c5ddb0b5f4c examples/common/default/home.m4.html
--- a/examples/common/default/home.m4.html	Fri May 22 08:35:05 2020 +0900
+++ b/examples/common/default/home.m4.html	Fri May 22 08:37:04 2020 +0900
@@ -7,12 +7,14 @@
 
 <div class="foldtabs">
 <input type="radio" id="sd" name="foldtabs"><label
- accesskey="a" title="A" for="sd">日記(_NBLOG_)</label>
+ accesskey="a" title="Shortcut: A
+My Blogs" for="sd">日記(_NBLOG_)</label>
 <div><!-- in home.m4 -->_BLOGS_</div><!-- in home.m4 -->
 
 
 <input type="radio" id="grp" name="foldtabs"><label
- accesskey="s" title="S" for="grp">参加中グループ</label>
+ accesskey="s" title="Shortcut: S
+My Groups" for="grp">参加中グループ</label>
 <div> <!-- div.fold hides this div (in home.m4.html) -->
 <div class="dumptable">
 _GROUPS_
@@ -22,5 +24,6 @@
 _HOMETAIL_
 
 <input type="radio" id="close" name="foldtabs"><label
- accesskey="x" title="X" for="close">×</label>
+ accesskey="x" title="Shortcut: X
+Hide Tabs" for="close">×</label>
 </div> <!--  end of fold (in home.m4.html) -->
diff -r fdd9c98f0888 -r 2c5ddb0b5f4c s4-blog.sh
--- a/s4-blog.sh	Fri May 22 08:35:05 2020 +0900
+++ b/s4-blog.sh	Fri May 22 08:37:04 2020 +0900
@@ -222,18 +222,18 @@
 <table class="bloghead">
 EOF
 
-  href="<a href=\"?editheading+$rowid\" accesskey=\"e\" title=\"E\"> 編集 </a>"
+  href="<a href=\"?editheading+$rowid\" accesskey=\"e\" title=\"Shortcut: E${nl}Edit\"> 編集 </a>"
   if $ismem; then
     case $blog_mode in
       *report*|*quiz*|*enquete*)
-	href2="<a href=\"?lshandout+$rowid\" accesskey=\"l\" title=\"L\"> 提出状況 </a>"
-	href3="(<a href=\"?gethandout+$rowid\" accesskey=\"f\" title=\"F\">ファイル取得</a>)"
+	href2="<a href=\"?lshandout+$rowid\" accesskey=\"l\" title=\"Shortcut: L${nl}List Handouts\"> 提出状況 </a>"
+	href3="(<a href=\"?gethandout+$rowid\" accesskey=\"f\" title=\"Shortcut: F${nl}File Retrieval\">ファイル取得</a>)"
 	;;
     esac
   fi
-  href4='<a href="#bottom" accesskey="b" title="B"> 末尾へ</a>'
+  href4="<a href=\"#bottom\" accesskey=\"b\" title=\"Shortcut: B${nl}to the Bottom\"> 末尾へ</a>"
   $isgrpadmin &&
-      href5="<a href=\"?blogseen+$rowid\" accesskey=\"s\" title=\"S\"> 読刻</a>"
+      href5="<a href=\"?blogseen+$rowid\" accesskey=\"s\" title=\"Shortcut: S${nl}State of Accesses\"> 読刻</a>"
   quizmodefile=$tmpd/quiz; rm -f "$quizmodefile"	# XXX: Global state
   midfile=$tmpd/midfile
 
diff -r fdd9c98f0888 -r 2c5ddb0b5f4c s4-cgi.sh
--- a/s4-cgi.sh	Fri May 22 08:35:05 2020 +0900
+++ b/s4-cgi.sh	Fri May 22 08:37:04 2020 +0900
@@ -10,8 +10,8 @@
 <form action="$myname" method="${METHOD:-POST}" enctype="multipart/form-data">
 $cont
 <input type="hidden" name="stage" value="$1">
-<input type="submit" value="送信">
-<input type="reset" value="リセット">
+<input type="submit" value="送信" title="COMMIT">
+<input type="reset" value="リセット" title="Reset">
 </form>
 EOF
 }
@@ -82,12 +82,12 @@
     cat<<EOF
  <tr><td>($i)</td><td>
 <input class="action" type="radio" name="action.$vname" id="keep.$vname"
- value="keep"><label for="keep.$vname">温存</label>
+ value="keep"><label for="keep.$vname" title="Keep">温存</label>
 <input class="action" type="radio" name="action.$vname" id="edit.$vname"
- value="edit"><label for="edit.$vname">修正</label>
+ value="edit"><label for="edit.$vname" title="Replace">修正</label>
 <input class="action" type="radio" name="action.$vname" id="rm.$vname"
- value="rm"><label for="rm.$vname">削除</label>
-<label class="confirm">本当に消します<input class="confirm" type="checkbox"
+ value="rm"><label for="rm.$vname" title="Remove">削除</label>
+<label class="confirm" title="OK?">本当に消します<input class="confirm" type="checkbox"
  name="confirm.$vname" value="yes">はい</label><br>
 `$func $vname "$val" "$4"`<span>$val</span>
 </td></tr>
diff -r fdd9c98f0888 -r 2c5ddb0b5f4c s4-funcs.sh
--- a/s4-funcs.sh	Fri May 22 08:35:05 2020 +0900
+++ b/s4-funcs.sh	Fri May 22 08:37:04 2020 +0900
@@ -2024,8 +2024,8 @@
   search_form_args=""
   if [ x"$user" = x"$uname" ]; then
     usermenu="<a href=\"?userconf\" accesskey=\"e\"
-	 title=\"E\">プロフィールの編集</a> /
-	<a href=\"?blog\" accesskey=\"n\" title=\"N\">新規話題の作成</a>"
+	 title=\"Shortcut: E${nl}Edit Profile\">プロフィールの編集</a> /
+	<a href=\"?blog\" accesskey=\"n\" title=\"Shortcut: N${nl}New blog\">新規話題の作成</a>"
     # Display folders
     sql="select count(id) from article_m where id
 		 in (select id from article where author='$user')
@@ -2035,7 +2035,7 @@
     # err nfile=$nfile
     if [ $nfile -gt 0 ]; then
       usermenu="$usermenu / <a href=\"?lsmyfile\" accesskey=\"l\"
-       title=\"L\">過去の提出ファイル</a>"
+       title=\"Shortcut: L${nl}List All Attachment files\">過去の提出ファイル</a>"
     fi
   else
     latestlog=`query "SELECT max(time) FROM acclog WHERE user='$uname' \
@@ -2123,7 +2123,7 @@
 
   cat<<-EOF
 	`cgi_radio foldtabs yes 'id="mre" accesskey="d"'`<label
-	 for="mre" title="D">最近の書き込み先</label>
+	 for="mre" title="Shortcut: D${nl}Recent Post">最近の書き込み先</label>
 	<div class="lcto">
 	`DT_VIEW=replyblog dumptable html blog`
 	</div>
@@ -2146,7 +2146,7 @@
     if [ $cont -gt 0 ]; then
       #echo "全体の新着記事${cont}傑" | html h2
       cgi_radio foldtabs yes 'id="new10" accesskey="f"'
-      echo "<label for=\"new10\" title=\"F\">新着${cont}傑</label><div>"
+      echo "<label for=\"new10\" title=\"Shortcut: F${nl}NEWS\">新着${cont}傑</label><div>"
       cat<<-EOF | html form 'action="?home"'
 	`cgi_checkbox readchk yes 'id="read"'`<label
 	 for="read">新着ふくめて全部読んだことにする</label>
@@ -2538,27 +2538,32 @@
   viewtable $1 grp $rowid
   echo "</div>"
   if isgrpowner "$user" "$grp"; then
-    echo "<p><a href=\"?groupconf+$rowid\">グループ情報の編集</a>"
+    echo "<p><a href=\"?groupconf+$rowid\" accesskey=\"e\"
+      title=\"Shortcut: e${nl}Edit Group\">グループ情報の編集</a>"
     iamowner=$rowid
     colmd=" mode"
   fi
   if [ -n "$ismember" ]; then
-    echo "${iamowner:+ / }<a href=\"?blog+$rowid\">グループの新規話題作成</a>"
-    echo "/ <a href=\"?grpaction+$rowid\">メンバーを個別選択しての操作</a></p>"
+    #echo "${iamowner:+ / }<a href=\"?blog+$rowid\">グループの新規話題作成</a>"
+    #echo "/ <a href=\"?grpaction+$rowid\">メンバーを個別選択しての操作</a></p>"
 # div.fold input[type="checkbox"]:checked ~ div {display: block;}
-    cat<<EOF
-<form action="?send2mem" method="POST" enctype="multipart/form-data">
-<div class="fold clear">
-`cgi_checkbox send yes id="send"`<label
- for="send">グループ全員にメッセージ送信</label>
-<div>
-`cgi_textarea message "" "cols=60"`
-`cgi_submit 送信`
-`cgi_reset リセット`
-</div>
-`cgi_hidden grp $rowid`
-</div></form>
-EOF
+    cat<<-EOF
+	${iamowner:+ / }<a accesskey="n" title="Shortcut: n${nl}New blog"
+	  href="?blog+$rowid">グループの新規話題作成</a>
+	  / <a accesskey="m" title="Shortcut: m${nl}Operations on Members"
+	  href="?grpaction+$rowid">メンバーを個別選択しての操作</a></p>
+	<form action="?send2mem" method="POST" enctype="multipart/form-data">
+	<div class="fold clear">
+	`cgi_checkbox send yes id="send"`<label
+	 for="send">グループ全員にメッセージ送信</label>
+	<div>
+	`cgi_textarea message "" "cols=60"`
+	`cgi_submit 送信`
+	`cgi_reset リセット`
+	</div>
+	`cgi_hidden grp $rowid`
+	</div></form>
+	EOF
   fi
   # 加入ボタン + 加入者リスト
   if [ -n "$ismember" ]; then
@@ -2822,7 +2827,7 @@
   from=`getpar from`; to=`getpar to`
   from_input="<input type=\"date\" name=\"from\" placeholder=\"YYYY-MM-DD\" value=\"${from}\">"
   to_input="<input type=\"date\" name=\"to\" value=\"${to:-9999}\">"
-  fromtonote="<p>POST集計: $from_input - $to_input</p><!-- $from - $to -->"
+  fromtonote="<p title=\"Count the Number of Posts from-to\">POST集計: $from_input - $to_input</p><!-- $from - $to -->"
   # New entry
   sql="WITH mems AS (
 	  SELECT g.rowid, name, gecos FROM grp_mem gm LEFT JOIN gecoses g
@@ -2866,11 +2871,13 @@
   ## err grpaction: "`echo \"$sql\"`"
   tf=$tmpd/title.$$
   echo "グループ[<a href=\"?grp+$grid\">$grp</a>]参加メンバーに対する操作" > $tf
-  cmmsg="`cgi_radio rm commission id=\"cmadmin\"`<label
+  cmmsg="`cgi_radio rm commission id=\"cmadmin\"`<label accesskey=\"f\"
+ title=\"Shortcut: f${nl}Add to Administrator of the Group\"
  for=\"cmadmin\">管理者委任</label>
 <div><p>このグループでの全権を付与します。信頼できる人に託してください。
 </p></div>"
-  excmsg="`cgi_radio rm yes id=\"conf\"`<label
+  excmsg="`cgi_radio rm yes id=\"conf\"`<label accesskey=\"g\"
+ title=\"Shortcut: g${nl}Remove from the Group\"
  for=\"conf\">GRP登録解除</label>
 <div>本当に消します! `cgi_checkbox confirm yes` 確認
 <p>この操作による通知は本人に行きません。
@@ -2884,7 +2891,8 @@
     myhexteams=$(hexteams "$grp" "$user")
   fi
   if [ -n "$myhexteams" ]; then
-    rmteammsg="`cgi_radio rm rmteam 'id=\"cmrmteam\"'`<label
+    rmteammsg="`cgi_radio rm rmteam 'id=\"cmrmteam\"'`<label accesskey=\"s\"
+title=\"Shortcut: s${nl}Strip a team tag from\"
 for=\"cmrmteam\">チーム属性除去</label>
 <div>チーム属性:`cgi_select_h rmteam \"2d2d2d\" $myhexteams`
 を除去します: `cgi_checkbox teamconfirm yes` 確認
@@ -2913,17 +2921,19 @@
 	| _m4 -D_TEAM_="spaste(\`$stf')"
 <p>下でチェックした人を対象として:</p>
 <div class="foldtabs">
-`cgi_radio rm addteam 'id="cmteam"'`<label
+`cgi_radio rm addteam 'id="cmteam"'`<label accesskey="a"
+title="Shortcut: a${nl}Add a team tag to"
 for="cmteam">同じチーム属性を付与</label>
 <div>チーム名:`cgi_text team "" 'id="inteam" list="teams"'`
 `cgi_datalist_h teams $allhexteams`
 </div>
 ${rmteammsg}
-`cgi_radio rm send id="sendmsg"`<label
+`cgi_radio rm send id="sendmsg"`<label accesskey="d"
+ title="Shortcut: d${nl}DirectMail to"
  for="sendmsg" title="Direct Message">DM送信</label>
 <div>
 `cgi_checkbox email yes 'id="email" class="fold"'`<label for="email"
->email書式を使う</label>
+title="Using email format">email書式を使う</label>
 <div class="folded">
 <table>
 <tr><td>From: </td><td>$user</td></tr>