Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
95.1
edited by Super Admin
on 2026/03/20 18:03
on 2026/03/20 18:03
Change comment:
There is no comment for this version
To version
70.1
edited by Super Admin
on 2026/03/18 18:54
on 2026/03/18 18:54
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -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 -## --- 生徒会組織 ---38 +## --- 組織図 --- 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 -## --- 校則 ・生徒会会則の見直し ---58 +## --- 校則の見直し --- 61 61 #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus')) 62 62 #set($ruleReviewContent = $doc.getValue('ruleReviewContent')) 63 63 #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer')) ... ... @@ -64,43 +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($ictUsage = $doc.getValue('ictUsage')) 72 - 73 -## --- 生徒総会 --- 74 -#set($assemblyFormat = $doc.getValue('assemblyFormat')) 75 -#set($assemblyCount = $doc.getValue('assemblyCount')) 76 -#set($assemblyAgenda = $doc.getValue('assemblyAgenda')) 77 -#set($assemblyTopics = $doc.getValue('assemblyTopics')) 78 -#set($assemblyNote = $doc.getValue('assemblyNote')) 79 - 80 -## --- 広報 --- 81 -#set($publicityMethod = $doc.getValue('publicityMethod')) 82 -#set($publicityFrequency = $doc.getValue('publicityFrequency')) 83 -#set($publicityNote = $doc.getValue('publicityNote')) 84 - 85 -## --- 外部連携 --- 86 -#set($externalCooperation = $doc.getValue('externalCooperation')) 87 -#set($externalOrgName = $doc.getValue('externalOrgName')) 88 -#set($socialParticipation = $doc.getValue('socialParticipation')) 89 - 90 -## --- 年間主要行事 --- 91 -#set($eventApril = $doc.getValue('eventApril')) 92 -#set($eventMay = $doc.getValue('eventMay')) 93 -#set($eventJune = $doc.getValue('eventJune')) 94 -#set($eventJuly = $doc.getValue('eventJuly')) 95 -#set($eventAugust = $doc.getValue('eventAugust')) 96 -#set($eventSeptember = $doc.getValue('eventSeptember')) 97 -#set($eventOctober = $doc.getValue('eventOctober')) 98 -#set($eventNovember = $doc.getValue('eventNovember')) 99 -#set($eventDecember = $doc.getValue('eventDecember')) 100 -#set($eventJanuary = $doc.getValue('eventJanuary')) 101 -#set($eventFebruary = $doc.getValue('eventFebruary')) 102 -#set($eventMarch = $doc.getValue('eventMarch')) 103 - 104 104 ## --- 課題・連絡先 --- 105 105 #set($challenges = $doc.getValue('challenges')) 106 106 #set($contactInfo = $doc.getValue('contactInfo')) ... ... @@ -140,8 +140,6 @@ 140 140 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 141 141 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) 142 142 #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode')) 143 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode')) 144 - #set($viewerUserRole = $!viewerDoc.getValue('userRole')) 145 145 #if($viewerAccountType == 'admin') 146 146 #set($isViewerAdmin = true) 147 147 #end ... ... @@ -151,31 +151,10 @@ 151 151 #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 152 152 #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 153 153 #set($isAffiliated = false) 154 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 155 - #if($viewerSchoolCode == $affiliatedSchoolCode) 156 - #set($isAffiliated = true) 157 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 158 - #set($isAffiliated = true) 159 - #end 113 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode) 114 + #set($isAffiliated = true) 160 160 #end 161 161 162 -## --- 校内判定(卒業生を除外、secondarySchoolCodeも含む) --- 163 -#set($isSchoolMember = false) 164 -#if(!$isGuest && $viewerUserRole != 'graduate') 165 - #if($viewerSchoolCode == $schoolCode || $isAffiliated) 166 - #set($isSchoolMember = true) 167 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 168 - #set($isSchoolMember = true) 169 - #end 170 -#end 171 -## 卒業生の母校判定(投稿バッジ用) 172 -#set($isAlumniOfSchool = false) 173 -#if(!$isGuest && $viewerUserRole == 'graduate') 174 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)) 175 - #set($isAlumniOfSchool = true) 176 - #end 177 -#end 178 - 179 179 ## --- 学校ページ非表示チェック --- 180 180 #set($schoolHidden = $doc.getValue('hidden')) 181 181 #if($schoolHidden == 1) ... ... @@ -209,7 +209,7 @@ 209 209 210 210 ## --- 投稿固定/解除処理 --- 211 211 #set($pinAction = $!request.action) 212 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))150 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token)) 213 213 #set($pinPostObjStr = $!request.postObj) 214 214 #if(!$pinPostObjStr.matches('^\d+$')) 215 215 ## 不正な値 → 無視 ... ... @@ -239,7 +239,7 @@ 239 239 240 240 ## --- 特色ある活動 選定/解除処理 --- 241 241 #set($featAction = $!request.action) 242 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))180 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 243 243 #set($featActObjStr = $!request.actObj) 244 244 #if($featActObjStr.matches('^\d+$')) 245 245 #set($actObjNum = $mathtool.toInteger($featActObjStr)) ... ... @@ -341,7 +341,7 @@ 341 341 342 342 ## --- 編集ボタン(権限があるユーザーのみ表示) --- 343 343 #set($canEditSchool = false) 344 -#if(!$isGuest && ($isViewerAdmin || $i sSchoolMember|| $isAlumniOfSchool))282 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated)) 345 345 #set($canEditSchool = true) 346 346 #end 347 347 #if($canEditSchool) ... ... @@ -371,56 +371,48 @@ 371 371 ## --- ① 学校基本情報 --- 372 372 <div class="school-info-card collapsed" id="card-basic-info"> 373 373 <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> 374 - <div class="school-basic-info-layout"> 375 - <div class="school-basic-info-table"> 376 - <table class="wiki-table school-info-table"> 377 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 378 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 379 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 380 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 381 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 382 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 383 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 384 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 385 - <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> 386 - </table> 387 - </div> 388 - #if($schoolPhoto && $schoolPhoto != '') 389 - <div class="school-photo-area"> 390 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" /> 391 - </div> 392 - #end 393 - </div> 394 - #if($schoolDescription && $schoolDescription.trim() != '') 395 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div> 312 + <table class="wiki-table school-info-table"> 313 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 314 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 315 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 316 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 317 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 318 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 319 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 320 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 321 + <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> 322 + </table> 323 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 324 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 325 + #if($infoEditDate && $infoEditDate != '') 326 + <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> 396 396 #end 397 - 398 398 </div> 399 399 400 -## --- ② 生徒会情報(折りたたみカード) --- 330 +## --- ② 生徒会基本情報(折りたたみカード) --- 401 401 <div class="school-info-card" id="card-seitokai-info"> 402 - <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> 332 + <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> 403 403 <div class="seitokai-info-body"> 404 404 405 - ## --- 生徒会組織 ---335 + ## --- 組織図 --- 406 406 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 407 407 #if($hasOrgContent) 408 408 #set($canViewOrgChart = true) 409 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)410 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (( !$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)339 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false) 340 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false) 411 411 #end 412 412 #if($canViewOrgChart) 413 413 <div class="seitokai-subsection"> 414 - <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>344 + <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> 415 415 <div class="seitokai-subsection-content"> 416 416 #if($orgChartImage && $orgChartImage != '') 417 417 <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> 418 418 #end 419 - #if($orgChart && $orgChart != '') <div class="free-note">$!escapetool.xml($orgChart)</div>#end349 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 420 420 </div> 421 421 </div> 422 422 #else 423 - <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>353 + <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> 424 424 #end 425 425 #end 426 426 ... ... @@ -429,10 +429,12 @@ 429 429 <div class="seitokai-subsection"> 430 430 <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> 431 431 <div class="seitokai-subsection-content"> 432 - <p class="activity-hint">活動時間 が多い3つ</p>362 + <p class="activity-hint">活動時間の多い順に上位3つ</p> 433 433 <div class="tag-container"> 364 + #set($daIdx = 1) 434 434 #foreach($da in $dailyActivities) 435 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span> 366 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 367 + #set($daIdx = $daIdx + 1) 436 436 #end 437 437 </div> 438 438 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') ... ... @@ -484,12 +484,12 @@ 484 484 #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 485 485 #if($hasBudget) 486 486 #set($canViewBudget = true) 487 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)488 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (( !$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)419 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false) 420 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 489 489 #end 490 490 #if($canViewBudget) 491 491 <div class="seitokai-subsection"> 492 - <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>424 + <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> 493 493 <div class="seitokai-subsection-content"> 494 494 #if($budgetProcess && !$budgetProcess.isEmpty()) 495 495 <div class="info-row"> ... ... @@ -496,13 +496,8 @@ 496 496 <span class="info-label">作成過程の生徒関与</span> 497 497 <span class="info-value"> 498 498 <div class="selection-display"> 499 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 500 - #foreach($bpOpt in $allBpOpts) 501 - #if($budgetProcess.contains($bpOpt)) 502 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 503 - #else 504 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 505 - #end 431 + #foreach($bp in $budgetProcess) 432 + <span class="selection-item">$!escapetool.xml($bp.trim())</span> 506 506 #end 507 507 </div> 508 508 </span> ... ... @@ -542,21 +542,20 @@ 542 542 #end 543 543 #end 544 544 545 - ## --- 校則 ・生徒会会則の見直し ---472 + ## --- 校則の見直し --- 546 546 #if($ruleReviewStatus && $ruleReviewStatus != '') 547 547 #set($canViewRuleReview = true) 548 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)549 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (( !$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)475 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false) 476 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false) 550 550 #end 551 551 #if($canViewRuleReview) 552 552 <div class="seitokai-subsection"> 553 - <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>480 + <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> 554 554 <div class="seitokai-subsection-content"> 555 555 <div class="info-row"> 556 556 <span class="info-label">見直しの有無(3年以内)</span> 557 557 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 558 558 </div> 559 - #if($ruleReviewStatus != '実施なし') 560 560 #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 561 561 <div class="info-row"> 562 562 <span class="info-label">見直しの内容</span> ... ... @@ -593,7 +593,6 @@ 593 593 </span> 594 594 </div> 595 595 #end 596 - #end 597 597 #if($ruleReviewSystem && $ruleReviewSystem != '') 598 598 <div class="info-row"> 599 599 <span class="info-label">見直しの仕組み</span> ... ... @@ -603,206 +603,19 @@ 603 603 </div> 604 604 </div> 605 605 #else 606 - <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>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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 607 607 #end 608 608 #end 609 609 610 - ## --- 活動環境 --- 611 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty())) 612 - #if($hasActivityEnv) 613 - <div class="seitokai-subsection"> 614 - <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> 生徒会の活動環境</h3> 615 - <div class="seitokai-subsection-content"> 616 - #if($activityPlace && !$activityPlace.isEmpty()) 617 - <div class="info-row"> 618 - <span class="info-label">普段の活動場所</span> 619 - <span class="info-value"> 620 - <div class="selection-display"> 621 - #foreach($ap in $activityPlace) 622 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 623 - #end 624 - </div> 625 - </span> 626 - </div> 627 - #end 628 - #if($activityRoomEquipment && $activityRoomEquipment != '') 629 - <div class="info-row"> 630 - <span class="info-label">生徒会室の設備</span> 631 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 632 - </div> 633 - #end 634 - #if($activityRoomImage && $activityRoomImage != '') 635 - <div class="info-row"> 636 - <span class="info-label">活動場所の写真</span> 637 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 638 - </div> 639 - #end 640 - #if($ictUsage && !$ictUsage.isEmpty()) 641 - <div class="info-row"> 642 - <span class="info-label">ICT活用している場面</span> 643 - <span class="info-value"> 644 - <div class="selection-display"> 645 - #foreach($iu in $ictUsage) 646 - <span class="selection-item">$!escapetool.xml($iu.trim())</span> 647 - #end 648 - </div> 649 - </span> 650 - </div> 651 - #end 652 - </div> 653 - </div> 654 - #end 655 - 656 - ## --- 生徒総会 --- 657 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 658 - #if($hasAssembly) 659 - <div class="seitokai-subsection"> 660 - <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> 生徒総会</h3> 661 - <div class="seitokai-subsection-content"> 662 - #if($assemblyFormat && $assemblyFormat != '') 663 - <div class="info-row"> 664 - <span class="info-label">開催方式</span> 665 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 666 - </div> 667 - #end 668 - #if($assemblyCount && $assemblyCount > 0) 669 - <div class="info-row"> 670 - <span class="info-label">開催回数(年)</span> 671 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 672 - </div> 673 - #end 674 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 675 - <div class="info-row"> 676 - <span class="info-label">議案の集め方</span> 677 - <span class="info-value"> 678 - <div class="selection-display"> 679 - #foreach($aa in $assemblyAgenda) 680 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 681 - #end 682 - </div> 683 - </span> 684 - </div> 685 - #end 686 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 687 - <div class="info-row"> 688 - <span class="info-label">扱う内容</span> 689 - <span class="info-value"> 690 - <div class="selection-display"> 691 - #foreach($at in $assemblyTopics) 692 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 693 - #end 694 - </div> 695 - </span> 696 - </div> 697 - #end 698 - #if($assemblyNote && $assemblyNote != '') 699 - <div class="info-row"> 700 - <span class="info-label">自由記述</span> 701 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 702 - </div> 703 - #end 704 - </div> 705 - </div> 706 - #end 707 - 708 - ## --- 広報 --- 709 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 710 - #if($hasPublicity) 711 - <div class="seitokai-subsection"> 712 - <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> 広報</h3> 713 - <div class="seitokai-subsection-content"> 714 - #if($publicityMethod && !$publicityMethod.isEmpty()) 715 - <div class="info-row"> 716 - <span class="info-label">方法</span> 717 - <span class="info-value"> 718 - <div class="selection-display"> 719 - #foreach($pm in $publicityMethod) 720 - <span class="selection-item">$!escapetool.xml($pm.trim())</span> 721 - #end 722 - </div> 723 - </span> 724 - </div> 725 - #end 726 - #if($publicityFrequency && $publicityFrequency != '') 727 - <div class="info-row"> 728 - <span class="info-label">頻度</span> 729 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span> 730 - </div> 731 - #end 732 - #if($publicityNote && $publicityNote != '') 733 - <div class="info-row"> 734 - <span class="info-label">自由記述</span> 735 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span> 736 - </div> 737 - #end 738 - </div> 739 - </div> 740 - #end 741 - 742 - ## --- 外部連携 --- 743 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 744 - #if($hasExternal) 745 - <div class="seitokai-subsection"> 746 - <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> 外部連携</h3> 747 - <div class="seitokai-subsection-content"> 748 - #if($externalCooperation && $externalCooperation != '') 749 - <div class="info-row"> 750 - <span class="info-label">他校の生徒会との連携</span> 751 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span> 752 - </div> 753 - #end 754 - #if($externalOrgName && $externalOrgName != '') 755 - <div class="info-row"> 756 - <span class="info-label">参加している生徒会団体の名前</span> 757 - <span class="info-value">$!escapetool.xml($externalOrgName)</span> 758 - </div> 759 - #end 760 - #if($socialParticipation && !$socialParticipation.isEmpty()) 761 - <div class="info-row"> 762 - <span class="info-label">社会参加・地域連携・ボランティア</span> 763 - <span class="info-value"> 764 - <div class="selection-display"> 765 - #foreach($sp2 in $socialParticipation) 766 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span> 767 - #end 768 - </div> 769 - </span> 770 - </div> 771 - #end 772 - </div> 773 - </div> 774 - #end 775 - 776 - ## --- 年間主要行事 --- 777 - #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]]) 778 - #set($hasAnyEvent = false) 779 - #foreach($m in $months) 780 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 781 - #end 782 - #if($hasAnyEvent) 783 - <div class="seitokai-subsection"> 784 - <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> 年間主要行事</h3> 785 - <div class="seitokai-subsection-content"> 786 - <table class="wiki-table school-info-table" style="margin:0"> 787 - #foreach($m in $months) 788 - #if($m.get(1) && $m.get(1) != '') 789 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 790 - #end 791 - #end 792 - </table> 793 - </div> 794 - </div> 795 - #end 796 - 797 797 ## --- 生徒会の課題意識 --- 798 798 #if($challenges && $challenges != '') 799 799 #set($canViewChallenges = true) 800 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)801 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (( !$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)538 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false) 539 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false) 802 802 #end 803 803 #if($canViewChallenges) 804 804 <div class="seitokai-subsection"> 805 - <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>543 + <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> 806 806 <div class="seitokai-subsection-content"> 807 807 <div class="challenge-text">$!escapetool.xml($challenges)</div> 808 808 </div> ... ... @@ -826,11 +826,6 @@ 826 826 <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> 827 827 <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 828 828 </table> 829 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 830 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 831 - #if($infoEditDate && $infoEditDate != '') 832 - <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> 833 - #end 834 834 </div> 835 835 836 836 {{/html}} ... ... @@ -894,7 +894,6 @@ 894 894 <span class="author-legend-title">所属:</span> 895 895 <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> 896 896 <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> 897 - <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> 898 898 <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> 899 899 <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span> 900 900 </div> ... ... @@ -970,18 +970,16 @@ 970 970 <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)"> 971 971 <div class="activity-thread-header"> 972 972 <div class="activity-thread-title"> 973 - <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> 974 - <div class="activity-meta-line"> 975 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 976 - #set($actTagsList = $activity.getValue('tags')) 977 - #if($actTagsList && !$actTagsList.isEmpty()) 978 - #foreach($tagItem in $actTagsList) 979 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 980 - #end 705 + <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> 706 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 707 + #set($actTagsList = $activity.getValue('tags')) 708 + #if($actTagsList && !$actTagsList.isEmpty()) 709 + #foreach($tagItem in $actTagsList) 710 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 981 981 #end 982 - </div>712 + #end 983 983 </div> 984 - <div class="thread-meta-r ight">714 + <div class="thread-meta-row"> 985 985 <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span> 986 986 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 987 987 #if($actFeatured == '1') ... ... @@ -1041,8 +1041,8 @@ 1041 1041 #set($postVis = $!post.getValue('visibility')) 1042 1042 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 1043 1043 #set($canViewPost = true) 1044 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)1045 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (( !$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)774 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false) 775 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false) 1046 1046 #end 1047 1047 #if(!$canViewPost) 1048 1048 <div class="thread-post visibility-restricted-post"> ... ... @@ -1086,11 +1086,8 @@ 1086 1086 <span class="badge badge-general badge-sm">一般</span> 1087 1087 #end 1088 1088 ## 所属バッジ(投稿者の学校コードとページの学校コードを比較) 1089 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))) 1090 1090 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 1091 - #if($postUserRole == 'graduate' && $postIsSchoolMatch) 1092 - <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> 1093 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate') 820 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)) 1094 1094 #if($postAccountType == 'verified' || $postAccountType == 'admin') 1095 1095 <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> 1096 1096 #else ... ... @@ -1117,13 +1117,6 @@ 1117 1117 #if($postEdited == 1 || $postEdited == '1') 1118 1118 <span class="post-edited-label">(編集済み)</span> 1119 1119 #end 1120 - #set($postAuthorRefH = $!post.getValue('authorRef')) 1121 - #set($postObjNumH = $post.number) 1122 - #if(!$isGuest && $xcontext.user != $postAuthorRefH) 1123 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報"> 1124 - <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> 通報 1125 - </button> 1126 - #end 1127 1127 </div> 1128 1128 <div class="thread-post-body"> 1129 1129 $!escapetool.xml($!postContent) ... ... @@ -1188,18 +1188,12 @@ 1188 1188 #end 1189 1189 </div> 1190 1190 #if($postVis != 'public') 1191 - <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>911 + <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> 1192 1192 #end 1193 - ## 固定/編集/削除/通報/非表示ボタン(横並び) 1194 - #set($postAuthorRef = $!post.getValue('authorRef')) 1195 - #set($postObjNumED = $post.number) 1196 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified')) 1197 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')) 1198 - #set($showHideBtn = ($viewerAccountType == 'admin')) 1199 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn) 1200 - <div class="post-edit-actions post-action-mt"> 1201 - #if($showPinBtn) 1202 - #set($postObjNum = $post.number) 913 + ## 固定/解除ボタン(承認済み・管理者のみ) 914 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 915 + #set($postObjNum = $post.number) 916 + <div class="post-pin-action post-action-mt"> 1203 1203 #if($isPinned == '1') 1204 1204 <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除"> 1205 1205 <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> 固定を解除 ... ... @@ -1209,12 +1209,15 @@ 1209 1209 <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> 固定する 1210 1210 </a> 1211 1211 #end 1212 - #end 1213 - #if($showEditDeleteBtn) 926 + </div> 927 + #end 928 + ## 編集・削除ボタン(投稿者本人 or 管理者) 929 + #set($postAuthorRef = $!post.getValue('authorRef')) 930 + #set($postObjNumED = $post.number) 931 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin') 932 + <div class="post-edit-actions post-action-mt"> 1214 1214 #if($xcontext.user == $postAuthorRef) 1215 - #set($editImages = $!post.getValue('images')) 1216 - #set($editFiles = $!post.getValue('files')) 1217 - <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="この投稿を編集"> 934 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集"> 1218 1218 <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> 編集 1219 1219 </button> 1220 1220 #end ... ... @@ -1221,12 +1221,6 @@ 1221 1221 <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除"> 1222 1222 <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> 削除 1223 1223 </button> 1224 - #end 1225 - #if($showHideBtn) 1226 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする"> 1227 - <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> 非表示 1228 - </button> 1229 - #end 1230 1230 </div> 1231 1231 #end 1232 1232 </div> ... ... @@ -1276,11 +1276,9 @@ 1276 1276 1277 1277 #if($xcontext.user != "XWiki.XWikiGuest") 1278 1278 <div class="thread-add-post"> 1279 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin) 1280 1280 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 1281 1281 + 活動報告を追加 1282 1282 </a> 1283 - #end 1284 1284 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 1285 1285 <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> コメントを書く 1286 1286 </a> ... ... @@ -1357,27 +1357,6 @@ 1357 1357 } 1358 1358 // ページ読み込み時の初期化 1359 1359 document.addEventListener('DOMContentLoaded', function() { 1360 - // 年度タブを降順にソート(「全期間」タブは末尾に固定) 1361 - var tabContainer = document.querySelector('.activity-fy-tabs'); 1362 - if (tabContainer) { 1363 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); 1364 - var allTab = null; 1365 - var fyTabs = []; 1366 - tabs.forEach(function(t) { 1367 - var onclickStr = t.getAttribute('onclick') || ''; 1368 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; } 1369 - else { fyTabs.push(t); } 1370 - }); 1371 - // 年度タブを数値の降順でソート 1372 - fyTabs.sort(function(a, b) { 1373 - var aYear = parseInt(a.textContent) || 0; 1374 - var bYear = parseInt(b.textContent) || 0; 1375 - return bYear - aYear; 1376 - }); 1377 - // DOM再配置 1378 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1379 - if (allTab) { tabContainer.appendChild(allTab); } 1380 - } 1381 1381 // デフォルトで現在の年度を表示 1382 1382 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1383 1383 if (defaultTab) { defaultTab.click(); } ... ... @@ -1447,130 +1447,37 @@ 1447 1447 } 1448 1448 1449 1449 // 投稿の編集(インライン編集フォームを開く) 1450 -function openEditPost(btn) { 1138 +function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1451 1451 var postEl = btn.closest('.thread-post'); 1452 1452 if (!postEl) return; 1141 + // 既存の編集フォームがあれば閉じる 1453 1453 var existing = postEl.querySelector('.post-edit-form'); 1454 1454 if (existing) { existing.remove(); return; } 1455 1455 var bodyEl = postEl.querySelector('.thread-post-body'); 1456 1456 if (!bodyEl) return; 1457 - 1458 - var schoolPage = btn.getAttribute('data-school'); 1459 - var postObjNum = btn.getAttribute('data-obj'); 1460 - var currentContent = btn.getAttribute('data-content') || ''; 1461 - var currentImages = btn.getAttribute('data-images') || ''; 1462 - var currentFiles = btn.getAttribute('data-files') || ''; 1463 - var postType = btn.getAttribute('data-post-type') || 'report'; 1464 - 1465 1465 var form = document.createElement('div'); 1466 1466 form.className = 'post-edit-form'; 1467 - form.setAttribute('data-school', schoolPage); 1468 - form.setAttribute('data-obj', postObjNum); 1469 - 1470 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1471 - 1472 - // コメント以外は添付ファイル編集を表示 1473 - if (postType !== 'comment') { 1474 - // 既存画像 1475 - html += '<div class="edit-attachments">'; 1476 - if (currentImages.trim()) { 1477 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>'; 1478 - var imgs = currentImages.trim().split('\n'); 1479 - for (var i = 0; i < imgs.length; i++) { 1480 - var img = imgs[i].trim(); 1481 - if (!img) continue; 1482 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1483 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1484 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1485 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1486 - '</div>'; 1487 - } 1488 - html += '</div>'; 1489 - } 1490 - // 既存ファイル 1491 - if (currentFiles.trim()) { 1492 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>'; 1493 - var files = currentFiles.trim().split('\n'); 1494 - for (var j = 0; j < files.length; j++) { 1495 - var f = files[j].trim(); 1496 - if (!f) continue; 1497 - var displayName = f; 1498 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1499 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1500 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1501 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1502 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1503 - '</div>'; 1504 - } 1505 - html += '</div>'; 1506 - } 1507 - // 新規追加 1508 - html += '<div class="edit-attach-add">' + 1509 - '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' + 1510 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' + 1511 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' + 1512 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' + 1513 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' + 1514 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' + 1515 - '</div>'; 1516 - html += '</div>'; 1517 - } 1518 - 1519 - html += '<div class="post-edit-form-actions">' + 1148 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1149 + '<div class="post-edit-form-actions">' + 1520 1520 '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1521 - '<button type="button" class="btn-save" onclick="saveEditPost( this)">保存</button>' +1151 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1522 1522 '</div>'; 1523 - 1524 - form.innerHTML = html; 1525 1525 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1526 1526 form.querySelector('textarea').focus(); 1527 1527 } 1528 1528 1529 -function removeEditAttach(btn) { 1530 - var item = btn.closest('.edit-attach-item'); 1531 - if (item) item.remove(); 1532 -} 1533 - 1534 1534 // 投稿の編集を保存 1535 -function saveEditPost(btn) { 1536 - var formEl = btn.closest('.post-edit-form'); 1537 - if (!formEl) return; 1538 - var schoolPage = formEl.getAttribute('data-school'); 1539 - var postObjNum = formEl.getAttribute('data-obj'); 1540 - var textarea = formEl.querySelector('textarea'); 1158 +function saveEditPost(schoolPage, postObjNum) { 1159 + var textarea = document.getElementById('editContent_' + postObjNum); 1541 1541 if (!textarea) return; 1542 1542 var newContent = textarea.value.trim(); 1543 1543 if (!newContent) { alert('投稿内容を入力してください'); return; } 1544 - 1545 1545 var csrfEl = document.querySelector('input[name="form_token"]'); 1546 1546 var csrfToken = csrfEl ? csrfEl.value : ''; 1547 - 1548 - var fd = new FormData(); 1549 - fd.append('schoolPage', schoolPage); 1550 - fd.append('postObj', postObjNum); 1551 - fd.append('newContent', newContent); 1552 - fd.append('form_token', csrfToken); 1553 - 1554 - // 残す画像・ファイル 1555 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); }); 1556 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); }); 1557 - 1558 - // 新規画像 1559 - var newImgInput = formEl.querySelector('input[name="editNewImages"]'); 1560 - if (newImgInput && newImgInput.files) { 1561 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); } 1562 - } 1563 - // 新規ファイル 1564 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]'); 1565 - if (newFileInput && newFileInput.files) { 1566 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); } 1567 - } 1568 - 1569 - btn.disabled = true; 1570 - btn.textContent = '保存中...'; 1571 - 1572 1572 var xhr = new XMLHttpRequest(); 1573 1573 xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true); 1167 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1168 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1574 1574 xhr.onload = function() { 1575 1575 try { 1576 1576 var res = JSON.parse(xhr.responseText); ... ... @@ -1578,13 +1578,12 @@ 1578 1578 showToast('投稿を更新しました', 'success'); 1579 1579 setTimeout(function() { location.reload(); }, 800); 1580 1580 } else { 1581 - btn.disabled = false; btn.textContent = '保存'; 1582 1582 alert('編集に失敗しました: ' + (res.error || '')); 1583 1583 } 1584 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }1178 + } catch(e) { alert('編集に失敗しました'); } 1585 1585 }; 1586 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };1587 - xhr.send( fd);1180 + xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1181 + xhr.send(editPostData); 1588 1588 } 1589 1589 1590 1590 // 投稿の削除(確認ダイアログ付き) ... ... @@ -1608,80 +1608,6 @@ 1608 1608 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1609 1609 xhr.send(deletePostData); 1610 1610 } 1611 - 1612 -/* --- 通報ダイアログ --- */ 1613 -function openReportDialog(btn, targetPage, postObjNum, token) { 1614 - if (document.getElementById('report-dialog-overlay')) return; 1615 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他']; 1616 - var overlay = document.createElement('div'); 1617 - overlay.id = 'report-dialog-overlay'; 1618 - 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;'; 1619 - var dialog = document.createElement('div'); 1620 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;'; 1621 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>'; 1622 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>'; 1623 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>'; 1624 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">'; 1625 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>'; 1626 - html += '</select>'; 1627 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>'; 1628 - 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>'; 1629 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">'; 1630 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>'; 1631 - 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>'; 1632 - html += '</div>'; 1633 - dialog.innerHTML = html; 1634 - overlay.appendChild(dialog); 1635 - document.body.appendChild(overlay); 1636 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); }); 1637 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); }); 1638 - document.getElementById('report-submit-btn').addEventListener('click', function() { 1639 - var reason = document.getElementById('report-reason').value; 1640 - var detail = document.getElementById('report-detail').value; 1641 - var submitBtn = document.getElementById('report-submit-btn'); 1642 - submitBtn.disabled = true; submitBtn.textContent = '送信中...'; 1643 - var xhr = new XMLHttpRequest(); 1644 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true); 1645 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1646 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token); 1647 - xhr.onload = function() { 1648 - overlay.remove(); 1649 - showToast('通報を受け付けました', 'success'); 1650 - setTimeout(function() { location.reload(); }, 1000); 1651 - }; 1652 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); }; 1653 - xhr.send(data); 1654 - }); 1655 -} 1656 - 1657 -/* --- 非表示ダイアログ(管理者用) --- */ 1658 -function openHideDialog(btn, targetPage, postObjNum, token) { 1659 - if (document.getElementById('hide-dialog-overlay')) return; 1660 - var overlay = document.createElement('div'); 1661 - overlay.id = 'hide-dialog-overlay'; 1662 - 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;'; 1663 - var dialog = document.createElement('div'); 1664 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;'; 1665 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>'; 1666 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>'; 1667 - 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="理由を入力" />'; 1668 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">'; 1669 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>'; 1670 - 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>'; 1671 - 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>'; 1672 - html += '</div>'; 1673 - dialog.innerHTML = html; 1674 - overlay.appendChild(dialog); 1675 - document.body.appendChild(overlay); 1676 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); }); 1677 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); }); 1678 - function doHide(action) { 1679 - var reason = document.getElementById('hide-reason').value || '管理者判断'; 1680 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token); 1681 - } 1682 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); }); 1683 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); }); 1684 -} 1685 1685 </script> 1686 1686 {{/html}} 1687 1687 {{/velocity}}