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

Summary

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

Details

Page properties

Content

...	...	@@ -88,9 +88,6 @@
88	88	#elseif($profileUserRole == 'graduate')
89	89	<span class="badge badge-role-graduate"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
90	90	#end
91		- #if($profileGrade && $profileGrade != '')
92		- <span class="badge badge-grade">$profileGrade</span>
93		- #end
94	94	#if($profileUserStatus == 'graduated')
95	95	<span class="badge badge-status-graduated"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span>
96	96	#elseif($profileUserStatus == 'on_leave')
...	...	@@ -105,7 +105,7 @@
105	105
106	106	{{html clean="false"}}
107	107	<div class="school-info-card">
108		- <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>
109	109	<table class="wiki-table school-info-table">
110	110	<tr><th>表示名</th><td><strong>$profileDisplayName</strong></td></tr>
111	111	<tr><th>アカウント種別</th><td>
...	...	@@ -120,7 +120,7 @@
120	120	#elseif($profileUserRole == 'graduate')卒業生
121	121	#else$!profileUserRole#end
122	122	</td></tr>
123		- <tr><th>所属校</th><td>
	120	+ <tr><th>#if($profileUserRole == 'graduate')母校#else所属校#end</th><td>
124	124	#if($profileSchoolCode && $profileSchoolCode != '')
125	125	<a href="/bin/Schools/${profileSchoolCode}/WebHome">$!profileSchoolName</a>
126	126	#else
...	...	@@ -127,38 +127,25 @@
127	127	未公開
128	128	#end
129	129	</td></tr>
130		- #if($profileUserRole == 'student' && $profileGrade != '')
131		- <tr><th>学年</th><td>$profileGrade</td></tr>
	127	+ #set($profileSecondarySchoolCode = $!targetDoc.getValue('secondarySchoolCode'))
	128	+ #set($profileSecondarySchoolName = $!targetDoc.getValue('secondarySchoolName'))
	129	+ #if($profileSecondarySchoolCode && $profileSecondarySchoolCode != '')
	130	+ <tr><th>第2所属校</th><td>
	131	+ <a href="/bin/Schools/${profileSecondarySchoolCode}/WebHome">$!profileSecondarySchoolName</a>
	132	+ </td></tr>
132	132	#end
133		- <tr><th>在籍状態</th><td>
134		- #if($profileUserStatus == 'active')在籍中
135		- #elseif($profileUserStatus == 'graduated')卒業済み
136		- #elseif($profileUserStatus == 'on_leave')休学中
137		- #elseif($profileUserStatus == 'transferred')転校済み
138		- #else$!profileUserStatus#end
	134	+ #set($profileAlumniSchoolCode = $!targetDoc.getValue('alumniSchoolCode'))
	135	+ #set($profileAlumniSchoolName = $!targetDoc.getValue('alumniSchoolName'))
	136	+ #if($profileAlumniSchoolCode && $profileAlumniSchoolCode != '' && $profileAlumniSchoolCode != $profileSchoolCode)
	137	+ <tr><th>出身校</th><td>
	138	+ <a href="/bin/Schools/${profileAlumniSchoolCode}/WebHome">$!profileAlumniSchoolName</a>
139	139	</td></tr>
	140	+ #end
	141	+ ## 学年はプライバシー保護のため公開プロフィールには表示しない
140	140	</table>
141	141	</div>
142	142	{{/html}}
143	143
144		-== このユーザーの投稿・編集履歴 ==
145		-
146		-{{velocity}}
147		-#set($query = $services.query.xwql("where doc.author = '${targetUser}' order by doc.date desc"))
148		-#set($query = $query.setLimit(20))
149		-#set($results = $query.execute())
150		-
151		-#if($results.size() > 0)
152		-|=ページ|=日時
153		-#foreach($docName in $results)
154		- #set($actDoc = $xwiki.getDocument($docName))
155		-|[[$actDoc.title>>$docName]]|$datetool.format("yyyy/MM/dd HH:mm", $actDoc.date)
156		-#end
157		-#else
158		-//このユーザーの公開投稿はまだありません。//
159		-#end
160		-{{/velocity}}
161		-
162	162	{{html clean="false"}}
163	163	<div class="info-note info-note-lg" style="margin-top:24px;text-align:center;">
164	164	<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> 本名・メールアドレス・警告状態などの個人情報は非公開です