Merge pull request #1356 from EFForg/issue-1088

Show version of Privacy Badger in dropdown
EFForg · May 2, 2017 · b9a1561 · b9a1561
2 parents ee6d8f4 + 33a881b
commit b9a1561
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/_locales/en_US/messages.json b/src/_locales/en_US/messages.json
@@ -295,6 +295,8 @@
     },
     "donate_to_eff": {
       "message": "Donate to EFF"
+    },
+    "version": {
+      "message": "version"
     }
-
 }
diff --git a/src/js/popup.js b/src/js/popup.js
@@ -103,6 +103,9 @@ function init() {
       $("#deactivate_site_btn").hide();
     }
   });
+
+  var version = i18n.getMessage("version") + " " +  chrome.runtime.getManifest().version;
+  $("#version").text(version);
 }
 $(init);
 

diff --git a/src/skin/popup.css b/src/skin/popup.css
@@ -164,10 +164,11 @@ color: #505050;
 font-size: 16px;
 }
 #privacyBadgerHeader h2{
-  margin: 10px;
+  margin: 5px;
+  padding-left: 5px;
   float: left;
   color: #707070;
-  font-size: 26px;
+  font-size: 24px;
   font-weight: normal;
   font-family: helvetica, arial, 'Lucida Grande', 'Segoe UI', Tahoma, 'DejaVu Sans', sans-serif;;
 }
@@ -284,6 +285,7 @@ font-size: 16px;
 #pbInstructions{
   color: #505050;
   font-size: 16px;
+  padding-top: 10px;
   margin: 0;
 }
 
@@ -378,3 +380,11 @@ font-size: 16px;
 #siteControls button {
   font-size: 12px;
 }
+
+#version{
+  float: left;
+  margin-top: -15px;
+  padding-left: 60px;
+  color: #707070;
+  font-size: 10px;
+}
diff --git a/src/skin/popup.html b/src/skin/popup.html
@@ -64,8 +64,9 @@ <h1 id="report_title" class="i18n_report_title"></h1>
 <div id='privacyBadgerHeader'>
   <a id="options" title="options" href='/skin/options.html' class="control-button grey-button" style="display:block" target="_blank"><img src='/icons/options.svg'></a>
   <a id="help" title="help" href='/skin/firstRun.html' class="control-button grey-button" style="display:block" target="_blank"><img src='/icons/help.svg'></a>
-    <div id='title'><img src='/icons/badger-48.png'> <h2><span class="i18n_privacy_badger"></span></h2></div>
+  <div id='title'><img src='/icons/badger-48.png'> <h2><span class="i18n_privacy_badger"></span></h2></div>
   <div class='clear'></div>
+  <div id="subtitle"><span id="version" class="i18n_version"></span></div>
 </div>
 <div id="blockedResourcesContainer">
   <p id="pbInstructions"> <span class="i18n_pb_detected"></span> <span id='number_trackers'></span> <span class="i18n_popup_instructions"></span></p>