s4

changeset 609:7eb71958a09e

Add display limitation buttons in listentry()
author HIROSE Yuuji <yuuji@gentei.org>
date Fri, 17 Apr 2020 07:18:07 +0900
parents 07ec77f4e224
children dfd83a6d09fb
files examples/common/default/default.css s4-funcs.sh
diffstat 2 files changed, 19 insertions(+), 5 deletions(-) [+]
line diff
     1.1 --- a/examples/common/default/default.css	Mon Apr 13 20:33:18 2020 +0900
     1.2 +++ b/examples/common/default/default.css	Fri Apr 17 07:18:07 2020 +0900
     1.3 @@ -280,6 +280,11 @@
     1.4  div.iconlist p._info	{background: #eff;} /* light cyan */
     1.5  div.iconlist p._support	{background: #ffe;} /* light yellow */
     1.6  div.iconlist p._test	{background: #ffb6c1;} /* light pink */
     1.7 +input#ismembtn:checked ~ div.iconlist,
     1.8 +input#isadmbtn:checked ~ div.iconlist {display: none;}
     1.9 +input#ismembtn:checked ~ div.iconlist.Member,
    1.10 +input#isadmbtn:checked ~ div.iconlist.ADMIN,
    1.11 +input#ismembtn:checked ~ div.iconlist.ADMIN {display: block;}
    1.12  div.xy120x120 {min-width: 120px; min-height: 140px;}
    1.13  div.xy96x96 {min-width: 96px; min-height: 116px;}
    1.14  div.xy96x96 img {max-width: 96px;}
     2.1 --- a/s4-funcs.sh	Mon Apr 13 20:33:18 2020 +0900
     2.2 +++ b/s4-funcs.sh	Fri Apr 17 07:18:07 2020 +0900
     2.3 @@ -2148,11 +2148,11 @@
     2.4   	  as name,
     2.5  	 b.tag,
     2.6  	case when a.$nm in (select user from grp_adm
     2.7 -		where gname=$getgrp) then '(管理者)'
     2.8 +		where gname=$getgrp) then '管理者'
     2.9  	     when '$user' in (select user from grp_adm where gname=a.$nm)
    2.10 -		then '(ADMIN)'
    2.11 +		then 'ADMIN'
    2.12  	     when '$user' in (select user from grp_mem where gname=a.$nm)
    2.13 -		then '(Member)'
    2.14 +		then 'Member'
    2.15  	     when '$iamowner' = '' then ''
    2.16  	     else ',not='||a.rowid end as ownerlink,
    2.17  	CASE '$entity'
    2.18 @@ -2184,6 +2184,14 @@
    2.19  ## err LE:sql.1="$sql"
    2.20    total=`query "with x as ($sql) select count(*) from x;"`
    2.21    echo "${entity} 一覧" | html h2
    2.22 +  echo '<div class="listentry">'		# List-entry div
    2.23 +  # Show owner/member filter button
    2.24 +  cat<<-EOF
    2.25 +	`cgi_checkbox onlymem no 'id="ismembtn"'`<label
    2.26 +	for="ismembtn">参加中のみ表示</label>
    2.27 +	`cgi_checkbox onlyadm no 'id="isadmbtn"'`<label
    2.28 +	for="isadmbtn">管理者参加のみ表示</label>
    2.29 +	EOF
    2.30    METHOD=GET
    2.31    if [ $total -gt $limit ]; then
    2.32      echo '<div class="right">'
    2.33 @@ -2234,7 +2242,7 @@
    2.34      # err newlnk=$lnk regmode=$regmode
    2.35      icondir=$dir/$id
    2.36      # Pick up only last icon
    2.37 -    echo "<div class=\"iconlist xy$thumbxy $type\">
    2.38 +    echo "<div class=\"iconlist xy$thumbxy $type $ownerp\">
    2.39  	<p class=\"tag _$tag\">$tag</p>" \
    2.40  	| _m4 $tagconv
    2.41      if [ -n "$NOSPEEDUP" ]; then
    2.42 @@ -2261,9 +2269,10 @@
    2.43  	iconhref2 "$dir/$deficon" "$hrb+$lnk" "$gecos"
    2.44        fi
    2.45      fi
    2.46 -    echo "<br>$name${ownerp:+<br>$ownerp}"
    2.47 +    echo "<br>$name${ownerp:+<br>($ownerp)}"
    2.48      echo "</div>"
    2.49    done
    2.50 +  echo "</div>"					# End of List-entry div
    2.51    echo ${pnbtn:+"<hr>$nextbtn$prevbtn"}
    2.52  )
    2.53  listmember() {