From fc4bd0054f1a5bb55648c72e5c9a2aa7ce692498 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Tue, 12 Aug 2014 17:44:10 +0200
Subject: [PATCH] Review faq link

---
 src/js/app-config.js             | 1 +
 src/js/bo/auth.js                | 4 +++-
 src/js/util/error.js             | 2 +-
 src/sass/components/_dialog.scss | 4 ++++
 src/tpl/dialog.html              | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/js/app-config.js b/src/js/app-config.js
index 8482720..bfa1995 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -123,6 +123,7 @@ define(function(require) {
         updateCertificateMessage: 'The SSL certificate for the mail server {0} changed. Do you want to proceed?',
         updateCertificatePosBtn: 'Yes',
         updateCertificateNegBtn: 'No',
+        certificateFaqLink: 'https://github.com/whiteout-io/mail-html5/wiki/FAQ#what-does-the-ssl-certificate-for-the-mail-server--changed-mean',
         bugReportTitle: 'Report a bug',
         bugReportSubject: '[Bug] I want to report a bug',
         bugReportBody: 'Steps to reproduce\n1. \n2. \n3. \n\nWhat happens?\n\n\nWhat do you expect to happen instead?\n\n\n\n== PLEASE DONT PUT ANY KEYS HERE! ==\n\n\n## Log\n\nBelow is the log. It includes your interactions with your email provider in an anonymized way from the point where you started the app for the last time. Any information provided by you will be used for the porpose of locating and fixing the bug you reported. It will be deleted subsequently. However, you can edit this log and/or remove log data in the event that something would show up.\n\n',
diff --git a/src/js/bo/auth.js b/src/js/bo/auth.js
index 94eea07..8d60560 100644
--- a/src/js/bo/auth.js
+++ b/src/js/bo/auth.js
@@ -394,7 +394,8 @@ define(function(require) {
             // do not update the pinned certificates!
             callback({
                 title: str.outdatedCertificateTitle,
-                message: str.outdatedCertificateMessage.replace('{0}', self[component].host)
+                message: str.outdatedCertificateMessage.replace('{0}', self[component].host),
+                faqLink: str.certificateFaqLink,
             });
             return;
         }
@@ -406,6 +407,7 @@ define(function(require) {
             positiveBtnStr: str.updateCertificatePosBtn,
             negativeBtnStr: str.updateCertificateNegBtn,
             showNegativeBtn: true,
+            faqLink: str.certificateFaqLink,
             callback: function(granted) {
                 if (!granted) {
                     return;
diff --git a/src/js/util/error.js b/src/js/util/error.js
index 3fcf4d2..8eac76f 100644
--- a/src/js/util/error.js
+++ b/src/js/util/error.js
@@ -17,7 +17,7 @@ define(function(require) {
                 open: true,
                 title: options.title || 'Error',
                 message: options.errMsg || options.message,
-                showFaqLink: options.showFaqLink || false,
+                faqLink: options.faqLink,
                 positiveBtnStr: options.positiveBtnStr || 'Ok',
                 negativeBtnStr: options.negativeBtnStr || 'Cancel',
                 showNegativeBtn: options.showNegativeBtn || false,
diff --git a/src/sass/components/_dialog.scss b/src/sass/components/_dialog.scss
index 781878e..5961505 100644
--- a/src/sass/components/_dialog.scss
+++ b/src/sass/components/_dialog.scss
@@ -2,6 +2,10 @@
     padding: 0px;
     color: $color-grey-dark;
 
+    a {
+        color: $color-blue;
+    }
+
     .control {
         float: right;
 
diff --git a/src/tpl/dialog.html b/src/tpl/dialog.html
index d28afdb..bfbcb1f 100644
--- a/src/tpl/dialog.html
+++ b/src/tpl/dialog.html
@@ -5,7 +5,7 @@
   </header>
 
   <div class="content">
-    <p>{{state.dialog.message}} <a ng-show="state.dialog.showFaqLink" href="https://github.com/whiteout-io/mail-html5/wiki/FAQ" target="_blank">Learn more.</a></p>
+    <p>{{state.dialog.message}} <a ng-show="state.dialog.faqLink" href="{{state.dialog.faqLink}}" target="_blank">Learn more</a></p>
     <div class="control">
       <button wo-touch="confirm(false)" class="btn btn-alt" ng-show="state.dialog.showNegativeBtn">{{state.dialog.negativeBtnStr}}</button>
       <button wo-touch="confirm(true)" class="btn">{{state.dialog.positiveBtnStr}}</button>