- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit fd7cccb3f4a908ff38edfefc36b194666c886f69 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Apr 2 20:59:30 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 29982 - Adding additional safe guards --- .../mozilla/gecko/torbootstrap/TorPreferences.java | 42 +++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 32a3bed3e685..9a8468292e7d 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -15,6 +15,7 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.preference.SwitchPreference; +import android.support.v7.app.ActionBar; import android.text.style.ClickableSpan; import android.text.SpannableString; import android.text.Spanned; @@ -138,7 +139,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { // Save the current preference when the app is minimized or swiped away. @Override public void onStop() { - mFrag.onSaveState(); + if (mFrag != null) { + mFrag.onSaveState(); + } super.onStop(); } @@ -163,7 +166,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { // the back button @Override public void onBackPressed() { - mFrag.onSaveState(); + if (mFrag != null) { + mFrag.onSaveState(); + } super.onBackPressed(); } @@ -200,7 +205,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { // https://android.googlesource.com/platform/frameworks/base/+/6af15ebcfec64d0… @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { + if (item != null && item.getItemId() == android.R.id.home) { Log.i(LOGTAG, "onOptionsItemSelected(): Home"); onNavigateUp(); return true; @@ -214,8 +219,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { protected TorPreferences mTorPrefAct; @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); // This is only ever a TorPreferences mTorPrefAct = (TorPreferences) getActivity(); @@ -317,6 +322,11 @@ public class TorPreferences extends AppCompatPreferenceActivity { // Disable the bridges.enabled Preference protected void disableBridges(PreferenceFragment frag) { + if (frag == null) { + Log.w(LOGTAG, "disableBridges: frag is null"); + return; + } + SwitchPreference bridgesEnabled = (SwitchPreference) frag.findPreference(PREFS_BRIDGES_ENABLED); Preference bridgesType = frag.findPreference(PREFS_BRIDGES_TYPE); Preference bridgesProvide = frag.findPreference(PREFS_BRIDGES_PROVIDE); @@ -349,7 +359,14 @@ public class TorPreferences extends AppCompatPreferenceActivity { // Set the current title protected void setTitle(int resId) { - mTorPrefAct.getSupportActionBar().setTitle(resId); + ActionBar actionBar = mTorPrefAct.getSupportActionBar(); + + if (actionBar == null) { + Log.w(LOGTAG, "setTitle: actionBar is null"); + return; + } + + actionBar.setTitle(resId); } } @@ -446,6 +463,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { public void onChildViewAdded(View parent, View child) { Log.i(LOGTAG, "onChildViewAdded: Adding ListView child view"); + setTitle(R.string.pref_tor_network_title); + // Make sure the Switch widget is synchronized with the preference final Switch bridgesEnabledSwitch = (Switch) parent.findViewById(android.R.id.switch_widget); @@ -541,6 +560,11 @@ public class TorPreferences extends AppCompatPreferenceActivity { // If PREFS_BRIDGES_PROVIDE is not null, then true // Else false private boolean isBridgeProvided(SwitchPreference bridgesEnabled) { + if (bridgesEnabled == null) { + Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is null"); + return false; + } + if (!bridgesEnabled.isChecked()) { Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is not checked"); return false; @@ -572,7 +596,6 @@ public class TorPreferences extends AppCompatPreferenceActivity { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - setTitle(R.string.pref_tor_select_a_bridge_title); ListView lv = getListView(view); if (lv == null) { @@ -585,6 +608,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { @Override public void onChildViewAdded(View parent, View child) { + setTitle(R.string.pref_tor_select_a_bridge_title); + // Set the previously chosen RadioButton as checked final RadioGroup group = getBridgeTypeRadioGroup(); if (group == null) { @@ -828,7 +853,6 @@ public class TorPreferences extends AppCompatPreferenceActivity { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - setTitle(R.string.pref_tor_provide_a_bridge_title); ListView lv = getListView(view); if (lv == null) { Log.i(LOGTAG, "onViewCreated: ListView not found"); @@ -847,6 +871,8 @@ public class TorPreferences extends AppCompatPreferenceActivity { lv.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() { @Override public void onChildViewAdded(View parent, View child) { + setTitle(R.string.pref_tor_provide_a_bridge_title); + // If we have a bridge line saved for this pref, // then show the user setBridgeProvideText(parent);

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit d3ea3528ce2cde0675d297ea934090c77f4b5f76 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 1 21:39:53 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 29906 Add API-level guard --- .../org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java index 584c0fc3cdde..8d42b13a2a8e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java @@ -106,11 +106,16 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg } }); - // This should be declared in the xml layout, however there is a bug - // preventing this (the XML attribute isn't actually defined in the - // SDK). - // https://issuetracker.google.com/issues/37036728 - connectButton.setClipToOutline(true); + if (Build.VERSION.SDK_INT > 20) { + // Round the button's edges, but only on API 21+. Earlier versions + // do not support this. + // + // This should be declared in the xml layout, however there is a bug + // preventing this (the XML attribute isn't actually defined in the + // SDK). + // https://issuetracker.google.com/issues/37036728 + connectButton.setClipToOutline(true); + } configureGearCogClickHandler();

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit d8163c5fe45122f4e7fa98b77e37a5736421edb9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 10 14:57:02 2019 -0400 fixup! Bug 29768: Introduce new features to users Fixes #30104. --- .../content/img/figure_tor-security-level.png | Bin 12185 -> 10888 bytes .../extensions/onboarding/content/onboarding.css | 6 ------ 2 files changed, 6 deletions(-) diff --git a/browser/extensions/onboarding/content/img/figure_tor-security-level.png b/browser/extensions/onboarding/content/img/figure_tor-security-level.png index 5c7b8c5635fe..4f940ea008ef 100644 Binary files a/browser/extensions/onboarding/content/img/figure_tor-security-level.png and b/browser/extensions/onboarding/content/img/figure_tor-security-level.png differ diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index ed7ef9e2add8..3bd1b4df7017 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -396,12 +396,6 @@ transform: scaleX(-1); } -/* The image contained in figure_tor-security-level.png contains English text; - * therefore it should not be flipped when the document direction is RTL. */ -#onboarding-tour-tor-security-update-8-5-page > .onboarding-tour-content > img:dir(rtl) { - transform: scaleX(1); -} - .onboarding-tour-content > iframe { width: 100%; height: 100%;

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 11 Apr '19

11 Apr '19

commit f29aef752c7bb1a6215bc537fff1d742ea0961fe Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 10 09:45:57 2019 -0400 fixup! Bug 29768: Introduce new features to users --- browser/extensions/onboarding/content/onboarding.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 939721677c4f..ed7ef9e2add8 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -27,6 +27,7 @@ padding: 16px 0 0 0; position: fixed; top: 4px; + offset-inline-start: 12px; } /* @@ -61,7 +62,6 @@ #onboarding-overlay-button { cursor: pointer; - offset-inline-start: 12px; border: none; /* Set to none so no grey contrast background in the high-contrast mode */ background: none;

1 0

[tor-browser-build/master] Bug 30016: Localize bootstrap-/bridge-related strings for mobile
by boklm＠torproject.org 10 Apr '19

10 Apr '19

commit a901b95e48702cba67a5838244a5773a6843e5ba Author: Georg Koppen <gk(a)torproject.org> Date: Sun Apr 7 06:30:08 2019 +0000 Bug 30016: Localize bootstrap-/bridge-related strings for mobile --- projects/firefox/build | 5 ++++- projects/firefox/config | 3 +++ projects/tba-translation/build | 8 ++++++++ projects/tba-translation/config | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 9bc025a..1d9faac 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -108,9 +108,10 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo # Move orbot files so they will be included in the apk during the build cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app - # Prepare building the multi-locale .apk + # Prepare building the multi-locale .apk including our own strings mkdir -p /var/tmp/dist/locales tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/tba-translation') %] [% END %] eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) @@ -163,6 +164,8 @@ rm -f js/src/configure # Building a multi-locale .apk [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang) %] + # Copy our torbrowser_strings.dtd at the right place + cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.dtd /var/tmp/dist/locales/[% lang %]/mobile/android/base/ ./mach build chrome-[% lang %]; [% END %] export MOZ_CHROME_MULTILOCALE='[% tmpl(c('var/locales').join(' ')) %]' diff --git a/projects/firefox/config b/projects/firefox/config index 679aaee..9eabf05 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -166,3 +166,6 @@ input_files: - project: firefox-locale-bundle name: firefox-locale-bundle enable: '[% c("var/android") %]' + - project: tba-translation + name: tba-translation + enable: '[% c("var/android") %]' diff --git a/projects/tba-translation/build b/projects/tba-translation/build new file mode 100644 index 0000000..ac0f21b --- /dev/null +++ b/projects/tba-translation/build @@ -0,0 +1,8 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +tar xf [% project %]-[% c("version") %].tar.gz +mv [% project %]-[% c("version") %] [% project %] +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/tba-translation/config b/projects/tba-translation/config new file mode 100644 index 0000000..fd31b01 --- /dev/null +++ b/projects/tba-translation/config @@ -0,0 +1,7 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +git_url: https://git.torproject.org/translation.git +# We need to bump the commit before releasing but just pointing to a branch +# might cause too much rebuidling of the Firefox part. +git_hash: 8da59b784ec6a8492805379903696647adbcfb97 +version: '[% c("abbrev") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_30016_v2'
by boklm＠torproject.org 10 Apr '19

10 Apr '19

commit 516887a876b9ed5ebb020e8e3723fc09ac2fe3ec Merge: c141452 a901b95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 11 01:23:00 2019 +0200 Merge remote-tracking branch 'gk/bug_30016_v2' projects/firefox/build | 5 ++++- projects/firefox/config | 3 +++ projects/tba-translation/build | 8 ++++++++ projects/tba-translation/config | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30089_v4'
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit c14145264cd1f8eaff3a465d0014d5bf1d061e8a Merge: ed424fd 99b49ad Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 10 13:46:27 2019 +0000 Merge remote-tracking branch 'boklm/bug_30089_v4' projects/android-toolchain/build | 4 +--- projects/debootstrap-image/config | 8 -------- projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 6 +----- rbm.conf | 2 ++ 5 files changed, 5 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 30089: Use apksigner instead of jarsigner
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit 99b49adf8e049ff5d5c091485fb3a45b6e6e359c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 10 12:28:03 2019 +0200 Bug 30089: Use apksigner instead of jarsigner --- projects/android-toolchain/build | 4 +--- projects/debootstrap-image/config | 8 -------- projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 6 +----- rbm.conf | 2 ++ 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index ff899d2..9fe40f7 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -21,9 +21,7 @@ rm -fR android-ndk-r15c # The architectures we support archs="arm x86" for arch in $archs; do - # API 16 is the minimum we currently support for Tor Browser on Android for - # 32bit. - ./build/tools/make_standalone_toolchain.py --api 16 --arch $arch --install-dir=./$arch + ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api") %] --arch $arch --install-dir=./$arch done # Tool Archives diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 7d535ec..7fa3551 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -94,14 +94,6 @@ targets: suite: jessie arch: i386 - # Still needed to fix faketime issues in tor-browser for Android, see: #29453 - buster-amd64: - var: - minimal_apt_version: '1.8.0~alpha3.1' - container: - suite: buster - arch: amd64 - stretch-amd64: var: minimal_apt_version: 1.4.9 diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 2de8d36..ffaf93d 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -25,4 +25,4 @@ zip -d $apk lib/armeabi/tor.so [% END %] # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest -[% c("var/faketime") %] jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $rootdir/android-qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android +java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 0a82092..c14b9d7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -52,11 +52,7 @@ targets: var: arch_deps: - openjdk-8-jdk - - faketime - # On some machines using faketime with Stretch to make the debug signature - # leads to a stalled build. Work around this by switching to Buster. - container: - suite: buster + - apksigner input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index 1a0c6ca..7be1106 100644 --- a/rbm.conf +++ b/rbm.conf @@ -191,6 +191,8 @@ targets: var: android: 1 compiler: android-toolchain + # API 16 is the minimum we currently support for Tor Browser on Android + android_min_api: 16 snowflake: 0 fteproxy: 0 container:

1 0

[tor-browser-build/master] Bug 30039: Use the target_prepend option in https-everywhere
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit ed424fd45a740f1b62857456fbcf616976012986 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 8 13:38:36 2019 +0200 Bug 30039: Use the target_prepend option in https-everywhere Update rbm for #30039, adding support for the target_prepend and target_append options in input_files. In projects/https-everywhere/config we now use the target_prepend option instead of the target option for the python input file. This does not change the output of the build. However this makes it possible in the future to check the channel or platform we build for in the python project (which was not possible before as we were using the target option, replacing all the initial targets). --- projects/https-everywhere/config | 2 +- rbm | 2 +- rbm.conf | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a9409cd..d84cdf6 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -32,5 +32,5 @@ input_files: - project: container-image - project: python name: python - target: + target_prepend: - common-stretch diff --git a/rbm b/rbm index 70d1ff3..87adfb7 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 70d1ff3e7c1c5c69a1b4cdb61ee1b6b9e2a9bc4a +Subproject commit 87adfb7b7be7e7e0f437020dbf8a119673133412 diff --git a/rbm.conf b/rbm.conf index 1a0c6ca..64192b4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,6 +162,7 @@ targets: container: suite: stretch arch: amd64 + pre_pkginst: '' deps: - build-essential - python

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 29768: Introduce new features to users
by gk＠torproject.org 10 Apr '19

10 Apr '19

commit 7706b044c9a013ae205168038ae8a734b2249741 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 9 14:38:35 2019 -0400 fixup! Bug 29768: Introduce new features to users --- .../extensions/onboarding/content/onboarding.css | 21 +++++++++---- .../extensions/onboarding/content/onboarding.js | 34 +++++++++++++--------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 4804c4fbadc6..939721677c4f 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -341,14 +341,13 @@ grid-template-columns: [tour-page-start] 368px [tour-content-start] 1fr [tour-page-end]; } -.onboarding-tour-description-prefix { +.onboarding-tour-description-highlight { display: inline-block; - margin-bottom: -8px; /* reduce vertical space below */ - padding: 2px 10px; - vertical-align: center; + margin-inline-start: 8px; + padding: 6px 8px; + vertical-align: middle; background-color: #F1F1F3; border-radius: 4px; - min-height: 25px; font-size: 10px; font-weight: 600; text-transform: uppercase; @@ -373,6 +372,12 @@ color: #420c5d; } +.onboarding-tour-description-suffix { + margin-top: 6px; + font-size: 13px; + line-height: 16px; +} + .onboarding-tour-content { grid-row: tour-page-start / tour-button-start; grid-column: tour-content-start / tour-page-end; @@ -391,6 +396,12 @@ transform: scaleX(-1); } +/* The image contained in figure_tor-security-level.png contains English text; + * therefore it should not be flipped when the document direction is RTL. */ +#onboarding-tour-tor-security-update-8-5-page > .onboarding-tour-content > img:dir(rtl) { + transform: scaleX(1); +} + .onboarding-tour-content > iframe { width: 100%; height: 100%; diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index acfcd93c5cef..1326aebc9bcf 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -51,17 +51,6 @@ function createOnboardingTourDescription(div, title, description) { } /** - * Helper function to insert a prefix above the tour description. - */ -function addOnboardingTourPrefix(section, l10nId) { - let doc = section.ownerDocument; - let div = doc.createElement("div"); - div.className = "onboarding-tour-description-prefix"; - div.setAttribute("data-l10n-id", l10nId); - section.insertBefore(div, section.firstChild); // Insert as first child. -} - -/** * Helper function to create the tour content UI element. */ function createOnboardingTourContent(div, imageSrc) { @@ -189,11 +178,18 @@ var onboardingTourset = { "security": { id: "onboarding-tour-tor-security", tourNameId: "onboarding.tour-tor-security", + highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); - createOnboardingTourDescription(div, + let desc = createOnboardingTourDescription(div, "onboarding.tour-tor-security.title", "onboarding.tour-tor-security.description"); + let additionalDesc = win.document.createElement("p"); + additionalDesc.className = "onboarding-tour-description-suffix"; + additionalDesc.setAttribute("data-l10n-id", + "onboarding.tour-tor-security.description-suffix"); + desc.appendChild(additionalDesc); + createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security.png"); let btnContainer = createOnboardingTourButton(div, "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button"); @@ -244,13 +240,13 @@ var onboardingTourset = { "toolbar-update-8.5": { id: "onboarding-tour-tor-toolbar-update-8-5", tourNameId: "onboarding.tour-tor-toolbar", + highlightId: "onboarding.tour-tor-update.prefix-updated", instantComplete: true, getPage(win) { let div = win.document.createElement("div"); let desc = createOnboardingTourDescription(div, "onboarding.tour-tor-toolbar-update-8.5.title", "onboarding.tour-tor-toolbar-update-8.5.description"); - addOnboardingTourPrefix(desc, "onboarding.tour-tor-update.prefix-updated"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-toolbar-layout.png"); createOnboardingTourButton(div, @@ -262,12 +258,12 @@ var onboardingTourset = { "security-update-8.5": { id: "onboarding-tour-tor-security-update-8-5", tourNameId: "onboarding.tour-tor-security", + highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); let desc = createOnboardingTourDescription(div, "onboarding.tour-tor-security-update-8.5.title", "onboarding.tour-tor-security-update-8.5.description"); - addOnboardingTourPrefix(desc, "onboarding.tour-tor-update.prefix-new"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security-level.png"); let btnContainer = createOnboardingTourButton(div, @@ -1777,7 +1773,17 @@ class Onboarding { let tourPanelId = `${tour.id}-page`; tab.setAttribute("aria-controls", tourPanelId); + if (tour.highlightId) { + // Add [New] or [Updated] text after this navigation item to draw + // attention to it. + let highlight = this._window.document.createElement("span"); + highlight.className = "onboarding-tour-description-highlight"; + highlight.textContent = this._bundle.GetStringFromName(tour.highlightId); + tab.appendChild(highlight); + } + li.appendChild(tab); + itemsFrag.appendChild(li); // Dynamically create tour pages let div = tour.getPage(this._window, this._bundle);

1 0