From 669be3d45d5a497852ddf234328c78eb3ec8fa5b Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Wed, 26 Apr 2017 12:21:01 -0400
Subject: [PATCH] fine tune tooltips in 3rd-party lists pane

---
 src/3p-filters.html           |  4 ++--
 src/_locales/en/messages.json | 28 ++++++++++++----------------
 src/js/3p-filters.js          | 12 +++++++++---
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/3p-filters.html b/src/3p-filters.html
index 64931d569..714052ece 100644
--- a/src/3p-filters.html
+++ b/src/3p-filters.html
@@ -51,8 +51,8 @@
          --><span class="counts dim"></span>&#8203;<!--
          --><span class="fa status obsolete" title="3pExternalListObsolete">&#xf071;</span>&#8203;<!--
          --><span class="fa status cache">&#xf017;</span>&#8203;<!--
-         --><span class="fa status updating">&#xf110;</span>&#8203;<!--
-         --><span class="fa status failed">&#xf06a;</span>
+         --><span class="fa status updating" title="3pUpdating">&#xf110;</span>&#8203;<!--
+         --><span class="fa status failed" title="3pNetworkError">&#xf127;</span>
             </li>
         </ul>
     </div>
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 653cf75c4..05eb18ade 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -335,25 +335,21 @@
     "message":"One URL per line. Lines prefixed with &lsquo;!&rsquo; will be ignored. Invalid URLs will be silently ignored.",
     "description":"English: One URL per line. Lines prefixed with &lsquo;!&rsquo; will be ignored. Invalid URLs will be silently ignored."
   },
-  "3pExternalListsApply":{
-    "message":"Parse",
-    "description":"English: Parse"
-  },
-  "3pExternalListPurge":{
-    "message":"purge cache",
-    "description":"English: purge cache"
-  },
-  "3pExternalListNew":{
-    "message":"new version available",
-    "description":"English: new version available"
-  },
   "3pExternalListObsolete":{
-    "message":"out of date",
-    "description":"a filter list is 'out of date' (possibly needs to be updated)"
+    "message":"Out of date.",
+    "description":"used as a tooltip for the out-of-date icon beside a list"
   },
   "3pLastUpdate":{
-    "message":"Last update: {{ago}}",
-    "description":"English: Last update: {{ago}}, where 'ago' will be replaced with something like '2 days ago'"
+    "message":"Last update: {{ago}}.\nClick to force an update.",
+    "description":"used as a tooltip for the clock icon beside a list"
+  },
+  "3pUpdating":{
+    "message":"Updating...",
+    "description":"used as a tooltip for the spinner icon beside a list"
+  },
+  "3pNetworkError":{
+    "message":"A network error prevented the resource from being updated.",
+    "description":"used as a tooltip for error icon beside a list"
   },
   "1pFormatHint":{
     "message":"One filter per line. A filter can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with &lsquo;!&rsquo; will be ignored.",
diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js
index 57cccf2f6..8e877389d 100644
--- a/src/js/3p-filters.js
+++ b/src/js/3p-filters.js
@@ -43,6 +43,7 @@ var onMessage = function(msg) {
         break;
     case 'assetsUpdated':
         document.body.classList.remove('updating');
+        renderWidgets();
         break;
     case 'staticFilteringDataChanged':
         renderFilterLists();
@@ -137,12 +138,17 @@ var renderFilterLists = function(soft) {
         );
         li.classList.toggle('failed', asset.error !== undefined);
         li.classList.toggle('obsolete', asset.obsolete === true);
-        li.classList.toggle('cached', asset.cached === true && asset.writeTime > 0);
-        if ( asset.cached ) {
+        if ( asset.cached === true ) {
+            li.classList.add('cached');
             li.querySelector('.status.cache').setAttribute(
                 'title',
-                lastUpdateTemplateString.replace('{{ago}}', renderElapsedTimeToString(asset.writeTime))
+                lastUpdateTemplateString.replace(
+                    '{{ago}}',
+                    renderElapsedTimeToString(asset.writeTime)
+                )
             );
+        } else {
+            li.classList.remove('cached');
         }
         li.classList.remove('discard');
         return li;