fix first-run page link issue

codebeast · Nov 19, 2016 · ad78cd4 · ad78cd4
1 parent 34d9873
commit ad78cd4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/_locales/en/adnauseam.json b/src/_locales/en/adnauseam.json
@@ -28,15 +28,15 @@
     "description": "English: Firstrun.html -> Block Malware"
   },
   "adnFirstRunHideAllAdsDescription": {
-    "message": "hide Ads in your selected <a href='\/dashboard.html#3p-filters.html'>filter lists<\/a>",
+    "message": "hide Ads in your selected <span class='link' id='To3pfilter'>filter lists<\/span>",
     "description": "English: Firstrun.html -> hide Ads in your selected filter lists"
   },
   "adnFirstRunClickingAdsDescription": {
-    "message": "register visits on Ads found via your <a href='\/dashboard.html#3p-filters.html'>filter lists<\/a>",
+    "message": "register visits on Ads found via your <span class='link' id='To3pfilter'>filter lists<\/span>",
     "description": "English: Firstrun.html -> register visits on Ads found via your filter lists"
   },
   "adnFirstRunBlockingMalwareDescription": {
-    "message": "optimize your settings to protect against malware and non-visual trackers (<a href='\/dashboard.html#security'>customize<\/a>)",
+    "message": "optimize your settings to protect against malware and non-visual trackers (<span class='link' id='ToOptions'>customize<\/span>)",
     "description": "English: Firstrun.html -> optimize your settings to protect against malware and non-visual trackers (customize)"
   },
   "adnNotificationButtonReactivate": {

diff --git a/src/css/firstrun.css b/src/css/firstrun.css
@@ -28,6 +28,12 @@ form a {
   color: inherit;
   text-decoration: underline;
 }
+.link{
+  text-decoration: underline;
+}
+.link:hover{
+ color: #3B96FF;
+}
 .toggled0{
     display:none;
 }

diff --git a/src/js/adn/firstrun.js b/src/js/adn/firstrun.js
@@ -143,7 +143,7 @@
     vAPI.i18n.render();
 
   }
-
+  
   /******************************************************************************/
 
   // TODO: use data-* to declare simple settings
@@ -177,6 +177,13 @@
       uNode.val(details[uNode.attr('data-setting-name')])
         .on('change', onInputChanged);
     });
+
+    uDom(document).on('click', '#To3pfilter', function() {
+        openPage('/dashboard.html#3p-filters.html');
+    });
+    uDom(document).on('click', '#ToOptions',function (e) {
+       openPage('/dashboard.html#options.html');
+    });
 
     uDom('#confirm-close').on('click', function (e) {
       if (hasEnabledToggle()) {

diff --git a/src/js/adn/shared.js b/src/js/adn/shared.js
@@ -204,19 +204,23 @@ function reactivateList() {
     }, reloadPane);
 }
 
-function openExtPage() {
-  vAPI.messaging.send(
+function openPage(url){
+    vAPI.messaging.send(
     'default', {
       what: 'gotoURL',
       details: {
-        url: vAPI.extensionsPage,
+        url: url,
         select: true,
         index: -1
       }
     }
   );
 }
 
+function openExtPage() {
+  openPage(vAPI.extensionsPage);
+}
+
 function reloadPane() {
 
   if (window && window.location) {