s4
changeset 987:e71a86651d72
Table in GrpAction page contains userid(localpart) for summary
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Sun, 31 Jul 2022 15:26:18 +0900 |
parents | fb0ffa47e0f3 |
children | e77d6258ad54 |
files | examples/common/default/default.css s4-funcs.sh s4-main.js |
diffstat | 3 files changed, 15 insertions(+), 10 deletions(-) [+] |
line diff
1.1 --- a/examples/common/default/default.css Sun Jun 26 19:09:40 2022 +0900 1.2 +++ b/examples/common/default/default.css Sun Jul 31 15:26:18 2022 +0900 1.3 @@ -41,6 +41,7 @@ 1.4 table.td3evw th:nth-child(2n+4), span.textdigest { 1.5 background: white; 1.6 } 1.7 +table.td4r td:nth-child(4) {text-align: right;} 1.8 table.thl th {text-align: left;} 1.9 span#reverse {background: white; padding: 0 0 0 0.4ex; border: outset;} 1.10
2.1 --- a/s4-funcs.sh Sun Jun 26 19:09:40 2022 +0900 2.2 +++ b/s4-funcs.sh Sun Jul 31 15:26:18 2022 +0900 2.3 @@ -3205,8 +3205,8 @@ 2.4 then 'k' 2.5 ELSE '' 2.6 END || rowid || ',' 2.7 - || rtrim(substr(name, 1, instr(name, '@')), '@') || ',' 2.8 - || gecos NAME, 2.9 + || rtrim(substr(name, 1, instr(name, '@')), '@') UID, 2.10 + gecos NAME, 2.11 post POST, 2.12 (coalesce((SELECT cnt FROM user_view WHERE vuser=name), 0)) ACCESS, 2.13 team _TEAM_ 2.14 @@ -3256,15 +3256,19 @@ 2.15 b1='<label> <input type="checkbox" name="usel" value="' 2.16 ba='<label class="admin"><input type="checkbox" name="usel" value="' 2.17 br='<span id="reverse" title="Reverse Selection"></span>' 2.18 - #b2='"> <span>' b3='</span></label>' 2.19 - # | sed -e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$b2\3$b3|" \ 2.20 - # -e "s|^\(<TR><TD>\)\([0-9]*\),\([^<]*\)|\1$b1\2$b2\3$b3|" \ 2.21 - lnk='"> <span>\5</span></label> [<a href="?home+\3">HOME</a>]' 2.22 + # lnk='"> <span></span></label> [<a href="?home+\3">HOME</a>]' 2.23 + lnk='<a href="?home+\3">\5</a>' 2.24 + # (1) Join <TR> line and the next 2.25 + # (2) (<TR><TD)>(k?)(1234),(userid)</TD><TD>(GECOS)</TD> 2.26 + # ↓ 2.27 + # <TR><TD>\2<label><input ...value="\3">\4</label></TD> \ 2.28 + # <TD><a href="?home+\3">\5</a></TD> 2.29 cgi_form grpaction<<EOF \ 2.30 + | sed -e '/^<TR>/{; N; s/\n//; }' \ 2.31 | sed -E \ 2.32 - -e "s|^(<TR><TD)>(k?)([0-9]*),([^,]+),([^<]*)|\1 title=\"\4\">\2$b1\3$lnk|" \ 2.33 + -e "s|^(<TR><TD>)(k?)([0-9]*),(.*)</TD><TD>(.*)</TD>|\1\2$b1\3\">\4</label></td><td>$lnk</TD>|" \ 2.34 -e 's/^(<TR><TD[^>]*>)k(<label)/\1\2 class="admin"/' \ 2.35 - -e "s|^(<TR><TH>)(NAME)|\1$br \2|" \ 2.36 + -e "s|^(<TR><TH>)(UID)|\1$br \2|" \ 2.37 | _m4 -D_TITLE_="spaste(\`$tf')" \ 2.38 -D_SUBTITLE_="チェック後操作ボタン" \ 2.39 -D_FORM_="syscmd(cat)" -D_DUMPTABLE_="" \ 2.40 @@ -3305,7 +3309,7 @@ 2.41 `cgi_radio rm close id="x"`<label for="x" accesskey="x">×</label> 2.42 </div> 2.43 <h4>$htmlgrp 参加者一覧</h4>$gettingcsv$fromtonote 2.44 -<table class="td2r td3r thl"> 2.45 +<table class="td3r td4r thl"> 2.46 `sq $db -header -html "$sql"` 2.47 </table> 2.48 `cgi_hidden grp $grid`
3.1 --- a/s4-main.js Sun Jun 26 19:09:40 2022 +0900 3.2 +++ b/s4-main.js Sun Jul 31 15:26:18 2022 +0900 3.3 @@ -901,7 +901,7 @@ 3.4 u.checked = false; // when "TEAM" is selected 3.5 } else { 3.6 p = p.parentNode.parentNode;// should be tr 3.7 - team = nthChildOf(p, 4, "td") 3.8 + team = nthChildOf(p, 5, "td") 3.9 if (team && team.textContent 3.10 && team.textContent.match(selected)) { 3.11 u.checked = true;