Verified Commit 8f35f42f authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! TB 2176: Rebrand Firefox to TorBrowser 

TB 42720: Show what's new in the about:dialog.

Customize the "What's new" link and cleanup other channel-specific
prefs.
parent de58bd66

browser/base/content/aboutDialog.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ 
              <!-- This HBOX is duplicated above without class="update" -->

              <hbox align="baseline">

                <label id="version" class="update"/>

                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>

              </hbox>

              <description class="text-blurb">

                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>

                <label is="text-link" onclick="openHelpLink('firefox-help')" data-l10n-id="aboutdialog-help-user"/>

                <label id="submit-feedback" is="text-link" onclick="openFeedbackPage()" data-l10n-id="aboutdialog-submit-feedback"/>

              </description>

browser/base/content/aboutDialogTor.css

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 
  margin-block: 10px;

}



#releasenotes {

  margin-inline-end: .9em; /* Same as #submit-feedback */

}



#contributeDesc {

  display: none;

}

browser/branding/tb-alpha/pref/firefox-branding.js

+5 −16
Original line number Diff line number Diff line
@@ -10,30 +10,19 @@ 
//   actions="showURL"

//   openURL="https://blog.torproject.org/tor-browser-55a2-released"

pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");

pref("startup.homepage_welcome_url", "about:welcome");

pref("startup.homepage_welcome_url.additional", "");

pref("app.update.url.details", "https://www.torproject.org/download/alpha/");

pref("app.update.url.manual", "https://www.torproject.org/download/alpha/");

pref("app.releaseNotesURL", "https://blog.torproject.org/new-alpha-release-tor-browser-%BB_VERSION_FOR_URLS%/");

pref("app.releaseNotesURL.aboutDialog", "https://blog.torproject.org/new-alpha-release-tor-browser-%BB_VERSION_FOR_URLS%/");



// The time interval between checks for a new version (in seconds)

pref("app.update.interval", 43200); // 12 hours

// Give the user x seconds to react before showing the big UI. default=12 hours

pref("app.update.promptWaitTime", 43200);

// URL user can browse to manually if for some reason all update installation

// attempts fail.

pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/nightly/");

// A default value for the "More information about this update" link

// supplied in the "An update is available" page of the update wizard.

pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/");



pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");



// The number of days a binary is permitted to be old

// without checking for an update.  This assumes that

// app.update.checkInstallTime is true.

pref("app.update.checkInstallTime.days", 2);



// Give the user x seconds to reboot before showing a badge on the hamburger

// button. default=immediately

pref("app.update.badgeWaitTime", 0);



// Number of usages of the web console.

// If this is less than 5, then pasting code into the web console is disabled

pref("devtools.selfxss.count", 5);

browser/branding/tb-nightly/pref/firefox-branding.js

+6 −18
Original line number Diff line number Diff line
@@ -9,32 +9,20 @@ 
// each update manifest should contain attributes similar to:

//   actions="showURL"

//   openURL="https://blog.torproject.org/tor-browser-55a2-released"

pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");

pref("startup.homepage_welcome_url", "about:welcome");

pref("startup.homepage_welcome_url.additional", "");

pref("startup.homepage_override_url", "https://nightlies.tbb.torproject.org/");

pref("app.update.url.details", "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/");

pref("app.update.url.manual", "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/");

pref("app.releaseNotesURL", "about:blank");

pref("app.releaseNotesURL.aboutDialog", "about:blank");



// The time interval between checks for a new version (in seconds)

pref("app.update.interval", 14400); // 4 hours

// Give the user x seconds to react before showing the big UI. default=12 hours

pref("app.update.promptWaitTime", 43200);

// URL user can browse to manually if for some reason all update installation

// attempts fail.

pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/nightly/?reason=manual-update");

// A default value for the "More information about this update" link

// supplied in the "An update is available" page of the update wizard.

pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/");



pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");

pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");



// The number of days a binary is permitted to be old

// without checking for an update.  This assumes that

// app.update.checkInstallTime is true.

pref("app.update.checkInstallTime.days", 2);



// Give the user x seconds to reboot before showing a badge on the hamburger

// button. default=immediately

pref("app.update.badgeWaitTime", 0);



// Number of usages of the web console.

// If this is less than 5, then pasting code into the web console is disabled

pref("devtools.selfxss.count", 5);

browser/branding/tb-release/pref/firefox-branding.js

+5 −29
Original line number Diff line number Diff line
@@ -10,43 +10,19 @@ 
//   actions="showURL"

//   openURL="https://blog.torproject.org/tor-browser-55a2-released"

pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");

pref("startup.homepage_welcome_url", "about:welcome");

pref("startup.homepage_welcome_url.additional", "");

pref("app.update.url.details", "https://www.torproject.org/download/");

pref("app.update.url.manual", "https://www.torproject.org/download/");

pref("app.releaseNotesURL", "https://blog.torproject.org/new-release-tor-browser-%BB_VERSION_FOR_URLS%/");

pref("app.releaseNotesURL.aboutDialog", "https://blog.torproject.org/new-release-tor-browser-%BB_VERSION_FOR_URLS%/");



// Interval: Time between checks for a new version (in seconds)

pref("app.update.interval", 43200); // 12 hours

// Give the user x seconds to react before showing the big UI. default=192 hours

pref("app.update.promptWaitTime", 691200);

// app.update.url.manual: URL user can browse to manually if for some reason

// all update installation attempts fail.

// app.update.url.details: a default value for the "More information about this

// update" link supplied in the "An update is available" page of the update

// wizard.

#if MOZ_UPDATE_CHANNEL == beta

  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta?reason=manual-update");

  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes");

  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");

  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");

#elifdef MOZ_ESR

  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/enterprise?reason=manual-update");

  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/organizations/notes");

  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");

  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");

#else

  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/new?reason=manual-update");

  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");

  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");

  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");

#endif



// The number of days a binary is permitted to be old

// without checking for an update.  This assumes that

// app.update.checkInstallTime is true.

pref("app.update.checkInstallTime.days", 63);



// Give the user x seconds to reboot before showing a badge on the hamburger

// button. default=4 days

pref("app.update.badgeWaitTime", 345600);



// Number of usages of the web console.

// If this is less than 5, then pasting code into the web console is disabled

pref("devtools.selfxss.count", 0);