From 2827bff7b8328ba43802ba570aa2df4e700e6beb Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall.law@gmail.com>
Date: Wed, 21 Nov 2012 12:32:24 -0600
Subject: [PATCH 1/3] Bug 809974: Display "Last Updated" date and time in
 Device Info. r=kaze

---
 apps/settings/index.html         |  4 ++--
 apps/settings/js/settings.js     | 21 +++++++++++++++++++++
 apps/settings/style/settings.css |  7 +++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/apps/settings/index.html b/apps/settings/index.html
index 3a789f674d5e..52f1a9feed94 100644
--- a/apps/settings/index.html
+++ b/apps/settings/index.html
@@ -1750,8 +1750,8 @@ <h1 data-l10n-id="deviceInfo"> Device Information </h1>
           </a>
         </li>
         <li>
-          <a id="last-update-date" data-l10n-id="last-updated"> Last Updated
-            <span data-name="deviceinfo.last_updated"></span>
+          <a data-l10n-id="last-updated"> Last Updated
+            <span id="last-update-date"><span>
           </a>
         </li>
         <li>
diff --git a/apps/settings/js/settings.js b/apps/settings/js/settings.js
index 303fa02536fa..91f0e6a051ed 100644
--- a/apps/settings/js/settings.js
+++ b/apps/settings/js/settings.js
@@ -290,6 +290,26 @@ var Settings = {
     req.send();
   },
 
+  loadLastUpdated: function settings_loadLastUpdated() {
+    var settings = this.mozSettings;
+    if (!settings) {
+      return;
+    }
+
+    var lastUpdateDate = document.getElementById('last-update-date');
+    var lock = settings.createLock();
+    var key = 'deviceinfo.last_updated';
+    var request = lock.get(key);
+    request.onsuccess = function() {
+      var lastUpdated = request.result[key];
+      var f = new navigator.mozL10n.DateTimeFormat();
+      var _ = navigator.mozL10n.get;
+
+      lastUpdateDate.textContent = f.localeFormat(new Date(lastUpdated),
+                                                  _('shortDateTimeFormat'));
+    };
+  },
+
   openDialog: function settings_openDialog(dialogID) {
     var settings = this.mozSettings;
     var dialog = document.getElementById(dialogID);
@@ -484,6 +504,7 @@ window.addEventListener('load', function loadSettings() {
         document.getElementById('ftuLauncher').onclick =
           Settings.launchFTU.bind(Settings);
         Settings.loadGaiaCommit();
+        Settings.loadLastUpdated();
         break;
       case 'help':                // handle specific link
         document.querySelector('[data-l10n-id="user-guide"]').onclick =
diff --git a/apps/settings/style/settings.css b/apps/settings/style/settings.css
index c7660871056c..67caa3cfeea2 100644
--- a/apps/settings/style/settings.css
+++ b/apps/settings/style/settings.css
@@ -227,6 +227,12 @@ ul li > label .range-icons.brightness {
   pointer-events: none;
 }
 
+/******************************************************************************
+ * Device Information
+ */
+#last-update-date {
+  font-size: 1.4rem;
+}
 
 /******************************************************************************
  * Improve Firefox OS
@@ -259,3 +265,4 @@ html[dir="rtl"] label[for^="pwd"] {
   padding-right: 3rem;
 }
 
+

From 7028e09553b05fd6b32aef077dc9f2603217c66b Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall.law@gmail.com>
Date: Tue, 27 Nov 2012 11:37:21 -0600
Subject: [PATCH 2/3] Don't show last updated when the setting is empty

---
 apps/settings/js/settings.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/settings/js/settings.js b/apps/settings/js/settings.js
index 91f0e6a051ed..7b19b70991d1 100644
--- a/apps/settings/js/settings.js
+++ b/apps/settings/js/settings.js
@@ -302,9 +302,12 @@ var Settings = {
     var request = lock.get(key);
     request.onsuccess = function() {
       var lastUpdated = request.result[key];
+      if (!lastUpdated) {
+        return;
+      }
+
       var f = new navigator.mozL10n.DateTimeFormat();
       var _ = navigator.mozL10n.get;
-
       lastUpdateDate.textContent = f.localeFormat(new Date(lastUpdated),
                                                   _('shortDateTimeFormat'));
     };

From 692d7657ff872a897b12a4d4c280f6a33090f940 Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall.law@gmail.com>
Date: Wed, 28 Nov 2012 15:38:51 -0600
Subject: [PATCH 3/3] Use a multi-line label for Last Updated

---
 apps/settings/index.html         | 5 ++---
 apps/settings/style/settings.css | 7 -------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/settings/index.html b/apps/settings/index.html
index 52f1a9feed94..060dda66b2e1 100644
--- a/apps/settings/index.html
+++ b/apps/settings/index.html
@@ -1750,9 +1750,8 @@ <h1 data-l10n-id="deviceInfo"> Device Information </h1>
           </a>
         </li>
         <li>
-          <a data-l10n-id="last-updated"> Last Updated
-            <span id="last-update-date"><span>
-          </a>
+          <small id="last-update-date"></small>
+          <a data-l10n-id="last-updated"> Last Updated </a>
         </li>
         <li>
           <label>
diff --git a/apps/settings/style/settings.css b/apps/settings/style/settings.css
index 67caa3cfeea2..58355fe7675a 100644
--- a/apps/settings/style/settings.css
+++ b/apps/settings/style/settings.css
@@ -227,13 +227,6 @@ ul li > label .range-icons.brightness {
   pointer-events: none;
 }
 
-/******************************************************************************
- * Device Information
- */
-#last-update-date {
-  font-size: 1.4rem;
-}
-
 /******************************************************************************
  * Improve Firefox OS
  */