From 4dcf34792f9065511f91fe4cdd57557dac801b4b Mon Sep 17 00:00:00 2001 From: gasolin Date: Mon, 12 Jun 2017 12:14:42 +0800 Subject: [PATCH] Bug 1357029 - Should add the Default Browser tour in the onBoarding overlay;r=Fischer,mossop,rexboy MozReview-Commit-ID: FYUHqd3g64Y --HG-- extra : rebase_source : 74e3823540aadb6056831fd7598f299e84742c9c --- .../onboarding/content/img/figure_default.svg | 1 + .../content/img/icons_default-colored.svg | 1 + .../onboarding/content/img/icons_default.svg | 1 + .../onboarding/content/onboarding.css | 9 +++++++++ .../extensions/onboarding/content/onboarding.js | 17 +++++++++++++++++ .../locales/en-US/onboarding.properties | 11 +++++++++++ 6 files changed, 40 insertions(+) create mode 100644 browser/extensions/onboarding/content/img/figure_default.svg create mode 100644 browser/extensions/onboarding/content/img/icons_default-colored.svg create mode 100644 browser/extensions/onboarding/content/img/icons_default.svg diff --git a/browser/extensions/onboarding/content/img/figure_default.svg b/browser/extensions/onboarding/content/img/figure_default.svg new file mode 100644 index 000000000000..ecb753d1a3cd --- /dev/null +++ b/browser/extensions/onboarding/content/img/figure_default.svg @@ -0,0 +1 @@ +Onvoarding- \ No newline at end of file diff --git a/browser/extensions/onboarding/content/img/icons_default-colored.svg b/browser/extensions/onboarding/content/img/icons_default-colored.svg new file mode 100644 index 000000000000..3df3f692df27 --- /dev/null +++ b/browser/extensions/onboarding/content/img/icons_default-colored.svg @@ -0,0 +1 @@ +icons \ No newline at end of file diff --git a/browser/extensions/onboarding/content/img/icons_default.svg b/browser/extensions/onboarding/content/img/icons_default.svg new file mode 100644 index 000000000000..ddf04410f418 --- /dev/null +++ b/browser/extensions/onboarding/content/img/icons_default.svg @@ -0,0 +1 @@ +icons \ No newline at end of file diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index d144b69e2ceb..9d3be25d84ba 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -243,3 +243,12 @@ #onboarding-tour-customize:hover { background-image: url("img/icons_customize-colored.svg"); } + +#onboarding-tour-default-browser { + background-image: url("img/icons_default.svg"); +} + +#onboarding-tour-default-browser.onboarding-active, +#onboarding-tour-default-browser:hover { + background-image: url("img/icons_default-colored.svg"); +} diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 6e649648b5c8..26359eebcf81 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -116,6 +116,23 @@ var onboardingTours = [ return div; }, }, + { + id: "onboarding-tour-default-browser", + tourNameId: "onboarding.tour-default-browser", + getPage(win) { + let div = win.document.createElement("div"); + div.innerHTML = ` +
+

+

+
+
+ +
+ `; + return div; + }, + }, ]; /** diff --git a/browser/extensions/onboarding/locales/en-US/onboarding.properties b/browser/extensions/onboarding/locales/en-US/onboarding.properties index c875a3363d63..cee8e28204ad 100644 --- a/browser/extensions/onboarding/locales/en-US/onboarding.properties +++ b/browser/extensions/onboarding/locales/en-US/onboarding.properties @@ -32,3 +32,14 @@ onboarding.tour-customize.title=Do things your way. # LOCALIZATION NOTE(onboarding.tour-customize.description): This string will be used in the customize tour description. %S is brandShortName onboarding.tour-customize.description=Drag, drop, and reorder %S’s toolbar and menu to fit your needs. You can even select a compact theme to give websites more room. onboarding.tour-customize.button=Show Customize in Menu +onboarding.tour-default-browser=Default Browser +onboarding.tour-default-browser.title=We’re there for you. + +# LOCALIZATION NOTE(onboarding.tour-default-browser.description): This string will be used in the default browser tour description. %1$S is brandShortName +onboarding.tour-default-browser.description=Love %1$S? Set it as your default browser. Then when you open a link from another application, %1$S has you covered. + +# LOCALIZATION NOTE(onboarding.tour-default-browser.button): Label for a button to open the OS default browser settings where it's not possible to set the default browser directly. (OSX, Linux, Windows 8 and higher) +onboarding.tour-default-browser.button=Open Default Browser Settings + +# LOCALIZATION NOTE(onboarding.tour-default-browser.win7.button): Label for a button to directly set the default browser (Windows 7). %S is brandShortName +onboarding.tour-default-browser.win7.button=Make %S Your Default Browser