Commit 71a828ca authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by richard
Browse files

fixup! Bug 2176: Rebrand Firefox to TorBrowser 

Customize the about dialog in the branding commit.

This actually depends on the strings commit, but maybe we could move it
to earlier in the patchset.
parent 3173b2c0

browser/base/content/aboutDialog.xhtml

+70 −64
Original line number Diff line number Diff line
@@ -7,22 +7,25 @@ 
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>

<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>

<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>

<?xml-stylesheet href="chrome://browser/content/aboutDialogTor.css" type="text/css"?>



<!-- We need to include the localization DTDs until we migrate to Fluent -->

<!DOCTYPE window [

#include browser-doctype.inc

]>



<window xmlns:html="http://www.w3.org/1999/xhtml"

        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

        id="aboutDialog"

        windowtype="Browser:About"

        onload="init(event);"

#ifdef MOZ_UPDATER

        onunload="onUnload(event);"

#endif

#ifdef XP_MACOSX

        inwindowmenu="false"

#else

#ifndef XP_MACOSX

        data-l10n-id="aboutDialog-title"

#endif

        role="dialog"

        aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"

        aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor"

        >

#ifdef XP_MACOSX

#include macWindow.inc.xhtml
@@ -35,12 +38,10 @@ 
    <html:link rel="localization" href="browser/aboutDialog.ftl"/>

  </linkset>



  <script src="chrome://browser/content/aboutDialog.js"/>



  <vbox id="aboutDialogContainer">

  <html:div id="aboutDialogContainer">

    <hbox id="clientBox">

      <vbox id="leftBox" flex="1"/>

      <vbox id="rightBox" flex="1">

      <vbox id="rightBox">

        <label id="release" hidden="true">

        <!-- This string is explicitly not translated -->

          Extended Support Release
@@ -60,61 +61,51 @@ 
          <hbox id="updateBox">

#ifdef MOZ_UPDATER

            <html:div id="icons">

              <html:img class="icon update-throbber" src="chrome://global/skin/icons/loading.png" role="presentation"/>

              <html:img class="icon update-throbber" role="presentation"/>

              <html:img class="icon noUpdatesFound" src="chrome://global/skin/icons/check.svg" role="presentation"/>

              <html:img class="icon apply" src="chrome://global/skin/icons/reload.svg" role="presentation"/>

            </html:div>

            <vbox>

              <stack id="updateDeck" orient="vertical">

                <hbox id="checkForUpdates" align="center">

                  <button id="checkForUpdatesButton" align="start"

              <deck id="updateDeck" orient="vertical">

                <description id="checkForUpdates">

                  <button id="checkForUpdatesButton"

                          data-l10n-id="update-checkForUpdatesButton"

                          oncommand="gAppUpdater.checkForUpdates();"/>

                  <spacer flex="1"/>

                </hbox>

                <hbox id="downloadAndInstall" align="center">

                  <button id="downloadAndInstallButton" align="start"

                </description>

                <description id="downloadAndInstall">

                  <button id="downloadAndInstallButton"

                          oncommand="gAppUpdater.startDownload();"/>

                          <!-- label and accesskey will be filled by JS -->

                  <spacer flex="1"/>

                </hbox>

                <hbox id="apply" align="center">

                  <button id="updateButton" align="start"

                </description>

                <description id="apply">

                  <button id="updateButton"

                          data-l10n-id="update-updateButton"

                          oncommand="gAppUpdater.buttonRestartAfterDownload();"/>

                  <spacer flex="1"/>

                </hbox>

                <hbox id="checkingForUpdates" align="center">

                  <label data-l10n-id="update-checkingForUpdates"/>

                </hbox>

                <hbox id="downloading" data-l10n-id="update-downloading-message" align="center">

                  <label id="downloadStatus" data-l10n-name="download-status"/>

                </hbox>

                <hbox id="applying" align="center">

                  <label data-l10n-id="update-applying"/>

                </hbox>

                <hbox id="downloadFailed" align="center" data-l10n-id="update-failed">

                </description>

                <description id="checkingForUpdates" data-l10n-id="update-checkingForUpdates"/>

                <description id="downloading" data-l10n-id="aboutdialog-update-downloading" data-l10n-args='{"transfer":""}'>

                  <label data-l10n-name="download-status"/>

                </description>

                <description id="applying" data-l10n-id="update-applying"/>

                <description id="downloadFailed" data-l10n-id="update-failed">

                  <label id="failedLink" is="text-link" data-l10n-name="failed-link"/>

                </hbox>

                <hbox id="policyDisabled" align="center">

                  <label data-l10n-id="update-adminDisabled"/>

                </hbox>

                <hbox id="noUpdatesFound" align="center">

                  <label data-l10n-id="update-noUpdatesFound"/>

                </hbox>

                <hbox id="otherInstanceHandlingUpdates" align="center">

                  <label data-l10n-id="update-otherInstanceHandlingUpdates"/>

                </hbox>

                <hbox id="manualUpdate" align="center" data-l10n-id="update-manual">

                  <label id="manualLink" is="text-link" data-l10n-name="manual-link"/>

                </hbox>

                <hbox id="unsupportedSystem" align="center" data-l10n-id="update-unsupported">

                </description>

                <description id="policyDisabled" data-l10n-id="update-adminDisabled"/>

                <description id="noUpdatesFound" data-l10n-id="update-noUpdatesFound"/>

                <description id="checkingFailed" data-l10n-id="aboutdialog-update-checking-failed"/>

                <description id="otherInstanceHandlingUpdates" data-l10n-id="update-otherInstanceHandlingUpdates"/>

                <description id="manualUpdate" data-l10n-id="aboutdialog-update-manual-with-link" data-l10n-args='{"displayUrl":""}'>

                  <label class="manualLink" is="text-link" data-l10n-name="manual-link"/>

                </description>

                <description id="unsupportedSystem" data-l10n-id="update-unsupported">

                  <label id="unsupportedLink" is="text-link" data-l10n-name="unsupported-link"/>

                </hbox>

                <hbox id="restarting" align="center">

                  <label data-l10n-id="update-restarting"/>

                </hbox>

              </stack>

                </description>

                <description id="restarting" data-l10n-id="update-restarting"/>

                <description id="internalError" data-l10n-id="update-internal-error2" data-l10n-args='{"displayUrl":""}'>

                  <label class="manualLink" is="text-link" data-l10n-name="manual-link"/>

                </description>

                <description id="noUpdater"/>

              </deck>

              <!-- This HBOX is duplicated above without class="update" -->

              <hbox align="baseline">

                <label id="version" class="update"/>
@@ -129,7 +120,9 @@ 
          </hbox>



#ifdef MOZ_UPDATER

          <description class="text-blurb" id="currentChannelText" data-l10n-id="channel-description">

          <description class="text-blurb" id="currentChannelText"

                       data-l10n-id="aboutdialog-channel-description"

                       data-l10n-attrs="{&quot;channel&quot;: &quot;&quot;}">

            <label id="currentChannel" data-l10n-name="current-channel"/>

          </description>

#endif
@@ -140,29 +133,42 @@ 
              <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>

            </description>

          </vbox>

          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">

            <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/>

            <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>

          <!-- Keep communityDesc and contributeDesc to avoid JS errors trying to hide them -->

          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2" hidden="true"></description>

          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus" hidden="true"></description>

          <description class="text-blurb" id="projectDesc">

            &project.start;

            <label is="text-link" href="https://www.torproject.org/">

              &project.tpoLink;

            </label>&project.end;

          </description>

          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">

            <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"/>

            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>

          <description class="text-blurb" id="helpDesc">

            &help.start;

            <label is="text-link" href="https://donate.torproject.org/">

              &help.donateLink;

            </label>

            &help.or;

            <label is="text-link" href="https://community.torproject.org/">

              &help.getInvolvedLink;

            </label>&help.end;

          </description>

        </vbox>

      </vbox>

    </hbox>

    <vbox id="bottomBox">

      <hbox pack="center">

        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>

        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>

        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>

      <hbox id="newBottom" pack="center" position="1">

        <label is="text-link" class="bottom-link" href="https://support.torproject.org/">&bottomLinks.questions;</label>

        <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/">&bottomLinks.grow;</label>

        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license">&bottomLinks.license;</label>

      </hbox>

      <description id="trademark" data-l10n-id="trademarkInfo"></description>

      <description id="trademarkTor">&tor.TrademarkStatement;</description>

    </vbox>

  </vbox>

  </html:div>



  <keyset>

    <key keycode="VK_ESCAPE" oncommand="window.close();"/>

  </keyset>



  <script src="chrome://browser/content/aboutDialog.js"/>

</window>

browser/base/content/aboutDialogTor.css

0 → 100644
+34 −0
Original line number Diff line number Diff line 
#leftBox {

  background-image: url('chrome://branding/content/icon256.png');

  background-position: right top;

  background-size: 180px;

}



#rightBox {

  background-image: url('chrome://global/skin/illustrations/about-wordmark.png');

  background-position: left top;

}



#contributeDesc {

  display: none;

}



#communityDesc {

  display: none;

}



#trademark {

  display: none;

}



#trademarkTor {

  font-size: xx-small;

  text-align: center;

  color: #999999;

  margin-top: 10px;

  margin-bottom: 10px;

}



#bottomBox > hbox:not(#newBottom) {

  display: none;

}

browser/base/jar.mn

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ browser.jar: 
*       content/browser/aboutDialog.xhtml                    (content/aboutDialog.xhtml)

        content/browser/aboutDialog.js                (content/aboutDialog.js)

        content/browser/aboutDialog.css               (content/aboutDialog.css)

        content/browser/aboutDialogTor.css            (content/aboutDialogTor.css)

        content/browser/aboutRestartRequired.js       (content/aboutRestartRequired.js)

        content/browser/aboutRestartRequired.xhtml    (content/aboutRestartRequired.xhtml)

        content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)

toolkit/themes/shared/desktop-jar.inc.mn

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 
  skin/classic/global/icons/whatsnew.svg                   (../../shared/icons/whatsnew.svg)

  skin/classic/global/illustrations/about-rights.svg       (../../shared/illustrations/about-rights.svg)

  skin/classic/global/illustrations/about-license.svg      (../../shared/illustrations/about-license.svg)

  skin/classic/global/illustrations/about-wordmark.png     (../../shared/illustrations/about-wordmark.png)

  skin/classic/global/illustrations/error-malformed-url.svg (../../shared/illustrations/error-malformed-url.svg)

  skin/classic/global/media/picture-in-picture-open.svg    (../../shared/media/picture-in-picture-open.svg)

  skin/classic/global/media/picture-in-picture-closed.svg  (../../shared/media/picture-in-picture-closed.svg)

toolkit/themes/shared/illustrations/about-wordmark.png

0 → 100644
+4.5 KiB
Loading image diff...