1.1 --- a/s4-funcs.sh	Sun Jun 26 19:09:40 2022 +0900
     1.2 +++ b/s4-funcs.sh	Sun Jul 31 15:26:18 2022 +0900
     1.3 @@ -3205,8 +3205,8 @@
     1.4  	      then 'k'
     1.5  	  ELSE ''
     1.6  	  END || rowid || ','
     1.7 -	  || rtrim(substr(name, 1, instr(name, '@')), '@') || ','
     1.8 -	  || gecos NAME,
     1.9 +	  || rtrim(substr(name, 1, instr(name, '@')), '@') UID,
    1.10 +	  gecos NAME,
    1.11  	  post POST,
    1.12  	  (coalesce((SELECT cnt FROM user_view WHERE vuser=name), 0)) ACCESS,
    1.13   	  team _TEAM_
    1.14 @@ -3256,15 +3256,19 @@
    1.15    b1='<label> <input type="checkbox" name="usel" value="'
    1.16    ba='<label class="admin"><input type="checkbox" name="usel" value="'
    1.17    br='<span id="reverse" title="Reverse Selection"></span>'
    1.18 -  #b2='"> <span>' b3='</span></label>'
    1.19 -  #    	| sed  -e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$b2\3$b3|" \
    1.20 -  #	       -e "s|^\(<TR><TD>\)\([0-9]*\),\([^<]*\)|\1$b1\2$b2\3$b3|" \
    1.21 -  lnk='"> <span>\5</span></label> [<a href="?home+\3">HOME</a>]'
    1.22 +  # lnk='"> <span></span></label> [<a href="?home+\3">HOME</a>]'
    1.23 +  lnk='<a href="?home+\3">\5</a>'
    1.24 +  # (1) Join <TR> line and the next
    1.25 +  # (2) (<TR><TD)>(k?)(1234),(userid)</TD><TD>(GECOS)</TD>
    1.26 +  #     ↓
    1.27 +  # <TR><TD>\2<label><input ...value="\3">\4</label></TD> \
    1.28 +  #    <TD><a href="?home+\3">\5</a></TD>
    1.29    cgi_form grpaction<<EOF \
    1.30 +      	| sed  -e '/^<TR>/{; N; s/\n//; }' \
    1.31        	| sed  -E \
    1.32 -	       -e "s|^(<TR><TD)>(k?)([0-9]*),([^,]+),([^<]*)|\1 title=\"\4\">\2$b1\3$lnk|" \
    1.33 +	       -e "s|^(<TR><TD>)(k?)([0-9]*),(.*)</TD><TD>(.*)</TD>|\1\2$b1\3\">\4</label></td><td>$lnk</TD>|" \
    1.34  	       -e 's/^(<TR><TD[^>]*>)k(<label)/\1\2 class="admin"/' \
    1.35 -	       -e "s|^(<TR><TH>)(NAME)|\1$br \2|" \
    1.36 +	       -e "s|^(<TR><TH>)(UID)|\1$br \2|" \
    1.37  	| _m4 -D_TITLE_="spaste(\`$tf')" \
    1.38  	      -D_SUBTITLE_="チェック後操作ボタン" \
    1.39  	      -D_FORM_="syscmd(cat)" -D_DUMPTABLE_="" \
    1.40 @@ -3305,7 +3309,7 @@
    1.41  `cgi_radio rm close id="x"`<label for="x" accesskey="x">×</label>
    1.42  </div>
    1.43  <h4>$htmlgrp 参加者一覧</h4>$gettingcsv$fromtonote
    1.44 -<table class="td2r td3r thl">
    1.45 +<table class="td3r td4r thl">
    1.46  `sq $db -header -html "$sql"`
    1.47  </table>
    1.48  `cgi_hidden grp $grid`