diff --git a/public/ROUTER b/public/ROUTER index 32f6728f..689c81ac 100644 --- a/public/ROUTER +++ b/public/ROUTER @@ -179,32 +179,42 @@ 302 /carmel /oculus_carmel -302 /oculus-carmel /oculus_carmel +302 /oculus-browser /oculus_browser -302 /oculus-carmel/ford /oculus_carmel/ford -302 /oculus-carmel/fog /oculus_carmel/fog -302 /oculus-carmel/kadjar /oculus_carmel/kadjar +302 /oculus-carmel /oculus_browser -302 /carmel/ford /oculus_carmel/ford -302 /carmel/fog /oculus_carmel/fog -302 /carmel/kadjar /oculus_carmel/kadjar +302 /oculus-carmel/ford /oculus_browser/ford +302 /oculus-carmel/fog /oculus_browser/fog +302 /oculus-carmel/kadjar /oculus_browser/kadjar -302 /oculus_carmel/ford ovrweb:http://static.oculus.com/webvr/production/97f2fc11c8a96114547e8edc8453878b5f9c5653/Samples/FordDemo/index.html -302 /oculus_carmel/fog ovrweb:http://aframe.io/aframe/examples/showcase/spheres-and-fog/ -302 /oculus_carmel/kadjar ovrweb:http://kadjar.littleworkshop.fr/ +302 /oculus-browser/ford /oculus_browser/ford +302 /oculus-browser/fog /oculus_browser/fog +302 /oculus-browser/kadjar /oculus_browser/kadjar + +302 /oculus/ford /oculus_browser/ford +302 /oculus/fog /oculus_browser/fog +302 /oculus/kadjar /oculus_browser/kadjar + +302 /carmel/ford /oculus_browser/ford +302 /carmel/fog /oculus_browser/fog +302 /carmel/kadjar /oculus_browser/kadjar + +302 /oculus_carmel/ford https://static.oculus.com/webvr/production/97f2fc11c8a96114547e8edc8453878b5f9c5653/Samples/FordDemo/index.html +302 /oculus_carmel/fog https://aframe.io/aframe/examples/showcase/spheres-and-fog/ +302 /oculus_carmel/kadjar http://kadjar-vr.littleworkshop.fr/ 302 /chat /slack 302 /browsers /#browsers 302 /browsers/ /#browsers +302 /Browsers /browsers +302 /Browsers/ /browsers/ + 302 /posters https://github.com/WebVRRocks/posters 302 /poster https://raw.githubusercontent.com/WebVRRocks/posters/master/rocks-webvr-browsers.png 302 /poster.png https://raw.githubusercontent.com/WebVRRocks/posters/master/rocks-webvr-browsers.png -302 /Browsers /browsers -302 /Browsers/ /browsers/ - 302 /compat/submit https://airtable.com/shrGtVbhfoadJ47c8 302 /compat /compat/submit 302 /compatability/submit /compat/submit diff --git a/public/_helpers.html b/public/_helpers.html index ebb3ad2e..013f8107 100644 --- a/public/_helpers.html +++ b/public/_helpers.html @@ -46,7 +46,7 @@ {% includeData 'chromium.json' as chromium %} {% includeData 'firefox.json' as firefox %} {% includeData 'samsung_internet.json' as samsung_internet %} -{% includeData 'oculus_carmel.json' as oculus_carmel %} +{% includeData 'oculus_browser.json' as oculus_browser %} {% includeData 'chrome_for_android.json' as chrome_for_android %} {% includeData 'microsoft_edge.json' as microsoft_edge %} {% includeData 'servo.json' as servo %} @@ -74,7 +74,7 @@ chromium: chromium, firefox: firefox, samsung_internet: samsung_internet, - oculus_carmel: oculus_carmel, + oculus_browser: oculus_browser, chrome_for_android: chrome_for_android, microsoft_edge: microsoft_edge, servo: servo @@ -98,6 +98,45 @@ windows_mixed_reality: windows_mixed_reality } %} +{% set phones = { + "samsung_galaxy_note8": { + "name": "Samsung Galaxy Note8", + "about": "https://www.samsung.com/global/galaxy/galaxy-note8/" + }, + "samsung_galaxy_s8": { + "name": "Samsung Galaxy S8", + "about": "https://www.samsung.com/global/galaxy/gallery/galaxy-s8/" + }, + "samsung_galaxy_s8_plus": { + "name": "Samsung Galaxy S8+", + "about": "https://www.samsung.com/global/galaxy/gallery/galaxy-s8/" + }, + "samsung_galaxy_s7": { + "name": "Samsung Galaxy S7", + "about": "https://www.samsung.com/global/galaxy/gallery/galaxy-s7/" + }, + "samsung_galaxy_s7_edge": { + "name": "Samsung Galaxy S7 Edge", + "about": "https://www.samsung.com/global/galaxy/gallery/galaxy-s7/" + }, + "samsung_galaxy_note5": { + "name": "Samsung Galaxy Note5", + "about": "http://www.samsung.com/global/galaxy/galaxy-note5/" + }, + "samsung_galaxy_s6_edge_plus": { + "name": "Samsung Galaxy S6 Edge+", + "about": "http://www.samsung.com/global/galaxy/galaxy-s6-edge-plus/" + }, + "samsung_galaxy_s6": { + "name": "Samsung Galaxy S6", + "about": "http://www.samsung.com/global/galaxy/galaxys6/galaxy-s6/" + }, + "samsung_galaxy_s6_edge": { + "name": "Samsung Galaxy S6 Edge", + "about": "http://www.samsung.com/global/galaxy/galaxys6/galaxy-s6-edge/" + } +} %} + {% macro browser_platform_support (browser, headset, os) %} {% set support = browser.platforms[headset][os] %} {% if support === 'supported' %} diff --git a/public/_layout_browser.html b/public/_layout_browser.html index 5789b90a..b101afa1 100644 --- a/public/_layout_browser.html +++ b/public/_layout_browser.html @@ -1,4 +1,4 @@ -{% from '_helpers.html' import author_item, browser_item, browsers, bugs_bar, compat_report_row, demo_item, headsets, site_title, youtube %} +{% from '_helpers.html' import author_item, browser_item, browsers, bugs_bar, compat_report_row, demo_item, headsets, phones, site_title, youtube %} {% set browser = browsers[slug] %} {% set page = slug + '.html' %} @@ -87,6 +87,23 @@

Supported headsets

{% endblock %} + {% block phones_block %} + {% if browser.phones %} +
+

Supported phones

+ {% block phones %} + + {% endblock %} +
+ {% else %} +
+ {% endif %} + {% endblock %} + {% block demos_block %}

Demos

@@ -146,6 +163,15 @@

Latest version

{% endfor %} {% endif %} + {% if browser.showPhones === true %} +
Supported phones
+
+ {% for slug in browser.phones %} + {{ phones[slug].name }} + {%- if loop.revindex > 1 %},{% endif %} + {% endfor %} +
+ {% endif %} {% if browser.showOperatingSystem !== false %}
System requirements
diff --git a/public/index.html b/public/index.html index 5d5828a8..194179d7 100644 --- a/public/index.html +++ b/public/index.html @@ -54,7 +54,7 @@

WebVR Browsers

{{ browser_item('chrome_for_android') }} {{ browser_item('chromium') }} {{ browser_item('samsung_internet') }} - {{ browser_item('oculus_carmel') }} + {{ browser_item('oculus_browser') }} {{ browser_item('servo') }}
diff --git a/public/media/css/main.css b/public/media/css/main.css index 7357fe88..b7bab47b 100644 --- a/public/media/css/main.css +++ b/public/media/css/main.css @@ -356,6 +356,10 @@ h1.page-heading { min-width: 70px; } +[data-layout~="oculus_browser"] .browser-icon { + border-radius: 6px; +} + .headset-icon { display: inline-block; margin-bottom: 1rem; @@ -1576,16 +1580,17 @@ html[data-layout~="headset"][data-layout~="htc_vive"] .edit-page a:hover { color: rgba(151,126,254,1); } - .matrix [itemprop="browser"][data-slug="oculus_carmel"] [itemprop="image"] { + .matrix [itemprop="browser"][data-slug="oculus_browser"] [itemprop="image"] { + background-color: rgb(33,33,35); border-color: rgba(60,61,62,.3); } - .matrix [itemprop="browser"][data-slug="oculus_carmel"]:hover [itemprop="image"] { + .matrix [itemprop="browser"][data-slug="oculus_browser"]:hover [itemprop="image"] { border-color: rgba(60,61,62,.6); } - .matrix [itemprop="browser"][data-slug="oculus_carmel"] [itemprop="url"] { + .matrix [itemprop="browser"][data-slug="oculus_browser"] [itemprop="url"] { color: rgba(60,61,62,.8); } - .matrix [itemprop="browser"][data-slug="oculus_carmel"] [itemprop="url"]:hover { + .matrix [itemprop="browser"][data-slug="oculus_browser"] [itemprop="url"]:hover { color: rgba(60,61,62,1); } diff --git a/public/oculus_carmel.html b/public/oculus_browser.html similarity index 77% rename from public/oculus_carmel.html rename to public/oculus_browser.html index 825976b7..cc6f027d 100644 --- a/public/oculus_carmel.html +++ b/public/oculus_browser.html @@ -1,32 +1,30 @@ -{% set slug = 'oculus_carmel' %} +{% set slug = 'oculus_browser' %} {% extends '_layout_browser.html' %} -{% set browser = browsers.oculus_carmel %} - {% block instructions %}
  1. -

    Search for and install Carmel Developer Preview from the Oculus Gear VR store.

    -
    - Oculus Carmel installation screen -
    Installation screen
    -
    + Insert your supported Android phone into the Samsung Gear VR headset. +
      +
    • + If prompted, eject your phone and proceed to complete the Gear VR installation or upgrade process.
      • +
  2. - Launch Carmel Developer Preview from your Gear VR Library. + Launch the Oculus Browser from the Oculus Home lobby.
  3. -

    Enjoy the included WebVR demos!

    -
    - Oculus Carmel demos -
    WebVR demos from Carmel main lobby space
    -
    +

    Load aframe.io or webvr.rocks

     +
  4. + + Enjoy WebVR content! +
{% endblock %} @@ -40,6 +38,7 @@ {% block links %}