Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 97.1 Icon
edited by Super Admin
on 2026/03/20 18:10
Change comment: There is no comment for this version
To version Icon 110.1 Icon
edited by Super Admin
on 2026/03/24 19:13
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -7,6 +7,19 @@
7 7   #stop
8 8  #end
9 9  {{html clean="false"}}
10 +## --- OGP メタタグ（SNSシェア対応） ---
11 +#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
12 +#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
13 +#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
14 +<meta property="og:type" content="article" />
15 +<meta property="og:title" content="$escapetool.xml($ogTitle)" />
16 +<meta property="og:description" content="$escapetool.xml($ogDesc)" />
17 +<meta property="og:url" content="$escapetool.xml($ogUrl)" />
18 +<meta property="og:site_name" content="生徒会Wiki" />
19 +<meta property="og:locale" content="ja_JP" />
20 +<meta name="twitter:card" content="summary" />
21 +<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
22 +<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
12 12  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
... ... @@ -68,6 +68,7 @@
68 68  #set($activityPlace = $doc.getValue('activityPlace'))
69 69  #set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 70  #set($activityRoomImage = $doc.getValue('activityRoomImage'))
84 +#set($ictTools = $doc.getValue('ictTools'))
71 71  #set($ictUsage = $doc.getValue('ictUsage'))
72 72  
73 73  ## --- 生徒総会 ---
... ... @@ -144,6 +144,7 @@
144 144  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
145 145  #set($isViewerAdmin = false)
146 146  #set($viewerSchoolCode = '')
161 +#set($viewerSecondaryGraduated = false)
147 147  #if(!$isGuest)
148 148   #set($viewerDoc = $xwiki.getDocument($viewerUser))
149 149   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -153,6 +153,24 @@
153 153   #if($viewerAccountType == 'admin')
154 154   #set($isViewerAdmin = true)
155 155   #end
171 + ## 第2所属校の在学年数超過チェック
172 + #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
173 + #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
174 + #set($vNow = $datetool.date)
175 + #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
176 + #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
177 + #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
178 + #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
179 + #set($vSecMax = 3)
180 + #if($viewerSecondarySchoolCode.length() >= 2)
181 + #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
182 + #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
183 + #end
184 + #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
185 + #if($vSecGrade > $vSecMax)
186 + #set($viewerSecondaryGraduated = true)
187 + #end
188 + #end
156 156  #end
157 157  
158 158  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -162,7 +162,7 @@
162 162  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
163 163   #if($viewerSchoolCode == $affiliatedSchoolCode)
164 164   #set($isAffiliated = true)
165 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
198 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
166 166   #set($isAffiliated = true)
167 167   #end
168 168  #end
... ... @@ -172,7 +172,7 @@
172 172  #if(!$isGuest && $viewerUserRole != 'graduate')
173 173   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
174 174   #set($isSchoolMember = true)
175 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
208 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
176 176   #set($isSchoolMember = true)
177 177   #end
178 178  #end
... ... @@ -376,6 +376,106 @@
376 376  </div>
377 377  #end
378 378  
412 +## --- 入力進捗ガイド（自校ユーザー向け） ---
413 +#if(!$isGuest && $canEdit)
414 + #set($stepItems = [])
415 + #set($completedCount = 0)
416 + #set($totalSteps = 8)
417 + ## 1. 基本情報（生徒数）
418 + #if($studentCount && $studentCount != '' && $studentCount != '0')
419 + #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true}))
420 + #set($completedCount = $completedCount + 1)
421 + #else
422 + #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false}))
423 + #end
424 + ## 2. 生徒会組織
425 + #if($orgChart && $orgChart != '')
426 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
427 + #set($completedCount = $completedCount + 1)
428 + #else
429 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
430 + #end
431 + ## 3. 日常の活動
432 + #if($dailyActivities && $dailyActivities != '')
433 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
434 + #set($completedCount = $completedCount + 1)
435 + #else
436 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
437 + #end
438 + ## 4. 選挙
439 + #if($electionExists && $electionExists != '')
440 + #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
441 + #set($completedCount = $completedCount + 1)
442 + #else
443 + #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
444 + #end
445 + ## 5. 予算
446 + #set($budgetFilled = false)
447 + #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
448 + #if($budgetFilled)
449 + #set($discard = $stepItems.add({'name': '予算', 'done': true}))
450 + #set($completedCount = $completedCount + 1)
451 + #else
452 + #set($discard = $stepItems.add({'name': '予算', 'done': false}))
453 + #end
454 + ## 6. 校則の見直し
455 + #if($ruleReviewStatus && $ruleReviewStatus != '')
456 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
457 + #set($completedCount = $completedCount + 1)
458 + #else
459 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
460 + #end
461 + ## 7. 生徒総会
462 + #if($assemblyFormat && $assemblyFormat != '')
463 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
464 + #set($completedCount = $completedCount + 1)
465 + #else
466 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
467 + #end
468 + ## 8. 活動報告
469 + #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
470 + #if($activityCount > 0)
471 + #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
472 + #set($completedCount = $completedCount + 1)
473 + #else
474 + #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false}))
475 + #end
476 + ## 全完了なら非表示
477 + #if($completedCount < $totalSteps)
478 + #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
479 + #set($progressPctInt = $mathtool.toInteger($progressPct))
480 + #set($firstMissing = false)
481 +<div class="progress-guide" style="margin-bottom:var(--sp-4);">
482 + <div class="progress-guide-header">
483 + <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span>
484 + <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
485 + </div>
486 + <div class="progress-bar-track">
487 + <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
488 + </div>
489 + <ul class="progress-step-list">
490 + #foreach($step in $stepItems)
491 + #if($step.done)
492 + <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li>
493 + #else
494 + #if(!$firstMissing)
495 + <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ！</span></li>
496 + #set($firstMissing = true)
497 + #else
498 + <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li>
499 + #end
500 + #end
501 + #end
502 + </ul>
503 + <div style="margin-top:var(--sp-3);">
504 + <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
505 + <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><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> 編集画面を開く
506 + </a>
507 + </div>
508 +</div>
509 + #end
510 +#end
511 +
379 379  ## --- ① 学校基本情報 ---
380 380  <div class="school-info-card collapsed" id="card-basic-info">
381 381   <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>
... ... @@ -640,7 +640,7 @@
640 640   #end
641 641  
642 642   ## --- 活動環境 ---
643 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
776 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
644 644   #if($hasActivityEnv)
645 645   #set($canViewAE = true)
646 646   #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
... ... @@ -674,6 +674,40 @@
674 674   <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
675 675   </div>
676 676   #end
810 + #if($ictTools && !$ictTools.isEmpty())
811 + <div class="info-row">
812 + <span class="info-label">利用しているICTツール</span>
813 + <span class="info-value">
814 + #set($ictCatDisplay = [
815 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
816 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
817 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
818 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
819 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
820 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
821 + ["その他", ["独自のWebシステム・自作アプリ"]]
822 + ])
823 + #foreach($catD in $ictCatDisplay)
824 + #set($catHasItems = false)
825 + #foreach($t in $catD.get(1))
826 + #if($ictTools.contains($t)) #set($catHasItems = true) #end
827 + #end
828 + #if($catHasItems)
829 + <div style="margin-bottom:6px">
830 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
831 + <div class="selection-display" style="margin-top:2px">
832 + #foreach($t in $catD.get(1))
833 + #if($ictTools.contains($t))
834 + <span class="selection-item">$!escapetool.xml($t)</span>
835 + #end
836 + #end
837 + </div>
838 + </div>
839 + #end
840 + #end
841 + </span>
842 + </div>
843 + #end
677 677   #if($ictUsage && !$ictUsage.isEmpty())
678 678   <div class="info-row">
679 679   <span class="info-label">ICT活用している場面</span>
... ... @@ -1262,6 +1262,25 @@
1262 1262   #if($postVis != 'public')
1263 1263   <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>
1264 1264   #end
1432 + ## いいねボタン
1433 + #set($postLikeCount = $!post.getValue('likeCount'))
1434 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
1435 + #set($postLikedBy = $!post.getValue('likedBy'))
1436 + #set($isLikedByMe = false)
1437 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
1438 + <div class="post-like-row post-action-mt">
1439 + #if($xcontext.user != 'XWiki.XWikiGuest')
1440 + <button type="button" class="btn-like #if($isLikedByMe)liked#end" data-page="$escapetool.xml($doc.fullName)" data-obj="$post.number" data-csrf="$services.csrf.getToken()" onclick="toggleLike(this)">
1441 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24" #if($isLikedByMe)fill="currentColor" stroke="none"#end><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1442 + <span class="like-count">$postLikeCount</span>
1443 + </button>
1444 + #else
1445 + <span class="btn-like disabled">
1446 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1447 + <span class="like-count">$postLikeCount</span>
1448 + </span>
1449 + #end
1450 + </div>
1265 1265   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1266 1266   #set($postAuthorRef = $!post.getValue('authorRef'))
1267 1267   #set($postObjNumED = $post.number)
... ... @@ -1382,10 +1382,68 @@
1382 1382  {{/html}}
1383 1383  #end
1384 1384  
1571 +## --- OGP / SNSシェア対応 ---
1572 +#set($ogpTitle = "${schoolName} — 生徒会Wiki")
1573 +#set($ogpDesc = "${schoolName}の生徒会活動情報。")
1574 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
1575 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
1576 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
1577 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
1578 +
1385 1385  ## --- 年度タブ切り替え JavaScript ---
1386 1386  {{html clean="false"}}
1387 1387  <script>
1582 +// OGPメタタグ挿入
1583 +(function() {
1584 + var ogp = {
1585 + 'og:title': '$escapetool.javascript($ogpTitle)',
1586 + 'og:description': '$escapetool.javascript($ogpDesc)',
1587 + 'og:type': 'article',
1588 + 'og:url': '$escapetool.javascript($ogpUrl)',
1589 + 'og:site_name': '生徒会Wiki',
1590 + 'twitter:card': 'summary'
1591 + };
1592 + for (var p in ogp) {
1593 + var meta = document.createElement('meta');
1594 + meta.setAttribute('property', p);
1595 + meta.setAttribute('content', ogp[p]);
1596 + document.head.appendChild(meta);
1597 + }
1598 + // twitter用
1599 + var tw = document.createElement('meta');
1600 + tw.setAttribute('name', 'twitter:card');
1601 + tw.setAttribute('content', 'summary');
1602 + document.head.appendChild(tw);
1603 +})();
1388 1388  // コンパクト表示（タイトルのみ）トグル
1605 +// いいねトグル
1606 +function toggleLike(btn) {
1607 + var page = btn.getAttribute('data-page');
1608 + var obj = btn.getAttribute('data-obj');
1609 + var csrf = btn.getAttribute('data-csrf');
1610 + btn.disabled = true;
1611 + var fd = new FormData();
1612 + fd.append('page', page);
1613 + fd.append('obj', obj);
1614 + fd.append('form_token', csrf);
1615 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
1616 + .then(function(r) { return r.json(); })
1617 + .then(function(data) {
1618 + btn.querySelector('.like-count').textContent = data.count;
1619 + if (data.action === 'liked') {
1620 + btn.classList.add('liked');
1621 + btn.querySelector('svg').setAttribute('fill', 'currentColor');
1622 + btn.querySelector('svg').setAttribute('stroke', 'none');
1623 + } else {
1624 + btn.classList.remove('liked');
1625 + btn.querySelector('svg').removeAttribute('fill');
1626 + btn.querySelector('svg').setAttribute('stroke', 'currentColor');
1627 + }
1628 + })
1629 + .catch(function() { alert('エラーが発生しました'); })
1630 + .finally(function() { btn.disabled = false; });
1631 +}
1632 +
1389 1389  function toggleCompactView() {
1390 1390   var container = document.querySelector('.xwiki-content') || document.body;
1391 1391   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1503,7 +1503,15 @@
1503 1503   };
1504 1504   var toast = document.createElement('div');
1505 1505   toast.className = 'toast toast-' + type;
1506 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1750 + var iconSvg = icons[type] || '';
1751 + if (iconSvg) {
1752 + var iconSpan = document.createElement('span');
1753 + iconSpan.innerHTML = iconSvg;
1754 + toast.appendChild(iconSpan);
1755 + }
1756 + var msgSpan = document.createElement('span');
1757 + msgSpan.textContent = message;
1758 + toast.appendChild(msgSpan);
1507 1507   container.appendChild(toast);
1508 1508   setTimeout(function() { toast.remove(); }, 3200);
1509 1509  }
... ... @@ -1542,6 +1542,7 @@
1542 1542   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1543 1543  
1544 1544   // コメント以外は添付ファイル編集を表示
1797 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1545 1545   if (postType !== 'comment') {
1546 1546   // 既存画像
1547 1547   html += '<div class="edit-attachments">';
... ... @@ -1551,10 +1551,10 @@
1551 1551   for (var i = 0; i < imgs.length; i++) {
1552 1552   var img = imgs[i].trim();
1553 1553   if (!img) continue;
1554 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1807 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1555 1555   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1556 1556   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1557 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1810 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1558 1558   '</div>';
1559 1559   }
1560 1560   html += '</div>';
... ... @@ -1568,10 +1568,10 @@
1568 1568   if (!f) continue;
1569 1569   var displayName = f;
1570 1570   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1571 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1572 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1824 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1825 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1573 1573   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1574 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1827 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1575 1575   '</div>';
1576 1576   }
1577 1577   html += '</div>';