# HG changeset patch
# User HIROSE Yuuji
# Date 1476663091 -32374
# Node ID a868f03970b51077d9e0ca79f134d98e9d7c8769
# Parent ff1b00ca07e8867ede3a729bd1a1cd05480b605d
Profimg hiding rule revised
diff -r ff1b00ca07e8 -r a868f03970b5 examples/common/default/default.css
--- a/examples/common/default/default.css Mon Oct 17 08:10:55 2016 +0859
+++ b/examples/common/default/default.css Mon Oct 17 09:11:05 2016 +0859
@@ -100,9 +100,10 @@
table.mini td, table.mini th {padding: 1px 1ex; min-width: 1em;}
table.mini {margin-left: 1em; border-left: 2px solid #686;}
-body.grouphome tr.profimg, body.home tr.profimg {visibility: collapse;}
-tr:hover + tr.profimg, tr:active + tr.profimg, tr.profimg:hover,
-tr.profimg:active {visibility: visible;}
+div.noprofimg tr.profimg {visibility: collapse;}
+div.noprofimg tr:hover + tr.profimg, div.noprofimg tr:active + tr.profimg,
+div.noprofimg tr.profimg:hover, div.noprofimg tr.profimg:active {
+ visibility: visible;}
p.profimg {float: left; max-width: 50%; max-height: 400px;
overflow: hidden; margin: 0 1em 1ex;
diff -r ff1b00ca07e8 -r a868f03970b5 s4-funcs.sh
--- a/s4-funcs.sh Mon Oct 17 08:10:55 2016 +0859
+++ b/s4-funcs.sh Mon Oct 17 09:11:05 2016 +0859
@@ -1542,7 +1542,10 @@
tf=$tmpd/title.$$ pf=$tmpd/profile.$$ bf=$tmpd/blogs.$$ sf=$tmpd/search.$$
search_form > $sf
echo "$gecos さん" > $tf
- viewtable $formdir/user.def user $1 > $pf
+ { echo ""
+ viewtable $formdir/user.def user $1
+ echo "
"
+ } > $pf
sqcond="WHERE name='$uname' AND key='profimg' AND type LIKE 'file:image%'"
img=`query "SELECT type FROM user_m $sqcond LIMIT 1;"`
@@ -1938,7 +1941,9 @@
`imgsrc_cache $td/main grp_m "$enticond"`
EOF
fi
+ echo ""
viewtable $1 grp $rowid
+ echo "
"
if isgrpowner "$user" "$grp"; then
echo "グループ情報の編集"
iamowner=$rowid