Merge pull request #270 from cvan/servo-downloads

update Servo downloads, links, release info (fixes #268)
immersive-web · Oct 31, 2017 · 756bfb8 · 756bfb8
2 parents c1514ac + 19ae04f
commit 756bfb8
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 66 deletions.
diff --git a/public/media/css/main.css b/public/media/css/main.css
@@ -1644,6 +1644,14 @@ html[data-layout~="headset"][data-layout~="htc_vive"] .edit-page a:hover {
     margin-bottom: 0;
     position: absolute;
   }
+
+  #download:empty ~ .download-block + .download-block .download {
+    margin-top: 1rem;
+  }
+
+  .download-block {
+    margin-right: 1.5rem;
+  }
 }
 
 @media all and (min-width: 45rem) {
@@ -1849,6 +1857,28 @@ html[data-layout~="headset"][data-layout~="htc_vive"] .edit-page a:hover {
   }
 }
 
+[data-report-key="description"] {
+  width: 100%;
+}
+
+.download-block {
+  display: inline-block;
+}
+
+.download-block p {
+  margin-bottom: .5rem;
+}
+
+.download-block .download {
+  margin-top: 1.5rem;
+}
+
+.c:after {
+  clear: both;
+  content: "";
+  display: table;
+}
+
 @media all and (min-width: 70rem) {
   .table-support /*a*/.supported strong {
     color: #3d9970;
@@ -1862,7 +1892,3 @@ html[data-layout~="headset"][data-layout~="htc_vive"] .edit-page a:hover {
     color: darkgreen;
   }
 }
-
-[data-report-key="description"] {
-  width: 100%;
-}
diff --git a/public/servo.html b/public/servo.html
@@ -1,4 +1,4 @@
-{% from '_helpers.html' import author_item, browsers, site_title %}
+{% from '_helpers.html' import author_item, browsers, headsets, site_title %}
 {% set browser = browsers.servo %}
 {% set page = 'servo.html' %}
 <!doctype html>
@@ -9,7 +9,7 @@
   </head>
   <body>
     <header id="header" class="header" role="banner">
-      <div class="container section">
+      <div class="container section c">
         {% include '_logo.html' %}
 
         <a class="page-heading-link" href="{{ browser.about }}">
@@ -23,24 +23,62 @@ <h1 class="browser-name page-heading">{{ browser.name }}</h1>
           <strong>Warning:</strong> All <a href="#releases">Servo WebVR builds posted here</a> are highly experimental and subject to change!
         </p>
 
-        <div id="download" class="download dropdown-standalone dropdown-download">
-          <a href="{{ browser.downloadUrl }}" class="button button-unstyled button-large button-download" data-download-name="{{ browser.slug }}" data-download-id="{{ browser.softwareVersion }}">Download {% include "media/img/download-icon.svg" %}
-            <span class="download-info c">
-              {% if browser.showVersion and browser.releases.latest.version %}
-                <span class="download-version">Version {{ browser.releases.latest.version }}</span>
-              {%- endif %}
-              {% if browser.showDateReleased and browser.releases.latest.dateReleased %}
-                <span class="download-date">{{ browser.releases.latest.dateReleased.datetimeString }}</span>
-              {%- endif %}
-              {%- if browser.showFileSize and browser.releases.latest.fileSize %}
-                <span class="download-size">{{ browser.releases.latest.fileSize }}</span>
-              {%- endif -%}
-            </span>
-          </a>
+        <div id="download"></div>
+
+        <div class="download-block">
+          <div class="download dropdown-standalone dropdown-download">
+            <a href="{{ browser.downloadUrl }}" class="button button-unstyled button-large button-download" data-download-name="{{ browser.slug }}" data-download-id="{{ browser.softwareVersion }}">Download {% include "media/img/download-icon.svg" %}
+              <span class="download-info c">
+                <span class="download-version">{{ headsets.samsung_gear_vr.name }}</span>
+                {% if browser.showDateReleased and browser.releases.samsung_gear_vr.dateReleased %}
+                  <span class="download-date">{{ browser.releases.samsung_gear_vr.dateReleased.datetimeString }}</span>
+                {%- endif %}
+                {%- if browser.showFileSize and browser.releases.samsung_gear_vr.fileSize %}
+                  <span class="download-size">{{ browser.releases.samsung_gear_vr.fileSize }}</span>
+                {%- endif -%}
+              </span>
+            </a>
+          </div>
+          <p class="view-source">
+            <a href="https://github.com/MortimerGoro/servo/tree/webvr_api" class="button-source no-underline">View source</a>
+          </p>
+        </div>
+        <div class="download-block">
+          <div class="download dropdown-standalone dropdown-download">
+            <a href="{{ browser.downloadUrl }}" class="button button-unstyled button-large button-download" data-download-name="{{ browser.slug }}" data-download-id="{{ browser.softwareVersion }}">Download {% include "media/img/download-icon.svg" %}
+              <span class="download-info c">
+                <span class="download-version">{{ headsets.google_daydream.name }}</span>
+                {% if browser.showDateReleased and browser.releases.google_daydream.dateReleased %}
+                  <span class="download-date">{{ browser.releases.google_daydream.dateReleased.datetimeString }}</span>
+                {%- endif %}
+                {%- if browser.showFileSize and browser.releases.google_daydream.fileSize %}
+                  <span class="download-size">{{ browser.releases.google_daydream.fileSize }}</span>
+                {%- endif -%}
+              </span>
+            </a>
+          </div>
+          <p class="view-source">
+            <a href="{{ browser.releases.google_daydream.sourceCodeUrl }}" class="button-source no-underline">View source</a>
+          </p>
+        </div>
+        <div class="download-block">
+          <div class="download dropdown-standalone dropdown-download">
+            <a href="{{ browser.downloadUrl }}" class="button button-unstyled button-large button-download" data-download-name="{{ browser.slug }}" data-download-id="{{ browser.softwareVersion }}">Download {% include "media/img/download-icon.svg" %}
+              <span class="download-info c">
+                <span class="download-version">{{ headsets.htc_vive.name }}</span>
+                {% if browser.showDateReleased and browser.releases.htc_vive.dateReleased %}
+                  <span class="download-date">{{ browser.releases.htc_vive.dateReleased.datetimeString }}</span>
+                {%- endif %}
+                {%- if browser.showFileSize and browser.releases.htc_vive.fileSize %}
+                  <span class="download-size">{{ browser.releases.htc_vive.fileSize }}</span>
+                {%- endif -%}
+              </span>
+            </a>
+          </div>
+          <p class="view-source">
+            <a href="{{ browser.releases.htc_vive.sourceCodeUrl }}" class="button-source no-underline">View source</a>
+          </p>
         </div>
-        <p class="view-source">
-          <a href="https://github.com/MortimerGoro/servo/tree/webvr_api" class="button-source no-underline">View source</a>
-        </p>
       </div>
     </header>
 
@@ -61,32 +99,12 @@ <h2><a href="#setup">Instructions</a></h2>
         </section>
 
         <section id="releases" class="section" data-section="releases">
-          <h2><a href="#releases">Latest version</a></h2>
+          <h2><a href="#releases">Releases</a></h2>
           <article itemscope itemtype="http://schema.org/SoftwareApplication">
             <dl>
               <dt class="browser-download">Download</dt>
               <dd>
-                <a class="button button-outlined-approve button-download" href="{{ browser.downloadUrl }}" data-download-name="{{ browser.slug }}" data-download-id="{{ browser.softwareVersion }}" itemprop="downloadUrl">Download</a>
-              </dd>
-              <dt class="browser-date-released">Date released</dt>
-              <dd>
-                <time itemprop="datePublished" datetime="2016-12-16T9:39:00Z">
-                  Dec 16, 2016
-                </time>
-              </dd>
-              <dt class="browser-system-requirements">System requirements</dt>
-              <dd>
-                <span class="operatingSystems">Windows</span>
-              </dd>
-              <dt class="browser-file-size">File size</dt>
-              <dd>
-                <span itemprop="fileSize" content="36MB">36 MB</span>
-              </dd>
-              <dt class="browser-release-notes">Release notes</dt>
-              <dd>
-                <ul class="release-notes bullets-light">
-                  <li><span>Currently works with the <a href="/htc_vive">HTC Vive</a> only.</span></li>
-                </ul>
+                <a class="button button-outlined-approve button-download" href="#download" data-download-name="{{ browser.slug }}" data-download-id="{{ browser.softwareVersion }}" itemprop="downloadUrl">Download</a>
               </dd>
             </dl>
           </article>
@@ -112,6 +130,8 @@ <h2><a href="#compat">Known issues</a></h2>
           <div id="info"></div>
           <h2><a href="#info">Links</a></h2>
           <ul class="bullets-light">
+            <li><span><a href="https://blog.mozvr.com/samsung-gear-vr-support-lands-in-servo/">Mozilla VR Blog: <em>WebVR Support for Samsung Gear VR Lands in Servo:</em> <time data-datetime-original="2017-08-16T00:00:00-07:00">August 16, 2017</time></a></span></li>
+            <li><span><a href="https://blog.mozvr.com/webvr-daydream-support-lands-in-servo/">Mozilla VR Blog: <em>WebVR Support for Google Daydream Lands in Servo</em> <time data-datetime-original="2017-04-19T00:00:00-07:00">April 19, 2017</time></a></span></li>
             <li><span><a href="http://www.androidpolice.com/2017/04/20/mozillas-experimental-servo-engine-adds-webvr-support/">Android Police: <em>Mozilla’s experimental Servo engine adds WebVR support with Daydream VR</em> <time data-datetime-original="2017-04-20T11:40:46-07:00">April 20, 2017</time></a></span></li>
             <li><span><a href="https://blog.mozvr.com/webvr-daydream-support-lands-in-servo/">Mozilla VR Blog: <em>WebVR Google Daydream support lands in Servo</em> <time>April 19, 2017</time></a></span></li>
             <li><span><a href="https://blog.mozvr.com/webvr-servo-architecture-and-latency-optimizations/">Mozilla VR Blog: <em>WebVR Coming to Servo: Architecture and Latency Optimizations</em> <time>November 29, 2016</time></a></span></li>

diff --git a/public/servo.json b/public/servo.json
@@ -4,32 +4,54 @@
   "name": "Servo",
   "slug": "servo",
   "description": "Mozilla's next-generation parallel, embedded browser engine",
-  "description_html": "<a href=\"https://www.mozilla.org/\">Mozilla</a>&rsquo;s next-generation parallel, embedded <a href=\"https://servo.org/\">browser engine</a>",
-  "operatingSystem": "Windows 10",
+  "description_html": "<a href=\"https://www.mozilla.org/\" rel=\"noreferrer noopener\">Mozilla</a>&rsquo;s next-generation parallel, embedded <a href=\"https://servo.org/\" rel=\"noreferrer noopener\">browser engine</a>",
+  "operatingSystem": "Windows 10 or Android",
   "processorRequirements": "IA64",
   "logo": "/servo/icon.png",
   "url": "https://servo.org/",
   "about": "/servo",
-  "downloadUrl": "https://github.com/MortimerGoro/servo/releases/download/0.2/servo_gamepad.rar",
+  "downloadUrl": "https://github.com/MortimerGoro/servo/releases/download/0.9/gear_vr_apk.zip",
   "//downloadUrl": "//https://download.servo.org/nightly/windows/servo-latest.msi",
   "sameAs": [
     "https://developer.oculus.com/webvr/"
   ],
   "showDateReleased": true,
   "showFileSize": true,
   "showVersion": true,
-  "dateReleased": {
-    "originalDateTimeString": "16-Dec-2016 9:39",
-    "datetime": 1481909940000,
-    "datetimeString": "Dec 16, 2016, 9:39 AM",
-    "dateString": "Dec 16, 2016",
-    "timeString": "9:39 AM",
-    "isoString": "2016-12-16T17:39:00.000Z"
-  },
-  "softwareVersion": "0.2",
-  "fileSize": "36 MB",
+  "softwareVersion": "0.9",
+  "fileSize": "34.2 MB",
   "releases": {
-    "latest": {
+    "samsung_gear_vr": {
+      "url": "https://github.com/MortimerGoro/servo/releases/download/0.9/gear_vr_apk.zip",
+      "sourceCodeUrl": "https://github.com/MortimerGoro/servo/tree/0.9/",
+      "aboutUrl": "https://blog.mozvr.com/samsung-gear-vr-support-lands-in-servo/",
+      "version": "0.9",
+      "fileSize": "34.2 MB",
+      "dateReleased": {
+        "originalDateTimeString": "16-Aug-2017 7:48",
+        "datetime": 1481909940000,
+        "datetimeString": "Aug 16, 2016, 7:48 AM",
+        "dateString": "Aug 16, 2016",
+        "timeString": "7:48 AM",
+        "isoString": "2017-08-16T07:48:00.000Z"
+      }
+    },
+    "google_daydream": {
+      "url": "https://github.com/MortimerGoro/servo/releases/download/daydream/servo_rollercoaster.apk",
+      "sourceCodeUrl": "https://github.com/MortimerGoro/servo/tree/daydream/",
+      "aboutUrl": "https://blog.mozvr.com/webvr-daydream-support-lands-in-servo/",
+      "version": "daydream",
+      "fileSize": "28.9 MB",
+      "dateReleased": {
+        "originalDateTimeString": "19-Apr-2017 8:13",
+        "datetime": 1481909940000,
+        "datetimeString": "Apr 19, 2016, 8:13 AM",
+        "dateString": "Apr 19, 2016",
+        "timeString": "8:13 AM",
+        "isoString": "2017-08-16T08:13:00.000Z"
+      }
+    },
+    "htc_vive": {
       "url": "https://github.com/MortimerGoro/servo/releases/download/0.2/servo_gamepad.rar",
       "version": "0.2",
       "fileSize": "36 MB",
@@ -43,11 +65,6 @@
       }
     }
   },
-  "targetProduct": {
-    "@type": "SoftwareSourceCode",
-    "url": "https://github.com/MortimerGoro/servo/tree/0.2",
-    "downloadUrl": "https://github.com/MortimerGoro/servo/archive/0.2.zip"
-  },
   "platforms": {
     "htc_vive": {
       "windows": "supported",
@@ -67,14 +84,14 @@
       "windows": "headset_unsupported",
       "mac": "headset_unsupported",
       "linux": "headset_unsupported",
-      "android": "browser_unsupported",
+      "android": "supported",
       "ios": "headset_unsupported"
     },
     "google_daydream": {
       "windows": "headset_unsupported",
       "mac": "headset_unsupported",
       "linux": "headset_unsupported",
-      "android": "browser_unsupported",
+      "android": "supported",
       "ios": "headset_unsupported"
     },
     "google_cardboard": {