From a348b5de8e5db695166be3714825f3fe21432ad2 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Thu, 8 Jan 2015 11:43:58 +0000
Subject: [PATCH] Support RC and Stable firmware releases.

---
 changelog.html             |  6 ++++--
 tabs/firmware_flasher.css  |  7 ++++++-
 tabs/firmware_flasher.html |  1 +
 tabs/firmware_flasher.js   | 16 +++++++++++++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/changelog.html b/changelog.html
index 26cd75dbc..367aaa9db 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,8 +1,10 @@
-<span>2015.01.07 - 0.59.1 - cleanflight</span>
+<span>2015.01.08 - 0.59.1 - cleanflight</span>
 <p>
+    - Add support for Blackbox flight recorder feature (requires v1.5.0 firmware).<br />
     - Update RSSI channel section to allow any channel.<br />
     - Implemented configuration migration to aid with backwards compatibility.<br />
-    - Allow CLI access when connecting firmware with an out-of-date API.
+    - Allow CLI access when connecting firmware with an out-of-date API.<br />
+    - Support 'release candidate' and 'stable' releases.
 </p>
 <span>2015.01.04 - 0.59.0 - cleanflight</span>
 <p>
diff --git a/tabs/firmware_flasher.css b/tabs/firmware_flasher.css
index cc938883d..b76d8e1f8 100755
--- a/tabs/firmware_flasher.css
+++ b/tabs/firmware_flasher.css
@@ -108,6 +108,11 @@
     border-bottom: 1px solid silver;
     background-color: #3f4241;
 }
+
+.tab-firmware_flasher .release_info .target {
+    color: blue;
+}
+
 .tab-firmware_flasher .release_info p {
     padding: 5px;
 }
@@ -166,7 +171,7 @@
 .tab-firmware_flasher .buttons {
     width: calc(100% - 20px);
 
-    position: absolute;
+    margin-top: 10px;
     bottom: 10px;
 }
 .tab-firmware_flasher .buttons a {
diff --git a/tabs/firmware_flasher.html b/tabs/firmware_flasher.html
index 23c3cd8f4..d0ac0300b 100755
--- a/tabs/firmware_flasher.html
+++ b/tabs/firmware_flasher.html
@@ -56,6 +56,7 @@
             <strong i18n="firmwareFlasherReleaseName"></strong> <a i18n_title="firmwareFlasherReleaseUrl" class="name" href="#" target="_blank"></a><br />
             <strong i18n="firmwareFlasherReleaseFile"></strong> <a i18n_title="firmwareFlasherReleaseFileUrl" class="file" href="#" target="_blank"></a><br />
             <strong i18n="firmwareFlasherReleaseDate"></strong> <span class="date"></span><br />
+            <strong i18n="firmwareFlasherReleaseStatus"></strong> <span class="status"></span><br />
             <strong i18n="firmwareFlasherReleaseNotes"></strong> <br />
             <div class=notes></div>
         </p>
diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js
index e24d41448..f2bb2e160 100755
--- a/tabs/firmware_flasher.js
+++ b/tabs/firmware_flasher.js
@@ -66,16 +66,18 @@ TABS.firmware_flasher.initialize = function (callback) {
                                 "file"      : asset.name,
                                 "target"    : target,
                                 "date"      : formattedDate,
-                                "notes"     : release.body
+                                "notes"     : release.body,
+                                "status"    : release.prerelease ? "release-candidate" : "stable"
                             };
 
                             var select_e = 
-                                $("<option value='{0}_{1}'>{2} {3} {4}</option>".format(
+                                $("<option value='{0}_{1}'>{2} {3} {4} ({5})</option>".format(
                                     releaseIndex,
                                     assetIndex,
                                     summary.name,
                                     summary.target,
-                                    summary.date
+                                    summary.date,
+                                    summary.status
                                 )).data('summary', summary);
                             
                             releases_e.append(select_e);
@@ -215,6 +217,14 @@ TABS.firmware_flasher.initialize = function (callback) {
                         }
                         
                         $('div.release_info .target').text(summary.target);
+                        
+                        var status_e = $('div.release_info .status');
+                        if (summary.status == 'release-candidate') {
+                            $('div.release_info .status').html(chrome.i18n.getMessage('firmwareFlasherReleaseStatusReleaseCandidate')).show();
+                        } else {
+                            status_e.hide();
+                        }
+                        
                         $('div.release_info .name').text(summary.name).prop('href', summary.releaseUrl);
                         $('div.release_info .date').text(summary.date);
                         $('div.release_info .file').text(summary.file).prop('href', summary.url);