Commit 3173b2c0 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by richard
Browse files

fixup! Bug 10760: Integrate TorButton to TorBrowser core 

Stop customizing the about dialog in the Torbutton commit.
parent 983b1f77

browser/base/content/aboutDialog.xhtml

+64 −70
Changes for browser/base/content/aboutDialog.xhtml: 64 added lines, 70 removed lines.
Original line number Diff line number Diff line
@@ -7,25 +7,22 @@ 
<?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://torbutton/skin/aboutDialog.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

#ifndef XP_MACOSX

#ifdef XP_MACOSX

        inwindowmenu="false"

#else

        data-l10n-id="aboutDialog-title"

#endif

        role="dialog"

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

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

        >

#ifdef XP_MACOSX

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

  </linkset>



  <html:div id="aboutDialogContainer">

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



  <vbox id="aboutDialogContainer">

    <hbox id="clientBox">

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

      <vbox id="rightBox">

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

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

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

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

#ifdef MOZ_UPDATER

            <html:div id="icons">

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

              <html:img class="icon update-throbber" src="chrome://global/skin/icons/loading.png" 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>

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

                <description id="checkForUpdates">

                  <button id="checkForUpdatesButton"

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

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

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

                          data-l10n-id="update-checkForUpdatesButton"

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

                </description>

                <description id="downloadAndInstall">

                  <button id="downloadAndInstallButton"

                  <spacer flex="1"/>

                </hbox>

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

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

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

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

                </description>

                <description id="apply">

                  <button id="updateButton"

                  <spacer flex="1"/>

                </hbox>

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

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

                          data-l10n-id="update-updateButton"

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

                </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">

                  <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">

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

                </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">

                </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">

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

                </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>

                </hbox>

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

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

                </hbox>

              </stack>

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

              <hbox align="baseline">

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



#ifdef MOZ_UPDATER

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

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

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

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

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

          </description>

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

            </description>

          </vbox>

          <!-- 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 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"/>

          </description>

          <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 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>

        </vbox>

      </vbox>

    </hbox>

    <vbox id="bottomBox">

      <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 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>

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

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

    </vbox>

  </html:div>

  </vbox>



  <keyset>

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

  </keyset>



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

</window>

toolkit/torbutton/chrome/skin/about-wordmark.png

deleted100644 → 0
−4.5 KiB
Loading image diff...

toolkit/torbutton/chrome/skin/aboutDialog.css

deleted100644 → 0
+0 −34
Changes for toolkit/torbutton/chrome/skin/aboutDialog.css: 0 added lines, 34 removed lines.
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://torbutton/skin/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;

}

toolkit/torbutton/jar.mn

+0 −3
Changes for toolkit/torbutton/jar.mn: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ torbutton.jar: 


  content/torbutton.js                   (chrome/content/torbutton.js)

  modules/       (modules/*)

  skin/          (chrome/skin/*)



% resource torbutton %
@@ -20,5 +19,3 @@ torbutton.jar: 


% locale torbutton en-US %locale/en-US/

  locale/en-US/ (chrome/locale/en-US/*)
 


% skin torbutton classic/1.0 %skin/