diff --git a/common/css/seesaa_neutral_gray.css b/common/css/seesaa_neutral_gray.css index 98d11c4..4c74f42 100644 --- a/common/css/seesaa_neutral_gray.css +++ b/common/css/seesaa_neutral_gray.css @@ -159,10 +159,28 @@ a:hover { width: 250px; background-color: var(--wiki-sidebar-bg); border-right: 1px solid var(--wiki-border); - padding: 16px 12px; + padding: 0; flex-shrink: 0; } +/* iframe共通コンポーネント */ +.wiki-header-frame { + width: 100%; + height: 108px; + border: none; + display: block; + overflow: hidden; + background-color: #ffffff; +} + +.wiki-sidebar-frame { + width: 100%; + height: 100%; + min-height: 1450px; + border: none; + display: block; +} + .sidebar-box { background-color: var(--wiki-sidebar-box-bg); border: 1px solid var(--wiki-border); diff --git a/common/header.html b/common/header.html index 3c07afe..ca7a2cd 100644 --- a/common/header.html +++ b/common/header.html @@ -4,7 +4,7 @@ - Wiki 共通ヘッダー (iframe用) + FF14 攻略Wiki 共通ヘッダー - -
+ +
+
+ FINAL FANTASY XIV 総合攻略Wiki +
+
+ 光の戦士のための実戦立ち回り・XHB配置・マクロ詳細・育成ロードマップ集成 (パッチ7.x 黄金のレガシー対応) +
+
- - + + - diff --git a/common/js/wiki_common.js b/common/js/wiki_common.js index a9df88a..0c1a434 100644 --- a/common/js/wiki_common.js +++ b/common/js/wiki_common.js @@ -297,17 +297,31 @@ function initMacroCopy() { }); } -// DOMContentLoaded 時に一括実行 -document.addEventListener('DOMContentLoaded', () => { +// 共通初期化処理 +function initWikiCommon() { const rootPrefix = getWikiRootPrefix(); - // 共通コンポーネント自動レンダリング - renderHeader(rootPrefix); - renderGlobalNav(rootPrefix); - renderSidebar(rootPrefix); - renderFooter(); + // iframeが配置されていない場合のみJS動的レンダリング(フォールバック) + const hasHeaderFrame = document.querySelector('.wiki-header-frame'); + const hasSidebarFrame = document.querySelector('.wiki-sidebar-frame'); - // 機能の初期化 - initSearch(rootPrefix); + if (!hasHeaderFrame) { + renderHeader(rootPrefix); + renderGlobalNav(rootPrefix); + } + + if (!hasSidebarFrame) { + renderSidebar(rootPrefix); + initSearch(rootPrefix); + } + + renderFooter(); initMacroCopy(); -}); +} + +// DOM ready 時に安全に実行(すでにロード済みのケースも完全対応) +if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', initWikiCommon); +} else { + initWikiCommon(); +} diff --git a/common/sidebar.html b/common/sidebar.html index ba0bf1b..39400a7 100644 --- a/common/sidebar.html +++ b/common/sidebar.html @@ -4,29 +4,142 @@ - Wiki 共通サイドメニュー (iframe用) + FF14 攻略Wiki 共通サイドメニュー - -
+ + - + + + + + + + + + + + + + + + + + + + diff --git a/crafter_gatherer/index.html b/crafter_gatherer/index.html index ef7b126..0684d22 100644 --- a/crafter_gatherer/index.html +++ b/crafter_gatherer/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -84,8 +83,11 @@
- - + +
diff --git a/crafter_gatherer/ishgard_ocean_custom.html b/crafter_gatherer/ishgard_ocean_custom.html index b117b70..5c29b9f 100644 --- a/crafter_gatherer/ishgard_ocean_custom.html +++ b/crafter_gatherer/ishgard_ocean_custom.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -59,8 +58,11 @@
- - + +
diff --git a/crafter_gatherer/leveling_roadmap.html b/crafter_gatherer/leveling_roadmap.html index f98b9a8..537b86d 100644 --- a/crafter_gatherer/leveling_roadmap.html +++ b/crafter_gatherer/leveling_roadmap.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -79,8 +78,11 @@
- - + +
diff --git a/crafter_gatherer/leves_gc_supply.html b/crafter_gatherer/leves_gc_supply.html index 4f76afb..a42979d 100644 --- a/crafter_gatherer/leves_gc_supply.html +++ b/crafter_gatherer/leves_gc_supply.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -60,8 +59,11 @@
- - + +
diff --git a/crafter_gatherer/macros.html b/crafter_gatherer/macros.html index f6686fe..c032a16 100644 --- a/crafter_gatherer/macros.html +++ b/crafter_gatherer/macros.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -196,8 +195,11 @@
- - + +
diff --git a/crafter_gatherer/npc_locations.html b/crafter_gatherer/npc_locations.html index 58b7e15..d83ee02 100644 --- a/crafter_gatherer/npc_locations.html +++ b/crafter_gatherer/npc_locations.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -130,8 +129,11 @@
- - + +
diff --git a/ff14_arcanist_smn_sch_guide_lv34.html b/ff14_arcanist_smn_sch_guide_lv34.html index 12a12be..5cdc330 100644 --- a/ff14_arcanist_smn_sch_guide_lv34.html +++ b/ff14_arcanist_smn_sch_guide_lv34.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -76,8 +75,11 @@
- - + +
diff --git a/ff14_bard_guide_and_xhb.html b/ff14_bard_guide_and_xhb.html index 24f4268..c445e23 100644 --- a/ff14_bard_guide_and_xhb.html +++ b/ff14_bard_guide_and_xhb.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -80,8 +79,11 @@
- - + +
diff --git a/ff14_gatherer_crafter_roadmap.html b/ff14_gatherer_crafter_roadmap.html index 3178d51..6f10a8b 100644 --- a/ff14_gatherer_crafter_roadmap.html +++ b/ff14_gatherer_crafter_roadmap.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -80,8 +79,11 @@
- - + +
diff --git a/ff14_summoner_leveling_and_xhb_master_guide.html b/ff14_summoner_leveling_and_xhb_master_guide.html index 2ba9716..12a1b82 100644 --- a/ff14_summoner_leveling_and_xhb_master_guide.html +++ b/ff14_summoner_leveling_and_xhb_master_guide.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -72,8 +71,11 @@
- - + +
diff --git a/index.html b/index.html index bbcd652..99488cd 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -294,8 +293,11 @@
- - + +
diff --git a/jobs/arcanist/index.html b/jobs/arcanist/index.html index c905f36..496fd17 100644 --- a/jobs/arcanist/index.html +++ b/jobs/arcanist/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -93,8 +92,11 @@
- - + +
diff --git a/jobs/arcanist/macros.html b/jobs/arcanist/macros.html index 1454d9c..52113ab 100644 --- a/jobs/arcanist/macros.html +++ b/jobs/arcanist/macros.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -228,8 +227,11 @@
- - + +
diff --git a/jobs/bard/cd_hotbar.html b/jobs/bard/cd_hotbar.html index c5cfb7e..e179f48 100644 --- a/jobs/bard/cd_hotbar.html +++ b/jobs/bard/cd_hotbar.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -316,8 +315,11 @@
- - + +
diff --git a/jobs/bard/index.html b/jobs/bard/index.html index 4566ef2..8649974 100644 --- a/jobs/bard/index.html +++ b/jobs/bard/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -84,8 +83,11 @@
- - + +
diff --git a/jobs/bard/macros.html b/jobs/bard/macros.html index 4e50f37..01c6c83 100644 --- a/jobs/bard/macros.html +++ b/jobs/bard/macros.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -288,8 +287,11 @@
- - + +
diff --git a/jobs/bard/rotation_lv70_100.html b/jobs/bard/rotation_lv70_100.html index 38c6d74..326b2fd 100644 --- a/jobs/bard/rotation_lv70_100.html +++ b/jobs/bard/rotation_lv70_100.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -60,8 +59,11 @@
- - + +
diff --git a/jobs/bard/songs_rotation.html b/jobs/bard/songs_rotation.html index c31d916..4557e99 100644 --- a/jobs/bard/songs_rotation.html +++ b/jobs/bard/songs_rotation.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -83,8 +82,11 @@
- - + +
diff --git a/jobs/bard/xhb.html b/jobs/bard/xhb.html index 8d0d344..fea1fc8 100644 --- a/jobs/bard/xhb.html +++ b/jobs/bard/xhb.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -693,8 +692,11 @@
- - + +
diff --git a/jobs/samurai/cd_hotbar.html b/jobs/samurai/cd_hotbar.html index c0f650f..33e13fd 100644 --- a/jobs/samurai/cd_hotbar.html +++ b/jobs/samurai/cd_hotbar.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -155,8 +154,11 @@
- - + +
diff --git a/jobs/samurai/combos_rotation.html b/jobs/samurai/combos_rotation.html index 3a4bf79..5cb1eba 100644 --- a/jobs/samurai/combos_rotation.html +++ b/jobs/samurai/combos_rotation.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -155,8 +154,11 @@
- - + +
diff --git a/jobs/samurai/index.html b/jobs/samurai/index.html index 670b046..0501f6c 100644 --- a/jobs/samurai/index.html +++ b/jobs/samurai/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -125,8 +124,11 @@
- - + +
diff --git a/jobs/samurai/macros.html b/jobs/samurai/macros.html index 0c1f9a5..5dc98d0 100644 --- a/jobs/samurai/macros.html +++ b/jobs/samurai/macros.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -260,8 +259,11 @@
- - + +
diff --git a/jobs/samurai/xhb.html b/jobs/samurai/xhb.html index 43d58fa..eadd64d 100644 --- a/jobs/samurai/xhb.html +++ b/jobs/samurai/xhb.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -696,8 +695,11 @@
- - + +
diff --git a/jobs/scholar/fairy_guide.html b/jobs/scholar/fairy_guide.html index aec5a36..cfb1f82 100644 --- a/jobs/scholar/fairy_guide.html +++ b/jobs/scholar/fairy_guide.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -81,8 +80,11 @@
- - + +
diff --git a/jobs/scholar/index.html b/jobs/scholar/index.html index 0390102..c4668ad 100644 --- a/jobs/scholar/index.html +++ b/jobs/scholar/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -82,8 +81,11 @@
- - + +
diff --git a/jobs/scholar/macros.html b/jobs/scholar/macros.html index c57e89d..9bd7deb 100644 --- a/jobs/scholar/macros.html +++ b/jobs/scholar/macros.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -318,8 +317,11 @@
- - + +
diff --git a/jobs/scholar/xhb.html b/jobs/scholar/xhb.html index c906c50..b2138ca 100644 --- a/jobs/scholar/xhb.html +++ b/jobs/scholar/xhb.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -102,8 +101,11 @@
- - + +
diff --git a/jobs/summoner/index.html b/jobs/summoner/index.html index d5eb795..02dc08b 100644 --- a/jobs/summoner/index.html +++ b/jobs/summoner/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -93,8 +92,11 @@
- - + +
diff --git a/jobs/summoner/macros.html b/jobs/summoner/macros.html index 8046a3f..a63f28e 100644 --- a/jobs/summoner/macros.html +++ b/jobs/summoner/macros.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -283,8 +282,11 @@
- - + +
diff --git a/jobs/summoner/rotation_lv34.html b/jobs/summoner/rotation_lv34.html index b62e765..a36e5ec 100644 --- a/jobs/summoner/rotation_lv34.html +++ b/jobs/summoner/rotation_lv34.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -100,8 +99,11 @@
- - + +
diff --git a/jobs/summoner/rotation_lv50_100.html b/jobs/summoner/rotation_lv50_100.html index 971ab4f..a86cdb4 100644 --- a/jobs/summoner/rotation_lv50_100.html +++ b/jobs/summoner/rotation_lv50_100.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -103,8 +102,11 @@
- - + +
diff --git a/jobs/summoner/xhb.html b/jobs/summoner/xhb.html index 221e3b3..12f5897 100644 --- a/jobs/summoner/xhb.html +++ b/jobs/summoner/xhb.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -158,8 +157,11 @@
- - + +
diff --git a/macros/useful_macros.html b/macros/useful_macros.html index 3b77009..db0ae7c 100644 --- a/macros/useful_macros.html +++ b/macros/useful_macros.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -301,8 +300,11 @@
- - + +
diff --git a/multiplayer/dungeon_basics.html b/multiplayer/dungeon_basics.html index 28140f9..26eda0e 100644 --- a/multiplayer/dungeon_basics.html +++ b/multiplayer/dungeon_basics.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -74,8 +73,11 @@
- - + +
diff --git a/multiplayer/index.html b/multiplayer/index.html index ee9b208..9b4d5f4 100644 --- a/multiplayer/index.html +++ b/multiplayer/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -83,8 +82,11 @@
- - + +
diff --git a/xhb/common_layout.html b/xhb/common_layout.html index 053d670..e1197c2 100644 --- a/xhb/common_layout.html +++ b/xhb/common_layout.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -114,8 +113,11 @@
- - + +
diff --git a/xhb/index.html b/xhb/index.html index 9af8f2b..cc2a7a5 100644 --- a/xhb/index.html +++ b/xhb/index.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -84,8 +83,11 @@
- - + +
diff --git a/xhb/wxhb_settings.html b/xhb/wxhb_settings.html index fa2f91a..6094b5c 100644 --- a/xhb/wxhb_settings.html +++ b/xhb/wxhb_settings.html @@ -1,4 +1,4 @@ - + @@ -10,17 +10,16 @@
- -
- - - + +
- -
+ +
+ +
@@ -118,8 +117,11 @@
- - + +