use one link tracking protections msg for all cases, match current style of popup messaging

Author: ablanathtanalba

src/_locales/en_US/messages.json

@@ -424,13 +424,9 @@
         }
     },
     "popup_info_firstparty_protections": {
-        "message": "and is enforcing <a href='https://www.eff.org/deeplinks/2018/05/privacy-badger-rolls-out-new-ways-fight-facebook-tracking'>link tracking protections</a>.",
+        "message": "Protection from <a href='https://www.eff.org/deeplinks/2018/05/privacy-badger-rolls-out-new-ways-fight-facebook-tracking'>link tracking</a> is enforced on this site",
         "description": "message shown on a site where first party outgoing link tracking protections are enabled"
     },
-    "popup_info_firstparty_protections_no_trackers": {
-        "message": "<a href='https://www.eff.org/deeplinks/2018/05/privacy-badger-rolls-out-new-ways-fight-facebook-tracking'>Link tracking protections</a> are enforced.",
-        "description": "message shown on a site where first party outgoing link tracking protections are enabled, but there are no third party trackers detected."
-    },
     "popup_blocked": {
         "message": "There are no third party resources on this page. Hooray for privacy!",
         "description": "Text shown in the popup when showing non-tracking domains is enabled, and there are no third-party domains on the page."

src/js/popup.js

@@ -169,6 +169,11 @@ function init() {
     $overlay.toggleClass('active');
   }
 
+  // show firstparty link tracking protection if we scrub links on this tab host
+  if (POPUP_DATA.tabHost == 'www.facebook.com' || POPUP_DATA.tabHost == 'www.google.com') {
+    $("#instructions_firstparty_protections").show();
+  }
+
   $("#error").on("click", function() {
     $overlay.toggleClass('active');
   });
@@ -599,23 +604,13 @@ function refreshPopup() {
 
     // show "no trackers" message
     $("#instructions-no-trackers").show();
-
-    // show first party protections message if link tracker cleaning is enabled on this tabHost
-    if (POPUP_DATA.tabHost == 'www.facebook.com' || POPUP_DATA.tabHost == 'www.google.com') {
-      $("#instructions_firstparty_protections_no_trackers").show();
-    }
   } else {
     $('#instructions-many-trackers').html(chrome.i18n.getMessage(
       "popup_instructions", [
         POPUP_DATA.trackerCount,
         "<a target='_blank' title='" + _.escape(chrome.i18n.getMessage("what_is_a_tracker")) + "' class='tooltip' href='https://privacybadger.org/#What-is-a-third-party-tracker'>"
       ]
     )).find(".tooltip").tooltipster();
-
-    // show first party protections message if link tracker cleaning is enabled on this tabHost
-    if (POPUP_DATA.tabHost == 'www.facebook.com' || POPUP_DATA.tabHost == 'www.google.com') {
-      $("#instructions_firstparty_protections").show();
-    }
   }
 
   function renderDomains() {

src/skin/popup.css

@@ -297,7 +297,7 @@ font-size: 16px;
 #pbInstructions :not(#options_domain_list_trackers):not(#options_domain_list_no_trackers) a:hover {
     color: #ec9329
 }
-#instructions-no-trackers, #special-browser-page, #disabled-site-message, #instructions_firstparty_protections_no_trackers {
+#instructions-no-trackers, #special-browser-page, #disabled-site-message, #instructions_firstparty_protections {
     text-align: center;
     margin: 45px 0;
     padding: 0;
@@ -306,7 +306,7 @@ font-size: 16px;
     text-align: center;
     margin: 10px 0;
 }
-#instructions-many-trackers, #instructions-no-trackers, #no-third-parties, #instructions_firstparty_protections_no_trackers {
+#instructions-many-trackers, #instructions-no-trackers, #no-third-parties, #instructions_firstparty_protections {
     display: block;
 }
 #no-third-parties {

src/skin/popup.html

@@ -128,7 +128,6 @@ <h2 id="title-name"><span class="i18n_name"></span></h2>
     <span id="instructions-no-trackers" style="display:none">
       <span class="i18n_popup_instructions_no_trackers" data-i18n_contents_placeholders="<a target='_blank' title='i18n_what_is_a_tracker' class='tooltip' href='https://privacybadger.org/#What-is-a-third-party-tracker'>"></span>
       <span id="no-third-parties" class="i18n_popup_blocked" style="display:none"></span>
-      <span id="instructions_firstparty_protections_no_trackers" class="i18n_popup_info_firstparty_protections_no_trackers" style="display:none"></span>
     </span>
     <span id="instructions_firstparty_protections" class="i18n_popup_info_firstparty_protections" style="display:none"></span>
   </p>