From f563b2eec2b7b237f6ac8d5c14eeca52a4a78a86 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Wed, 2 Jun 2021 23:29:19 +0900
Subject: Web/Accessibility/ARIA/widgets を conflicting から移動 (#962)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- メイン記事側の内容がなかったので、 conflicting の記事をメイン記事に移動
- リダイレクトと Wiki の履歴も移動
---
 files/ja/_redirects.txt                            |  2 +-
 files/ja/_wikihistory.json                         | 10 +--
 .../web/accessibility/aria/widgets/index.html      | 73 ----------------------
 files/ja/web/accessibility/aria/widgets/index.html | 70 +++++++++++++++++++--
 4 files changed, 69 insertions(+), 86 deletions(-)
 delete mode 100644 files/ja/conflicting/web/accessibility/aria/widgets/index.html

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index b117920c59..0bce612890 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -4256,7 +4256,7 @@
 /ja/docs/Web/API/window.window	/ja/docs/Web/API/Window/window
 /ja/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role	/ja/docs/Web/Accessibility/ARIA/Roles/button_role
 /ja/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_checkbox_role	/ja/docs/Web/Accessibility/ARIA/Roles/checkbox_role
-/ja/docs/Web/Accessibility/ARIA/widgets/overview	/ja/docs/conflicting/Web/Accessibility/ARIA/widgets
+/ja/docs/Web/Accessibility/ARIA/widgets/overview	/ja/docs/Web/Accessibility/ARIA/widgets
 /ja/docs/Web/Accessibility/Accessibility_FAQ	/ja/docs/Web/Accessibility/FAQ
 /ja/docs/Web/Apps/Build/Manipulating_media	/ja/docs/Web/Guide/Audio_and_video_delivery
 /ja/docs/Web/Apps/Build/Manipulating_media/Adding_captions_and_subtitles_to_HTML5_video	/ja/docs/Web/Guide/Audio_and_video_delivery/Adding_captions_and_subtitles_to_HTML5_video
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 985d82f0a9..c99bb97bc5 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -27011,9 +27011,9 @@
     ]
   },
   "Web/Accessibility/ARIA/widgets": {
-    "modified": "2019-01-17T03:02:23.841Z",
+    "modified": "2019-03-18T21:35:01.506Z",
     "contributors": [
-      "julianosilvaa"
+      "Uemmra3"
     ]
   },
   "Web/Accessibility/An_overview_of_accessible_web_applications_and_widgets": {
@@ -49389,12 +49389,6 @@
       "Marsf"
     ]
   },
-  "conflicting/Web/Accessibility/ARIA/widgets": {
-    "modified": "2019-03-18T21:35:01.506Z",
-    "contributors": [
-      "Uemmra3"
-    ]
-  },
   "conflicting/Web/CSS": {
     "modified": "2019-03-23T23:49:43.648Z",
     "contributors": [
diff --git a/files/ja/conflicting/web/accessibility/aria/widgets/index.html b/files/ja/conflicting/web/accessibility/aria/widgets/index.html
deleted file mode 100644
index f5df778a0e..0000000000
--- a/files/ja/conflicting/web/accessibility/aria/widgets/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
----
-title: 概観
-slug: conflicting/Web/Accessibility/ARIA/widgets
-tags:
-  - Accessibility
-  - JavaScript
-  - Landing
-  - NeedsUpdate
-translation_of: Web/Accessibility/ARIA/widgets/overview
-original_slug: Web/Accessibility/ARIA/widgets/overview
----
-<div class="warning">Warning: needs updating</div>
-
-<h2 id="Introduction_2" name="Introduction_2"><span class="mw-headline" id="Introduction">入門</span></h2>
-
-<p>ここでは、動作する例とアクセシブルなJavaScript ウィジェットを作るベストプラクティスを見ていきます。</p>
-
-<h2 id="General_Resources_2" name="General_Resources_2"><span class="mw-headline" id="General_Resources">一般リソース</span></h2>
-
-<ul>
- <li><a class="external text" href="http://dev.aol.com/dhtml_style_guide" rel="nofollow">DHTML Style Guide</a> にはキーボードインタラクションのお勧めがあります。</li>
- <li><a class="external text" href="http://www.w3.org/wai/pf/aria-practices" rel="nofollow">WAI-ARIA Authoring Practices Guide</a></li>
-</ul>
-
-<h2 id="Checkbox" name="Checkbox">チェックボックス</h2>
-
-<ul>
- <li><a class="external text" href="http://www.paciellogroup.com/blog/?p=53" rel="nofollow">ARIA Toggle Button and Tri-state Checkbox examples</a> (from "The Paciello Group Blog")</li>
- <li><a class="external text" href="http://test.cita.uiuc.edu/aria/checkbox" rel="nofollow">ARIA Example Checkbox Widgets from the University of Illinois</a></li>
-</ul>
-
-<h2 id="Menu_2" name="Menu_2"><span class="mw-headline" id="Menu">メニュー</span></h2>
-
-<ul>
- <li><a class="external text" href="http://yuiblog.com/blog/2007/12/21/menu-waiaria/" rel="nofollow">Using WAI-ARIA Roles and States with the YUI Menu Control</a></li>
-</ul>
-
-<h2 id="Slider_2" name="Slider_2"><span class="mw-headline" id="Slider">スライダー</span></h2>
-
-<ul>
- <li>From the Paciello Group Blog: ARIA Slider, <a class="external text" href="http://www.paciellogroup.com/blog/?p=68" rel="nofollow">part one</a>, <a class="external text" href="http://www.paciellogroup.com/blog/?p=69" rel="nofollow">part two</a>, <a class="external text" href="http://www.paciellogroup.com/blog/?p=76" rel="nofollow">part threet</a> (<a class="external text" href="http://www.paciellogroup.com/blog/misc/ARIA/slider/" rel="nofollow">example</a>)</li>
- <li><a class="external text" href="http://mindtrove.info/articles/creating-an-accessible-internationalized-dojo-rating-widget/" rel="nofollow">Creating an Accessible, Internationalized Dojo Rating Widget</a></li>
-</ul>
-
-<h2 id="Tabs_2" name="Tabs_2"><span class="mw-headline" id="Tabs">タブ</span></h2>
-
-<ul>
- <li><a class="external text" href="http://yuiblog.com/blog/2008/07/30/tabview-aria/" rel="nofollow">Enhancing TabView Accessibility with WAI-ARIA Roles and States</a>, from the YUI blog</li>
- <li><a class="external text" href="http://wiki.github.com/fnagel/jQuery-Accessible-RIA/tabs" rel="nofollow">Enhancing the jQuery UI Tabs accordingly to WCAG 2.0 and ARIA</a></li>
- <li><a class="external text" href="http://codetalks.org/source/widgets/tabpanel/tabpanel1.html" rel="nofollow">Tab panel example here on CodeTalks</a></li>
-</ul>
-
-<h2 id="Lightbox_2" name="Lightbox_2"><span class="mw-headline" id="Lightbox">ライトボックス</span></h2>
-
-<ul>
- <li><a class="external text" href="http://wiki.github.com/fnagel/jQuery-Accessible-RIA/lightbox" rel="nofollow">WCAG 2.0 and ARIA-</a><a class="external text" href="http://wiki.github.com/fnagel/jQuery-Accessible-RIA/table" rel="nofollow">conformant</a><a class="external text" href="http://wiki.github.com/fnagel/jQuery-Accessible-RIA/lightbox" rel="nofollow"> lightbox application</a></li>
- <li><a class="external free" href="http://majx-js.digissime.net/js/popin/" rel="nofollow">http://majx-js.digissime.net/js/popin/</a></li>
-</ul>
-
-<h2 id="Form_Validation_2" name="Form_Validation_2"><span class="mw-headline" id="Form_Validation">フォーム検証</span></h2>
-
-<ul>
- <li><a class="external text" href="http://wiki.github.com/fnagel/jQuery-Accessible-RIA/formular" rel="nofollow">WCAG 2.0 and ARIA-conformant live form validation</a></li>
-</ul>
-
-<h2 id="Tables" name="Tables"><span class="mw-headline" id="Table">表</span></h2>
-
-<ul>
- <li><a class="external text" href="http://www.einfach-fuer-alle.de/artikel/barrierefreie-formulare-mit-html-css-und-javascript/" rel="nofollow">German tutorial on creating an accessible form</a></li>
- <li><a class="external text" href="http://codetalks.org/source/widgets/grid/grid.sample.html" rel="nofollow">Simple grid example at CodeTalks</a></li>
- <li><a class="external text" href="http://codetalks.org/source/widgets/datepicker/datepicker.sample.html" rel="nofollow">Date picker grid at CodeTalks</a></li>
- <li><a class="external text" href="http://wiki.github.com/fnagel/jQuery-Accessible-RIA/table" rel="nofollow">WCAG 2.0 and ARIA-conformant sortable tables</a></li>
-</ul>
diff --git a/files/ja/web/accessibility/aria/widgets/index.html b/files/ja/web/accessibility/aria/widgets/index.html
index 136aecae2e..a9545e485d 100644
--- a/files/ja/web/accessibility/aria/widgets/index.html
+++ b/files/ja/web/accessibility/aria/widgets/index.html
@@ -1,10 +1,72 @@
 ---
-title: widgets
+title: ウィジェット
 slug: Web/Accessibility/ARIA/widgets
 tags:
   - Accessibility
-  - NeedsTranslation
-  - TopicStub
+  - JavaScript
+  - Landing
+  - NeedsUpdate
 translation_of: Web/Accessibility/ARIA/widgets
 ---
-<p>This page was auto-generated because a user created a sub-page to this page.</p>
+<div class="warning">警告: 更新が必要</div>
+
+<h2 id="Introduction">入門</h2>
+
+<p>ここでは、アクセシブルな JavaScript ウィジェットを作るための実装例とベストプラクティスを見ていきます。</p>
+
+<h2 id="General_Resources">一般リソース</h2>
+
+<ul>
+ <li><a class="external text" href="https://dev.aol.com/dhtml_style_guide" rel="nofollow">DHTML Style Guide</a> にはキーボードインタラクションのお勧めがあります。</li>
+ <li><a class="external text" href="https://www.w3.org/wai/pf/aria-practices" rel="nofollow">WAI-ARIA Authoring Practices Guide</a></li>
+</ul>
+
+<h2 id="Checkbox">チェックボックス</h2>
+
+<ul>
+ <li><a class="external text" href="https://www.paciellogroup.com/blog/?p=53" rel="nofollow">ARIA Toggle Button and Tri-state Checkbox examples</a> (from "The Paciello Group Blog")</li>
+ <li><a class="external text" href="http://test.cita.uiuc.edu/aria/checkbox" rel="nofollow">ARIA Example Checkbox Widgets from the University of Illinois</a></li>
+</ul>
+
+<h2 id="Menu">メニュー</h2>
+
+<ul>
+ <li><a class="external text" href="http://yuiblog.com/blog/2007/12/21/menu-waiaria/" rel="nofollow">Using WAI-ARIA Roles and States with the YUI Menu Control</a></li>
+</ul>
+
+<h2 id="Slider">スライダー</h2>
+
+<ul>
+ <li>From the Paciello Group Blog: ARIA Slider, <a class="external text" href="https://www.paciellogroup.com/blog/?p=68" rel="nofollow">part one</a>, <a class="external text" href="https://www.paciellogroup.com/blog/?p=69" rel="nofollow">part two</a>, <a class="external text" href="https://www.paciellogroup.com/blog/?p=76" rel="nofollow">part three</a> (<a class="external text" href="https://www.paciellogroup.com/blog/misc/ARIA/slider/" rel="nofollow">example</a>)</li>
+ <li><a class="external text" href="https://mindtrove.info/articles/creating-an-accessible-internationalized-dojo-rating-widget/" rel="nofollow">Creating an Accessible, Internationalized Dojo Rating Widget</a></li>
+</ul>
+
+<h2 id="Tabs">タブ</h2>
+
+<ul>
+ <li><a class="external text" href="http://yuiblog.com/blog/2008/07/30/tabview-aria/" rel="nofollow">Enhancing TabView Accessibility with WAI-ARIA Roles and States</a>, from the YUI blog</li>
+ <li><a class="external text" href="https://wiki.github.com/fnagel/jQuery-Accessible-RIA/tabs" rel="nofollow">Enhancing the jQuery UI Tabs accordingly to WCAG 2.0 and ARIA</a></li>
+ <li><a class="external text" href="https://codetalks.org/source/widgets/tabpanel/tabpanel1.html" rel="nofollow">Tab panel example here on CodeTalks</a></li>
+</ul>
+
+<h2 id="Lightbox">ライトボックス</h2>
+
+<ul>
+ <li><a class="external text" href="https://wiki.github.com/fnagel/jQuery-Accessible-RIA/lightbox" rel="nofollow">WCAG 2.0 and ARIA-</a><a class="external text" href="https://wiki.github.com/fnagel/jQuery-Accessible-RIA/table" rel="nofollow">conformant</a><a class="external text" href="https://wiki.github.com/fnagel/jQuery-Accessible-RIA/lightbox" rel="nofollow"> lightbox application</a></li>
+ <li><a class="external free" href="http://majx-js.digissime.net/js/popin/" rel="nofollow">http://majx-js.digissime.net/js/popin/</a></li>
+</ul>
+
+<h2 id="Form_Validation">フォーム検証</h2>
+
+<ul>
+ <li><a class="external text" href="https://wiki.github.com/fnagel/jQuery-Accessible-RIA/formular" rel="nofollow">WCAG 2.0 and ARIA-conformant live form validation</a></li>
+</ul>
+
+<h2 id="Tables">表</h2>
+
+<ul>
+ <li><a class="external text" href="https://www.einfach-fuer-alle.de/artikel/barrierefreie-formulare-mit-html-css-und-javascript/" rel="nofollow">German tutorial on creating an accessible form</a></li>
+ <li><a class="external text" href="https://codetalks.org/source/widgets/grid/grid.sample.html" rel="nofollow">Simple grid example at CodeTalks</a></li>
+ <li><a class="external text" href="https://codetalks.org/source/widgets/datepicker/datepicker.sample.html" rel="nofollow">Date picker grid at CodeTalks</a></li>
+ <li><a class="external text" href="https://wiki.github.com/fnagel/jQuery-Accessible-RIA/table" rel="nofollow">WCAG 2.0 and ARIA-conformant sortable tables</a></li>
+</ul>
-- 
cgit v1.2.3-54-g00ecf