From c6867d3c528d632f31d48b96eb34538b05e253e4 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Fri, 19 Dec 2014 16:04:42 +0000
Subject: [PATCH] Update the firmware flasher to provide more details about the
 release. Add warning message about target selection.

---
 _locales/en/messages.json  | 18 ++++++++++++++++++
 tabs/firmware_flasher.css  |  3 +++
 tabs/firmware_flasher.html |  7 ++++++-
 tabs/firmware_flasher.js   | 27 ++++++++++++++++-----------
 4 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index ea474021f1..dcb01ca7eb 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -760,6 +760,24 @@
     "firmwareFlasherReleaseSummaryHead": {    
         "message": "Release info"
     },
+    "firmwareFlasherReleaseNotes": {
+        "message": "Release notes:"
+    },
+    "firmwareFlasherReleaseDate": {
+        "message": "Date:"
+    },
+    "firmwareFlasherReleaseTarget": {
+        "message": "Target:"
+    },
+    "firmwareFlasherReleaseFile": {
+        "message": "Binary:"
+    },
+    "firmwareFlasherReleaseFileUrl": {
+        "message": "Download manually."
+    },
+    "firmwareFlasherTargetWarning": {
+        "message": "<span style=\"color: red\">IMPORTANT</span>: Ensure you flash a file appropriate for your target.  Flashing a binary for the wrong target can cause <span style=\"color: red\">bad</span> things to happen."
+    },
     
     "firmwareFlasherPath": {
         "message": "Path:"
diff --git a/tabs/firmware_flasher.css b/tabs/firmware_flasher.css
index 68acd21ee4..72d243f5c6 100644
--- a/tabs/firmware_flasher.css
+++ b/tabs/firmware_flasher.css
@@ -117,6 +117,9 @@
 .tab-firmware_flasher .release_info p a:hover {
     text-decoration: underline;
 }
+.tab-firmware_flasher .release_info .notes {
+    padding: 5px;
+}
 
 .tab-firmware_flasher .git_info {
     display: none;
diff --git a/tabs/firmware_flasher.html b/tabs/firmware_flasher.html
index 08013e2045..34b7f8aad7 100644
--- a/tabs/firmware_flasher.html
+++ b/tabs/firmware_flasher.html
@@ -52,13 +52,18 @@
     <div class="release_info">
         <div class="title" i18n="firmwareFlasherReleaseSummaryHead"></div>
         <p>
-            <strong i18n="firmwareFlasherReleaseMessage"></strong> <span class="message"></span>
+            <strong i18n="firmwareFlasherReleaseTarget"></strong> <span class="target"></span><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="firmwareFlasherReleaseNotes"></strong> <br />
+            <div class=notes></div>
         </p>
     </div>
     
     <div class="warning">
         <div class="title" i18n="firmwareFlasherWarninghead"></div>
         <p i18n="firmwareFlasherWarningText">
+        <p i18n="firmwareFlasherTargetWarning">
         </p>
     </div>
     <div class="buttons">
diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js
index 9717bddb81..dd9aed2965 100644
--- a/tabs/firmware_flasher.js
+++ b/tabs/firmware_flasher.js
@@ -48,15 +48,7 @@ TABS.firmware_flasher.initialize = function (callback) {
                                 continue;
                             }
 
-                            var summary = {
-                                "name"    : release.name,
-                                "url"     : asset.browser_download_url,
-                                "target"  : target,
-                                "date"    : release.published_at,
-                                "message" : release.body
-                            };
-
-                            var date = new Date(summary.date);
+                            var date = new Date(release.published_at);
                             var formattedDate = "{0}-{1}-{2} {3}:{4}".format(
                                 date.getFullYear(),
                                 date.getMonth(),
@@ -64,6 +56,15 @@ TABS.firmware_flasher.initialize = function (callback) {
                                 date.getHours(),
                                 date.getMinutes()
                             );
+                            
+                            var summary = {
+                                "name"    : release.name,
+                                "url"     : asset.browser_download_url,
+                                "file"    : asset.name,
+                                "target"  : target,
+                                "date"    : formattedDate,
+                                "notes"   : release.body
+                            };
 
                             var select_e = 
                                 $("<option value='{0}_{1}'>{2} {3} {4}</option>".format(
@@ -71,7 +72,7 @@ TABS.firmware_flasher.initialize = function (callback) {
                                     assetIndex,
                                     summary.name,
                                     summary.target,
-                                    formattedDate
+                                    summary.date
                                 )).data('summary', summary);
                             
                             releases_e.append(select_e);
@@ -239,8 +240,12 @@ TABS.firmware_flasher.initialize = function (callback) {
                                 $('div.git_info').slideDown();
                             });
                         }
-                        $('div.release_info .message').text(summary.message);
                         
+                        $('div.release_info .target').text(summary.target);
+                        $('div.release_info .date').text(summary.date);
+                        $('div.release_info .file').text(summary.file).prop('href', summary.url);
+                        $('div.release_info .notes').text(summary.notes);
+
                         $('div.release_info').slideDown();
 
                     } else {