Mercurial > hgrepos > hgweb.cgi > s4

changeset 987:e71a86651d72 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 wrap: on
line diff
--- a/examples/common/default/default.css	Sun Jun 26 19:09:40 2022 +0900
+++ b/examples/common/default/default.css	Sun Jul 31 15:26:18 2022 +0900
@@ -41,6 +41,7 @@
 table.td3evw th:nth-child(2n+4), span.textdigest {
     background: white;
 }
+table.td4r td:nth-child(4) {text-align: right;}
 table.thl th {text-align: left;}
 span#reverse {background: white; padding: 0 0 0 0.4ex; border: outset;}
 
--- a/s4-funcs.sh	Sun Jun 26 19:09:40 2022 +0900
+++ b/s4-funcs.sh	Sun Jul 31 15:26:18 2022 +0900
@@ -3205,8 +3205,8 @@
 	      then 'k'
 	  ELSE ''
 	  END || rowid || ','
-	  || rtrim(substr(name, 1, instr(name, '@')), '@') || ','
-	  || gecos NAME,
+	  || rtrim(substr(name, 1, instr(name, '@')), '@') UID,
+	  gecos NAME,
 	  post POST,
 	  (coalesce((SELECT cnt FROM user_view WHERE vuser=name), 0)) ACCESS,
  	  team _TEAM_
@@ -3256,15 +3256,19 @@
   b1='<label> <input type="checkbox" name="usel" value="'
   ba='<label class="admin"><input type="checkbox" name="usel" value="'
   br='<span id="reverse" title="Reverse Selection"></span>'
-  #b2='"> <span>' b3='</span></label>'
-  #    	| sed  -e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$b2\3$b3|" \
-  #	       -e "s|^\(<TR><TD>\)\([0-9]*\),\([^<]*\)|\1$b1\2$b2\3$b3|" \
-  lnk='"> <span>\5</span></label> [<a href="?home+\3">HOME</a>]'
+  # lnk='"> <span></span></label> [<a href="?home+\3">HOME</a>]'
+  lnk='<a href="?home+\3">\5</a>'
+  # (1) Join <TR> line and the next
+  # (2) (<TR><TD)>(k?)(1234),(userid)</TD><TD>(GECOS)</TD>
+  #     ↓
+  # <TR><TD>\2<label><input ...value="\3">\4</label></TD> \
+  #    <TD><a href="?home+\3">\5</a></TD>
   cgi_form grpaction<<EOF \
+      	| sed  -e '/^<TR>/{; N; s/\n//; }' \
       	| sed  -E \
-	       -e "s|^(<TR><TD)>(k?)([0-9]*),([^,]+),([^<]*)|\1 title=\"\4\">\2$b1\3$lnk|" \
+	       -e "s|^(<TR><TD>)(k?)([0-9]*),(.*)</TD><TD>(.*)</TD>|\1\2$b1\3\">\4</label></td><td>$lnk</TD>|" \
 	       -e 's/^(<TR><TD[^>]*>)k(<label)/\1\2 class="admin"/' \
-	       -e "s|^(<TR><TH>)(NAME)|\1$br \2|" \
+	       -e "s|^(<TR><TH>)(UID)|\1$br \2|" \
 	| _m4 -D_TITLE_="spaste(\`$tf')" \
 	      -D_SUBTITLE_="チェック後操作ボタン" \
 	      -D_FORM_="syscmd(cat)" -D_DUMPTABLE_="" \
@@ -3305,7 +3309,7 @@
 `cgi_radio rm close id="x"`<label for="x" accesskey="x">×</label>
 </div>
 <h4>$htmlgrp 参加者一覧</h4>$gettingcsv$fromtonote
-<table class="td2r td3r thl">
+<table class="td3r td4r thl">
 `sq $db -header -html "$sql"`
 </table>
 `cgi_hidden grp $grid`
--- a/s4-main.js	Sun Jun 26 19:09:40 2022 +0900
+++ b/s4-main.js	Sun Jul 31 15:26:18 2022 +0900
@@ -901,7 +901,7 @@
 			u.checked = false;	// when "TEAM" is selected
 		    } else {
 			p = p.parentNode.parentNode;// should be tr
-			team = nthChildOf(p, 4, "td")
+			team = nthChildOf(p, 5, "td")
 			if (team && team.textContent
 			    && team.textContent.match(selected)) {
 			    u.checked = true;

yatex.org