diff options
Diffstat (limited to 'libre/iceweasel/9004-FSDG-misc.patch')
| -rw-r--r-- | libre/iceweasel/9004-FSDG-misc.patch | 139 |
1 files changed, 117 insertions, 22 deletions
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 7d1da5668..591daa0c3 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -334,15 +334,13 @@ index 44d36d3b28..6823855d56 100644 // These app marketplace icons are referenced based on the user's locale // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx -diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm -index 940332f27f..1f7378bbae 100644 +diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm -@@ -95,220 +95,6 @@ const ONBOARDING_MESSAGES = () => [ - ], +@@ -649,321 +649,6 @@ }, }, -- { + { - id: "PB_NEWTAB_FOCUS_PROMO", - type: "default", - template: "pb_newtab", @@ -423,10 +421,6 @@ index 940332f27f..1f7378bbae 100644 - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, -- image_overrides: { -- de: -- "chrome://browser/content/assets/klar-qr-code.svg", -- }, - }, - marketplace_buttons: ["ios", "android"], - }, @@ -449,7 +443,9 @@ index 940332f27f..1f7378bbae 100644 - ], - lifetime: 12, - }, -- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')", +- // Exclude the next 2 messages: 1) Klar for en 2) Klar for de +- targeting: +- "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en') && localeLanguageCode != 'de'", - }, - { - id: "PB_NEWTAB_KLAR_PROMO", @@ -529,6 +525,109 @@ index 940332f27f..1f7378bbae 100644 - QR_code: { - image_url: - "chrome://browser/content/assets/klar-qr-code.svg", +- alt_text: "Scan the QR code to get Firefox Klar", +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- }, +- }, +- }, +- }, +- priority: 2, +- frequency: { +- custom: [ +- { +- cap: 3, +- period: 604800000, // Max 3 per week +- }, +- ], +- lifetime: 12, +- }, +- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", +- }, +- { +- id: "PB_NEWTAB_KLAR_PROMO_DE", +- type: "default", +- template: "pb_newtab", +- groups: ["pbNewtab"], +- content: { +- infoBody: "fluent:about-private-browsing-info-description-simplified", +- infoEnabled: true, +- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", +- infoLinkText: "fluent:about-private-browsing-learn-more-link", +- infoTitle: "", +- infoTitleEnabled: false, +- promoEnabled: true, +- promoType: "FOCUS", +- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", +- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", +- promoLinkText: "fluent:about-private-browsing-focus-promo-cta", +- promoLinkType: "button", +- promoSectionStyle: "below-search", +- promoTitle: "fluent:about-private-browsing-focus-promo-text-c", +- promoTitleEnabled: true, +- promoButton: { +- action: { +- type: "SHOW_SPOTLIGHT", +- data: { +- content: { +- id: "FOCUS_PROMO", +- template: "multistage", +- modal: "tab", +- backdrop: "transparent", +- screens: [ +- { +- id: "DEFAULT_MODAL_UI", +- content: { +- logo: { +- imageURL: +- "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: { +- string_id: "spotlight-focus-promo-title", +- }, +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/klar-qr-code.svg", - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, @@ -554,21 +653,19 @@ index 940332f27f..1f7378bbae 100644 - ], - lifetime: 12, - }, -- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", +- targeting: "localeLanguageCode == 'de'", - }, - { +- { id: "PB_NEWTAB_INFO_SECTION", template: "pb_newtab", - -diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm -index a991581f7b..af57c3eea8 100644 + content: { +diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm --- a/browser/components/newtab/lib/PanelTestProvider.jsm +++ b/browser/components/newtab/lib/PanelTestProvider.jsm -@@ -558,90 +558,6 @@ const MESSAGES = () => [ - frequency: { lifetime: 3 }, +@@ -557,87 +557,6 @@ trigger: { id: "defaultBrowserCheck" }, }, -- { + { - id: "PB_FOCUS_PROMO", - groups: ["panel-test-provider"], - template: "spotlight", @@ -636,9 +733,6 @@ index a991581f7b..af57c3eea8 100644 - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, -- image_overrides: { -- de: "chrome://browser/content/assets/klar-qr-code.svg", -- }, - }, - email: { - link_text: "Email yourself a link", @@ -652,9 +746,10 @@ index a991581f7b..af57c3eea8 100644 - }, - trigger: { id: "defaultBrowserCheck" }, - }, - { +- { id: "PB_NEWTAB_VPN_PROMO", template: "pb_newtab", + content: { diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg deleted file mode 100644 index f182567314..0000000000 |