# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1340844209 -32400
# Node ID db1502243712482185de80054b6d03085b7de8a4
# Parent  a421c2fefc320fe5e4d49d1f8efc658aba7719c0
Do not hover mail addresses of users for non-administrator list.

diff -r a421c2fefc32 -r db1502243712 after5.rb
--- a/after5.rb	Tue Jun 26 18:41:57 2012 +0900
+++ b/after5.rb	Thu Jun 28 09:43:29 2012 +0900
@@ -4,7 +4,7 @@
 # Associative Scheduling Table - after5
 # (C)2003, 2004, 2006, 2008, 2012 by HIROSE Yuuji [yuuji<at>gentei.org]
 # $Id: after5.rb,v 1.19 2012/04/01 11:52:25 yuuji Exp yuuji $
-# Last modified Tue Jun 26 18:40:51 2012 on firestorm
+# Last modified Thu Jun 28 09:42:37 2012 on firestorm
 # See http://www.gentei.org/~yuuji/software/after5/
 # このスクリプトはEUCで保存してください。
 $hgid = <<_HGID_.split[1..-2].join(" ")
@@ -3036,13 +3036,14 @@
       @H.elementln("table", {'class'=>'border'}){
 	grmap.sort.collect{|g, ghash|
           memberp = @sc.ismember(user, g)
+          adminp = @sc.isadmin(user, g)
 	  @H.elementln("tr"){
-	    @H.element("td", @sc.isadmin(user, g) ? admclass : nil){
+	    @H.element("td", adminp ? admclass : nil){
 	      g + "<br>("+@sc.members(g).length.to_s+")"
 	    } + \
 	    @H.element("td"){
 	      @H.element("div", {'class'=>'c'}) {
-		if @sc.isadmin(user, g)
+		if adminp
 		  @H.a(@myname+"?-admgroup+#{g}", msg('adminop'))
 		else
 		  '--'
@@ -3057,8 +3058,7 @@
 	      end + '<br>' + \
               # If this group is inviteonly and the user is not a member,
               # one cannot join.
-              if memberp && @sc.isadmin(user, g) ||
-                  !@sc.getgroupattr(g, 'inviteonly')
+              if memberp && adminp || !@sc.getgroupattr(g, 'inviteonly')
                 @H.radio("groupadd-#{g}", "yes", "IN", memberp) + " / " + \
                 @H.radio("groupadd-#{g}", "no", "OUT", !memberp)
               else
@@ -3073,9 +3073,11 @@
                   memlist.unshift(user)
                 end
                 memlist.collect{|u|
-                  @H.element("abbr", "title"=>mailaddress(u)) {
-                    @sc.nickname(u)
-                  } + \
+                  (adminp \
+                   ? @H.element("abbr", "title"=>mailaddress(u)) {
+                     @sc.nickname(u)
+                   }
+                   : @sc.nickname(u)) + \
                   ((u == user) ? ("("+@H.text("mail4-#{g}", memberp, 30, 180)+")") : "")
                 }.join(", ")
               }