Merge pull request #278 from cvan/samsung_gear_vr-page

create headset page for "Samsung Gear VR" (fixes #277)
immersive-web · Nov 14, 2017 · 55b34b6 · 55b34b6
2 parents 4338ae0 + ce28954
commit 55b34b6
Show file tree

Hide file tree

Showing 25 changed files with 467 additions and 117 deletions.
diff --git a/public/ROUTER b/public/ROUTER
@@ -10,7 +10,6 @@
 
 302   /oculus_rift  https://www.oculus.com/rift/
 302   /osvr  http://www.osvr.org/hdk2.html
-302   /samsung_gear_vr  https://www.samsung.com/global/galaxy/gear-vr/
 302   /windows_mixed_reality  https://developer.microsoft.com/en-us/windows/mixed-reality
 
 302   /ios  https://www.apple.com/ios/

diff --git a/public/_helpers.html b/public/_helpers.html
@@ -52,6 +52,7 @@
 {% includeData 'servo.json' as servo %}
 
 {% includeData 'htc_vive.json' as htc_vive %}
+{% includeData 'samsung_gear_vr.json' as samsung_gear_vr %}
 {% includeData 'google_daydream.json' as google_daydream %}
 {% includeData 'windows_mixed_reality.json' as windows_mixed_reality %}
 
@@ -86,10 +87,7 @@
     "name": "Oculus Rift",
     "about": "/oculus_rift"
   },
-  "samsung_gear_vr": {
-    "name": "Samsung Gear VR",
-    "about": "/samsung_gear_vr"
-  },
+  samsung_gear_vr: samsung_gear_vr,
   google_daydream: google_daydream,
   "google_cardboard": {
     "name": "Google Cardboard",

diff --git a/public/_layout_browser.html b/public/_layout_browser.html
@@ -201,6 +201,8 @@ <h2><a href="#releases">Latest version</a></h2>
         {% block reports_block %}
           <section id="compat" class="section" data-section="compat">
             <div id="compatibility"></div>
+            <div id="bugs"></div>
+            <div id="issues"></div>
             <div id="known_issues"></div>
             <div id="known-issues"></div>
             <h2><a href="#compat">Implementation Status</a></h2>
@@ -251,12 +253,14 @@ <h2><a href="#links">{{ links_heading or links_title or info_heading or info_tit
           </section>
         {% endblock %}
 
-        {% block faq_block %}
-          <section id="faq" class="section faq" data-section="faq">
-            <h2><a href="#faq">{{ faq_heading or faq_title or 'FAQ' }}</a></h2>
-            {% block faq %}
+        {% block help_block %}
+          <section id="help" class="section help" data-section="help">
+            <div id="faq"></div>
+            <div id="info"></div>
+            <div id="support"></div>
+            <h2><a href="#help">{{ help_heading or help_title or 'Help' }}</a></h2>
+            {% block help %}
             {% endblock %}
-            {{ bugs_bar(browser) }}
           </section>
         {% endblock %}
       </div>

diff --git a/public/_layout_headset.html b/public/_layout_headset.html
@@ -1,4 +1,4 @@
-{% from '_helpers.html' import author_item, browser_item, browsers, compat_report_row, demo_item, headsets, site_title, youtube %}
+{% from '_helpers.html' import browser_item, browsers, demo_item, headsets, phones, site_title %}
 {% set headset = headsets[slug] %}
 {% set page = slug + '.html' %}
 <!doctype html>
@@ -68,10 +68,39 @@ <h2><a href="#setup">{{ instructions_heading or instructions_title or 'Setup ins
           <section id="browsers" class="section browsers" data-section="browsers">
             <h2><a href="#browsers">{{ demos_heading or demos_title or 'Supported browsers' }}</a></h2>
             {% block browsers %}
+              {% set browsers_list = [] %}
+              {% for os, browsers in headset.platforms %}
+                {% for browser in browsers %}
+                  {% if browser not in browsers_list %}
+                    {% set browsers_list = (browsers_list.push(browser), browsers_list) %}
+                  {% endif %}
+                {% endfor %}
+              {% endfor %}
+              {% for browser in browsers_list %}
+                <h3><a href="{{ browsers[browser].about }}" itemprop="aboutUrl">{{ browsers[browser].name }}</a></h3>
+                <p><a class="button button-outlined-approve button-download" href="{{ browsers[browser].about }}" itemprop="aboutUrl">Download</a></p>
+              {% endfor %}
             {% endblock %}
           </section>
         {% endblock %}
 
+        {% block phones_block %}
+          {% if headset.phones %}
+            <section id="phones" class="section phones" data-section="phones">
+              <h2><a href="#phones">Supported phones</a></h2>
+              {% block phones %}
+                <ul class="bullets-light">
+                  {% for slug in headset.phones -%}
+                    <li><span><a href="{{ phones[slug].about }}" itemprop="aboutUrl">{{ phones[slug].name }}</a></span></li>
+                  {%- endfor %}
+                </ul>
+              {% endblock %}
+            </section>
+          {% else %}
+            <div id="phones"></div>
+          {% endif %}
+        {% endblock %}
+
         {% block demos_block %}
           <section id="demos" class="section demos" data-section="demos">
             <h2><a href="#demos">{{ demos_heading or demos_title or 'Demos' }}</a></h2>
@@ -84,17 +113,19 @@ <h2><a href="#demos">{{ demos_heading or demos_title or 'Demos' }}</a></h2>
 
         {% block links_block %}
           <section id="links" class="section info links" data-section="info links">
-            <div id="info"></div>
             <h2><a href="#links">{{ links_heading or links_title or info_heading or info_title or 'Links' }}</a></h2>
             {% block links %}
             {% endblock %}
           </section>
         {% endblock %}
 
-        {% block faq_block %}
-          <section id="faq" class="section faq" data-section="faq">
-            <h2><a href="#faq">{{ faq_heading or faq_title or 'FAQ' }}</a></h2>
-            {% block faq %}
+        {% block help_block %}
+          <section id="help" class="section help" data-section="help">
+            <div id="faq"></div>
+            <div id="info"></div>
+            <div id="support"></div>
+            <h2><a href="#help">{{ help_heading or help_title or 'Help' }}</a></h2>
+            {% block help %}
             {% endblock %}
           </section>
         {% endblock %}

diff --git a/public/chrome_for_android.html b/public/chrome_for_android.html
@@ -244,10 +244,11 @@ <h2><a href="#links">Links</a></h2>
           </ul>
         </section>
 
-        <section id="faq" class="section" data-section="info faq">
-          <div id="help"></div>
+        <section id="help" class="section help" data-section="help">
+          <div id="faq"></div>
+          <div id="info"></div>
           <div id="support"></div>
-          <h2><a href="#faq">FAQ</a></h2>
+          <h2><a href="#help">Help</a></h2>
           <dl>
             <dt id="what_is_the_difference_between_chromium_and_chrome"><a href="what_is_the_difference_between_chromium_and_chrome">What is the difference between Chromium and Chrome?</a></dt>
             <dd><a href="https://www.chromium.org/">Chromium</a> is an open-source Web browser project, started and maintained by <a href="https://www.google.com/">Google</a>, for the proprietary, closed-source <a href="https://www.google.com/chrome/">Google Chrome</a> browser. Chromium and Chrome share the majority of code and functionality, though there are some minor differences in features (e.g., video/audio codecs, Speech Recognition/Synthesis APIs, etc.), branding/logos, and licensing.</dd>

diff --git a/public/chromium.html b/public/chromium.html
@@ -160,10 +160,11 @@ <h2><a href="#compat">Known issues</a></h2>
           {{ bugs_bar(browser) }}
         </section>
 
-        <section id="faq" class="section faq" data-section="faq">
-          <div id="links"></div>
+        <section id="help" class="section help" data-section="help">
+          <div id="faq"></div>
           <div id="info"></div>
-          <h2><a href="#faq">FAQ</a></h2>
+          <div id="support"></div>
+          <h2><a href="#help">Help</a></h2>
           <dl>
             <dt id="what_is_the_difference_between_chromium_and_chrome"><a href="#what_is_the_difference_between_chromium_and_chrome">What is the difference between Chromium and Chrome?</a></dt>
             <dd>

diff --git a/public/firefox.html b/public/firefox.html
@@ -59,12 +59,12 @@
   </ul>
 {% endblock %}
 
-{% block faq %}
+{% block help %}
 <dl>
   <dt id="where_can_i_find_the_list_of_known_bugs"><a href="#where_can_i_find_the_list_of_known_bugs">Where can I find the list of known bugs?</a></dt>
   <dd>
     <p>
-      You can find a list of the known bugs by searching the <a href="{{ browser.bugsUrl }}">Firefox Bugzilla bug tracker for bugs with the whiteboard keyword <code>[webvr]</code></a>.
+      Above is a list of <a href="#compat">bugs and features that are being actively worked on</a>. You can find the full list of filed bugs and planned features by searching the <a href="{{ browser.bugsUrl }}">Firefox Bugzilla bug tracker for bugs with the whiteboard keyword <code>[webvr]</code></a>.
     </p>
   </dd>
   <dt id="how_can_i_report_a_bug"><a href="#how_can_i_report_a_bug">How can I report a bug?</a></dt>

diff --git a/public/htc_vive.html b/public/htc_vive.html
@@ -10,13 +10,6 @@
   <p>(If needed, refer to the <a href="http://dl4.htc.com/web_materials/Manual/Vive/Vive_User_Guide.pdf">Vive User Guide</a> or the <a href="https://support.steampowered.com/kb_article.php?ref=5254-FJKZ-7829">SteamVR Support pages</a>.)</p>
 {% endblock %}
 
-{% block browsers %}
-  <h3><a href="{{ browsers.firefox.about }}" itemprop="aboutUrl">{{ browsers.firefox.name }}</a></h3>
-  <p><a class="button button-outlined-approve button-download" href="{{ browsers.firefox.about }}" itemprop="aboutUrl">Download</a></p>
-  <h3><a href="{{ browsers.chromium.about }}" itemprop="aboutUrl">{{ browsers.chromium.name }}</a></h3>
-  <p><a class="button button-outlined-approve button-download" href="{{ browsers.chromium.about }}" itemprop="aboutUrl">Download</a></p>
-{% endblock %}
-
 {% block demos %}
   {{ demo_item('a_blast') }}
   {{ demo_item('a_painter') }}
@@ -27,7 +20,7 @@ <h3><a href="{{ browsers.chromium.about }}" itemprop="aboutUrl">{{ browsers.chro
 {% block links_block %}
 {% endblock %}
 
-{% block faq %}
+{% block help %}
   <dl>
     <!--
     <dt>Which desktop PC or laptop should I buy?</dt>
@@ -36,7 +29,11 @@ <h3><a href="{{ browsers.chromium.about }}" itemprop="aboutUrl">{{ browsers.chro
     <dd></dd>
     -->
     <dt id="when_is_support_landing_in_release_channel_browsers"><a href="#when_is_support_landing_in_release_channel_browsers">When is WebVR support for the {{ headset.name }} landing in release-channel browsers?</a></dt>
-    <dd>WebVR support for the {{ headset.name }} is estimated to ship in mid-2017 in the stable, release-channel versions of both <a href="{{ browsers.firefox.about }}">{{ browsers.firefox.name }}</a> and <a href="{{ browsers.chrome.about }}">{{ browsers.chrome.name }}</a>.</dd>
+    <dd>
+      <p>
+        WebVR support for the {{ headset.name }} is estimated to ship in mid-2017 in the stable, release-channel versions of both <a href="{{ browsers.firefox.about }}">{{ browsers.firefox.name }}</a> and <a href="{{ browsers.chrome.about }}">{{ browsers.chrome.name }}</a>.
+      </p>
+    </dd>
     <dt id="can_i_still_use_a_vive_pre_developer_kit"><a href="#can_i_still_use_a_vive_pre_developer_kit">Can I still use a VIVE Pre developer kit?</a></dt>
     <dd>
       <p>

diff --git a/public/htc_vive.json b/public/htc_vive.json
@@ -2,6 +2,7 @@
   "@context": "http://schema.org",
   "@type": "Product",
   "name": "HTC VIVE",
+  "alternateName": "Vive",
   "slug": "htc_vive",
   "description": "Roomscale VR for SteamVR and OpenVR",
   "description_html": "Roomscale VR for <a href=\"http://store.steampowered.com/steamvr\">SteamVR</a> and <a href=\"https://github.com/ValveSoftware/openvr\">OpenVR</a>",
@@ -35,22 +36,22 @@
     "Headset"
   ],
   "releaseNotes": "/htc_vive/release_notes.json",
-  "dateCreated": "",
-  "datePublished": "",
-  "video": "https://webvr.rocks/chromium/video.json",
-  "downloadUrl": "https://docs.google.com/uc?id=0BzudLt22BqGRRElMNmVqQjJWS2c&export=download",
-  "fileFormat": "application/zip",
-  "learningResourceType": "https://webvr.rocks/chromium",
-  "discussionUrl": "https://webvr.rocks/chromium#comments",
-  "softwareHelp": "https://webvr.rocks/chromium#help",
-  "version": "",
+  "dateCreated": null,
+  "datePublished": null,
+  "video": "https://webvr.rocks/htc_vive/video.json",
+  "downloadUrl": "http://dl4.htc.com/vive/ViveSetup.exe",
+  "fileFormat": "application/vnd.microsoft.portable-executable",
+  "learningResourceType": "https://webvr.rocks/htc_vive",
+  "discussionUrl": "https://webvr.rocks/htc_vive#comments",
+  "softwareHelp": "https://webvr.rocks/htc_vive#help",
+  "version": null,
   "softwareRequirements": [
-    "https://www3.oculus.com/setup/",
-    "https://www.vive.com/us/setup/"
+    "https://www.vive.com/setup/",
+    "https://www3.oculus.com/setup/"
   ],
   "requirements": [
-    "https://www3.oculus.com/setup/",
     "https://www.vive.com/us/setup/",
+    "https://www3.oculus.com/setup/",
     "http://store.steampowered.com/app/323910"
   ],
   "fileSize": "93 MB",
@@ -61,51 +62,18 @@
   "sourceOrganization": "",
   "softwareAddOn": "",
   "device": "",
-  "alternateName": "Chromium WebVR",
   "audio": "",
   "platforms": {
-    "htc_vive": {
-      "windows": "supported",
-      "mac": "headset_unsupported",
-      "linux": "headset_unsupported",
-      "android": "headset_unsupported",
-      "ios": "headset_unsupported"
-    },
-    "oculus_rift": {
-      "windows": "supported",
-      "mac": "headset_unsupported",
-      "linux": "headset_unsupported",
-      "android": "headset_unsupported",
-      "ios": "headset_unsupported"
-    },
-    "samsung_gear_vr": {
-      "windows": "headset_unsupported",
-      "mac": "headset_unsupported",
-      "linux": "headset_unsupported",
-      "android": "browser_unsupported",
-      "ios": "headset_unsupported"
-    },
-    "google_daydream": {
-      "windows": "headset_unsupported",
-      "mac": "headset_unsupported",
-      "linux": "headset_unsupported",
-      "android": "supported",
-      "ios": "headset_unsupported"
-    },
-    "google_cardboard": {
-      "windows": "headset_unsupported",
-      "mac": "headset_unsupported",
-      "linux": "headset_unsupported",
-      "android": "supported",
-      "ios": "browser_unsupported"
-    },
-    "windows_mixed_reality": {
-      "windows": "browser_unsupported",
-      "mac": "headset_unsupported",
-      "linux": "headset_unsupported",
-      "android": "headset_unsupported",
-      "ios": "headset_unsupported"
-    }
+    "windows": [
+      "firefox",
+      "chromium"
+    ],
+    "mac": [
+      "firefox"
+    ],
+    "linux": [],
+    "android": [],
+    "ios": []
   },
   "reports": [
     {