tbb-commits November 2016

tbb-commits@lists.torproject.org

1 participants
122 discussions

[tor-browser/tor-browser-45.5.0esr-6.5-1] Bug 20707: Avoid localization failure in about:preferences
by gk＠torproject.org 22 Nov '16

22 Nov '16

commit 70b2e4769bc4a7dd877e8ca82403d71561dbeec8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 18 12:42:22 2016 -0800 Bug 20707: Avoid localization failure in about:preferences This fixes problem with our 20244 patches in non-US-English locales. If those patches are uplifted, then Mozilla can localize the strings. In the meantime, this patch removes our localizable strings from privacy.xul altogether. Our torbutton code overlays … [View More]

1 0

[torbutton/master] Bug 20614: Add links to Tor Browser User Manual
by gk＠torproject.org 22 Nov '16

22 Nov '16

commit 24e2f3aa02b40274e20e27aa568c076bd74f7b2f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 11 20:03:15 2016 -0800 Bug 20614: Add links to Tor Browser User Manual --- src/chrome/content/aboutTor/aboutTor.xhtml | 13 ++++++++++++- src/chrome/content/menu-overlay.xul | 11 ++++++++++- src/chrome/content/torbutton.js | 31 +++++++++++++++++++++++++++++- src/chrome/locale/en/aboutTor.dtd | 2 ++ src/chrome/locale/en/torbutton.dtd … [View More] | 2 ++ src/chrome/skin/aboutTor.css | 9 ++++----- 6 files changed, 60 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 2fffb2a..2c823b5 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -241,7 +241,18 @@ window.addEventListener("pageshow", function() { <div class="bubble"> <h1>&aboutTor.whatnextQuestion.label;</h1> <p>&aboutTor.whatnextAnswer.label;</p> - <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> + <ul> + <li> + <a href="&aboutTor.whatnext.link;"> + &aboutTor.whatnext.label; + </a> + </li> + <li class="showForManual"> + <a href="&aboutTor.torbrowser_user_manual.link;"> + &aboutTor.torbrowser_user_manual.label; + </a> + </li> + </ul> </div> <div class="bubble"> diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index ceadf85..8067b5c 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>  - +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + <overlay id="torbutton-menu-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <menupopup id="menu_HelpPopup"> +  <menuitem id="menu_openHelp" removeelement="true"/> <menuitem id="menu_openTour" removeelement="true"/> <menuitem id="healthReport" removeelement="true"/> @@ -14,5 +16,12 @@  <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> +  + <menuitem name="torBrowserUserManual" + id="torBrowserUserManual" + position="1" + label="&torbutton.torbrowser_user_manual.label;" + accesskey="&torbutton.torbrowser_user_manual.accesskey;" + oncommand="torbutton_open_torbrowser_user_manual()" /> </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7de599d..139cb41 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,6 +12,7 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -362,7 +363,7 @@ function torbutton_init() { window.addEventListener("aftercustomization", function() { torbutton_update_all_abouttor_pages(undefined, undefined); }, false); - + //setting up context menu //var contextMenu = document.getElementById("contentAreaContextMenu"); //if (contextMenu) @@ -399,6 +400,8 @@ function torbutton_init() { quantizeBrowserSize(window, 100, 100); + torbutton_init_user_manual_links(); + torbutton_log(3, 'init completed'); } @@ -630,6 +633,11 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { else aDoc.body.removeAttribute("torNeedsUpdate"); + if (torbutton_show_torbrowser_manual()) + aDoc.body.setAttribute("showmanual", "yes"); + else + aDoc.body.removeAttribute("showmanual"); + // Display product name and TBB version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; @@ -2437,5 +2445,26 @@ function torbutton_update_noscript_button() }, 0); } +// Opens the Tor Browser User Manual in a new tab +function torbutton_open_torbrowser_user_manual() { + gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org"); +} + +// Returns true if we should show the tor browser manual. +function torbutton_show_torbrowser_manual() { + let locale = torbutton_get_general_useragent_locale(); + return locale.startsWith("en"); +} + +// Makes sure the item in the Help Menu and the link in about:tor +// for the Tor Browser User Manual are only visible when +// torbutton_show_torbrowser_manual() returns true. +function torbutton_init_user_manual_links() { + let menuitem = document.getElementById("torBrowserUserManual"); + bindPrefAndInit("general.useragent.locale", val => { + menuitem.hidden = !torbutton_show_torbrowser_manual(); + torbutton_update_all_abouttor_pages(undefined, undefined); + }); +} //vim:set ts=4 diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 12313c4..9e44fc2 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -32,6 +32,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..c67ec6e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 0a196dc..3f747a9 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -132,6 +132,10 @@ body[toron] .top h1 { color: #600060; } +body:not([showmanual]) .showForManual { + display: none; +} + div.hideIfTorIsUpToDate, body .top div.hideIfTorIsUpToDate h1 { color: black; @@ -201,11 +205,6 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { margin-bottom: 10px; } -#middle a.tips { - display: block; - margin-top: 1.6em; -} - #middle ul { padding: 5px 0 0 22px; } [View Less]

1 0

[torbutton/master] Revert "Bug 20614: Add links to Tor Browser User Manual"
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 745c80d997df1f2f5b2351f55cc8fc263228f73b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 21 18:56:21 2016 +0000 Revert "Bug 20614: Add links to Tor Browser User Manual" This reverts commit 8a5dc8c510331714e84feb2b8d4369abf76b8e20. This is the wrong commit for 20614. --- src/chrome/content/aboutTor/aboutTor.xhtml | 9 +----- src/chrome/content/menu-overlay.xul | 11 +------ src/chrome/content/torbutton.js | 46 +++++---------------… [View More]---------- src/chrome/locale/en/aboutTor.dtd | 2 -- src/chrome/locale/en/torbutton.dtd | 2 -- src/chrome/skin/aboutTor.css | 4 --- 6 files changed, 9 insertions(+), 65 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index c1207ed..2fffb2a 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -241,14 +241,7 @@ window.addEventListener("pageshow", function() { <div class="bubble"> <h1>&aboutTor.whatnextQuestion.label;</h1> <p>&aboutTor.whatnextAnswer.label;</p> - <ul> - <li class="showForManual"> - <a href="&aboutTor.torbrowser_user_manual.link;"> - &aboutTor.torbrowser_user_manual.label; - </a> - </li> - <li><a href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a></li> - </ul> + <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> </div> <div class="bubble"> diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 8067b5c..ceadf85 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?>  -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> - + <overlay id="torbutton-menu-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <menupopup id="menu_HelpPopup"> -  <menuitem id="menu_openHelp" removeelement="true"/> <menuitem id="menu_openTour" removeelement="true"/> <menuitem id="healthReport" removeelement="true"/> @@ -16,12 +14,5 @@  <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> -  - <menuitem name="torBrowserUserManual" - id="torBrowserUserManual" - position="1" - label="&torbutton.torbrowser_user_manual.label;" - accesskey="&torbutton.torbrowser_user_manual.accesskey;" - oncommand="torbutton_open_torbrowser_user_manual()" /> </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5d494fa..7de599d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,7 +12,6 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -201,7 +200,7 @@ var torbutton_tor_check_observer = { // Update all open about:tor pages. If the user does not have an // about:tor page open in the front most window, open one. - if (torbutton_update_all_abouttor_pages(undefined, undefined, false) < 1) { + if (torbutton_update_all_abouttor_pages(undefined, false) < 1) { var wm = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var win = wm.getMostRecentWindow("navigator:browser"); @@ -361,7 +360,7 @@ function torbutton_init() { // Detect toolbar customization and update arrow on about:tor pages. window.addEventListener("aftercustomization", function() { - torbutton_update_all_abouttor_pages(undefined, undefined, undefined); + torbutton_update_all_abouttor_pages(undefined, undefined); }, false); //setting up context menu @@ -400,8 +399,6 @@ function torbutton_init() { quantizeBrowserSize(window, 100, 100); - torbutton_init_user_manual_links(); - torbutton_log(3, 'init completed'); } @@ -568,7 +565,7 @@ function torbutton_notify_if_update_needed() { setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); // Update all open about:tor pages. - torbutton_update_all_abouttor_pages(updateNeeded, undefined, undefined); + torbutton_update_all_abouttor_pages(updateNeeded, undefined); // Make the "check for update" menu item bold if an update is needed. var item = document.getElementById("torbutton-checkForUpdate"); @@ -597,11 +594,9 @@ function torbutton_check_for_update() { // Pass undefined for a parameter to have this function determine it. // Returns a count of open pages that were updated, -function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsOn) { +function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { if (aUpdateNeeded === undefined) aUpdateNeeded = torbutton_update_is_needed(); - if (aShowManual === undefined) - aShowManual = torbutton_show_torbrowser_manual(); if (aTorIsOn === undefined) aTorIsOn = torbutton_tor_check_ok(); @@ -612,7 +607,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsO for (var tab = tabs[0]; tab != null; tab = tab.nextSibling) { try { let doc = tabBrowser.getBrowserForTab(tab).contentDocument; - if (torbutton_update_abouttor_doc(doc, aTorIsOn, aShowManual, aUpdateNeeded)) + if (torbutton_update_abouttor_doc(doc, aTorIsOn, aUpdateNeeded)) ++count; } catch(e) {} } @@ -622,7 +617,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsO } // Returns true if aDoc is an about:tor page. -function torbutton_update_abouttor_doc(aDoc, aTorOn, aShowManual, aUpdateNeeded) { +function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { var isAboutTor = torbutton_is_abouttor_doc(aDoc); if (isAboutTor) { if (aTorOn) @@ -630,11 +625,6 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aShowManual, aUpdateNeeded) else aDoc.body.removeAttribute("toron"); - if (aShowManual) - aDoc.body.setAttribute("showmanual", "yes"); - else - aDoc.body.removeAttribute("showmanual"); - if (aUpdateNeeded) aDoc.body.setAttribute("torNeedsUpdate", "yes"); else @@ -749,9 +739,8 @@ function torbutton_on_abouttor_load(aDoc) { // Show correct Tor on/off and "update needed" status. let torOn = torbutton_tor_check_ok(); - let showManual = torbutton_show_torbrowser_manual(); let needsUpdate = torbutton_update_is_needed(); - torbutton_update_abouttor_doc(aDoc, torOn, showManual, needsUpdate); + torbutton_update_abouttor_doc(aDoc, torOn, needsUpdate); aDoc.defaultView.addEventListener("resize", function() { torbutton_update_abouttor_arrow(aDoc); }, @@ -2448,26 +2437,5 @@ function torbutton_update_noscript_button() }, 0); } -// Opens the Tor Browser User Manual in a new tab -function torbutton_open_torbrowser_user_manual() { - gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org"); -} - -// Returns true if we should show the tor browser manual. -function torbutton_show_torbrowser_manual() { - let locale = torbutton_get_general_useragent_locale(); - return locale.startsWith("en"); -} - -// Makes sure the tem in the Help Menu and the link in about:tor -// for the Tor Browser User Manual are only visible when -// torbutton_show_torbrowser_manual() returns true. -function torbutton_init_user_manual_links() { - let menuitem = document.getElementById("torBrowserUserManual"); - bindPrefAndInit("general.useragent.locale", val => { - menuitem.hidden = !torbutton_show_torbrowser_manual(); - torbutton_update_all_abouttor_pages(undefined, undefined, undefined); - }); -} //vim:set ts=4 diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 9e44fc2..12313c4 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -32,8 +32,6 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index c67ec6e..97a994f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -59,5 +59,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> -<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> -<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 1971f06..0a196dc 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -132,10 +132,6 @@ body[toron] .top h1 { color: #600060; } -body:not([showmanual]) .showForManual { - display: none; -} - div.hideIfTorIsUpToDate, body .top div.hideIfTorIsUpToDate h1 { color: black; [View Less]

1 0

[torbutton/master] Bug 20614: Add links to Tor Browser User Manual
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 8a5dc8c510331714e84feb2b8d4369abf76b8e20 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 11 20:03:15 2016 -0800 Bug 20614: Add links to Tor Browser User Manual --- src/chrome/content/aboutTor/aboutTor.xhtml | 9 +++++- src/chrome/content/menu-overlay.xul | 11 ++++++- src/chrome/content/torbutton.js | 46 +++++++++++++++++++++++++----- src/chrome/locale/en/aboutTor.dtd | 2 ++ src/chrome/locale/en/torbutton.dtd | 2 +… [View More]+ src/chrome/skin/aboutTor.css | 4 +++ 6 files changed, 65 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 2fffb2a..c1207ed 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -241,7 +241,14 @@ window.addEventListener("pageshow", function() { <div class="bubble"> <h1>&aboutTor.whatnextQuestion.label;</h1> <p>&aboutTor.whatnextAnswer.label;</p> - <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> + <ul> + <li class="showForManual"> + <a href="&aboutTor.torbrowser_user_manual.link;"> + &aboutTor.torbrowser_user_manual.label; + </a> + </li> + <li><a href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a></li> + </ul> </div> <div class="bubble"> diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index ceadf85..8067b5c 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>  - +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + <overlay id="torbutton-menu-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <menupopup id="menu_HelpPopup"> +  <menuitem id="menu_openHelp" removeelement="true"/> <menuitem id="menu_openTour" removeelement="true"/> <menuitem id="healthReport" removeelement="true"/> @@ -14,5 +16,12 @@  <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> +  + <menuitem name="torBrowserUserManual" + id="torBrowserUserManual" + position="1" + label="&torbutton.torbrowser_user_manual.label;" + accesskey="&torbutton.torbrowser_user_manual.accesskey;" + oncommand="torbutton_open_torbrowser_user_manual()" /> </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7de599d..5d494fa 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,6 +12,7 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -200,7 +201,7 @@ var torbutton_tor_check_observer = { // Update all open about:tor pages. If the user does not have an // about:tor page open in the front most window, open one. - if (torbutton_update_all_abouttor_pages(undefined, false) < 1) { + if (torbutton_update_all_abouttor_pages(undefined, undefined, false) < 1) { var wm = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var win = wm.getMostRecentWindow("navigator:browser"); @@ -360,7 +361,7 @@ function torbutton_init() { // Detect toolbar customization and update arrow on about:tor pages. window.addEventListener("aftercustomization", function() { - torbutton_update_all_abouttor_pages(undefined, undefined); + torbutton_update_all_abouttor_pages(undefined, undefined, undefined); }, false); //setting up context menu @@ -399,6 +400,8 @@ function torbutton_init() { quantizeBrowserSize(window, 100, 100); + torbutton_init_user_manual_links(); + torbutton_log(3, 'init completed'); } @@ -565,7 +568,7 @@ function torbutton_notify_if_update_needed() { setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); // Update all open about:tor pages. - torbutton_update_all_abouttor_pages(updateNeeded, undefined); + torbutton_update_all_abouttor_pages(updateNeeded, undefined, undefined); // Make the "check for update" menu item bold if an update is needed. var item = document.getElementById("torbutton-checkForUpdate"); @@ -594,9 +597,11 @@ function torbutton_check_for_update() { // Pass undefined for a parameter to have this function determine it. // Returns a count of open pages that were updated, -function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { +function torbutton_update_all_abouttor_pages(aUpdateNeeded, aShowManual, aTorIsOn) { if (aUpdateNeeded === undefined) aUpdateNeeded = torbutton_update_is_needed(); + if (aShowManual === undefined) + aShowManual = torbutton_show_torbrowser_manual(); if (aTorIsOn === undefined) aTorIsOn = torbutton_tor_check_ok(); @@ -607,7 +612,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { for (var tab = tabs[0]; tab != null; tab = tab.nextSibling) { try { let doc = tabBrowser.getBrowserForTab(tab).contentDocument; - if (torbutton_update_abouttor_doc(doc, aTorIsOn, aUpdateNeeded)) + if (torbutton_update_abouttor_doc(doc, aTorIsOn, aShowManual, aUpdateNeeded)) ++count; } catch(e) {} } @@ -617,7 +622,7 @@ function torbutton_update_all_abouttor_pages(aUpdateNeeded, aTorIsOn) { } // Returns true if aDoc is an about:tor page. -function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { +function torbutton_update_abouttor_doc(aDoc, aTorOn, aShowManual, aUpdateNeeded) { var isAboutTor = torbutton_is_abouttor_doc(aDoc); if (isAboutTor) { if (aTorOn) @@ -625,6 +630,11 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { else aDoc.body.removeAttribute("toron"); + if (aShowManual) + aDoc.body.setAttribute("showmanual", "yes"); + else + aDoc.body.removeAttribute("showmanual"); + if (aUpdateNeeded) aDoc.body.setAttribute("torNeedsUpdate", "yes"); else @@ -739,8 +749,9 @@ function torbutton_on_abouttor_load(aDoc) { // Show correct Tor on/off and "update needed" status. let torOn = torbutton_tor_check_ok(); + let showManual = torbutton_show_torbrowser_manual(); let needsUpdate = torbutton_update_is_needed(); - torbutton_update_abouttor_doc(aDoc, torOn, needsUpdate); + torbutton_update_abouttor_doc(aDoc, torOn, showManual, needsUpdate); aDoc.defaultView.addEventListener("resize", function() { torbutton_update_abouttor_arrow(aDoc); }, @@ -2437,5 +2448,26 @@ function torbutton_update_noscript_button() }, 0); } +// Opens the Tor Browser User Manual in a new tab +function torbutton_open_torbrowser_user_manual() { + gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org"); +} + +// Returns true if we should show the tor browser manual. +function torbutton_show_torbrowser_manual() { + let locale = torbutton_get_general_useragent_locale(); + return locale.startsWith("en"); +} + +// Makes sure the tem in the Help Menu and the link in about:tor +// for the Tor Browser User Manual are only visible when +// torbutton_show_torbrowser_manual() returns true. +function torbutton_init_user_manual_links() { + let menuitem = document.getElementById("torBrowserUserManual"); + bindPrefAndInit("general.useragent.locale", val => { + menuitem.hidden = !torbutton_show_torbrowser_manual(); + torbutton_update_all_abouttor_pages(undefined, undefined, undefined); + }); +} //vim:set ts=4 diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 12313c4..9e44fc2 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -32,6 +32,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..c67ec6e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 0a196dc..1971f06 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -132,6 +132,10 @@ body[toron] .top h1 { color: #600060; } +body:not([showmanual]) .showForManual { + display: none; +} + div.hideIfTorIsUpToDate, body .top div.hideIfTorIsUpToDate h1 { color: black; [View Less]

1 0

[torbutton/master] Bug 20728: Fix bad preferences.xul dimensions
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit d3aa9fed9b0feffd5cc046d0729fc90c7c53c96e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 21 10:15:53 2016 -0800 Bug 20728: Fix bad preferences.xul dimensions --- src/chrome/content/preferences.xul | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index c6432e0..bb6e31f 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.… [View More]

1 0

[torbutton/master] Bug 20701: Allow the directory listing stylesheet in the content policy.
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 15496115caf82ed6865fa219c2eed4bc59363388 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Nov 17 18:54:41 2016 +0000 Bug 20701: Allow the directory listing stylesheet in the content policy. --- src/components/content-policy.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index 3379eb7..5c0ecf5 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -37,6 +… [View More]

1 0

[torbutton/master] Bug 20318: Remove helpdesk link from about:tor
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 4f8b3fb92c080f25b4e80e59a377fae1e1b0c1fb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 19 18:50:26 2016 +0000 Bug 20318: Remove helpdesk link from about:tor --- src/chrome/content/aboutTor/aboutTor.xhtml | 3 --- src/chrome/locale/en/aboutTor.dtd | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index b6860d8..2fffb2a 100644 --- a/src/chrome/content/aboutTor/… [View More]

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit c556cdac99fcf4570feb4cfdb676fc56d384a101 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 12:01:44 2016 +0000 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. This fixes bug 20709. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 64ab700..ce16a75 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/… [View More]

1 0

[tor-browser-bundle/master] Bug 20704: fix mar files code signing check
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 234b76caf9c9743a43fcd1ff08f6f180ee981b20 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 17 22:53:43 2016 +0100 Bug 20704: fix mar files code signing check --- tools/update-responses/config.yml | 1 - tools/update-responses/update_responses | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 786030d..2e48e2c 100644 --- a/tools/update-responses/config.yml +++ … [View More]

1 0

[tor-browser-bundle/master] Bug 20706: make it possible to use dmg2mar in Tor Messenger
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 27e05dc5e3257afd2dbd11d83317001eee70b5f5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 18 00:04:33 2016 +0100 Bug 20706: make it possible to use dmg2mar in Tor Messenger --- tools/dmg2mar | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/dmg2mar b/tools/dmg2mar index 8eaebe8..51d6acb 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -35,6 +35,12 @@ use File::Find; use Parallel::ForkManager; use Cwd; +# If the … [View More]application is not TorBrowser (for instance, TorMessenger) +# set the application name in the TOR_APPNAME_BUNDLE_OSX and in +# the TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; + sub exit_error { print STDERR "Error: ", $_[0], "\n"; chdir '/'; @@ -89,7 +95,7 @@ sub get_dmg_files_from_sha256sums { foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^TorBrowser-(.+)-osx64_(.+)\.dmg$/; + next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; } return @files; @@ -103,7 +109,7 @@ sub convert_files { # internally on OSX, but the dmg file still uses 'ja' to avoid # confusing users. my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; - my $output = "tor-browser-osx64-$file->{version}_$mar_lang.mar"; + my $output = "$appname_mar-osx64-$file->{version}_$mar_lang.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next; @@ -121,7 +127,7 @@ sub convert_files { unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0; my $wanted = sub { my $file = $File::Find::name; - $file =~ s{^$tmpdir/TorBrowser\.app/}{}; + $file =~ s{^$tmpdir/$appname\.app/}{}; if (-f "$tmpdir_oldmar/$file") { my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file"); chmod $mode, $File::Find::name; @@ -130,11 +136,11 @@ sub convert_files { chmod 0644, $File::Find::name if -f $File::Find::name; chmod 0755, $File::Find::name if -d $File::Find::name; }; - find($wanted, "$tmpdir/TorBrowser.app"); + find($wanted, "$tmpdir/$appname.app"); unlink $output; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', - $output, "$tmpdir/TorBrowser.app"); + $output, "$tmpdir/$appname.app"); exit_error "Error updating $output: $err" unless $success; $pm->finish; } @@ -147,7 +153,7 @@ sub remove_incremental_mars { foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^tor-browser-osx64.+\.incremental\.mar$/; + next unless $filename =~ m/^$appname_mar-osx64.+\.incremental\.mar$/; next unless -f $filename; print "Removing $filename\n"; unlink $filename; [View Less]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits November 2016