Changes for page ユーザープロフィール

Summary

• Page properties (2 modified, 0 added, 0 removed)

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.superadmin
	1	+XWiki.XWikiGuest

Content

...	...	@@ -102,7 +102,7 @@
102	102
103	103	{{html clean="false"}}
104	104	<div class="school-info-card">
105		- <h2><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 公開情報</h2>
	105	+ <h2><span><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 公開情報</span></h2>
106	106	<table class="wiki-table school-info-table">
107	107	<tr><th>表示名</th><td><strong>$profileDisplayName</strong></td></tr>
108	108	<tr><th>アカウント種別</th><td>
...	...	@@ -117,43 +117,46 @@
117	117	#elseif($profileUserRole == 'graduate')卒業生
118	118	#else$!profileUserRole#end
119	119	</td></tr>
120		- <tr><th>所属校</th><td>
	120	+ ## --- 学校情報を中学・高校・現任校ラベルで表示 ---
	121	+ #set($profileSecondarySchoolCode = $!targetDoc.getValue('secondarySchoolCode'))
	122	+ #set($profileSecondarySchoolName = $!targetDoc.getValue('secondarySchoolName'))
	123	+ #set($profileAlumniSchoolCode = $!targetDoc.getValue('alumniSchoolCode'))
	124	+ #set($profileAlumniSchoolName = $!targetDoc.getValue('alumniSchoolName'))
	125	+ #set($pMidCode = '')#set($pMidName = '')
	126	+ #set($pHiCode = '')#set($pHiName = '')
	127	+ #if($profileSchoolCode && $profileSchoolCode.length() >= 2)
	128	+ #set($pst = $profileSchoolCode.substring(0, 2))
	129	+ #if($pst == 'C1' || $pst == 'C2')#set($pMidCode = $profileSchoolCode)#set($pMidName = $profileSchoolName)
	130	+ #elseif($pst == 'D1' || $pst == 'D2')#set($pHiCode = $profileSchoolCode)#set($pHiName = $profileSchoolName)#end
	131	+ #end
	132	+ #if($profileSecondarySchoolCode && $profileSecondarySchoolCode.length() >= 2)
	133	+ #set($ps2t = $profileSecondarySchoolCode.substring(0, 2))
	134	+ #if($ps2t == 'C1' || $ps2t == 'C2')#set($pMidCode = $profileSecondarySchoolCode)#set($pMidName = $profileSecondarySchoolName)
	135	+ #elseif($ps2t == 'D1' || $ps2t == 'D2')#set($pHiCode = $profileSecondarySchoolCode)#set($pHiName = $profileSecondarySchoolName)#end
	136	+ #end
	137	+ #set($pIsGrad = ($profileUserRole == 'graduate'))
	138	+ #if($profileUserRole == 'teacher')
121	121	#if($profileSchoolCode && $profileSchoolCode != '')
122		- <a href="/bin/Schools/${profileSchoolCode}/WebHome">$!profileSchoolName</a>
123		- #else
124		- 未公開
	140	+ <tr><th>現任校</th><td><a href="/bin/Schools/${profileSchoolCode}/WebHome">$!profileSchoolName</a></td></tr>
125	125	#end
126		- </td></tr>
	142	+ ## 教員の出身校を alumni から復元
	143	+ #if($profileAlumniSchoolCode && $profileAlumniSchoolCode.length() >= 2)
	144	+ #set($pat = $profileAlumniSchoolCode.substring(0, 2))
	145	+ #if(($pat == 'D1' || $pat == 'D2') && $pHiCode == '')#set($pHiCode = $profileAlumniSchoolCode)#set($pHiName = $profileAlumniSchoolName)#end
	146	+ #if(($pat == 'C1' || $pat == 'C2') && $pMidCode == '')#set($pMidCode = $profileAlumniSchoolCode)#set($pMidName = $profileAlumniSchoolName)#end
	147	+ #end
	148	+ #end
	149	+ #if($pMidCode != '')
	150	+ <tr><th>#if($pIsGrad || $profileUserRole == 'teacher')出身中学#else中学校#end</th><td><a href="/bin/Schools/${pMidCode}/WebHome">$!pMidName</a></td></tr>
	151	+ #end
	152	+ #if($pHiCode != '')
	153	+ <tr><th>#if($pIsGrad || $profileUserRole == 'teacher')出身高校#else高等学校#end</th><td><a href="/bin/Schools/${pHiCode}/WebHome">$!pHiName</a></td></tr>
	154	+ #end
127	127	## 学年はプライバシー保護のため公開プロフィールには表示しない
128		- <tr><th>在籍状態</th><td>
129		- #if($profileUserStatus == 'active')在籍中
130		- #elseif($profileUserStatus == 'graduated')卒業済み
131		- #elseif($profileUserStatus == 'on_leave')休学中
132		- #elseif($profileUserStatus == 'transferred')転校済み
133		- #else$!profileUserStatus#end
134		- </td></tr>
135	135	</table>
136	136	</div>
137	137	{{/html}}
138	138
139		-== このユーザーの投稿・編集履歴 ==
140		-
141		-{{velocity}}
142		-#set($query = $services.query.xwql("where doc.author = :author order by doc.date desc").bindValue('author', $targetUser))
143		-#set($query = $query.setLimit(20))
144		-#set($results = $query.execute())
145		-
146		-#if($results.size() > 0)
147		-|=ページ|=日時
148		-#foreach($docName in $results)
149		- #set($actDoc = $xwiki.getDocument($docName))
150		-|[[$actDoc.title>>$docName]]|$datetool.format("yyyy/MM/dd HH:mm", $actDoc.date)
151		-#end
152		-#else
153		-//このユーザーの公開投稿はまだありません。//
154		-#end
155		-{{/velocity}}
156		-
157	157	{{html clean="false"}}
158	158	<div class="info-note info-note-lg" style="margin-top:24px;text-align:center;">
159	159	<svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg> 本名・メールアドレス・警告状態などの個人情報は非公開です