Commit 82c91547 authored by Ehsan Akhgari's avatar Ehsan Akhgari
Browse files

Bug 816914 - Revamp about:privatebrowsing to support per-window private... 

Bug 816914 - Revamp about:privatebrowsing to support per-window private browsing mode; r=jdm ui-r=shorlander

DONTBUILD since this is NPOTB for global PB builds
parent 33cc479d

browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml

+42 −1
Original line number Diff line number Diff line
@@ -13,10 +13,18 @@ 
  %globalDTD;

  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">

  %browserDTD;

#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING

#ifdef XP_MACOSX

  <!ENTITY basePBMenu.label   "&fileMenu.label;">

#else

  <!ENTITY basePBMenu.label   "<span class='appMenuButton'>&brandShortName;</span><span class='fileMenu'>&fileMenu.label;</span>">

#endif

#else

#ifdef XP_MACOSX

  <!ENTITY basePBMenu.label   "&toolsMenu.label;">

#else

  <!ENTITY basePBMenu.label   "<span class='appMenuButton'>&brandShortName;</span><span class='toolsMenu'>&toolsMenu.label;</span>">

#endif

#endif

  <!ENTITY % privatebrowsingpageDTD SYSTEM "chrome://browser/locale/aboutPrivateBrowsing.dtd">

  %privatebrowsingpageDTD;
@@ -31,9 +39,15 @@ 
      body.private .showNormal {

        display: none;

      }

#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING

      body.appMenuButtonVisible .fileMenu {

        display: none;

      }

#else

      body.appMenuButtonVisible .toolsMenu {

        display: none;

      }

#endif

      body.appMenuButtonInvisible .appMenuButton {

        display: none;

      }
@@ -94,9 +108,15 @@ 
                                                             "appMenuButtonInvisible");

      }, false);



#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING

      function openPrivateWindow() {

        mainWindow.OpenBrowserWindow({private: true});

      }

#else

      function togglePrivateBrowsing() {

        mainWindow.gPrivateBrowsingUI.toggleMode();

      }

#endif

    ]]></script>

  </head>
@@ -117,27 +137,48 @@ 


        <!-- Short Description -->

        <div id="errorShortDesc">

#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING

          <p id="errorShortDescText" class="showPrivate">&privatebrowsingpage.perwindow.issueDesc;</p>

          <p id="errorShortDescTextNormal" class="showNormal">&privatebrowsingpage.perwindow.issueDesc.normal;</p>

#else

          <p id="errorShortDescText" class="showPrivate">&privatebrowsingpage.issueDesc;</p>

          <p id="errorShortDescTextNormal" class="showNormal">&privatebrowsingpage.issueDesc.normal;</p>

#endif

        </div>



        <!-- Long Description -->

        <div id="errorLongDesc">

#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING

          <p id="errorLongDescText">&privatebrowsingpage.perwindow.description;</p>

#else

          <p id="errorLongDescText">&privatebrowsingpage.description;</p>

#endif

        </div>



        <!-- Start Private Browsing -->

        <div id="startPrivateBrowsingDesc" class="showNormal">

#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING

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

                  id="startPrivateBrowsing" label="&privatebrowsingpage.openPrivateWindow.label;"

                  accesskey="&privatebrowsingpage.openPrivateWindow.accesskey;"

                  oncommand="openPrivateWindow();"/>

#else

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

                  id="startPrivateBrowsing" label="&privatebrowsingpage.startPrivateBrowsing.label;"

                  accesskey="&privatebrowsingpage.startPrivateBrowsing.accesskey;"

                  oncommand="togglePrivateBrowsing();"/>

#endif

        </div>



        <!-- Footer -->

        <div id="footerDesc">

#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING

          <p id="footerText" class="showPrivate">&privatebrowsingpage.howToStop3;</p>

          <p id="footerTextNormal" class="showNormal">&privatebrowsingpage.howToStart3;</p>

#else

          <p id="footerText" class="showPrivate">&privatebrowsingpage.howToStop2;</p>

          <p id="footerTextNormal" class="showNormal">&privatebrowsingpage.howToStart2;</p>

#endif

        </div>



        <!-- More Info -->

browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd

+11 −0
Original line number Diff line number Diff line
@@ -8,16 +8,27 @@ 
<!ENTITY privatebrowsingpage.issueDesc                 "&brandShortName; won't remember any history for this session.">

<!ENTITY privatebrowsingpage.issueDesc.normal          "&brandShortName; is not currently in Private Browsing mode.">



<!ENTITY privatebrowsingpage.perwindow.issueDesc        "&brandShortName; won't remember any history for this window.">

<!ENTITY privatebrowsingpage.perwindow.issueDesc.normal "You are not currently in a private window.">



<!ENTITY privatebrowsingpage.description               "In a Private Browsing session, &brandShortName; won't keep any browser history, search history, download history, web form history, cookies, or temporary internet files.  However, files you download and bookmarks you make will be kept.">



<!ENTITY privatebrowsingpage.perwindow.description     "In a Private Browsing window, &brandShortName; won't keep any browser history, search history, download history, web form history, cookies, or temporary internet files.  However, files you download and bookmarks you make will be kept.">



<!ENTITY privatebrowsingpage.startPrivateBrowsing.label "Start Private Browsing">

<!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey "P">



<!ENTITY privatebrowsingpage.openPrivateWindow.label "Open a Private Window">

<!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "P">



<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->

<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->

<!ENTITY privatebrowsingpage.howToStop2                "To stop Private Browsing, select &basePBMenu.label; &gt; &privateBrowsingCmd.stop.label;, or close &brandShortName;.">

<!ENTITY privatebrowsingpage.howToStart2               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &privateBrowsingCmd.start.label;.">



<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->

<!ENTITY privatebrowsingpage.howToStart3               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &newPrivateWindow.label;.">

<!ENTITY privatebrowsingpage.howToStop3                "To stop Private Browsing, you can close this window.">



<!ENTITY privatebrowsingpage.moreInfo                  "While this computer won't have a record of your browsing history, your internet service provider or employer can still track the pages you visit.">

<!ENTITY privatebrowsingpage.learnMore                 "Learn More">