Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
102.1
edited by XWikiGuest
on 2026/03/22 00:26
on 2026/03/22 00:26
Change comment:
There is no comment for this version
To version
65.1
edited by Super Admin
on 2026/03/18 08:56
on 2026/03/18 08:56
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. XWikiGuest1 +XWiki.superadmin - Content
-
... ... @@ -1,11 +1,5 @@ 1 1 {{velocity}} 2 2 ## ===== 学校ページ テンプレート ===== 3 -## ゲストが ?sheet= 付きURL(編集フォーム等)に直接アクセスした場合、ログインページへリダイレクト 4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '') 5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}")) 6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)") 7 - #stop 8 -#end 9 9 {{html clean="false"}} 10 10 ## メンテナンスバナー({{include}}ではなくインラインで記述し、<p>タグ挿入を回避) 11 11 #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) ... ... @@ -34,10 +34,8 @@ 34 34 #set($schoolLevel = $doc.getValue('schoolLevel')) 35 35 #set($schoolSystem = $doc.getValue('schoolSystem')) 36 36 #set($website = $doc.getValue('website')) 37 -#set($schoolPhoto = $doc.getValue('schoolPhoto')) 38 -#set($schoolDescription = $doc.getValue('schoolDescription')) 39 39 40 -## --- 生徒会組織 ---32 +## --- 組織図 --- 41 41 #set($orgChart = $doc.getValue('orgChart')) 42 42 #set($orgChartImage = $doc.getValue('orgChartImage')) 43 43 ... ... @@ -57,7 +57,7 @@ 57 57 #set($budgetAllocation = $doc.getValue('budgetAllocation')) 58 58 #set($budgetNote = $doc.getValue('budgetNote')) 59 59 60 -## --- 校則 ・生徒会会則の見直し ---52 +## --- 校則の見直し --- 61 61 #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus')) 62 62 #set($ruleReviewContent = $doc.getValue('ruleReviewContent')) 63 63 #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer')) ... ... @@ -64,44 +64,6 @@ 64 64 #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer')) 65 65 #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem')) 66 66 67 -## --- 活動環境 --- 68 -#set($activityPlace = $doc.getValue('activityPlace')) 69 -#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment')) 70 -#set($activityRoomImage = $doc.getValue('activityRoomImage')) 71 -#set($ictTools = $doc.getValue('ictTools')) 72 -#set($ictUsage = $doc.getValue('ictUsage')) 73 - 74 -## --- 生徒総会 --- 75 -#set($assemblyFormat = $doc.getValue('assemblyFormat')) 76 -#set($assemblyCount = $doc.getValue('assemblyCount')) 77 -#set($assemblyAgenda = $doc.getValue('assemblyAgenda')) 78 -#set($assemblyTopics = $doc.getValue('assemblyTopics')) 79 -#set($assemblyNote = $doc.getValue('assemblyNote')) 80 - 81 -## --- 広報 --- 82 -#set($publicityMethod = $doc.getValue('publicityMethod')) 83 -#set($publicityFrequency = $doc.getValue('publicityFrequency')) 84 -#set($publicityNote = $doc.getValue('publicityNote')) 85 - 86 -## --- 外部連携 --- 87 -#set($externalCooperation = $doc.getValue('externalCooperation')) 88 -#set($externalOrgName = $doc.getValue('externalOrgName')) 89 -#set($socialParticipation = $doc.getValue('socialParticipation')) 90 - 91 -## --- 年間主要行事 --- 92 -#set($eventApril = $doc.getValue('eventApril')) 93 -#set($eventMay = $doc.getValue('eventMay')) 94 -#set($eventJune = $doc.getValue('eventJune')) 95 -#set($eventJuly = $doc.getValue('eventJuly')) 96 -#set($eventAugust = $doc.getValue('eventAugust')) 97 -#set($eventSeptember = $doc.getValue('eventSeptember')) 98 -#set($eventOctober = $doc.getValue('eventOctober')) 99 -#set($eventNovember = $doc.getValue('eventNovember')) 100 -#set($eventDecember = $doc.getValue('eventDecember')) 101 -#set($eventJanuary = $doc.getValue('eventJanuary')) 102 -#set($eventFebruary = $doc.getValue('eventFebruary')) 103 -#set($eventMarch = $doc.getValue('eventMarch')) 104 - 105 105 ## --- 課題・連絡先 --- 106 106 #set($challenges = $doc.getValue('challenges')) 107 107 #set($contactInfo = $doc.getValue('contactInfo')) ... ... @@ -126,14 +126,6 @@ 126 126 #set($visibilityBudget = $!doc.getValue('visibilityBudget')) 127 127 #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview')) 128 128 #set($visibilityChallenges = $!doc.getValue('visibilityChallenges')) 129 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities')) 130 -#set($visibilityElection = $!doc.getValue('visibilityElection')) 131 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting')) 132 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv')) 133 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly')) 134 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity')) 135 -#set($visibilityExternal = $!doc.getValue('visibilityExternal')) 136 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents')) 137 137 ## デフォルト値(未設定なら全体公開) 138 138 #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end 139 139 #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end ... ... @@ -145,65 +145,15 @@ 145 145 #set($isGuest = $viewerUser == 'XWiki.XWikiGuest') 146 146 #set($isViewerAdmin = false) 147 147 #set($viewerSchoolCode = '') 148 -#set($viewerSecondaryGraduated = false) 149 149 #if(!$isGuest) 150 150 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 151 151 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) 152 152 #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode')) 153 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode')) 154 - #set($viewerUserRole = $!viewerDoc.getValue('userRole')) 155 155 #if($viewerAccountType == 'admin') 156 156 #set($isViewerAdmin = true) 157 157 #end 158 - ## 第2所属校の在学年数超過チェック 159 - #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear')) 160 - #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '') 161 - #set($vNow = $datetool.date) 162 - #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow))) 163 - #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow))) 164 - #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end 165 - #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear)) 166 - #set($vSecMax = 3) 167 - #if($viewerSecondarySchoolCode.length() >= 2) 168 - #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2)) 169 - #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end 170 - #end 171 - #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1)) 172 - #if($vSecGrade > $vSecMax) 173 - #set($viewerSecondaryGraduated = true) 174 - #end 175 - #end 176 176 #end 177 177 178 -## --- 関連校(中高一貫校)情報 --- 179 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 180 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 181 -#set($isAffiliated = false) 182 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 183 - #if($viewerSchoolCode == $affiliatedSchoolCode) 184 - #set($isAffiliated = true) 185 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated) 186 - #set($isAffiliated = true) 187 - #end 188 -#end 189 - 190 -## --- 校内判定(卒業生を除外、secondarySchoolCodeも含む) --- 191 -#set($isSchoolMember = false) 192 -#if(!$isGuest && $viewerUserRole != 'graduate') 193 - #if($viewerSchoolCode == $schoolCode || $isAffiliated) 194 - #set($isSchoolMember = true) 195 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated) 196 - #set($isSchoolMember = true) 197 - #end 198 -#end 199 -## 卒業生の母校判定(投稿バッジ用) 200 -#set($isAlumniOfSchool = false) 201 -#if(!$isGuest && $viewerUserRole == 'graduate') 202 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)) 203 - #set($isAlumniOfSchool = true) 204 - #end 205 -#end 206 - 207 207 ## --- 学校ページ非表示チェック --- 208 208 #set($schoolHidden = $doc.getValue('hidden')) 209 209 #if($schoolHidden == 1) ... ... @@ -237,7 +237,7 @@ 237 237 238 238 ## --- 投稿固定/解除処理 --- 239 239 #set($pinAction = $!request.action) 240 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))136 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 241 241 #set($pinPostObjStr = $!request.postObj) 242 242 #if(!$pinPostObjStr.matches('^\d+$')) 243 243 ## 不正な値 → 無視 ... ... @@ -267,7 +267,7 @@ 267 267 268 268 ## --- 特色ある活動 選定/解除処理 --- 269 269 #set($featAction = $!request.action) 270 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))166 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 271 271 #set($featActObjStr = $!request.actObj) 272 272 #if($featActObjStr.matches('^\d+$')) 273 273 #set($actObjNum = $mathtool.toInteger($featActObjStr)) ... ... @@ -369,7 +369,7 @@ 369 369 370 370 ## --- 編集ボタン(権限があるユーザーのみ表示) --- 371 371 #set($canEditSchool = false) 372 -#if(!$isGuest && ($isViewerAdmin || $i sSchoolMember||$isAlumniOfSchool))268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 373 373 #set($canEditSchool = true) 374 374 #end 375 375 #if($canEditSchool) ... ... @@ -378,94 +378,65 @@ 378 378 </div> 379 379 #end 380 380 381 -## --- 関連校(中高一貫校)バナー --- 382 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 383 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome") 384 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef)) 385 -<div class="affiliated-school-banner"> 386 - <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 387 - <div> 388 - <strong>中高一貫校</strong>: 389 - #if($affiliatedPageExists) 390 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a> 391 - #else 392 - $!escapetool.xml($affiliatedSchoolName) 393 - #end 394 - と連携しています 395 - </div> 396 -</div> 397 -#end 398 - 399 399 ## --- ① 学校基本情報 --- 400 400 <div class="school-info-card collapsed" id="card-basic-info"> 401 401 <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 402 - <div class="school-basic-info-layout"> 403 - <div class="school-basic-info-table"> 404 - <table class="wiki-table school-info-table"> 405 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 406 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 407 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 408 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 409 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 410 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 411 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 412 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 413 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 414 - </table> 415 - </div> 416 - #if($schoolPhoto && $schoolPhoto != '') 417 - <div class="school-photo-area"> 418 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" /> 419 - </div> 420 - #end 421 - </div> 422 - #if($schoolDescription && $schoolDescription.trim() != '') 423 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div> 280 + <table class="wiki-table school-info-table"> 281 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 282 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 283 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 284 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 285 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 286 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 287 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 288 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 289 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 290 + </table> 291 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 292 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 293 + #if($infoEditDate && $infoEditDate != '') 294 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div> 424 424 #end 425 - 426 426 </div> 427 427 428 -## --- ② 生徒会情報(折りたたみカード) --- 298 +## --- ② 生徒会基本情報(折りたたみカード) --- 429 429 <div class="school-info-card" id="card-seitokai-info"> 430 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 300 + <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 431 431 <div class="seitokai-info-body"> 432 432 433 - ## --- 生徒会組織 ---303 + ## --- 組織図 --- 434 434 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 435 435 #if($hasOrgContent) 436 436 #set($canViewOrgChart = true) 437 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)438 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ( (!$isSchoolMember)|| ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)307 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false) 308 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false) 439 439 #end 440 440 #if($canViewOrgChart) 441 441 <div class="seitokai-subsection"> 442 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>312 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 443 443 <div class="seitokai-subsection-content"> 444 444 #if($orgChartImage && $orgChartImage != '') 445 445 <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> 446 446 #end 447 - #if($orgChart && $orgChart != '') <div class="free-note">$!escapetool.xml($orgChart)</div>#end317 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 448 448 </div> 449 449 </div> 450 450 #else 451 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>321 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 452 452 #end 453 453 #end 454 454 455 455 ## --- 日常の活動 --- 456 456 #if($dailyActivities && !$dailyActivities.isEmpty()) 457 - #set($canViewDA = true) 458 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false) 459 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false) 460 - #end 461 - #if($canViewDA) 462 462 <div class="seitokai-subsection"> 463 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>328 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3> 464 464 <div class="seitokai-subsection-content"> 465 - <p class="activity-hint">活動時間 が多い3つ</p>330 + <p class="activity-hint">活動時間の多い順に上位3つ</p> 466 466 <div class="tag-container"> 332 + #set($daIdx = 1) 467 467 #foreach($da in $dailyActivities) 468 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span> 334 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 335 + #set($daIdx = $daIdx + 1) 469 469 #end 470 470 </div> 471 471 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') ... ... @@ -473,20 +473,12 @@ 473 473 #end 474 474 </div> 475 475 </div> 476 - #else 477 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 日常の活動情報は #if($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 478 - #end 479 479 #end 480 480 481 481 ## --- 選挙 --- 482 482 #if($electionExists && $electionExists != '') 483 - #set($canViewEL = true) 484 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 485 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 486 - #end 487 - #if($canViewEL) 488 488 <div class="seitokai-subsection"> 489 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>348 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3> 490 490 <div class="seitokai-subsection-content"> 491 491 <div class="info-row"> 492 492 <span class="info-label">役員選挙</span> ... ... @@ -503,20 +503,12 @@ 503 503 #end 504 504 </div> 505 505 </div> 506 - #else 507 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 選挙情報は #if($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 508 - #end 509 509 #end 510 510 511 511 ## --- 定例活動 --- 512 512 #if($meetingFrequency && $meetingFrequency != '') 513 - #set($canViewMT = true) 514 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false) 515 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false) 516 - #end 517 - #if($canViewMT) 518 518 <div class="seitokai-subsection"> 519 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動 #if($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>370 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3> 520 520 <div class="seitokai-subsection-content"> 521 521 <div class="info-row"> 522 522 <span class="info-label">役員定例会の頻度</span> ... ... @@ -527,9 +527,6 @@ 527 527 #end 528 528 </div> 529 529 </div> 530 - #else 531 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 定例活動情報は #if($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 532 - #end 533 533 #end 534 534 535 535 ## --- 予算 --- ... ... @@ -536,12 +536,12 @@ 536 536 #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 537 537 #if($hasBudget) 538 538 #set($canViewBudget = true) 539 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)540 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ( (!$isSchoolMember)|| ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)387 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false) 388 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 541 541 #end 542 542 #if($canViewBudget) 543 543 <div class="seitokai-subsection"> 544 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認 ・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>392 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 545 545 <div class="seitokai-subsection-content"> 546 546 #if($budgetProcess && !$budgetProcess.isEmpty()) 547 547 <div class="info-row"> ... ... @@ -548,13 +548,8 @@ 548 548 <span class="info-label">作成過程の生徒関与</span> 549 549 <span class="info-value"> 550 550 <div class="selection-display"> 551 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 552 - #foreach($bpOpt in $allBpOpts) 553 - #if($budgetProcess.contains($bpOpt)) 554 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 555 - #else 556 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 557 - #end 399 + #foreach($bp in $budgetProcess) 400 + <span class="selection-item">$!escapetool.xml($bp.trim())</span> 558 558 #end 559 559 </div> 560 560 </span> ... ... @@ -594,21 +594,20 @@ 594 594 #end 595 595 #end 596 596 597 - ## --- 校則 ・生徒会会則の見直し ---440 + ## --- 校則の見直し --- 598 598 #if($ruleReviewStatus && $ruleReviewStatus != '') 599 599 #set($canViewRuleReview = true) 600 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)601 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ( (!$isSchoolMember)|| ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)443 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false) 444 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false) 602 602 #end 603 603 #if($canViewRuleReview) 604 604 <div class="seitokai-subsection"> 605 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則 ・生徒会会則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>448 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 606 606 <div class="seitokai-subsection-content"> 607 607 <div class="info-row"> 608 608 <span class="info-label">見直しの有無(3年以内)</span> 609 609 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 610 610 </div> 611 - #if($ruleReviewStatus != '実施なし') 612 612 #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 613 613 <div class="info-row"> 614 614 <span class="info-label">見直しの内容</span> ... ... @@ -645,7 +645,6 @@ 645 645 </span> 646 646 </div> 647 647 #end 648 - #end 649 649 #if($ruleReviewSystem && $ruleReviewSystem != '') 650 650 <div class="info-row"> 651 651 <span class="info-label">見直しの仕組み</span> ... ... @@ -655,280 +655,19 @@ 655 655 </div> 656 656 </div> 657 657 #else 658 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則 ・生徒会会則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>499 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 659 659 #end 660 660 #end 661 661 662 - ## --- 活動環境 --- 663 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty())) 664 - #if($hasActivityEnv) 665 - #set($canViewAE = true) 666 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false) 667 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false) 668 - #end 669 - #if($canViewAE) 670 - <div class="seitokai-subsection"> 671 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 672 - <div class="seitokai-subsection-content"> 673 - #if($activityPlace && !$activityPlace.isEmpty()) 674 - <div class="info-row"> 675 - <span class="info-label">普段の活動場所</span> 676 - <span class="info-value"> 677 - <div class="selection-display"> 678 - #foreach($ap in $activityPlace) 679 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 680 - #end 681 - </div> 682 - </span> 683 - </div> 684 - #end 685 - #if($activityRoomEquipment && $activityRoomEquipment != '') 686 - <div class="info-row"> 687 - <span class="info-label">生徒会室の設備</span> 688 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 689 - </div> 690 - #end 691 - #if($activityRoomImage && $activityRoomImage != '') 692 - <div class="info-row"> 693 - <span class="info-label">活動場所の写真</span> 694 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 695 - </div> 696 - #end 697 - #if($ictTools && !$ictTools.isEmpty()) 698 - <div class="info-row"> 699 - <span class="info-label">利用しているICTツール</span> 700 - <span class="info-value"> 701 - #set($ictCatDisplay = [ 702 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他(連絡)"]], 703 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他(ドキュメント)"]], 704 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他(タスク管理)"]], 705 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他(ビデオ会議)"]], 706 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他(アンケート)"]], 707 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他(デザイン)"]], 708 - ["その他", ["独自のWebシステム・自作アプリ"]] 709 - ]) 710 - #foreach($catD in $ictCatDisplay) 711 - #set($catHasItems = false) 712 - #foreach($t in $catD.get(1)) 713 - #if($ictTools.contains($t)) #set($catHasItems = true) #end 714 - #end 715 - #if($catHasItems) 716 - <div style="margin-bottom:6px"> 717 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 718 - <div class="selection-display" style="margin-top:2px"> 719 - #foreach($t in $catD.get(1)) 720 - #if($ictTools.contains($t)) 721 - <span class="selection-item">$!escapetool.xml($t)</span> 722 - #end 723 - #end 724 - </div> 725 - </div> 726 - #end 727 - #end 728 - </span> 729 - </div> 730 - #end 731 - #if($ictUsage && !$ictUsage.isEmpty()) 732 - <div class="info-row"> 733 - <span class="info-label">ICT活用している場面</span> 734 - <span class="info-value"> 735 - <div class="selection-display"> 736 - #foreach($iu in $ictUsage) 737 - <span class="selection-item">$!escapetool.xml($iu.trim())</span> 738 - #end 739 - </div> 740 - </span> 741 - </div> 742 - #end 743 - </div> 744 - </div> 745 - #else 746 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 活動環境情報は #if($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 747 - #end 748 - #end 749 - 750 - ## --- 生徒総会 --- 751 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 752 - #if($hasAssembly) 753 - #set($canViewAS = true) 754 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 755 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 756 - #end 757 - #if($canViewAS) 758 - <div class="seitokai-subsection"> 759 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 760 - <div class="seitokai-subsection-content"> 761 - #if($assemblyFormat && $assemblyFormat != '') 762 - <div class="info-row"> 763 - <span class="info-label">開催方式</span> 764 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 765 - </div> 766 - #end 767 - #if($assemblyCount && $assemblyCount > 0) 768 - <div class="info-row"> 769 - <span class="info-label">開催回数(年)</span> 770 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 771 - </div> 772 - #end 773 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 774 - <div class="info-row"> 775 - <span class="info-label">議案の集め方</span> 776 - <span class="info-value"> 777 - <div class="selection-display"> 778 - #foreach($aa in $assemblyAgenda) 779 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 780 - #end 781 - </div> 782 - </span> 783 - </div> 784 - #end 785 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 786 - <div class="info-row"> 787 - <span class="info-label">扱う内容</span> 788 - <span class="info-value"> 789 - <div class="selection-display"> 790 - #foreach($at in $assemblyTopics) 791 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 792 - #end 793 - </div> 794 - </span> 795 - </div> 796 - #end 797 - #if($assemblyNote && $assemblyNote != '') 798 - <div class="info-row"> 799 - <span class="info-label">自由記述</span> 800 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 801 - </div> 802 - #end 803 - </div> 804 - </div> 805 - #else 806 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 807 - #end 808 - #end 809 - 810 - ## --- 広報 --- 811 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 812 - #if($hasPublicity) 813 - #set($canViewPB = true) 814 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false) 815 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false) 816 - #end 817 - #if($canViewPB) 818 - <div class="seitokai-subsection"> 819 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 820 - <div class="seitokai-subsection-content"> 821 - #if($publicityMethod && !$publicityMethod.isEmpty()) 822 - <div class="info-row"> 823 - <span class="info-label">方法</span> 824 - <span class="info-value"> 825 - <div class="selection-display"> 826 - #foreach($pm in $publicityMethod) 827 - <span class="selection-item">$!escapetool.xml($pm.trim())</span> 828 - #end 829 - </div> 830 - </span> 831 - </div> 832 - #end 833 - #if($publicityFrequency && $publicityFrequency != '') 834 - <div class="info-row"> 835 - <span class="info-label">頻度</span> 836 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span> 837 - </div> 838 - #end 839 - #if($publicityNote && $publicityNote != '') 840 - <div class="info-row"> 841 - <span class="info-label">自由記述</span> 842 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span> 843 - </div> 844 - #end 845 - </div> 846 - </div> 847 - #else 848 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 広報情報は #if($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 849 - #end 850 - #end 851 - 852 - ## --- 外部連携 --- 853 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 854 - #if($hasExternal) 855 - #set($canViewEX = true) 856 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false) 857 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false) 858 - #end 859 - #if($canViewEX) 860 - <div class="seitokai-subsection"> 861 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 862 - <div class="seitokai-subsection-content"> 863 - #if($externalCooperation && $externalCooperation != '') 864 - <div class="info-row"> 865 - <span class="info-label">他校の生徒会との連携</span> 866 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span> 867 - </div> 868 - #end 869 - #if($externalOrgName && $externalOrgName != '') 870 - <div class="info-row"> 871 - <span class="info-label">参加している生徒会団体の名前</span> 872 - <span class="info-value">$!escapetool.xml($externalOrgName)</span> 873 - </div> 874 - #end 875 - #if($socialParticipation && !$socialParticipation.isEmpty()) 876 - <div class="info-row"> 877 - <span class="info-label">社会参加・地域連携・ボランティア</span> 878 - <span class="info-value"> 879 - <div class="selection-display"> 880 - #foreach($sp2 in $socialParticipation) 881 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span> 882 - #end 883 - </div> 884 - </span> 885 - </div> 886 - #end 887 - </div> 888 - </div> 889 - #else 890 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 外部連携情報は #if($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 891 - #end 892 - #end 893 - 894 - ## --- 年間主要行事 --- 895 - #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]]) 896 - #set($hasAnyEvent = false) 897 - #foreach($m in $months) 898 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 899 - #end 900 - #if($hasAnyEvent) 901 - #set($canViewAN = true) 902 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 903 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 904 - #end 905 - #if($canViewAN) 906 - <div class="seitokai-subsection"> 907 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 908 - <div class="seitokai-subsection-content"> 909 - <table class="wiki-table school-info-table" style="margin:0"> 910 - #foreach($m in $months) 911 - #if($m.get(1) && $m.get(1) != '') 912 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 913 - #end 914 - #end 915 - </table> 916 - </div> 917 - </div> 918 - #else 919 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 年間主要行事情報は #if($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 920 - #end 921 - #end 922 - 923 923 ## --- 生徒会の課題意識 --- 924 924 #if($challenges && $challenges != '') 925 925 #set($canViewChallenges = true) 926 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)927 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ( (!$isSchoolMember)|| ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)506 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false) 507 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false) 928 928 #end 929 929 #if($canViewChallenges) 930 930 <div class="seitokai-subsection"> 931 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認 ・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>511 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 932 932 <div class="seitokai-subsection-content"> 933 933 <div class="challenge-text">$!escapetool.xml($challenges)</div> 934 934 </div> ... ... @@ -952,11 +952,6 @@ 952 952 <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 953 953 <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 954 954 </table> 955 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 956 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 957 - #if($infoEditDate && $infoEditDate != '') 958 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div> 959 - #end 960 960 </div> 961 961 962 962 {{/html}} ... ... @@ -1011,23 +1011,22 @@ 1011 1011 <div class="author-legend-body"> 1012 1012 <div class="author-legend"> 1013 1013 <span class="author-legend-title">投稿者の信頼度:</span> 1014 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>1015 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>1016 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>1017 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>589 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 590 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 591 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 592 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般(未承認)</span> 1018 1018 </div> 1019 1019 <div class="author-legend"> 1020 1020 <span class="author-legend-title">所属:</span> 1021 - <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内(確認済)</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span> 1022 - <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span> 1023 - <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><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> <span class="text-hint">この学校の卒業生</span></span> 1024 - <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span> 1025 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span> 596 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内(確認済)</span> 承認済み+同校</span> 597 + <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介+同校</span> 598 + <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span> 599 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span> 1026 1026 </div> 1027 1027 <div class="author-legend"> 1028 1028 <span class="author-legend-title">役割:</span> 1029 1029 <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span> 1030 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span> <span class="text-hint">生徒会役員</span></span>604 + <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span> 1031 1031 <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><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></span> 1032 1032 </div> 1033 1033 </div> ... ... @@ -1096,18 +1096,16 @@ 1096 1096 <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)"> 1097 1097 <div class="activity-thread-header"> 1098 1098 <div class="activity-thread-title"> 1099 - <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> #end$!escapetool.xml($!actTitle)</h3> 1100 - <div class="activity-meta-line"> 1101 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 1102 - #set($actTagsList = $activity.getValue('tags')) 1103 - #if($actTagsList && !$actTagsList.isEmpty()) 1104 - #foreach($tagItem in $actTagsList) 1105 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 1106 - #end 673 + <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3> 674 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 675 + #set($actTagsList = $activity.getValue('tags')) 676 + #if($actTagsList && !$actTagsList.isEmpty()) 677 + #foreach($tagItem in $actTagsList) 678 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 1107 1107 #end 1108 - </div>680 + #end 1109 1109 </div> 1110 - <div class="thread-meta-r ight">682 + <div class="thread-meta-row"> 1111 1111 <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span> 1112 1112 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 1113 1113 #if($actFeatured == '1') ... ... @@ -1167,8 +1167,8 @@ 1167 1167 #set($postVis = $!post.getValue('visibility')) 1168 1168 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 1169 1169 #set($canViewPost = true) 1170 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)1171 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ( (!$isSchoolMember)|| ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)742 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false) 743 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false) 1172 1172 #end 1173 1173 #if(!$canViewPost) 1174 1174 <div class="thread-post visibility-restricted-post"> ... ... @@ -1212,11 +1212,8 @@ 1212 1212 <span class="badge badge-general badge-sm">一般</span> 1213 1213 #end 1214 1214 ## 所属バッジ(投稿者の学校コードとページの学校コードを比較) 1215 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))) 1216 1216 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 1217 - #if($postUserRole == 'graduate' && $postIsSchoolMatch) 1218 - <span class="badge badge-alumni badge-sm"><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> 1219 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate') 788 + #if($postSchoolCode == $schoolCode) 1220 1220 #if($postAccountType == 'verified' || $postAccountType == 'admin') 1221 1221 <span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内(確認済)</span> 1222 1222 #else ... ... @@ -1243,13 +1243,6 @@ 1243 1243 #if($postEdited == 1 || $postEdited == '1') 1244 1244 <span class="post-edited-label">(編集済み)</span> 1245 1245 #end 1246 - #set($postAuthorRefH = $!post.getValue('authorRef')) 1247 - #set($postObjNumH = $post.number) 1248 - #if(!$isGuest && $xcontext.user != $postAuthorRefH) 1249 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報"> 1250 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報 1251 - </button> 1252 - #end 1253 1253 </div> 1254 1254 <div class="thread-post-body"> 1255 1255 $!escapetool.xml($!postContent) ... ... @@ -1314,18 +1314,12 @@ 1314 1314 #end 1315 1315 </div> 1316 1316 #if($postVis != 'public') 1317 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認 ・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>879 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div> 1318 1318 #end 1319 - ## 固定/編集/削除/通報/非表示ボタン(横並び) 1320 - #set($postAuthorRef = $!post.getValue('authorRef')) 1321 - #set($postObjNumED = $post.number) 1322 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified')) 1323 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')) 1324 - #set($showHideBtn = ($viewerAccountType == 'admin')) 1325 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn) 1326 - <div class="post-edit-actions post-action-mt"> 1327 - #if($showPinBtn) 1328 - #set($postObjNum = $post.number) 881 + ## 固定/解除ボタン(承認済み・管理者のみ) 882 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 883 + #set($postObjNum = $post.number) 884 + <div class="post-pin-action post-action-mt"> 1329 1329 #if($isPinned == '1') 1330 1330 <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除"> 1331 1331 <svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除 ... ... @@ -1335,12 +1335,15 @@ 1335 1335 <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する 1336 1336 </a> 1337 1337 #end 1338 - #end 1339 - #if($showEditDeleteBtn) 894 + </div> 895 + #end 896 + ## 編集・削除ボタン(投稿者本人 or 管理者) 897 + #set($postAuthorRef = $!post.getValue('authorRef')) 898 + #set($postObjNumED = $post.number) 899 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin') 900 + <div class="post-edit-actions post-action-mt"> 1340 1340 #if($xcontext.user == $postAuthorRef) 1341 - #set($editImages = $!post.getValue('images')) 1342 - #set($editFiles = $!post.getValue('files')) 1343 - <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集"> 902 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集"> 1344 1344 <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集 1345 1345 </button> 1346 1346 #end ... ... @@ -1347,12 +1347,6 @@ 1347 1347 <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除"> 1348 1348 <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> 削除 1349 1349 </button> 1350 - #end 1351 - #if($showHideBtn) 1352 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする"> 1353 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示 1354 - </button> 1355 - #end 1356 1356 </div> 1357 1357 #end 1358 1358 </div> ... ... @@ -1402,11 +1402,9 @@ 1402 1402 1403 1403 #if($xcontext.user != "XWiki.XWikiGuest") 1404 1404 <div class="thread-add-post"> 1405 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin) 1406 1406 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 1407 1407 + 活動報告を追加 1408 1408 </a> 1409 - #end 1410 1410 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 1411 1411 <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く 1412 1412 </a> ... ... @@ -1483,27 +1483,6 @@ 1483 1483 } 1484 1484 // ページ読み込み時の初期化 1485 1485 document.addEventListener('DOMContentLoaded', function() { 1486 - // 年度タブを降順にソート(「全期間」タブは末尾に固定) 1487 - var tabContainer = document.querySelector('.activity-fy-tabs'); 1488 - if (tabContainer) { 1489 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); 1490 - var allTab = null; 1491 - var fyTabs = []; 1492 - tabs.forEach(function(t) { 1493 - var onclickStr = t.getAttribute('onclick') || ''; 1494 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; } 1495 - else { fyTabs.push(t); } 1496 - }); 1497 - // 年度タブを数値の降順でソート 1498 - fyTabs.sort(function(a, b) { 1499 - var aYear = parseInt(a.textContent) || 0; 1500 - var bYear = parseInt(b.textContent) || 0; 1501 - return bYear - aYear; 1502 - }); 1503 - // DOM再配置 1504 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1505 - if (allTab) { tabContainer.appendChild(allTab); } 1506 - } 1507 1507 // デフォルトで現在の年度を表示 1508 1508 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1509 1509 if (defaultTab) { defaultTab.click(); } ... ... @@ -1519,15 +1519,14 @@ 1519 1519 document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1520 1520 header.addEventListener('click', toggleThreadExpand); 1521 1521 }); 1522 - // 長文投稿の折りたたみ初期化 (max-height: 12em 超で省略)1052 + // 長文投稿の折りたたみ初期化 1523 1523 document.querySelectorAll('.thread-post-body').forEach(function(body) { 1524 - // pre-wrapのまま高さを測定し、max-height(12em≒ ~200px)を超える場合に折りたたむ1054 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定 1525 1525 var fullH = body.scrollHeight; 1526 - // 12em を px に変換(font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得) 1527 1527 body.classList.add('truncated'); 1528 - var maxH = body.clientHeight;// max-height: 12em 適用後の高さ1057 + var clampedH = body.clientHeight; 1529 1529 body.classList.remove('truncated'); 1530 - if (fullH > maxH +30) {1059 + if (fullH > clampedH + 10) { 1531 1531 body.classList.add('truncated'); 1532 1532 var btn = document.createElement('button'); 1533 1533 btn.className = 'btn-read-more'; ... ... @@ -1573,130 +1573,37 @@ 1573 1573 } 1574 1574 1575 1575 // 投稿の編集(インライン編集フォームを開く) 1576 -function openEditPost(btn) { 1105 +function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1577 1577 var postEl = btn.closest('.thread-post'); 1578 1578 if (!postEl) return; 1108 + // 既存の編集フォームがあれば閉じる 1579 1579 var existing = postEl.querySelector('.post-edit-form'); 1580 1580 if (existing) { existing.remove(); return; } 1581 1581 var bodyEl = postEl.querySelector('.thread-post-body'); 1582 1582 if (!bodyEl) return; 1583 - 1584 - var schoolPage = btn.getAttribute('data-school'); 1585 - var postObjNum = btn.getAttribute('data-obj'); 1586 - var currentContent = btn.getAttribute('data-content') || ''; 1587 - var currentImages = btn.getAttribute('data-images') || ''; 1588 - var currentFiles = btn.getAttribute('data-files') || ''; 1589 - var postType = btn.getAttribute('data-post-type') || 'report'; 1590 - 1591 1591 var form = document.createElement('div'); 1592 1592 form.className = 'post-edit-form'; 1593 - form.setAttribute('data-school', schoolPage); 1594 - form.setAttribute('data-obj', postObjNum); 1595 - 1596 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1597 - 1598 - // コメント以外は添付ファイル編集を表示 1599 - if (postType !== 'comment') { 1600 - // 既存画像 1601 - html += '<div class="edit-attachments">'; 1602 - if (currentImages.trim()) { 1603 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>'; 1604 - var imgs = currentImages.trim().split('\n'); 1605 - for (var i = 0; i < imgs.length; i++) { 1606 - var img = imgs[i].trim(); 1607 - if (!img) continue; 1608 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1609 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1610 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1611 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1612 - '</div>'; 1613 - } 1614 - html += '</div>'; 1615 - } 1616 - // 既存ファイル 1617 - if (currentFiles.trim()) { 1618 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>'; 1619 - var files = currentFiles.trim().split('\n'); 1620 - for (var j = 0; j < files.length; j++) { 1621 - var f = files[j].trim(); 1622 - if (!f) continue; 1623 - var displayName = f; 1624 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1625 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1626 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1627 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1628 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1629 - '</div>'; 1630 - } 1631 - html += '</div>'; 1632 - } 1633 - // 新規追加 1634 - html += '<div class="edit-attach-add">' + 1635 - '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' + 1636 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' + 1637 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' + 1638 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' + 1639 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' + 1640 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' + 1641 - '</div>'; 1642 - html += '</div>'; 1643 - } 1644 - 1645 - html += '<div class="post-edit-form-actions">' + 1115 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1116 + '<div class="post-edit-form-actions">' + 1646 1646 '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1647 - '<button type="button" class="btn-save" onclick="saveEditPost( this)">保存</button>' +1118 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1648 1648 '</div>'; 1649 - 1650 - form.innerHTML = html; 1651 1651 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1652 1652 form.querySelector('textarea').focus(); 1653 1653 } 1654 1654 1655 -function removeEditAttach(btn) { 1656 - var item = btn.closest('.edit-attach-item'); 1657 - if (item) item.remove(); 1658 -} 1659 - 1660 1660 // 投稿の編集を保存 1661 -function saveEditPost(btn) { 1662 - var formEl = btn.closest('.post-edit-form'); 1663 - if (!formEl) return; 1664 - var schoolPage = formEl.getAttribute('data-school'); 1665 - var postObjNum = formEl.getAttribute('data-obj'); 1666 - var textarea = formEl.querySelector('textarea'); 1125 +function saveEditPost(schoolPage, postObjNum) { 1126 + var textarea = document.getElementById('editContent_' + postObjNum); 1667 1667 if (!textarea) return; 1668 1668 var newContent = textarea.value.trim(); 1669 1669 if (!newContent) { alert('投稿内容を入力してください'); return; } 1670 - 1671 1671 var csrfEl = document.querySelector('input[name="form_token"]'); 1672 1672 var csrfToken = csrfEl ? csrfEl.value : ''; 1673 - 1674 - var fd = new FormData(); 1675 - fd.append('schoolPage', schoolPage); 1676 - fd.append('postObj', postObjNum); 1677 - fd.append('newContent', newContent); 1678 - fd.append('form_token', csrfToken); 1679 - 1680 - // 残す画像・ファイル 1681 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); }); 1682 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); }); 1683 - 1684 - // 新規画像 1685 - var newImgInput = formEl.querySelector('input[name="editNewImages"]'); 1686 - if (newImgInput && newImgInput.files) { 1687 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); } 1688 - } 1689 - // 新規ファイル 1690 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]'); 1691 - if (newFileInput && newFileInput.files) { 1692 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); } 1693 - } 1694 - 1695 - btn.disabled = true; 1696 - btn.textContent = '保存中...'; 1697 - 1698 1698 var xhr = new XMLHttpRequest(); 1699 1699 xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true); 1134 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1135 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1700 1700 xhr.onload = function() { 1701 1701 try { 1702 1702 var res = JSON.parse(xhr.responseText); ... ... @@ -1704,13 +1704,12 @@ 1704 1704 showToast('投稿を更新しました', 'success'); 1705 1705 setTimeout(function() { location.reload(); }, 800); 1706 1706 } else { 1707 - btn.disabled = false; btn.textContent = '保存'; 1708 1708 alert('編集に失敗しました: ' + (res.error || '')); 1709 1709 } 1710 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }1145 + } catch(e) { alert('編集に失敗しました'); } 1711 1711 }; 1712 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };1713 - xhr.send( fd);1147 + xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1148 + xhr.send(editPostData); 1714 1714 } 1715 1715 1716 1716 // 投稿の削除(確認ダイアログ付き) ... ... @@ -1734,80 +1734,6 @@ 1734 1734 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1735 1735 xhr.send(deletePostData); 1736 1736 } 1737 - 1738 -/* --- 通報ダイアログ --- */ 1739 -function openReportDialog(btn, targetPage, postObjNum, token) { 1740 - if (document.getElementById('report-dialog-overlay')) return; 1741 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他']; 1742 - var overlay = document.createElement('div'); 1743 - overlay.id = 'report-dialog-overlay'; 1744 - overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;'; 1745 - var dialog = document.createElement('div'); 1746 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;'; 1747 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>'; 1748 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>'; 1749 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>'; 1750 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">'; 1751 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>'; 1752 - html += '</select>'; 1753 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>'; 1754 - html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>'; 1755 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">'; 1756 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>'; 1757 - html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>'; 1758 - html += '</div>'; 1759 - dialog.innerHTML = html; 1760 - overlay.appendChild(dialog); 1761 - document.body.appendChild(overlay); 1762 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); }); 1763 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); }); 1764 - document.getElementById('report-submit-btn').addEventListener('click', function() { 1765 - var reason = document.getElementById('report-reason').value; 1766 - var detail = document.getElementById('report-detail').value; 1767 - var submitBtn = document.getElementById('report-submit-btn'); 1768 - submitBtn.disabled = true; submitBtn.textContent = '送信中...'; 1769 - var xhr = new XMLHttpRequest(); 1770 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true); 1771 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1772 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token); 1773 - xhr.onload = function() { 1774 - overlay.remove(); 1775 - showToast('通報を受け付けました', 'success'); 1776 - setTimeout(function() { location.reload(); }, 1000); 1777 - }; 1778 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); }; 1779 - xhr.send(data); 1780 - }); 1781 -} 1782 - 1783 -/* --- 非表示ダイアログ(管理者用) --- */ 1784 -function openHideDialog(btn, targetPage, postObjNum, token) { 1785 - if (document.getElementById('hide-dialog-overlay')) return; 1786 - var overlay = document.createElement('div'); 1787 - overlay.id = 'hide-dialog-overlay'; 1788 - overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;'; 1789 - var dialog = document.createElement('div'); 1790 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;'; 1791 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>'; 1792 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>'; 1793 - html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />'; 1794 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">'; 1795 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>'; 1796 - html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>'; 1797 - html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>'; 1798 - html += '</div>'; 1799 - dialog.innerHTML = html; 1800 - overlay.appendChild(dialog); 1801 - document.body.appendChild(overlay); 1802 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); }); 1803 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); }); 1804 - function doHide(action) { 1805 - var reason = document.getElementById('hide-reason').value || '管理者判断'; 1806 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token); 1807 - } 1808 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); }); 1809 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); }); 1810 -} 1811 1811 </script> 1812 1812 {{/html}} 1813 1813 {{/velocity}}